diff --git a/include/mapnik/expression_grammar_x3_config.hpp b/include/mapnik/expression_grammar_x3_config.hpp
index d6590f946..ffd9f9a1d 100644
--- a/include/mapnik/expression_grammar_x3_config.hpp
+++ b/include/mapnik/expression_grammar_x3_config.hpp
@@ -34,9 +34,9 @@ using iterator_type = std::string::const_iterator;
 using phrase_context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
 
 // define combined context
-using context_type = x3::with_context<transcoder_tag,
-                                      std::reference_wrapper<mapnik::transcoder const> const,
-                                      phrase_context_type>::type;
+using context_type = x3::context<transcoder_tag,
+                                 std::reference_wrapper<mapnik::transcoder const> const,
+                                 phrase_context_type>;
 
 }}
 
diff --git a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
index 84ad66e93..082e7b19a 100644
--- a/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
+++ b/include/mapnik/json/extract_bounding_boxes_x3_config.hpp
@@ -84,31 +84,31 @@ using space_type = x3::standard::space_type;
 
 using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
 
-using context_type = x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
-                                      phrase_parse_context_type>::type;
+using context_type = x3::context<keys_tag, std::reference_wrapper<keys_map> const,
+                                 phrase_parse_context_type>;
 
 using extract_bounding_boxes_context_type =
-    x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
-                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type> const,
-                                      context_type>::type>::type;
+    x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                     x3::context<feature_callback_tag, std::reference_wrapper<callback_type> const,
+                                      context_type>>;
 
 using extract_bounding_boxes_reverse_context_type =
-    x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
-                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type> const,
-                                      x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
-                                                       phrase_parse_context_type>::type>::type>::type;
+    x3::context<keys_tag, std::reference_wrapper<keys_map> const,
+                x3::context<feature_callback_tag, std::reference_wrapper<callback_type> const,
+                            x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                                        phrase_parse_context_type>>>;
 
 
 using extract_bounding_boxes_context_type_f =
-    x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
-                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
-                                      context_type>::type>::type;
+    x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
+                            context_type>>;
 
 using extract_bounding_boxes_reverse_context_type_f =
-    x3::with_context<keys_tag, std::reference_wrapper<keys_map> const,
-                     x3::with_context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
-                                      x3::with_context<bracket_tag, std::reference_wrapper<std::size_t> const,
-                                                       phrase_parse_context_type>::type>::type>::type;
+    x3::context<keys_tag, std::reference_wrapper<keys_map> const,
+                x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
+                            x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
+                                        phrase_parse_context_type>>>;
 
 }}}
 
diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp
index cc23efa8d..854a50b21 100644
--- a/include/mapnik/json/json_grammar_config.hpp
+++ b/include/mapnik/json/json_grammar_config.hpp
@@ -91,22 +91,22 @@ using space_type = x3::standard::space_type;
 using iterator_type = char const*;
 
 using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
-using context_type = x3::with_context<keys_tag,
-                                      std::reference_wrapper<keys_map> const,
-                                      phrase_parse_context_type>::type;
+using context_type = x3::context<keys_tag,
+                                 std::reference_wrapper<keys_map> const,
+                                 phrase_parse_context_type>;
 
-using feature_context_type = x3::with_context<transcoder_tag,
-                                              std::reference_wrapper<mapnik::transcoder> const,
-                                              x3::with_context<feature_tag,
-                                                               std::reference_wrapper<mapnik::feature_impl> const,
-                                                               phrase_parse_context_type>::type>::type;
+using feature_context_type = x3::context<transcoder_tag,
+                                         std::reference_wrapper<mapnik::transcoder> const,
+                                         x3::context<feature_tag,
+                                                          std::reference_wrapper<mapnik::feature_impl> const,
+                                                          phrase_parse_context_type>>;
 
 // our spirit x3 grammars needs this one with changed order of feature_impl and transcoder (??)
-using feature_context_const_type = x3::with_context<feature_tag,
-                                                    std::reference_wrapper<mapnik::feature_impl> const,
-                                                    x3::with_context<transcoder_tag,
-                                                                     std::reference_wrapper<mapnik::transcoder const> const,
-                                                                     phrase_parse_context_type>::type>::type;
+using feature_context_const_type = x3::context<feature_tag,
+                                               std::reference_wrapper<mapnik::feature_impl> const,
+                                               x3::context<transcoder_tag,
+                                                           std::reference_wrapper<mapnik::transcoder const> const,
+                                                           phrase_parse_context_type>>;
 
 // helper macro
 #define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context)   \
diff --git a/include/mapnik/svg/svg_grammar_config_x3.hpp b/include/mapnik/svg/svg_grammar_config_x3.hpp
index 44a2af266..db1c7eb8d 100644
--- a/include/mapnik/svg/svg_grammar_config_x3.hpp
+++ b/include/mapnik/svg/svg_grammar_config_x3.hpp
@@ -40,9 +40,9 @@ using space_type = x3::standard::space_type;
 using iterator_type = char const*;
 
 using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
-using svg_parse_context_type = x3::with_context<relative_tag, std::reference_wrapper<bool> const,
-                                                x3::with_context<svg_path_tag,std::reference_wrapper<svg_converter_type> const,
-                                                                 phrase_parse_context_type>::type>::type;
+using svg_parse_context_type = x3::context<relative_tag, std::reference_wrapper<bool> const,
+                                           x3::context<svg_path_tag,std::reference_wrapper<svg_converter_type> const,
+                                                       phrase_parse_context_type>>;
 
 inline double deg2rad(double deg) {return (M_PI * deg) / 180.0;}