diff --git a/sagemath-gcc6.patch b/sagemath-gcc6.patch
index 457949f..02e6ccc 100644
--- a/sagemath-gcc6.patch
+++ b/sagemath-gcc6.patch
@@ -15,7 +15,7 @@ diff -up src/module_list.py.orig src/module_list.py
                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'] + ['-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'],
@@ -24,7 +24,7 @@ diff -up src/module_list.py.orig src/module_list.py
                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_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',