diff --git a/benchmark/bench_framework.hpp b/benchmark/bench_framework.hpp
index a3de4fdd9..4cc9390e8 100644
--- a/benchmark/bench_framework.hpp
+++ b/benchmark/bench_framework.hpp
@@ -4,7 +4,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/safe_cast.hpp>
 #include "../test/cleanup.hpp"
 
diff --git a/include/mapnik/attribute.hpp b/include/mapnik/attribute.hpp
index edfaebefc..80887dacd 100644
--- a/include/mapnik/attribute.hpp
+++ b/include/mapnik/attribute.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_ATTRIBUTE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 // stl
diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index 58b34486e..d2acffa55 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/include/mapnik/expression_grammar_impl.hpp b/include/mapnik/expression_grammar_impl.hpp
index ad28f0135..5bc85954a 100644
--- a/include/mapnik/expression_grammar_impl.hpp
+++ b/include/mapnik/expression_grammar_impl.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/expression_grammar.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/function_call.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index 6fdad8f5f..77c45463a 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_EXPRESSION_NODE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/include/mapnik/expression_node_types.hpp b/include/mapnik/expression_node_types.hpp
index 371274a4e..0e2e3ce7b 100644
--- a/include/mapnik/expression_node_types.hpp
+++ b/include/mapnik/expression_node_types.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 namespace mapnik
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 5e09ebb3c..ff10ed5b0 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
diff --git a/include/mapnik/feature_factory.hpp b/include/mapnik/feature_factory.hpp
index c4a4d560e..87d20dc75 100644
--- a/include/mapnik/feature_factory.hpp
+++ b/include/mapnik/feature_factory.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 //#include <boost/pool/pool_alloc.hpp>
diff --git a/include/mapnik/group/group_symbolizer_helper.hpp b/include/mapnik/group/group_symbolizer_helper.hpp
index 93c7d4f3f..082f75e5d 100644
--- a/include/mapnik/group/group_symbolizer_helper.hpp
+++ b/include/mapnik/group/group_symbolizer_helper.hpp
@@ -25,7 +25,7 @@
 //mapnik
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/placements/base.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index 65c04c47d..4b812700d 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_GENERIC_JSON_HPP
 #define MAPNIK_GENERIC_JSON_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/value_converters.hpp>
 
diff --git a/include/mapnik/json/properties_generator_grammar.hpp b/include/mapnik/json/properties_generator_grammar.hpp
index 69145b8ab..3ae671af7 100644
--- a/include/mapnik/json/properties_generator_grammar.hpp
+++ b/include/mapnik/json/properties_generator_grammar.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 #define MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp
index f751f31c3..a35fa7034 100644
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/quad_tree.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp
index 535cacb38..280a6addf 100644
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push
diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp
index f127c4cf2..03b7765cb 100644
--- a/include/mapnik/params_impl.hpp
+++ b/include/mapnik/params_impl.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/conversions.hpp>
 
