diff --git a/include/mapnik/image_compositing.hpp b/include/mapnik/image_compositing.hpp
index 5a7ac0025..892dbade5 100644
--- a/include/mapnik/image_compositing.hpp
+++ b/include/mapnik/image_compositing.hpp
@@ -23,16 +23,15 @@
 #ifndef MAPNIK_IMAGE_COMPOSITING_HPP
 #define MAPNIK_IMAGE_COMPOSITING_HPP
 
+#include <mapnik/config.hpp>
+#include <mapnik/image_data.hpp>
+
+// boost
+#include <boost/optional.hpp>
+
 // stl
 #include <string>
 
-#include <boost/optional.hpp>
-#include <mapnik/config.hpp>
-
-#ifdef _MSC_VER
-#include <mapnik/image_data.hpp>
-#endif
-
 namespace mapnik
 {
 
@@ -91,15 +90,13 @@ MAPNIK_DECL void composite(T1 & dst, T2 & src,
                            int dy=0,
                            bool premultiply_src=false);
 
-#ifdef _MSC_VER
-template MAPNIK_DECL void composite<mapnik::image_data_32,mapnik::image_data_32>(mapnik::image_data_32 & dst,
+extern template MAPNIK_DECL void composite<mapnik::image_data_32,mapnik::image_data_32>(mapnik::image_data_32 & dst,
                            mapnik::image_data_32 & src,
                            composite_mode_e mode,
                            float opacity,
                            int dx,
                            int dy,
                            bool premultiply_src);
-#endif
 
 }
 #endif // MAPNIK_IMAGE_COMPOSITING_HPP
diff --git a/include/mapnik/image_scaling.hpp b/include/mapnik/image_scaling.hpp
index 0eb5cc81d..a7d843480 100644
--- a/include/mapnik/image_scaling.hpp
+++ b/include/mapnik/image_scaling.hpp
@@ -25,9 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#ifdef _MSC_VER
 #include <mapnik/image_data.hpp>
-#endif
 
 // stl
 #include <iosfwd>
@@ -72,8 +70,7 @@ MAPNIK_DECL void scale_image_agg(Image & target,
                       double y_off_f,
                       double filter_factor);
 
-#ifdef _MSC_VER
-template MAPNIK_DECL void scale_image_agg<mapnik::image_data_32>(
+extern template MAPNIK_DECL void scale_image_agg<mapnik::image_data_32>(
                       mapnik::image_data_32 & target,
                       mapnik::image_data_32 const& source,
                       scaling_method_e scaling_method,
@@ -82,7 +79,6 @@ template MAPNIK_DECL void scale_image_agg<mapnik::image_data_32>(
                       double x_off_f,
                       double y_off_f,
                       double filter_radius);
-#endif
 
 }
 #endif // MAPNIK_IMAGE_SCALING_HPP