diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp
index 6a7b2fc36..377967aea 100644
--- a/include/mapnik/palette.hpp
+++ b/include/mapnik/palette.hpp
@@ -33,11 +33,11 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #ifdef USE_DENSE_HASH_MAP
-    #include <mapnik/sparsehash/dense_hash_map>
-    using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>;
+#include <mapnik/sparsehash/dense_hash_map>
+using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>;
 #else
-    #include <boost/unordered_map.hpp>
-    using rgba_hash_table = boost::unordered_map<unsigned int, unsigned char>;
+#include <unordered_map>
+using rgba_hash_table = std::unordered_map<unsigned int, unsigned char>;
 #endif
 #pragma GCC diagnostic pop
 
diff --git a/src/datasource_cache_static.cpp b/src/datasource_cache_static.cpp
index 9318f924b..ba79d1d01 100644
--- a/src/datasource_cache_static.cpp
+++ b/src/datasource_cache_static.cpp
@@ -28,12 +28,12 @@
 #include <mapnik/params.hpp>
 
 // boost
-#include <boost/unordered_map.hpp>
 #include <boost/assign/list_of.hpp>
 #endif
 
 // stl
 #include <stdexcept>
+#include <unordered_map>
 
 // static plugin linkage
 #ifdef MAPNIK_STATIC_PLUGINS
@@ -88,7 +88,7 @@ datasource_ptr ds_generator(parameters const& params)
 }
 
 typedef datasource_ptr (*ds_generator_ptr)(parameters const& params);
-using datasource_map = boost::unordered_map<std::string, ds_generator_ptr>;
+using datasource_map = std::unordered_map<std::string, ds_generator_ptr>;
 
 static datasource_map ds_map = boost::assign::map_list_of
     #if defined(MAPNIK_STATIC_PLUGIN_CSV)