diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2015-12-09 18:09:26.357141568 -0200
+++ src/module_list.py	2015-12-09 18:09:36.501141956 -0200
@@ -3,7 +3,7 @@ from glob import glob
 from distutils.extension import Extension
 from sage.env import SAGE_LOCAL
 
-SAGE_INC = os.path.join(SAGE_LOCAL, 'include')
+SAGE_INC = '/usr/include'
 
 #########################################################
 ### BLAS setup
@@ -66,7 +66,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'
 
 #########################################################
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig	2015-12-09 18:09:33.813141853 -0200
+++ src/setup.py	2015-12-09 18:13:21.819150584 -0200
@@ -64,6 +64,7 @@ except KeyError:
     keep_going = False
 
 # search for dependencies and add to gcc -I<path>
+SAGE_INC = '/usr/include'
 include_dirs = sage_include_directories(use_sources=True)
 
 # Manually add -fno-strict-aliasing, which is needed to compile Cython
@@ -567,11 +568,9 @@ def run_cythonize():
         print('Enabling Cython profiling support')
         profile = True
 
-    # Disable Cython caching (the cache is stored in ~/.cycache which is
+    # Enable Cython caching (the cache is stored in ~/.cycache which is
     # Cython's default).
-    # Cycache is currently too broken to use reliably:
-    # http://trac.sagemath.org/ticket/17851
-    Cython.Compiler.Main.default_options['cache'] = False
+    Cython.Compiler.Main.default_options['cache'] = True
 
     force = True
     version_file = os.path.join(os.path.dirname(__file__), '.cython_version')
@@ -620,21 +619,6 @@ print("Discovered Python/Cython sources,
 
 
 #########################################################
-### Clean
-#########################################################
-
-print('Cleaning up stale installed files....')
-t = time.time()
-from sage_setup.clean import clean_install_dir
-output_dirs = SITE_PACKAGES + glob.glob(os.path.join(SAGE_SRC, 'build', 'lib*'))
-for output_dir in output_dirs:
-    print('- cleaning {0}'.format(output_dir))
-    clean_install_dir(output_dir, python_packages, python_modules,
-            ext_modules, python_data_files)
-print('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
-
-
-#########################################################
 ### Distutils
 #########################################################