diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2016-08-10 09:10:17.614742069 -0400
+++ src/module_list.py	2016-08-10 09:11:22.887744568 -0400
@@ -954,7 +954,7 @@ ext_modules = [
               library_dirs = m4ri_library_dirs,
               include_dirs = m4ri_include_dirs,
               depends = [SAGE_INC + "/m4rie/m4rie.h"],
-              extra_compile_args = ['-std=c99'] + m4ri_extra_compile_args),
+              extra_compile_args = ['-std=c++11'] + m4ri_extra_compile_args),
 
     Extension('sage.matrix.matrix_modn_dense_float',
               sources = ['sage/matrix/matrix_modn_dense_float.pyx'],
@@ -962,7 +962,7 @@ ext_modules = [
               libraries = ['ntl', 'linbox', 'givaro', 'mpfr', 'gmpxx', 'gmp'] + cblas_libs,
               library_dirs = cblas_library_dirs,
               include_dirs = cblas_include_dirs,
-              extra_compile_args = nocxx11_args + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
+              extra_compile_args = ['-std=c++11', '-D__GIVARO_modular_uint64_H', '-D__GIVARO_modular_int64_H'] + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args),
 
     Extension('sage.matrix.matrix_modn_dense_double',
               sources = ['sage/matrix/matrix_modn_dense_double.pyx'],
@@ -970,7 +970,7 @@ ext_modules = [
               libraries = ['ntl', 'linbox', 'givaro', 'mpfr', 'gmpxx', 'gmp'] + cblas_libs,
               library_dirs = cblas_library_dirs,
               include_dirs = cblas_include_dirs,
-              extra_compile_args = nocxx11_args + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
+              extra_compile_args = ['-std=c++11', '-D__GIVARO_modular_uint64_H', '-D__GIVARO_modular_int64_H'] + ["-D_XPG6", "-DDISABLE_COMMENTATOR"]
                     + m4ri_extra_compile_args + givaro_extra_compile_args),
 
     Extension('sage.matrix.matrix_modn_sparse',