diff --git a/include/mapnik/json/extract_bounding_box_grammar.hpp b/include/mapnik/json/extract_bounding_box_grammar.hpp
index 2183fe501..bfe9185bf 100644
--- a/include/mapnik/json/extract_bounding_box_grammar.hpp
+++ b/include/mapnik/json/extract_bounding_box_grammar.hpp
@@ -45,8 +45,8 @@
 
 namespace mapnik { namespace json {
 
-using position = mapnik::geometry::point<double>;
-using boxes = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>;
+using position_type = mapnik::geometry::point<double>;
+using boxes_type = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>;
 
 namespace qi = boost::spirit::qi;
 
@@ -84,15 +84,15 @@ struct push_box_impl
 
 template <typename Iterator, typename ErrorHandler = error_handler<Iterator> >
 struct extract_bounding_box_grammar :
-        qi::grammar<Iterator, void(boxes&), space_type>
+        qi::grammar<Iterator, void(boxes_type&), space_type>
 {
     extract_bounding_box_grammar();
     // rules
-    qi::rule<Iterator, void(boxes&), space_type> start;
-    qi::rule<Iterator, qi::locals<Iterator>, void(boxes&), space_type> features;
-    qi::rule<Iterator, qi::locals<int, box2d<double>>, void(boxes&, Iterator const&), space_type> feature;
+    qi::rule<Iterator, void(boxes_type&), space_type> start;
+    qi::rule<Iterator, qi::locals<Iterator>, void(boxes_type&), space_type> features;
+    qi::rule<Iterator, qi::locals<int, box2d<double>>, void(boxes_type&, Iterator const&), space_type> feature;
     qi::rule<Iterator, qi::locals<box2d<double>>, box2d<double>(), space_type> coords;
-    qi::rule<Iterator, boost::optional<position>(), space_type> pos;
+    qi::rule<Iterator, boost::optional<position_type>(), space_type> pos;
     qi::rule<Iterator, void(box2d<double>&), space_type> ring;
     qi::rule<Iterator, void(box2d<double>&), space_type> rings;
     qi::rule<Iterator, void(box2d<double>&), space_type> rings_array;
diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp
index 78d2ad2a1..bd976ec94 100644
--- a/plugins/input/geojson/geojson_datasource.cpp
+++ b/plugins/input/geojson/geojson_datasource.cpp
@@ -198,7 +198,7 @@ const mapnik::json::extract_bounding_box_grammar<base_iterator_type> geojson_dat
 template <typename Iterator>
 void geojson_datasource::initialise_index(Iterator start, Iterator end)
 {
-    mapnik::json::boxes boxes;
+    mapnik::json::boxes_type boxes;
     boost::spirit::standard::space_type space;
     Iterator itr = start;
     if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space))