diff --git a/SConstruct b/SConstruct
index 1248b0184..e94c6515b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1174,7 +1174,7 @@ if not preconfigured:
             color_print(1,'Warning: Directory specified for SYSTEM_FONTS does not exist!')
 
     # Set up for libraries and headers dependency checks
-    env['CPPPATH'] = ['#include', '#']
+    env['CPPPATH'] = ['#include']
     env['LIBPATH'] = ['#src','#src/json','#src/wkt']
 
     # set any custom cxxflags and ldflags to come first
@@ -1488,7 +1488,6 @@ if not preconfigured:
             # re-append the local paths for mapnik sources to the beginning of the list
             # to make sure they come before any plugins that were 'prepended'
             env.PrependUnique(CPPPATH = '#include', delete_existing=True)
-            env.PrependUnique(CPPPATH = '#', delete_existing=True)
             env.PrependUnique(LIBPATH = '#src', delete_existing=True)
 
     if not env['HOST']:
diff --git a/boost/geometry/extensions/index/rtree/helpers.hpp b/deps/boost/geometry/extensions/index/rtree/helpers.hpp
similarity index 100%
rename from boost/geometry/extensions/index/rtree/helpers.hpp
rename to deps/boost/geometry/extensions/index/rtree/helpers.hpp
diff --git a/boost/geometry/extensions/index/rtree/rtree.hpp b/deps/boost/geometry/extensions/index/rtree/rtree.hpp
similarity index 100%
rename from boost/geometry/extensions/index/rtree/rtree.hpp
rename to deps/boost/geometry/extensions/index/rtree/rtree.hpp
diff --git a/boost/geometry/extensions/index/rtree/rtree_leaf.hpp b/deps/boost/geometry/extensions/index/rtree/rtree_leaf.hpp
similarity index 100%
rename from boost/geometry/extensions/index/rtree/rtree_leaf.hpp
rename to deps/boost/geometry/extensions/index/rtree/rtree_leaf.hpp
diff --git a/boost/geometry/extensions/index/rtree/rtree_node.hpp b/deps/boost/geometry/extensions/index/rtree/rtree_node.hpp
similarity index 100%
rename from boost/geometry/extensions/index/rtree/rtree_node.hpp
rename to deps/boost/geometry/extensions/index/rtree/rtree_node.hpp
diff --git a/boost/gil/extension/toolbox/hsl.hpp b/deps/boost/gil/extension/toolbox/hsl.hpp
similarity index 100%
rename from boost/gil/extension/toolbox/hsl.hpp
rename to deps/boost/gil/extension/toolbox/hsl.hpp
diff --git a/boost/gil/extension/toolbox/hsv.hpp b/deps/boost/gil/extension/toolbox/hsv.hpp
similarity index 100%
rename from boost/gil/extension/toolbox/hsv.hpp
rename to deps/boost/gil/extension/toolbox/hsv.hpp