diff --git a/Makefile b/Makefile
index 314310d36..0ae5d4160 100755
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ clean:
 	@find ./ -name "*.dylib" -exec rm {} \;
 	@find ./ -name "*.so" -exec rm {} \;
 	@find ./ -name "*.o" -exec rm {} \;
+	@find ./ -name "*.a" -exec rm {} \;
 	@find ./ -name "*.pyc" -exec rm {} \;
 	@if test -e "bindings/python/mapnik/paths.py"; then rm "bindings/python/mapnik/paths.py"; fi
 
diff --git a/SConstruct b/SConstruct
index 7b3509ba1..cddcf61f1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1788,7 +1788,7 @@ if not preconfigured:
         else:
             # TODO - add back -fvisibility-inlines-hidden
             # https://github.com/mapnik/mapnik/issues/1863
-            env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION']))
+            env.Append(CXXFLAGS = common_cxx_flags + '-O%s -Wextra -Wno-unknown-pragmas' % (env['OPTIMIZATION']))
         if env['DEBUG_UNDEFINED']:
             env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
 
diff --git a/bindings/python/mapnik_color.cpp b/bindings/python/mapnik_color.cpp
index 1068fdf43..067a73d85 100644
--- a/bindings/python/mapnik_color.cpp
+++ b/bindings/python/mapnik_color.cpp
@@ -24,7 +24,13 @@
 #include "boost_std_shared_shim.hpp"
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 //mapnik
 #include <mapnik/color.hpp>
diff --git a/bindings/python/mapnik_coord.cpp b/bindings/python/mapnik_coord.cpp
index 90a6a34c5..222f5b47e 100644
--- a/bindings/python/mapnik_coord.cpp
+++ b/bindings/python/mapnik_coord.cpp
@@ -23,7 +23,14 @@
 #include "boost_std_shared_shim.hpp"
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
+
 
 // mapnik
 #include <mapnik/coord.hpp>
diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp
index 8b5a22c05..df63fe0d8 100644
--- a/bindings/python/mapnik_datasource.cpp
+++ b/bindings/python/mapnik_datasource.cpp
@@ -24,9 +24,15 @@
 
 // boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/version.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>
diff --git a/bindings/python/mapnik_datasource_cache.cpp b/bindings/python/mapnik_datasource_cache.cpp
index 8ecba1ccd..d33ece83b 100644
--- a/bindings/python/mapnik_datasource_cache.cpp
+++ b/bindings/python/mapnik_datasource_cache.cpp
@@ -22,10 +22,16 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
+
 #include <mapnik/value_types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/datasource.hpp>
diff --git a/bindings/python/mapnik_envelope.cpp b/bindings/python/mapnik_envelope.cpp
index bab80e332..04f18514d 100644
--- a/bindings/python/mapnik_envelope.cpp
+++ b/bindings/python/mapnik_envelope.cpp
@@ -22,10 +22,14 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/box2d.hpp>
@@ -94,7 +98,7 @@ void (box2d<double>::*clip)(box2d<double> const&) = &box2d<double>::clip;
 void (box2d<double>::*pad)(double) = &box2d<double>::pad;
 
 // deepcopy
