diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 27993ce3f..b73533d71 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -32,15 +32,7 @@ template <typename T>
 using recursive_wrapper = typename mapbox::util::recursive_wrapper<T>;
 
 template<typename... Types>
-class variant : public mapbox::util::variant<Types...>
-{
-public:
-    // tell spirit that this is an adapted variant
-    struct adapted_variant_tag;
-    using types = std::tuple<Types...>;
-    // inherit ctor's
-    using mapbox::util::variant<Types...>::variant;
-};
+using variant = typename  mapbox::util::variant<Types...>;
 
 // unary visitor interface
 // const
diff --git a/src/save_map.cpp b/src/save_map.cpp
index f3d89153c..882d795f9 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -46,7 +46,7 @@
 #include <mapnik/group/group_layout.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
 #include <mapnik/util/variant.hpp>
-#include <mapnik/util/variant_io.hpp>
+#include <mapbox/variant_io.hpp>
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string.hpp>