diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp
index a05caf9d4..a9168e59f 100644
--- a/include/mapnik/config.hpp
+++ b/include/mapnik/config.hpp
@@ -52,18 +52,4 @@
 
 #define PROJ_ENVELOPE_POINTS 20
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-
-#ifndef BOOST_MPL_LIMIT_VECTOR_SIZE
- #define BOOST_MPL_LIMIT_VECTOR_SIZE 30
-#else
- #warning "WARNING: BOOST_MPL_LIMIT_VECTOR_SIZE is already defined. Ensure config.hpp is included before any Boost headers"
-#endif
-
-#ifndef BOOST_MPL_LIMIT_LIST_SIZE
- #define BOOST_MPL_LIMIT_LIST_SIZE 30
-#else
- #warning "WARNING: BOOST_MPL_LIMIT_LIST_SIZE is already defined. Ensure config.hpp is included before any Boost headers"
-#endif
-
 #endif // MAPNIK_CONFIG_HPP
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 87cfb70ff..27993ce3f 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -26,24 +26,18 @@
 #include <mapnik/config.hpp>
 #include <mapbox/variant.hpp>
 
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include <boost/mpl/vector.hpp> // spirit support
-#pragma GCC diagnostic pop
-
 namespace mapnik { namespace util {
 
 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 = boost::mpl::vector<Types...>;
+    using types = std::tuple<Types...>;
     // inherit ctor's
     using mapbox::util::variant<Types...>::variant;
 };