diff --git a/Makefile b/Makefile
index 8265ea932..9f2ad7ce9 100755
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,11 @@ src/json/libmapnik-json.a:
 		src/renderer_common/render_thunk_extractor.os \
 		src/json/libmapnik-json.a \
 		src/wkt/libmapnik-wkt.a \
+		src/marker_helpers.os \
+		src/svg/svg_transform_parser.os \
+		src/agg/process_line_symbolizer.os \
+		plugins/input/geojson/geojson_datasource.os \
+		utils/mapnik-index/process_geojson_file.o \
 
 mapnik: src/json/libmapnik-json.a
 	# then install the rest with -j$(JOBS)
diff --git a/include/mapnik/json/topojson_grammar_impl.hpp b/include/mapnik/json/topojson_grammar_impl.hpp
index 558ef7232..d1dfc5474 100644
--- a/include/mapnik/json/topojson_grammar_impl.hpp
+++ b/include/mapnik/json/topojson_grammar_impl.hpp
@@ -24,6 +24,7 @@
 #include <mapnik/json/generic_json.hpp>
 
 #pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>