diff --git a/include/mapnik/std.hpp b/include/mapnik/make_unique.hpp
similarity index 82%
rename from include/mapnik/std.hpp
rename to include/mapnik/make_unique.hpp
index b3fb25898..0434cec78 100644
--- a/include/mapnik/std.hpp
+++ b/include/mapnik/make_unique.hpp
@@ -20,19 +20,19 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_STD_HPP
-#define MAPNIK_STD_HPP
+#ifndef MAPNIK_MAKE_UNIQUE_HPP
+#define MAPNIK_MAKE_UNIQUE_HPP
 
 #include <memory>
 
-namespace std {
+namespace mapnik {
 
 // C++14 backfill from http://herbsutter.com/gotw/_102/
 template<typename T, typename ...Args>
-inline ::std::unique_ptr<T> make_unique(Args&& ...args) {
-    return ::std::unique_ptr<T>(new T(::std::forward<Args>(args)...));
+inline std::unique_ptr<T> make_unique(Args&& ...args) {
+    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
 
 }
 
-#endif
+#endif // MAPNIK_MAKE_UNIQUE_HPP
diff --git a/include/mapnik/util/geometry_to_wkb.hpp b/include/mapnik/util/geometry_to_wkb.hpp
index 70afb69c1..58967394e 100644
--- a/include/mapnik/util/geometry_to_wkb.hpp
+++ b/include/mapnik/util/geometry_to_wkb.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_TO_WKB_HPP
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
 
diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp
index 5663032ff..d131c951a 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/image_data.hpp>
diff --git a/plugins/input/osm/osm_featureset.cpp b/plugins/input/osm/osm_featureset.cpp
index b6f68af39..99be92be0 100644
--- a/plugins/input/osm/osm_featureset.cpp
+++ b/plugins/input/osm/osm_featureset.cpp
@@ -1,4 +1,3 @@
-
 /*****************************************************************************
  *
  * This file is part of Mapnik (c++ mapping toolkit)
@@ -22,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp
index 9fc6f85ff..e027990ab 100644
--- a/plugins/input/shape/shape_datasource.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -31,7 +31,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/utils.hpp>
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 5118a92eb..bd6737f07 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/geom_util.hpp>
 
diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index 51ae6d993..d988973e0 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/agg_renderer.hpp>
diff --git a/src/cairo/cairo_renderer.cpp b/src/cairo/cairo_renderer.cpp
index a4f0dd4d3..93b983e13 100644
--- a/src/cairo/cairo_renderer.cpp
+++ b/src/cairo/cairo_renderer.cpp
@@ -23,7 +23,7 @@
 #if defined(HAVE_CAIRO)
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/layer.hpp>
diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp
index 3779a1c99..c27f43884 100644
--- a/src/grid/process_building_symbolizer.cpp
+++ b/src/grid/process_building_symbolizer.cpp
@@ -23,7 +23,7 @@
 #if defined(GRID_RENDERER)
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/grid/grid_rasterizer.hpp>
 #include <mapnik/grid/grid_renderer.hpp>
diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp
index 8116e98a8..75391ffdb 100644
--- a/src/webp_reader.cpp
+++ b/src/webp_reader.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/image_reader.hpp>
 
diff --git a/src/wkb.cpp b/src/wkb.cpp
index facee7113..143d95260 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/wkb.hpp>
diff --git a/src/xml_tree.cpp b/src/xml_tree.cpp
index 8e53470cf..02cda08c3 100644
--- a/src/xml_tree.cpp
+++ b/src/xml_tree.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 //mapnik
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/xml_attribute_cast.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/tests/cpp_tests/fontset_runtime_test.cpp b/tests/cpp_tests/fontset_runtime_test.cpp
index 69082b2a1..5e4acc03e 100644
--- a/tests/cpp_tests/fontset_runtime_test.cpp
+++ b/tests/cpp_tests/fontset_runtime_test.cpp
@@ -21,7 +21,7 @@
 #include <mapnik/symbolizer.hpp>
 #include <vector>
 #include <algorithm>
-#include <mapnik/std.hpp>
+#include <mapnik/make_unique.hpp>
 
 #include "utils.hpp"