diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index 35a5caed0..051ea6b4e 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -29,17 +29,19 @@
 #include <mapnik/hextree.hpp>
 #include <mapnik/image.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 // zlib
 #include <zlib.h>  // for Z_DEFAULT_COMPRESSION
 
-// boost
-
-
 extern "C"
 {
 #include <png.h>
 }
 
+#pragma GCC diagnostic pop
+
 #define MAX_OCTREE_LEVELS 4
 
 namespace mapnik {
diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp
index df2b25a7a..b80142906 100644
--- a/include/mapnik/tiff_io.hpp
+++ b/include/mapnik/tiff_io.hpp
@@ -28,6 +28,9 @@
 #include <mapnik/image_any.hpp>
 #include <mapnik/util/variant.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 extern "C"
 {
 #include <tiffio.h>
@@ -35,6 +38,9 @@ extern "C"
 #define RealTIFFClose TIFFClose
 }
 
+#pragma GCC diagnostic pop
+
+
 //std
 #include <memory>