sagemath/sagemath-includes.patch

diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2017-04-11 10:01:47.513275219 -0400
+++ src/module_list.py	2017-04-11 10:02:00.105275701 -0400
@@ -62,6 +62,7 @@ linbox_cflags = pkgconfig.cflags('linbox
 # Singular
 singular_pc = pkgconfig.parse('Singular')
 singular_libs = singular_pc['libraries']
+singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory']
 singular_library_dirs = singular_pc['library_dirs']
 singular_cflags = pkgconfig.cflags('Singular').split()
 
@@ -187,7 +188,8 @@ ext_modules = [
                language='c++',
                libraries = ["gmp", "m", "ntl"]),
 
-    Extension('*', sources = ['sage/algebras/letterplace/*.pyx']),
+    Extension('*', sources = ['sage/algebras/letterplace/*.pyx'],
+              include_dirs = singular_incs),
 
     Extension('sage.algebras.quatalg.quaternion_algebra_cython',
                sources = ['sage/algebras/quatalg/quaternion_algebra_cython.pyx'],
@@ -574,7 +576,8 @@ ext_modules = [
                                                         [])),
 
     Extension('sage.libs.lrcalc.lrcalc',
-              sources = ["sage/libs/lrcalc/lrcalc.pyx"]),
+              sources = ["sage/libs/lrcalc/lrcalc.pyx"],
+              include_dirs = [os.path.join(SAGE_INC, 'lrcalc')]),
 
     Extension('*', ['sage/libs/cypari2/*.pyx']),
     Extension('*', ['sage/libs/pari/*.pyx']),
@@ -592,7 +595,8 @@ ext_modules = [
               sources = ['sage/libs/readline.pyx'],
               libraries = ['readline']),
 
-    Extension('*', sources = ['sage/libs/singular/*.pyx']),
+    Extension('*', sources = ['sage/libs/singular/*.pyx'],
+              include_dirs = singular_incs),
 
     Extension('sage.libs.symmetrica.symmetrica',
               sources = ["sage/libs/symmetrica/symmetrica.pyx"],
@@ -600,17 +604,21 @@ ext_modules = [
 
     Extension('sage.libs.mpmath.utils',
               sources = ["sage/libs/mpmath/utils.pyx"],
-              libraries = ['mpfr']),
+              libraries = ['mpfr'],
+              include_dirs = [os.path.join(SAGE_INC, "flint")]),
 
     Extension('sage.libs.mpmath.ext_impl',
               sources = ["sage/libs/mpmath/ext_impl.pyx"],
-              libraries = ['mpfr']),
+              libraries = ['mpfr'],
+              include_dirs = [os.path.join(SAGE_INC, "flint")]),
 
     Extension('sage.libs.mpmath.ext_main',
-              sources = ["sage/libs/mpmath/ext_main.pyx"]),
+              sources = ["sage/libs/mpmath/ext_main.pyx"],
+              include_dirs = [os.path.join(SAGE_INC, "flint")]),
 
     Extension('sage.libs.mpmath.ext_libmp',
-              sources = ["sage/libs/mpmath/ext_libmp.pyx"]),
+              sources = ["sage/libs/mpmath/ext_libmp.pyx"],
+              include_dirs = [os.path.join(SAGE_INC, "flint")]),
 
     ###################################
     ##
@@ -618,7 +626,8 @@ ext_modules = [
     ##
     ###################################
 
-    Extension('*', ["sage/libs/arb/*.pyx"]),
+    Extension('*', ["sage/libs/arb/*.pyx"],
+              include_dirs = [SAGE_INC + '/flint', SAGE_INC + '/arb']),
 
     ###################################
     ##
@@ -799,6 +808,7 @@ ext_modules = [
     Extension("sage.matrix.matrix_complex_ball_dense",
               ["sage/matrix/matrix_complex_ball_dense.pyx"],
               libraries=['arb', 'mpfi', 'mpfr'],
+              include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
               language = "c++"),
 
     Extension('sage.matrix.matrix_complex_double_dense',
@@ -866,6 +876,7 @@ ext_modules = [
               sources = ['sage/matrix/matrix_modn_sparse.pyx']),
 
     Extension('sage.matrix.matrix_mpolynomial_dense',
+              include_dirs = singular_incs,
               sources = ['sage/matrix/matrix_mpolynomial_dense.pyx']),
 
     Extension('sage.matrix.matrix_polynomial_dense',
@@ -1189,6 +1200,7 @@ ext_modules = [
     Extension("sage.rings.complex_arb",
               ["sage/rings/complex_arb.pyx"],
               libraries=['mpfi', 'mpfr', 'gmp'],
+              include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
               language = 'c++'),
 
     Extension('sage.rings.complex_double',
@@ -1264,6 +1276,7 @@ ext_modules = [
     Extension("sage.rings.real_arb",
               ["sage/rings/real_arb.pyx"],
               libraries = ['mpfi', 'mpfr'],
+              include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
               language = 'c++'),
 
     Extension('sage.rings.real_lazy',
@@ -1462,12 +1475,15 @@ ext_modules = [
               sources = ['sage/rings/polynomial/multi_polynomial.pyx']),
 
     Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
+              include_dirs = singular_incs,
               sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx']),
 
     Extension('sage.rings.polynomial.plural',
+              include_dirs = singular_incs,
               sources = ['sage/rings/polynomial/plural.pyx']),
 
     Extension('sage.rings.polynomial.multi_polynomial_libsingular',
+              include_dirs = singular_incs,
               sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx']),
 
     Extension('sage.rings.polynomial.multi_polynomial_ring_generic',
@@ -1481,6 +1497,7 @@ ext_modules = [
 
     Extension('sage.rings.polynomial.polynomial_complex_arb',
                sources = ['sage/rings/polynomial/polynomial_complex_arb.pyx'],
+               include_dirs=[SAGE_INC + '/flint', SAGE_INC + '/arb'],
                language="c++"),
 
     Extension('sage.rings.polynomial.polynomial_compiled',
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig	2017-04-11 10:01:57.270275593 -0400
+++ src/setup.py	2017-04-11 10:02:00.107275701 -0400
@@ -83,6 +83,7 @@ except KeyError:
 # search for dependencies and add to gcc -I<path>
 # this depends on SAGE_CYTHONIZED
 include_dirs = sage_include_directories(use_sources=True)
+include_dirs.extend(['@@CYSIGNALS@@'])
 
 # Manually add -fno-strict-aliasing, which is needed to compile Cython
 # and disappears from the default flags if the user has set CFLAGS.