diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2014-02-07 11:31:05.355688232 -0200
+++ src/module_list.py	2014-02-07 11:32:21.239691137 -0200
@@ -5,7 +5,7 @@ from distutils.core import setup
 from distutils.extension import Extension
 from sage.env import *
 
-SAGE_INC = os.path.join(SAGE_LOCAL, 'include')
+SAGE_INC = '/usr/include'
 
 #########################################################
 ### BLAS setup
@@ -36,10 +36,11 @@ else:
 ### Commonly used definitions
 #########################################################
 
-numpy_include_dirs = [SAGE_LOCAL + '/lib/python/site-packages/numpy/core/include']
+from distutils.sysconfig import get_python_lib
+numpy_include_dirs = [get_python_lib(1) + '/numpy/core/include']
 # We pick a file from numpy which is autogenerated so it has the
 # timestamp of the numpy build.
-numpy_depends = [SAGE_LOCAL + '/lib/python/site-packages/numpy/core/include/numpy/_numpyconfig.h']
+numpy_depends = [get_python_lib(1) + '/numpy/core/include/numpy/_numpyconfig.h']
 
 flint_depends = [SAGE_INC + '/flint/flint.h']
 singular_depends = [SAGE_INC + '/libsingular.h', SAGE_INC + '/givaro/givconfig.h']
@@ -70,7 +71,7 @@ givaro_extra_compile_args =['-D__STDC_LI
 ### PolyBoRi settings
 #########################################################
 
-polybori_extra_compile_args = []
+polybori_extra_compile_args = ['-DPBORI_USE_ORIGINAL_CUDD']
 polybori_major_version = '0.8'
 
 
@@ -702,7 +703,7 @@ ext_modules = [
               sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
               libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
                            'Lfunction', 'stdc++'],
-              include_dirs = [SAGE_INC + "/libLfunction"],
+              include_dirs = [SAGE_INC + "/Lfunction"],
               extra_compile_args=["-O3", "-ffast-math"],
               language = 'c++'),
 
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig	2014-02-07 11:32:35.278691675 -0200
+++ src/setup.py	2014-02-07 11:34:40.589696474 -0200
@@ -36,11 +36,11 @@ except KeyError:
     compile_result_dir = None
     keep_going = False
 
-SAGE_INC = os.path.join(SAGE_LOCAL,'include')
+SAGE_INC = '/usr/include'
 
 # search for dependencies and add to gcc -I<path>
 include_dirs = [SAGE_INC,
-                os.path.join(SAGE_INC, 'csage'),
+                'c_lib/include',
                 SAGE_SRC,
                 os.path.join(SAGE_SRC, 'sage', 'ext')]
 
@@ -161,11 +161,11 @@ for m in ext_modules:
 
     # FIMXE: Do NOT link the following libraries to each and
     #        every module (regardless of the language btw.):
-    m.libraries = ['csage'] + m.libraries + ['stdc++', 'ntl']
+    m.libraries = ['csage'] + m.libraries + ['stdc++', 'ntl', 'gmp', 'm', 'dl']
 
     m.extra_compile_args += extra_compile_args
     m.extra_link_args += extra_link_args
-    m.library_dirs += ['%s/lib' % SAGE_LOCAL]
+    m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL]