diff --git a/SConstruct b/SConstruct
index 7e187afb3..47ae0eb92 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1262,6 +1262,9 @@ if not preconfigured:
     env.Prepend(CPPPATH = '#deps/agg/include')
     env.Prepend(LIBPATH = '#deps/agg')
 
+    # prepend deps dir for auxillary headers
+    env.Prepend(CPPPATH = '#deps')
+
     if env['CAIRO']:
         if env['CAIRO_LIBS'] or env['CAIRO_INCLUDES']:
             c_inc = env['CAIRO_INCLUDES']
@@ -1667,7 +1670,7 @@ if not HELP_REQUESTED:
     SConscript('include/build.py')
 
     # Install auxiliary headers
-    SConscript('deps/build.py')
+    SConscript('deps/mapnik/build.py')
 
     # Build the requested and able-to-be-compiled input plug-ins
     GDAL_BUILT = False
diff --git a/deps/mapnik/build.py b/deps/mapnik/build.py
new file mode 100644
index 000000000..9d281607b
--- /dev/null
+++ b/deps/mapnik/build.py
@@ -0,0 +1,13 @@
+import os
+from glob import glob
+
+Import('env')
+
+subdirs = ['sparsehash','sparsehash/internal']
+
+if 'install' in COMMAND_LINE_TARGETS:
+    for subdir in subdirs:
+        pathdir = os.path.join(subdir,'*')
+        includes = glob(pathdir)
+        inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+subdir)
+        env.Alias(target='install', source=env.Install(inc_target, includes))
diff --git a/deps/sparsehash/dense_hash_map b/deps/mapnik/sparsehash/dense_hash_map
similarity index 100%
rename from deps/sparsehash/dense_hash_map
rename to deps/mapnik/sparsehash/dense_hash_map
diff --git a/deps/sparsehash/internal/densehashtable.h b/deps/mapnik/sparsehash/internal/densehashtable.h
similarity index 100%
rename from deps/sparsehash/internal/densehashtable.h
rename to deps/mapnik/sparsehash/internal/densehashtable.h
diff --git a/deps/sparsehash/internal/hashtable-common.h b/deps/mapnik/sparsehash/internal/hashtable-common.h
similarity index 100%
rename from deps/sparsehash/internal/hashtable-common.h
rename to deps/mapnik/sparsehash/internal/hashtable-common.h
diff --git a/deps/sparsehash/internal/libc_allocator_with_realloc.h b/deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h
similarity index 100%
rename from deps/sparsehash/internal/libc_allocator_with_realloc.h
rename to deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h
diff --git a/deps/sparsehash/internal/sparseconfig.h b/deps/mapnik/sparsehash/internal/sparseconfig.h
similarity index 100%
rename from deps/sparsehash/internal/sparseconfig.h
rename to deps/mapnik/sparsehash/internal/sparseconfig.h
diff --git a/deps/sparsehash/template_util.h b/deps/mapnik/sparsehash/template_util.h
similarity index 100%
rename from deps/sparsehash/template_util.h
rename to deps/mapnik/sparsehash/template_util.h
diff --git a/deps/sparsehash/type_traits.h b/deps/mapnik/sparsehash/type_traits.h
similarity index 100%
rename from deps/sparsehash/type_traits.h
rename to deps/mapnik/sparsehash/type_traits.h