diff --git a/include/mapnik/svg/output/svg_generator.hpp b/include/mapnik/svg/output/svg_generator.hpp
index 1b3f18dea..e2a2830e2 100644
--- a/include/mapnik/svg/output/svg_generator.hpp
+++ b/include/mapnik/svg/output/svg_generator.hpp
@@ -30,7 +30,7 @@
 #include <mapnik/svg/geometry_svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 
 namespace mapnik { namespace svg {
diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp
index d99575b4d..9cd7e0536 100644
--- a/include/mapnik/svg/svg_renderer_agg.hpp
+++ b/include/mapnik/svg/svg_renderer_agg.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/gradient.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 #if defined(GRID_RENDERER)
diff --git a/include/mapnik/symbolizer_base.hpp b/include/mapnik/symbolizer_base.hpp
index f07cf3d2a..17f14a8e5 100644
--- a/include/mapnik/symbolizer_base.hpp
+++ b/include/mapnik/symbolizer_base.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/path_expression.hpp>
 #include <mapnik/symbolizer_keys.hpp>
diff --git a/include/mapnik/symbolizer_default_values.hpp b/include/mapnik/symbolizer_default_values.hpp
index ea5e5c02e..6131e89ae 100644
--- a/include/mapnik/symbolizer_default_values.hpp
+++ b/include/mapnik/symbolizer_default_values.hpp
@@ -29,7 +29,7 @@
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/simplify.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <type_traits>
 
 
diff --git a/include/mapnik/text/itemizer.hpp b/include/mapnik/text/itemizer.hpp
index 5087ce06f..b33c559bb 100644
--- a/include/mapnik/text/itemizer.hpp
+++ b/include/mapnik/text/itemizer.hpp
@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/text/evaluated_format_properties_ptr.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/config.hpp>
 
diff --git a/include/mapnik/text/text_layout.hpp b/include/mapnik/text/text_layout.hpp
index 2e59cdc8b..9d769c848 100644
--- a/include/mapnik/text/text_layout.hpp
+++ b/include/mapnik/text/text_layout.hpp
@@ -23,7 +23,7 @@
 #define MAPNIK_TEXT_LAYOUT_HPP
 
 //mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/attribute.hpp>
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index b43f69170..471287932 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/util/variant.hpp>
diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index f3b270cb9..22c0c87a0 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -26,7 +26,7 @@
 //mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <cstdint>
diff --git a/include/mapnik/util/conversions.hpp b/include/mapnik/util/conversions.hpp
index 284d20e03..49df4a49a 100644
--- a/include/mapnik/util/conversions.hpp
+++ b/include/mapnik/util/conversions.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <iosfwd>
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index 9ee732385..ba1575019 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -25,8 +25,8 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
-#include <mapnik/value_hash.hpp>
+#include <mapnik/value/types.hpp>
+#include <mapnik/value/hash.hpp>
 #include <mapnik/util/variant.hpp>
 
 
@@ -115,7 +115,7 @@ operator << (std::basic_ostream<charT,traits>& out,
 // hash function
 inline std::size_t hash_value(value const& val)
 {
-    return mapnik_hash_value(val);
+    return mapnik::value_hash(val);
 }
 
 } // namespace value_adl_barrier
@@ -157,7 +157,7 @@ struct hash<mapnik::value>
 {
     size_t operator()(mapnik::value const& val) const
     {
-        return mapnik::mapnik_hash_value(val);
+        return mapnik::value_hash(val);
     }
 };
 
diff --git a/include/mapnik/value_error.hpp b/include/mapnik/value/error.hpp
similarity index 89%
rename from include/mapnik/value_error.hpp
rename to include/mapnik/value/error.hpp
index 68df62255..171c65f7d 100644
--- a/include/mapnik/value_error.hpp
+++ b/include/mapnik/value/error.hpp
@@ -28,20 +28,19 @@
 #include <exception>
 #include <string>
 
-namespace mapnik {
+namespace mapnik { namespace value {
 
-class value_error : public std::exception
+class error : public std::exception
 {
 public:
-    value_error() :
+    error() :
         what_() {}
 
-    value_error( std::string const& what ) :
+    error( std::string const& what ) :
         what_( what )
-    {
-    }
+    {}
 
-    virtual ~value_error() throw() {}
+    virtual ~error() throw() {}
 
     virtual const char * what() const throw()
     {
@@ -56,6 +55,7 @@ public:
 protected:
     mutable std::string what_;
 };
-}
+
+}}
 
 #endif // MAPNIK_VALUE_ERROR_HPP
diff --git a/include/mapnik/value_hash.hpp b/include/mapnik/value/hash.hpp
similarity index 94%
rename from include/mapnik/value_hash.hpp
rename to include/mapnik/value/hash.hpp
index 80e10d855..81a27019a 100644
--- a/include/mapnik/value_hash.hpp
+++ b/include/mapnik/value/hash.hpp
@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/util/variant.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 // stl
 #include <functional>
 
@@ -35,7 +35,9 @@
 
 #pragma GCC diagnostic pop
 
-namespace mapnik { namespace detail {
+namespace mapnik {
+
+namespace detail {
 
 inline void hash_combine(std::size_t & seed, std::size_t val)
 {
@@ -70,7 +72,7 @@ struct value_hasher
 } // namespace  detail
 
 template <typename T>
-std::size_t mapnik_hash_value(T const& val)
+std::size_t value_hash(T const& val)
 {
     std::size_t seed = 0;
     detail::hash_combine(seed, util::apply_visitor(detail::value_hasher(), val));
diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value/types.hpp
similarity index 100%
rename from include/mapnik/value_types.hpp
rename to include/mapnik/value/types.hpp
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index ba1829472..1ebe96190 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/simplify.hpp>
 #include <mapnik/simplify_converter.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/symbolizer_keys.hpp>
 #include <mapnik/symbolizer.hpp>
diff --git a/include/mapnik/xml_attribute_cast.hpp b/include/mapnik/xml_attribute_cast.hpp
index cafa7e79a..0b3531189 100644
--- a/include/mapnik/xml_attribute_cast.hpp
+++ b/include/mapnik/xml_attribute_cast.hpp
@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/boolean.hpp>
diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp
index 17b9f3adb..cb763f08c 100644
--- a/plugins/input/csv/csv_datasource.cpp
+++ b/plugins/input/csv/csv_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/make_unique.hpp>
 #include <mapnik/util/spatial_index.hpp>
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
index 71cf2ea71..bbb47339b 100644
--- a/plugins/input/csv/csv_datasource.hpp
+++ b/plugins/input/csv/csv_datasource.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include "csv_utils.hpp"
 
 #pragma GCC diagnostic push
diff --git a/plugins/input/csv/csv_utils.hpp b/plugins/input/csv/csv_utils.hpp
index df976e3a7..73f9530e6 100644
--- a/plugins/input/csv/csv_utils.hpp
+++ b/plugins/input/csv/csv_utils.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/csv/csv_types.hpp>
diff --git a/plugins/input/gdal/gdal_datasource.cpp b/plugins/input/gdal/gdal_datasource.cpp
index 2454ed65b..2514b9455 100644
--- a/plugins/input/gdal/gdal_datasource.cpp
+++ b/plugins/input/gdal/gdal_datasource.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <gdal_version.h>
 
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 054b1e07b..bd58306ce 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/proj_transform.hpp>
diff --git a/plugins/input/ogr/ogr_featureset.cpp b/plugins/input/ogr/ogr_featureset.cpp
index c82a8431f..f5b28041d 100644
--- a/plugins/input/ogr/ogr_featureset.cpp
+++ b/plugins/input/ogr/ogr_featureset.cpp
@@ -22,14 +22,14 @@
 
 // mapnik
 #include <mapnik/global.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/correct.hpp>
 
diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp
index 768e16e91..a2442475b 100644
--- a/plugins/input/ogr/ogr_index_featureset.cpp
+++ b/plugins/input/ogr/ogr_index_featureset.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index e6eddf758..16339efbb 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -36,7 +36,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/pgraster/pgraster_datasource.hpp b/plugins/input/pgraster/pgraster_datasource.hpp
index 221f196e4..321e36635 100644
--- a/plugins/input/pgraster/pgraster_datasource.hpp
+++ b/plugins/input/pgraster/pgraster_datasource.hpp
@@ -36,7 +36,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/pgraster/pgraster_featureset.cpp b/plugins/input/pgraster/pgraster_featureset.cpp
index e2d4ccb50..781f06958 100644
--- a/plugins/input/pgraster/pgraster_featureset.cpp
+++ b/plugins/input/pgraster/pgraster_featureset.cpp
@@ -34,7 +34,7 @@
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 10ce521d0..02fc0c3b3 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -33,7 +33,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index 80ba89495..229fc831a 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/attribute.hpp>
 
 // boost
diff --git a/plugins/input/postgis/postgis_featureset.cpp b/plugins/input/postgis/postgis_featureset.cpp
index 25e2b6b4b..1b00cdb01 100644
--- a/plugins/input/postgis/postgis_featureset.cpp
+++ b/plugins/input/postgis/postgis_featureset.cpp
@@ -30,7 +30,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index d64d37384..3594bcbd6 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/unicode.hpp>
diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp
index 56d7a6aae..9c9015879 100644
--- a/plugins/input/shape/shape_datasource.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -40,7 +40,7 @@
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <fstream>
diff --git a/plugins/input/shape/shape_datasource.hpp b/plugins/input/shape/shape_datasource.hpp
index f702036eb..016d5cb57 100644
--- a/plugins/input/shape/shape_datasource.hpp
+++ b/plugins/input/shape/shape_datasource.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/shape/shape_featureset.hpp b/plugins/input/shape/shape_featureset.hpp
index caa962554..cfd440bca 100644
--- a/plugins/input/shape/shape_featureset.hpp
+++ b/plugins/input/shape/shape_featureset.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include "shape_io.hpp"
 
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index d104e0f20..bd8eecfe7 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -31,7 +31,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 
diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp
index eab71e9e3..5551d65aa 100644
--- a/plugins/input/sqlite/sqlite_datasource.hpp
+++ b/plugins/input/sqlite/sqlite_datasource.hpp
@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>
diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp
index fc5af1d09..93d977a02 100644
--- a/plugins/input/sqlite/sqlite_featureset.cpp
+++ b/plugins/input/sqlite/sqlite_featureset.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/geometry/envelope.hpp>
diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp
index 6c557d1f6..7c5493764 100644
--- a/plugins/input/topojson/topojson_datasource.cpp
+++ b/plugins/input/topojson/topojson_datasource.cpp
@@ -31,7 +31,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>
diff --git a/src/conversions.cpp b/src/conversions.cpp
index 04bfc5789..fc63f1dcd 100644
--- a/src/conversions.cpp
+++ b/src/conversions.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <cstring>
 #include <algorithm>
diff --git a/src/expression_node.cpp b/src/expression_node.cpp
index 549f4c891..9b78b5a04 100644
--- a/src/expression_node.cpp
+++ b/src/expression_node.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/expression_node.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/safe_cast.hpp>
 
diff --git a/src/expression_string.cpp b/src/expression_string.cpp
index 0f904ee68..a10a85da2 100644
--- a/src/expression_string.cpp
+++ b/src/expression_string.cpp
@@ -27,7 +27,7 @@
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 namespace mapnik
diff --git a/src/group/group_symbolizer_helper.cpp b/src/group/group_symbolizer_helper.cpp
index 2ba70ff9b..e520f1ae8 100644
--- a/src/group/group_symbolizer_helper.cpp
+++ b/src/group/group_symbolizer_helper.cpp
@@ -28,7 +28,7 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/vertex_cache.hpp>
diff --git a/src/params.cpp b/src/params.cpp
index 8d3a2c859..4a25c64a6 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -24,7 +24,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/params_impl.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 namespace mapnik {
 
diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp
index 2c43df6b6..b8dc077f9 100644
--- a/src/raster_colorizer.cpp
+++ b/src/raster_colorizer.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp> // for to_double
 #include <mapnik/feature.hpp>
 #include <mapnik/raster.hpp>
diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp
index 85c5876b6..384a7fe96 100644
--- a/src/text/symbolizer_helpers.cpp
+++ b/src/text/symbolizer_helpers.cpp
@@ -36,7 +36,7 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placement_finder_impl.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
diff --git a/src/unicode.cpp b/src/unicode.cpp
index c96c58914..969926788 100644
--- a/src/unicode.cpp
+++ b/src/unicode.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <stdexcept>
diff --git a/src/value.cpp b/src/value.cpp
index b5ad606c7..7dfb9f4ed 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/value.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 
 // stl
diff --git a/test/unit/core/comparison_test.cpp b/test/unit/core/comparison_test.cpp
index 7e8e8e414..886b52960 100644
--- a/test/unit/core/comparison_test.cpp
+++ b/test/unit/core/comparison_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("comparison")
diff --git a/test/unit/core/conversions_test.cpp b/test/unit/core/conversions_test.cpp
index 43592af01..d804230b0 100644
--- a/test/unit/core/conversions_test.cpp
+++ b/test/unit/core/conversions_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/util/conversions.hpp>
diff --git a/test/unit/core/params_test.cpp b/test/unit/core/params_test.cpp
index 3131f0cbc..0363d24a4 100644
--- a/test/unit/core/params_test.cpp
+++ b/test/unit/core/params_test.cpp
@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <iostream>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/boolean.hpp>
 
diff --git a/test/unit/core/value_test.cpp b/test/unit/core/value_test.cpp
index cdb64dbbe..a76910a26 100644
--- a/test/unit/core/value_test.cpp
+++ b/test/unit/core/value_test.cpp
@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("mapnik::value")
diff --git a/test/unit/font/fontset_runtime_test.cpp b/test/unit/font/fontset_runtime_test.cpp
index bfbae2786..1182807cd 100644
--- a/test/unit/font/fontset_runtime_test.cpp
+++ b/test/unit/font/fontset_runtime_test.cpp
@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 
 #include <mapnik/memory_datasource.hpp>
@@ -12,7 +11,7 @@
 #include <mapnik/rule.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/text/formatting/text.hpp>
@@ -69,4 +68,4 @@ SECTION("error") {
         REQUIRE(std::string(ex.what()) == std::string("Unable to find specified font face 'DejaVu Sans Book' in font set: 'fontset'"));
     }
 }
-}
\ No newline at end of file
+}