-box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict memo)
+box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict const&)
 {
     // FIXME::ignore memo for now
     box2d<double> result(obj);
diff --git a/bindings/python/mapnik_expression.cpp b/bindings/python/mapnik_expression.cpp
index f9ded80ec..75f35272b 100644
--- a/bindings/python/mapnik_expression.cpp
+++ b/bindings/python/mapnik_expression.cpp
@@ -21,15 +21,21 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
-#include "boost_std_shared_shim.hpp"
 #include "python_to_value.hpp"
 
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
-#include <mapnik/util/variant.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
+#include <mapnik/util/variant.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
diff --git a/bindings/python/mapnik_feature.cpp b/bindings/python/mapnik_feature.cpp
index b12bd1570..bb6f3f33a 100644
--- a/bindings/python/mapnik_feature.cpp
+++ b/bindings/python/mapnik_feature.cpp
@@ -22,15 +22,20 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/iterator.hpp>
 #include <boost/python/call_method.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/value_types.hpp>
diff --git a/bindings/python/mapnik_featureset.cpp b/bindings/python/mapnik_featureset.cpp
index 7836d6f18..b6d0fe384 100644
--- a/bindings/python/mapnik_featureset.cpp
+++ b/bindings/python/mapnik_featureset.cpp
@@ -22,11 +22,16 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/feature.hpp>
diff --git a/bindings/python/mapnik_font_engine.cpp b/bindings/python/mapnik_font_engine.cpp
index 5bc43a8a5..0da036f06 100644
--- a/bindings/python/mapnik_font_engine.cpp
+++ b/bindings/python/mapnik_font_engine.cpp
@@ -22,10 +22,16 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/utils.hpp>
diff --git a/bindings/python/mapnik_fontset.cpp b/bindings/python/mapnik_fontset.cpp
index a7924dec8..89668a08c 100644
--- a/bindings/python/mapnik_fontset.cpp
+++ b/bindings/python/mapnik_fontset.cpp
@@ -21,10 +21,16 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
-#include "boost_std_shared_shim.hpp"
 
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 //mapnik
 #include <mapnik/font_set.hpp>
diff --git a/bindings/python/mapnik_gamma_method.cpp b/bindings/python/mapnik_gamma_method.cpp
index 1b3b8edde..7d82d4127 100644
--- a/bindings/python/mapnik_gamma_method.cpp
+++ b/bindings/python/mapnik_gamma_method.cpp
@@ -22,7 +22,15 @@
 
 #include <mapnik/config.hpp>
 
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
+
 #include <mapnik/symbolizer_enumerations.hpp>
 #include "mapnik_enumeration.hpp"
 
diff --git a/bindings/python/mapnik_geometry.cpp b/bindings/python/mapnik_geometry.cpp
index 1594c86a7..fb0e6da83 100644
--- a/bindings/python/mapnik_geometry.cpp
+++ b/bindings/python/mapnik_geometry.cpp
@@ -20,9 +20,13 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/exception_translator.hpp>
@@ -30,6 +34,7 @@
 #include <boost/python/iterator.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/version.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/geometry.hpp>
diff --git a/bindings/python/mapnik_grid.cpp b/bindings/python/mapnik_grid.cpp
index 18fccc1c3..2bb5f2bd3 100644
--- a/bindings/python/mapnik_grid.cpp
+++ b/bindings/python/mapnik_grid.cpp
@@ -24,12 +24,17 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/grid/grid.hpp>
diff --git a/bindings/python/mapnik_grid_view.cpp b/bindings/python/mapnik_grid_view.cpp
index bea5054c8..066628385 100644
--- a/bindings/python/mapnik_grid_view.cpp
+++ b/bindings/python/mapnik_grid_view.cpp
@@ -23,12 +23,18 @@
 #if defined(GRID_RENDERER)
 
 #include <mapnik/config.hpp>
-#include "boost_std_shared_shim.hpp"
 
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <string>
diff --git a/bindings/python/mapnik_image.cpp b/bindings/python/mapnik_image.cpp
index 7e4a3811c..0e16c7d5b 100644
--- a/bindings/python/mapnik_image.cpp
+++ b/bindings/python/mapnik_image.cpp
@@ -22,12 +22,17 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/graphics.hpp>
diff --git a/bindings/python/mapnik_image_view.cpp b/bindings/python/mapnik_image_view.cpp
index 32d75dbf7..d68afa2a5 100644
--- a/bindings/python/mapnik_image_view.cpp
+++ b/bindings/python/mapnik_image_view.cpp
@@ -22,9 +22,19 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 #include <boost/python.hpp>
+#include <boost/python/module.hpp>
+#include <boost/python/def.hpp>
+#pragma GCC diagnostic pop
+
+// mapnik
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_view.hpp>
 #include <mapnik/image_util.hpp>
diff --git a/bindings/python/mapnik_label_collision_detector.cpp b/bindings/python/mapnik_label_collision_detector.cpp
index 015adaf21..762f92570 100644
--- a/bindings/python/mapnik_label_collision_detector.cpp
+++ b/bindings/python/mapnik_label_collision_detector.cpp
@@ -22,13 +22,17 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
-#include <boost/noncopyable.hpp>
-
+#pragma GCC diagnostic pop
 
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/map.hpp>
diff --git a/bindings/python/mapnik_layer.cpp b/bindings/python/mapnik_layer.cpp
index fb7054ef8..e463afe75 100644
--- a/bindings/python/mapnik_layer.cpp
+++ b/bindings/python/mapnik_layer.cpp
@@ -21,11 +21,17 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
-#include "boost_std_shared_shim.hpp"
 
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/layer.hpp>
diff --git a/bindings/python/mapnik_logger.cpp b/bindings/python/mapnik_logger.cpp
index 6e027008c..d26c2ff79 100644
--- a/bindings/python/mapnik_logger.cpp
+++ b/bindings/python/mapnik_logger.cpp
@@ -21,10 +21,17 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
+
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 #include <mapnik/debug.hpp>
 #include <mapnik/utils.hpp>
diff --git a/bindings/python/mapnik_map.cpp b/bindings/python/mapnik_map.cpp
index 1c0b0270d..3363e53be 100644
--- a/bindings/python/mapnik_map.cpp
+++ b/bindings/python/mapnik_map.cpp
@@ -22,12 +22,19 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 #include <boost/python/iterator.hpp>
 #include <boost/iterator/transform_iterator.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/rule.hpp>
diff --git a/bindings/python/mapnik_palette.cpp b/bindings/python/mapnik_palette.cpp
index ca3bfe2ca..878ecb6b5 100644
--- a/bindings/python/mapnik_palette.cpp
+++ b/bindings/python/mapnik_palette.cpp
@@ -22,11 +22,16 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 //mapnik
 #include <mapnik/palette.hpp>
diff --git a/bindings/python/mapnik_parameters.cpp b/bindings/python/mapnik_parameters.cpp
index 8bcea8eec..7074e726e 100644
--- a/bindings/python/mapnik_parameters.cpp
+++ b/bindings/python/mapnik_parameters.cpp
@@ -22,10 +22,15 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/debug.hpp>
diff --git a/bindings/python/mapnik_proj_transform.cpp b/bindings/python/mapnik_proj_transform.cpp
index 20079dde3..fa6f396ca 100644
--- a/bindings/python/mapnik_proj_transform.cpp
+++ b/bindings/python/mapnik_proj_transform.cpp
@@ -21,7 +21,18 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
+
+
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
+#include <boost/python.hpp>
+#include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/proj_transform.hpp>
@@ -29,10 +40,6 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/box2d.hpp>
 
-// boost
-#include <boost/noncopyable.hpp>
-#include <boost/python.hpp>
-
 // stl
 #include <stdexcept>
 
diff --git a/bindings/python/mapnik_projection.cpp b/bindings/python/mapnik_projection.cpp
index 54e8462c7..38cd53b3e 100644
--- a/bindings/python/mapnik_projection.cpp
+++ b/bindings/python/mapnik_projection.cpp
@@ -22,10 +22,15 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/coord.hpp>
diff --git a/bindings/python/mapnik_python.cpp b/bindings/python/mapnik_python.cpp
index 4dd1161df..69075115a 100644
--- a/bindings/python/mapnik_python.cpp
+++ b/bindings/python/mapnik_python.cpp
@@ -22,7 +22,13 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include "python_to_value.hpp"
 #include <boost/python/args.hpp>        // for keywords, arg, etc
 #include <boost/python/converter/from_python.hpp>
@@ -36,6 +42,7 @@
 #include <boost/python/object_core.hpp>  // for get_managed_object
 #include <boost/python/register_ptr_to_python.hpp>
 #include <boost/python/to_python_converter.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <stdexcept>
diff --git a/bindings/python/mapnik_query.cpp b/bindings/python/mapnik_query.cpp
index e0b85390d..893d83631 100644
--- a/bindings/python/mapnik_query.cpp
+++ b/bindings/python/mapnik_query.cpp
@@ -22,11 +22,16 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-#include "python_to_value.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
+#include "python_to_value.hpp"
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/query.hpp>
diff --git a/bindings/python/mapnik_raster_colorizer.cpp b/bindings/python/mapnik_raster_colorizer.cpp
index f76173281..725ea166b 100644
--- a/bindings/python/mapnik_raster_colorizer.cpp
+++ b/bindings/python/mapnik_raster_colorizer.cpp
@@ -22,10 +22,16 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/raster_colorizer.hpp>
diff --git a/bindings/python/mapnik_rule.cpp b/bindings/python/mapnik_rule.cpp
index 4d0763eea..53fa4ad21 100644
--- a/bindings/python/mapnik_rule.cpp
+++ b/bindings/python/mapnik_rule.cpp
@@ -22,12 +22,17 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/implicit.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/rule.hpp>
diff --git a/bindings/python/mapnik_scaling_method.cpp b/bindings/python/mapnik_scaling_method.cpp
index 8b984dfb6..495d38007 100644
--- a/bindings/python/mapnik_scaling_method.cpp
+++ b/bindings/python/mapnik_scaling_method.cpp
@@ -22,7 +22,15 @@
 
 
 #include <mapnik/image_scaling.hpp>
+
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 void export_scaling_method()
 {
diff --git a/bindings/python/mapnik_style.cpp b/bindings/python/mapnik_style.cpp
index 30b06797c..0658f9bf9 100644
--- a/bindings/python/mapnik_style.cpp
+++ b/bindings/python/mapnik_style.cpp
@@ -22,11 +22,16 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp"
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/value_error.hpp>
diff --git a/bindings/python/mapnik_symbolizer.cpp b/bindings/python/mapnik_symbolizer.cpp
index fa4f4b61c..2175b595e 100644
--- a/bindings/python/mapnik_symbolizer.cpp
+++ b/bindings/python/mapnik_symbolizer.cpp
@@ -22,18 +22,17 @@
 
 #include <mapnik/config.hpp>
 
-#include "boost_std_shared_shim.hpp" // FIXME - do we need it?
-// The functions in this file produce deprecation warnings.
-// But as shield symbolizer doesn't fully support more than one
-// placement from python yet these functions are actually the
-// correct ones.
-
-#define NO_DEPRECATION_WARNINGS
-
-
 // boost
+#include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/map_indexing_suite.hpp>
+#pragma GCC diagnostic pop
+
 // mapnik
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/symbolizer_hash.hpp>
@@ -131,10 +130,12 @@ boost::python::object __getitem__(mapnik::symbolizer_base const& sym, std::strin
     return boost::python::object();
 }
 
+/*
 std::string __str__(mapnik::symbolizer const& sym)
 {
     return mapnik::util::apply_visitor(mapnik::symbolizer_to_json(), sym);
 }
+*/
 
 std::string get_symbolizer_type(symbolizer const& sym)
 {
@@ -201,7 +202,7 @@ void export_symbolizer()
         .def("__setattr__",&__setitem__)
         .def("__getitem__",&__getitem__)
         .def("__getattr__",&__getitem__)
-        .def("__str__", &__str__)
+        //.def("__str__", &__str__)
         .def(self == self) // __eq__
         ;
 }
diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
index ba3bc0e01..8ab723e90 100644
--- a/bindings/python/mapnik_text_placement.cpp
+++ b/bindings/python/mapnik_text_placement.cpp
@@ -22,11 +22,17 @@
 
 #include <mapnik/config.hpp>
 
+// boost
 #include "boost_std_shared_shim.hpp"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
 #include <boost/noncopyable.hpp>
+#pragma GCC diagnostic pop
 
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/text/placements/simple.hpp>
diff --git a/bindings/python/mapnik_view_transform.cpp b/bindings/python/mapnik_view_transform.cpp
index 87a8aad23..d2194b1f6 100644
--- a/bindings/python/mapnik_view_transform.cpp
+++ b/bindings/python/mapnik_view_transform.cpp
@@ -21,8 +21,15 @@
  *****************************************************************************/
 
 #include <mapnik/config.hpp>
+
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/view_transform.hpp>
diff --git a/bindings/python/python_grid_utils.cpp b/bindings/python/python_grid_utils.cpp
index 13ac5d493..cbb9ad19a 100644
--- a/bindings/python/python_grid_utils.cpp
+++ b/bindings/python/python_grid_utils.cpp
@@ -23,8 +23,15 @@
 #if defined(GRID_RENDERER)
 
 #include <mapnik/config.hpp>
+
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/map.hpp>
diff --git a/bindings/python/python_to_value.hpp b/bindings/python/python_to_value.hpp
index 6d220b61f..da4830e8a 100644
--- a/bindings/python/python_to_value.hpp
+++ b/bindings/python/python_to_value.hpp
@@ -23,7 +23,12 @@
 #define MAPNIK_PYTHON_BINDING_PYTHON_TO_VALUE
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/value.hpp>
diff --git a/deps/agg/src/agg_pixfmt_rgba.cpp b/deps/agg/src/agg_pixfmt_rgba.cpp
index dff0bdb90..f07c54032 100644
--- a/deps/agg/src/agg_pixfmt_rgba.cpp
+++ b/deps/agg/src/agg_pixfmt_rgba.cpp
@@ -1,8 +1,14 @@
+
 #include "agg_pixfmt_rgba.h"
+
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/gil/gil_all.hpp>
 #include <boost/gil/extension/toolbox/hsv.hpp>
 #include <boost/gil/extension/toolbox/hsl.hpp>
-//#include <iostream>
+#pragma GCC diagnostic pop
 
 namespace agg
 {
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index 458edc142..7ed802449 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -40,7 +40,10 @@
 #include <mapnik/util/variant.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string/replace.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <set>
diff --git a/include/mapnik/css_color_grammar.hpp b/include/mapnik/css_color_grammar.hpp
index 222b8ce05..8a68de16c 100644
--- a/include/mapnik/css_color_grammar.hpp
+++ b/include/mapnik/css_color_grammar.hpp
@@ -27,22 +27,22 @@
 #include <mapnik/color.hpp>
 #include <mapnik/util/hsl.hpp>
 
-// spirit2
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_action.hpp>
-
-// phoenix
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_fusion.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/fusion/include/adapt_adt.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>
 
-// fusion
-#include <boost/fusion/include/adapt_adt.hpp>
-
 BOOST_FUSION_ADAPT_ADT(
     mapnik::color,
     (unsigned, unsigned, obj.red(), obj.set_red(val))
diff --git a/include/mapnik/evaluate_global_attributes.hpp b/include/mapnik/evaluate_global_attributes.hpp
index f880abb5e..309c5c831 100644
--- a/include/mapnik/evaluate_global_attributes.hpp
+++ b/include/mapnik/evaluate_global_attributes.hpp
@@ -46,7 +46,7 @@ struct evaluate_expression : util::static_visitor<T>
     explicit evaluate_expression(Attributes const& attributes)
         : attributes_(attributes) {}
 
-    value_type operator() (attribute const& attr) const
+    value_type operator() (attribute const&) const
     {
         throw std::runtime_error("can't evaluate feature attributes in this context");
     }
@@ -61,7 +61,7 @@ struct evaluate_expression : util::static_visitor<T>
         return value_type();// throw?
     }
 
-    value_type operator() (geometry_type_attribute const& geom) const
+    value_type operator() (geometry_type_attribute const&) const
     {
         throw std::runtime_error("can't evaluate geometry_type attributes in this context");
     }
@@ -139,17 +139,17 @@ struct evaluate_expression<T, boost::none_t> : util::static_visitor<T>
 
     evaluate_expression(boost::none_t) {}
 
-    value_type operator() (attribute const& attr) const
+    value_type operator() (attribute const&) const
     {
         throw std::runtime_error("can't evaluate feature attributes in this context");
     }
 
-    value_type operator() (global_attribute const& attr) const
+    value_type operator() (global_attribute const&) const
     {
         throw std::runtime_error("can't evaluate feature attributes in this context");
     }
 
-    value_type operator() (geometry_type_attribute const& geom) const
+    value_type operator() (geometry_type_attribute const&) const
     {
         throw std::runtime_error("can't evaluate geometry_type attributes in this context");
     }
@@ -287,7 +287,7 @@ struct evaluate_global_attributes : mapnik::noncopyable
         }
 
         template <typename T>
-        void operator() (T const& val) const
+        void operator() (T const&) const
         {
             // no-op
         }
diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
index 7e80e5540..11a75bb62 100644
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@@ -30,13 +30,15 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 
-// spirit2
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/support_locals.hpp>
-// phoenix
 #include <boost/spirit/include/phoenix_function.hpp>
-// fusion
 #include <boost/fusion/adapted/struct.hpp>
+#pragma GCC diagnostic pop
 
 BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
                           (mapnik::unary_function_impl, fun)
diff --git a/include/mapnik/geometry_container.hpp b/include/mapnik/geometry_container.hpp
index c56eaa734..ae654d24b 100644
--- a/include/mapnik/geometry_container.hpp
+++ b/include/mapnik/geometry_container.hpp
@@ -24,7 +24,11 @@
 #define MAPNIK_GEOMETRY_CONTAINER_HPP
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/ptr_container/ptr_vector.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 
diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
index e84c49a8e..b4fe9ae93 100644
--- a/include/mapnik/image_filter.hpp
+++ b/include/mapnik/image_filter.hpp
@@ -29,7 +29,11 @@
 #include <mapnik/util/hsl.hpp>
 
 // boost GIL
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/gil/gil_all.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_basics.h"
diff --git a/include/mapnik/image_filter_grammar.hpp b/include/mapnik/image_filter_grammar.hpp
index 005008e03..9f94a3b1e 100644
--- a/include/mapnik/image_filter_grammar.hpp
+++ b/include/mapnik/image_filter_grammar.hpp
@@ -24,8 +24,12 @@
 #define MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/css_color_grammar.hpp>
diff --git a/include/mapnik/image_util.hpp b/include/mapnik/image_util.hpp
index fcd7dbdf3..ec946b30c 100644
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@@ -29,8 +29,11 @@
 #include <mapnik/image_view.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>
diff --git a/include/mapnik/json/error_handler.hpp b/include/mapnik/json/error_handler.hpp
index dfe4c72be..f1a4f8b1e 100644
--- a/include/mapnik/json/error_handler.hpp
+++ b/include/mapnik/json/error_handler.hpp
@@ -34,7 +34,7 @@ struct error_handler
 {
     using result_type = void;
     void operator() (
-        Iterator first, Iterator last,
+        Iterator, Iterator last,
         Iterator err_pos, boost::spirit::info const& what) const
     {
         std::stringstream s;
diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp
index db01a32b6..e8baaf1eb 100644
--- a/include/mapnik/json/generic_json.hpp
+++ b/include/mapnik/json/generic_json.hpp
@@ -26,8 +26,13 @@
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/value_converters.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace json {
 
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 2128b6953..543dc64d1 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -31,10 +31,14 @@
 #include <mapnik/vertex.hpp>    // for CommandType::SEG_MOVETO
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
+#pragma GCC diagnostic pop
 
 //stl
 #include <tuple>
diff --git a/include/mapnik/json/positions_grammar.hpp b/include/mapnik/json/positions_grammar.hpp
index 3e4ca4c33..32b1e2a84 100644
--- a/include/mapnik/json/positions_grammar.hpp
+++ b/include/mapnik/json/positions_grammar.hpp
@@ -26,10 +26,17 @@
 // mapnik
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/error_handler.hpp>
-// spirit::qi
+
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
+
+// stl
 #include <tuple>
 
 namespace mapnik { namespace json {
diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp
index 319eaa5f3..b36f8abc4 100644
--- a/include/mapnik/json/topojson_grammar.hpp
+++ b/include/mapnik/json/topojson_grammar.hpp
@@ -30,8 +30,12 @@
 #include <mapnik/json/value_converters.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>
diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp
index cb53a13b7..7685d00f4 100644
--- a/include/mapnik/params_impl.hpp
+++ b/include/mapnik/params_impl.hpp
@@ -30,8 +30,12 @@
 #include <mapnik/util/conversions.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/optional.hpp>
 #include <boost/lexical_cast.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>
diff --git a/include/mapnik/path_expression_grammar.hpp b/include/mapnik/path_expression_grammar.hpp
index b8fdb5234..1a0a3acb7 100644
--- a/include/mapnik/path_expression_grammar.hpp
+++ b/include/mapnik/path_expression_grammar.hpp
@@ -27,7 +27,11 @@
 #include <mapnik/path_expression.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>
diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp
index ed716bf4d..5af4c6149 100644
--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@@ -28,7 +28,11 @@
 #include <mapnik/noncopyable.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/ptr_container/ptr_vector.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <algorithm>
diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index e4377c3e7..f8ade315a 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -27,7 +27,11 @@
 #include <mapnik/util/trim.hpp> // for trim
 
 // boost
-#include <boost/algorithm/string/replace.hpp>  // for ireplace_all, etc
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/algorithm/string/replace.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <sstream>
diff --git a/include/mapnik/svg/geometry_svg_generator.hpp b/include/mapnik/svg/geometry_svg_generator.hpp
index 98194b8fa..e0c40bbff 100644
--- a/include/mapnik/svg/geometry_svg_generator.hpp
+++ b/include/mapnik/svg/geometry_svg_generator.hpp
@@ -33,6 +33,9 @@
 #include <mapnik/util/container_adapter.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
@@ -41,6 +44,7 @@
 #include <boost/spirit/include/phoenix_statement.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
+#pragma GCC diagnostic pop
 
 
 // adapted to conform to the concepts
diff --git a/include/mapnik/svg/output/svg_output_grammars.hpp b/include/mapnik/svg/output/svg_output_grammars.hpp
index 2f59b1d92..428a9f780 100644
--- a/include/mapnik/svg/output/svg_output_grammars.hpp
+++ b/include/mapnik/svg/output/svg_output_grammars.hpp
@@ -37,9 +37,13 @@ namespace mapnik { namespace svg {
 }}
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma_nonterminal.hpp>
 #include <boost/spirit/include/karma_rule.hpp>
 #include <boost/fusion/adapted/struct.hpp>
+#pragma GCC diagnostic pop
 
 /*!
  * mapnik::svg::path_output_attributes is adapted as a fusion sequence
diff --git a/include/mapnik/svg/output/svg_output_grammars_impl.hpp b/include/mapnik/svg/output/svg_output_grammars_impl.hpp
index d98c90ca2..892fdf903 100644
--- a/include/mapnik/svg/output/svg_output_grammars_impl.hpp
+++ b/include/mapnik/svg/output/svg_output_grammars_impl.hpp
@@ -25,8 +25,14 @@
 
 // mapnik
 #include <mapnik/svg/output/svg_output_grammars.hpp>
+
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma.hpp>
 #include <boost/fusion/include/std_pair.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace svg {
 
diff --git a/include/mapnik/svg/svg_path_commands.hpp b/include/mapnik/svg/svg_path_commands.hpp
index 1195003f5..23df6ee9c 100644
--- a/include/mapnik/svg/svg_path_commands.hpp
+++ b/include/mapnik/svg/svg_path_commands.hpp
@@ -27,11 +27,14 @@
 #include <mapnik/global.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
-
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace svg {
 
diff --git a/include/mapnik/svg/svg_transform_grammar.hpp b/include/mapnik/svg/svg_transform_grammar.hpp
index 416e68890..5b0f4955d 100644
--- a/include/mapnik/svg/svg_transform_grammar.hpp
+++ b/include/mapnik/svg/svg_transform_grammar.hpp
@@ -29,12 +29,16 @@
 // agg
 #include <agg_trans_affine.h>
 
-// spirit
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace svg {
 
diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp
index 37e7f6eec..614c936e9 100644
--- a/include/mapnik/symbolizer_utils.hpp
+++ b/include/mapnik/symbolizer_utils.hpp
@@ -140,6 +140,8 @@ inline std::string symbolizer_name(symbolizer const& sym)
     return type;
 }
 
+// https://github.com/mapnik/mapnik/issues/2324
+/*
 
 template <typename Meta>
 class symbolizer_property_value_string : public util::static_visitor<std::string>
@@ -194,7 +196,7 @@ public:
         std::ostringstream ss;
         if (expr)
         {
-            ss << '\"' << "FIXME" /*mapnik::to_expression_string(*expr)*/ <<  '\"';
+            ss << '\"' << "FIXME" <<  '\"';
         }
         return ss.str();
     }
@@ -253,6 +255,8 @@ struct symbolizer_to_json : public util::static_visitor<std::string>
     }
 };
 
+*/
+
 namespace {
 
 template <typename Symbolizer, typename T>
diff --git a/include/mapnik/util/container_adapter.hpp b/include/mapnik/util/container_adapter.hpp
index 8416e6093..e67514dc8 100644
--- a/include/mapnik/util/container_adapter.hpp
+++ b/include/mapnik/util/container_adapter.hpp
@@ -29,7 +29,10 @@
 #include <mapnik/util/path_iterator.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/support_container.hpp>
+#pragma GCC diagnostic pop
 
 namespace boost { namespace spirit { namespace traits {
 
diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp
index e3bf9d9a0..616ed05b0 100644
--- a/include/mapnik/wkt/wkt_generator_grammar.hpp
+++ b/include/mapnik/wkt/wkt_generator_grammar.hpp
@@ -30,6 +30,9 @@
 #include <mapnik/util/container_adapter.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
@@ -38,6 +41,7 @@
 #include <boost/spirit/include/phoenix_statement.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
+#pragma GCC diagnostic pop
 
 // stl
 #include <tuple>
diff --git a/include/mapnik/wkt/wkt_grammar.hpp b/include/mapnik/wkt/wkt_grammar.hpp
index badaa720f..ff004faa2 100644
--- a/include/mapnik/wkt/wkt_grammar.hpp
+++ b/include/mapnik/wkt/wkt_grammar.hpp
@@ -23,9 +23,13 @@
 #ifndef MAPNIK_WKT_GRAMMAR_HPP
 #define MAPNIK_WKT_GRAMMAR_HPP
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/assert.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/geometry.hpp>
diff --git a/plugins/input/csv/csv_utils.hpp b/plugins/input/csv/csv_utils.hpp
index fd9143fee..a07346268 100644
--- a/plugins/input/csv/csv_utils.hpp
+++ b/plugins/input/csv/csv_utils.hpp
@@ -23,9 +23,13 @@
 #ifndef MAPNIK_CSV_UTILS_DATASOURCE_HPP
 #define MAPNIK_CSV_UTILS_DATASOURCE_HPP
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 
 #include <string>
-#include <boost/algorithm/string.hpp>
 #include <cstdio>
 
 namespace csv_utils
diff --git a/plugins/input/geojson/geojson_datasource.hpp b/plugins/input/geojson/geojson_datasource.hpp
index 906547ee9..c5194ec76 100644
--- a/plugins/input/geojson/geojson_datasource.hpp
+++ b/plugins/input/geojson/geojson_datasource.hpp
@@ -35,8 +35,10 @@
 
 // boost
 #include <boost/optional.hpp>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
@@ -47,7 +49,7 @@
 #else
 #include <boost/geometry/extensions/index/rtree/rtree.hpp>
 #endif
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 // stl
 #include <memory>
diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp
index 92df1929a..3e76dd94c 100644
--- a/plugins/input/ogr/ogr_datasource.cpp
+++ b/plugins/input/ogr/ogr_datasource.cpp
@@ -34,7 +34,11 @@
 #include <mapnik/utils.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <fstream>
diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index 4983dfeed..f4a8a9d12 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -39,9 +39,12 @@
 #include <mapnik/value_types.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
-#include <boost/make_shared.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>
diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index c18103f7b..95cb80873 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -36,9 +36,13 @@
 #include <mapnik/value_types.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <memory>
diff --git a/plugins/input/python/python_datasource.cpp b/plugins/input/python/python_datasource.cpp
index dbc964e80..f100d67c9 100644
--- a/plugins/input/python/python_datasource.cpp
+++ b/plugins/input/python/python_datasource.cpp
@@ -7,10 +7,15 @@
 #include <vector>
 
 // boost
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
 #include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
+
 
 #include "python_utils.hpp"
 
@@ -103,8 +108,6 @@ mapnik::layer_descriptor python_datasource::get_descriptor() const
 
 mapnik::datasource::datasource_t python_datasource::type() const
 {
-    using return_type = boost::optional<mapnik::datasource::geometry_t>;
-
     try
     {
         ensure_gil lock;
diff --git a/plugins/input/python/python_datasource.hpp b/plugins/input/python/python_datasource.hpp
index fc9941c6b..599f4c60b 100644
--- a/plugins/input/python/python_datasource.hpp
+++ b/plugins/input/python/python_datasource.hpp
@@ -5,7 +5,12 @@
 #include <mapnik/datasource.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 class python_datasource : public mapnik::datasource
 {
diff --git a/plugins/input/python/python_featureset.hpp b/plugins/input/python/python_featureset.hpp
index 127086867..af024beab 100644
--- a/plugins/input/python/python_featureset.hpp
+++ b/plugins/input/python/python_featureset.hpp
@@ -6,8 +6,13 @@
 #include <mapnik/feature.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/datasource.hpp>
diff --git a/plugins/input/python/python_utils.hpp b/plugins/input/python/python_utils.hpp
index 745cc4199..5ddc3800b 100644
--- a/plugins/input/python/python_utils.hpp
+++ b/plugins/input/python/python_utils.hpp
@@ -1,7 +1,12 @@
 #ifndef PYTHON_UTILS_HPP
 #define PYTHON_UTILS_HPP
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/python.hpp>
+#pragma GCC diagnostic pop
 
 // Use RAII to acquire and release the GIL as needed.
 class ensure_gil
diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp
index 9b5d20f84..cada1733b 100644
--- a/plugins/input/shape/dbfile.cpp
+++ b/plugins/input/shape/dbfile.cpp
@@ -29,11 +29,15 @@
 #include "dbfile.hpp"
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #ifdef SHAPE_MEMORY_MAPPED_FILE
 #include <boost/interprocess/mapped_region.hpp>
 #include <mapnik/mapped_memory_cache.hpp>
 #endif
+#pragma GCC diagnostic pop
 
 // stl
 #include <cstdint>
diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp
index a89ced64b..a649c75e3 100644
--- a/plugins/input/shape/shape_datasource.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -26,7 +26,11 @@
 
 // boost
 #include <boost/version.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 
 // mapnik
 #include <mapnik/debug.hpp>
diff --git a/plugins/input/shape/shape_utils.cpp b/plugins/input/shape/shape_utils.cpp
index b62f38aaf..0f90878db 100644
--- a/plugins/input/shape/shape_utils.cpp
+++ b/plugins/input/shape/shape_utils.cpp
@@ -27,7 +27,11 @@
 #include "shape_utils.hpp"
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 
 void setup_attributes(mapnik::context_ptr const& ctx,
                       std::set<std::string> const& names,
diff --git a/plugins/input/topojson/topojson_datasource.hpp b/plugins/input/topojson/topojson_datasource.hpp
index d3d51b1fd..cb7e046da 100644
--- a/plugins/input/topojson/topojson_datasource.hpp
+++ b/plugins/input/topojson/topojson_datasource.hpp
@@ -35,6 +35,10 @@
 #include <mapnik/json/topology.hpp>
 // boost
 #include <boost/optional.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
@@ -45,6 +49,7 @@
 #else
 #include <boost/geometry/extensions/index/rtree/rtree.hpp>
 #endif
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>
diff --git a/plugins/input/topojson/topojson_featureset.cpp b/plugins/input/topojson/topojson_featureset.cpp
index 6b660e643..b1231a04d 100644
--- a/plugins/input/topojson/topojson_featureset.cpp
+++ b/plugins/input/topojson/topojson_featureset.cpp
@@ -29,14 +29,19 @@
 #include <string>
 #include <vector>
 #include <fstream>
+
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/adaptor/sliced.hpp>
-// boost.geometry
 #include <boost/geometry.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
+#pragma GCC diagnostic pop
 
 #include "topojson_featureset.hpp"
 
diff --git a/src/box2d.cpp b/src/box2d.cpp
index ca73f5551..209fdece4 100644
--- a/src/box2d.cpp
+++ b/src/box2d.cpp
@@ -30,11 +30,13 @@
 #include <iomanip>
 
 // boost
-// fusion
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/fusion/include/adapt_adt.hpp>
-// spirit
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/support_adapt_adt_attributes.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/color.cpp b/src/color.cpp
index 1b8a87d73..5cc33b72b 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -29,13 +29,17 @@
 #include "agg_color_rgba.h"
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/phoenix_statement.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_fusion.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-
+#pragma GCC diagnostic pop
+ 
 // stl
 #include <sstream>
 
diff --git a/src/conversions.cpp b/src/conversions.cpp
index 7fce22904..da79ae0de 100644
--- a/src/conversions.cpp
+++ b/src/conversions.cpp
@@ -27,18 +27,21 @@
 #include <cstring>
 #include <algorithm>
 
-#include <boost/spirit/include/qi.hpp>
-
-#if _MSC_VER
-#define snprintf _snprintf
-#endif
-
 // karma is used by default
 #define MAPNIK_KARMA_TO_STRING
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/spirit/include/qi.hpp>
 #ifdef MAPNIK_KARMA_TO_STRING
   #include <boost/spirit/include/karma.hpp>
 #endif
+#pragma GCC diagnostic pop
+
+#if _MSC_VER
+#define snprintf _snprintf
+#endif
 
 namespace mapnik {
 
diff --git a/src/dasharray_parser.cpp b/src/dasharray_parser.cpp
index 47eeb8f99..6d432dea6 100644
--- a/src/dasharray_parser.cpp
+++ b/src/dasharray_parser.cpp
@@ -22,11 +22,16 @@
 
 // mapnik
 #include <mapnik/util/dasharray_parser.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 
diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp
index 95c9425b6..cafb8c978 100644
--- a/src/datasource_cache.cpp
+++ b/src/datasource_cache.cpp
@@ -31,9 +31,13 @@
 #include <mapnik/utils.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <algorithm>
diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp
index f971a5c23..3c71bc8b2 100644
--- a/src/image_compositing.cpp
+++ b/src/image_compositing.cpp
@@ -25,8 +25,12 @@
 #include <mapnik/image_data.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wredeclared-class-member"
 #include <boost/assign/list_of.hpp>
 #include <boost/bimap.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_rendering_buffer.h"
diff --git a/src/image_filter_types.cpp b/src/image_filter_types.cpp
index 93c7e05c2..702c56672 100644
--- a/src/image_filter_types.cpp
+++ b/src/image_filter_types.cpp
@@ -25,7 +25,12 @@
 #include <mapnik/image_filter_grammar_impl.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/spirit/include/karma.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>
diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp
index 0bb7adfed..c122e89c3 100644
--- a/src/image_scaling.cpp
+++ b/src/image_scaling.cpp
@@ -27,8 +27,12 @@
 //#include <mapnik/span_image_filter.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wredeclared-class-member"
 #include <boost/assign/list_of.hpp>
 #include <boost/bimap.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_image_accessors.h"
diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp
index 4292f01b8..af2d40083 100644
--- a/src/jpeg_reader.cpp
+++ b/src/jpeg_reader.cpp
@@ -31,9 +31,12 @@ extern "C"
 }
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/iostreams/device/file.hpp>
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
 
 // std
 #include <cstdio>
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 38a58acd9..74f7b3824 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -61,11 +61,14 @@
 
 // boost
 #include <boost/optional.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/static_assert.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/png_reader.cpp b/src/png_reader.cpp
index 0a93e1c35..80a8ec957 100644
--- a/src/png_reader.cpp
+++ b/src/png_reader.cpp
@@ -29,10 +29,12 @@ extern "C"
 #include <png.h>
 }
 // boost
-// iostreams
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/iostreams/device/file.hpp>
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <cstring>
diff --git a/src/save_map.cpp b/src/save_map.cpp
index d987877a2..27eb75518 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -46,8 +46,12 @@
 #include <mapnik/group/group_layout.hpp>
 #include <mapnik/group/group_symbolizer_properties.hpp>
 #include <mapnik/util/variant.hpp>
+
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
 #include <boost/optional.hpp>
 #include <boost/version.hpp>
 #include <boost/property_tree/ptree.hpp>
diff --git a/src/simplify.cpp b/src/simplify.cpp
index 0e7bcc10c..e50136781 100644
--- a/src/simplify.cpp
+++ b/src/simplify.cpp
@@ -2,8 +2,12 @@
 #include <mapnik/simplify.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wredeclared-class-member"
 #include <boost/assign/list_of.hpp>
 #include <boost/bimap.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {
diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 56767c390..b1ec83bfe 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -31,11 +31,15 @@
 #include "agg_span_gradient.h"
 #include "agg_color_rgba.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#pragma GCC diagnostic pop
 
 #include <string>
 #include <stdexcept>
diff --git a/src/text/font_feature_settings.cpp b/src/text/font_feature_settings.cpp
index 897e2c891..67473b509 100644
--- a/src/text/font_feature_settings.cpp
+++ b/src/text/font_feature_settings.cpp
@@ -25,8 +25,13 @@
 #include <mapnik/config_error.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/version.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <algorithm>
diff --git a/src/text/placements/simple.cpp b/src/text/placements/simple.cpp
index d0c36f9c3..edcdad236 100644
--- a/src/text/placements/simple.cpp
+++ b/src/text/placements/simple.cpp
@@ -27,10 +27,15 @@
 #include <mapnik/xml_node.hpp>
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 #include <cmath>
 
diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp
index 003dc6ebd..bb73712be 100644
--- a/src/tiff_reader.cpp
+++ b/src/tiff_reader.cpp
@@ -24,19 +24,22 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/image_reader.hpp>
 
-// boost
-#include <memory>
-
-// iostreams
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/device/array.hpp>
-#include <boost/iostreams/stream.hpp>
-
 extern "C"
 {
 #include <tiffio.h>
 }
 
+// boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/iostreams/device/file.hpp>
+#include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
+
+// stl
+#include <memory>
+
 namespace mapnik { namespace impl {
 
 static toff_t tiff_seek_proc(thandle_t fd, toff_t off, int whence)
diff --git a/src/webp_reader.cpp b/src/webp_reader.cpp
index bd618f222..bd34d2355 100644
--- a/src/webp_reader.cpp
+++ b/src/webp_reader.cpp
@@ -35,9 +35,13 @@ extern "C"
 #pragma clang diagnostic pop
 
 // boost
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/iostreams/device/file.hpp>
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
+
 // stl
 #include <fstream>
 
diff --git a/tests/cpp_tests/conversions_test.cpp b/tests/cpp_tests/conversions_test.cpp
index a837dbf57..bb86f7138 100644
--- a/tests/cpp_tests/conversions_test.cpp
+++ b/tests/cpp_tests/conversions_test.cpp
@@ -290,7 +290,7 @@ int main(int argc, char** argv)
         values_container vc;
         mapnik::value val2(1);
         vc[val2] = 1;
-        BOOST_TEST_EQ( vc[1], 1 );
+        BOOST_TEST_EQ( (int)vc[1], (int)1 );
 
     }
     catch (std::exception const & ex)
diff --git a/utils/nik2img/nik2img.cpp b/utils/nik2img/nik2img.cpp
index b58a5994e..2d4acebc2 100644
--- a/utils/nik2img/nik2img.cpp
+++ b/utils/nik2img/nik2img.cpp
@@ -7,8 +7,15 @@
 #include <mapnik/graphics.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/tokenizer.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
+#pragma GCC diagnostic pop
+
 #include <string>
 
 int main (int argc,char** argv)
diff --git a/utils/shapeindex/shapeindex.cpp b/utils/shapeindex/shapeindex.cpp
index d135b52d6..0161ea8cc 100644
--- a/utils/shapeindex/shapeindex.cpp
+++ b/utils/shapeindex/shapeindex.cpp
@@ -25,13 +25,18 @@
 #include <vector>
 #include <string>
 #include <mapnik/util/fs.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/program_options.hpp>
 #include "quadtree.hpp"
 #include "shapefile.hpp"
 #include "shape_io.hpp"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#include <boost/tokenizer.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/program_options.hpp>
+#pragma GCC diagnostic pop
+
 const int DEFAULT_DEPTH = 8;
 const double DEFAULT_RATIO=0.55;
 
diff --git a/utils/svg2png/svg2png.cpp b/utils/svg2png/svg2png.cpp
index 7fe3da601..796cd273b 100644
--- a/utils/svg2png/svg2png.cpp
+++ b/utils/svg2png/svg2png.cpp
@@ -35,8 +35,12 @@
 #include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
+#pragma GCC diagnostic pop
 
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_basics.h"