diff --git a/include/mapnik/ellipsoid.hpp b/include/mapnik/ellipsoid.hpp
index cd6e47297..48a6a0770 100644
--- a/include/mapnik/ellipsoid.hpp
+++ b/include/mapnik/ellipsoid.hpp
@@ -22,6 +22,9 @@
 
 //$Id$
 
+#ifndef MAPNIK_ELLIPSOID_HPP
+#define MAPNIK_ELLIPSOID_HPP
+
 namespace mapnik {
 struct ellipsoid
 {
@@ -29,3 +32,5 @@ struct ellipsoid
     double b; // semi minor axis
 };
 }
+
+#endif // MAPNIK_ELLIPSOID_HPP
\ No newline at end of file
diff --git a/include/mapnik/filter_featureset.hpp b/include/mapnik/filter_featureset.hpp
index 70e3f6eb9..b3fb50250 100644
--- a/include/mapnik/filter_featureset.hpp
+++ b/include/mapnik/filter_featureset.hpp
@@ -22,6 +22,9 @@
 
 //$Id$
 
+#ifndef MAPNIK_FILTER_FEATURESET_HPP
+#define MAPNIK_FILTER_FEATURESET_HPP
+
 #include <mapnik/datasource.hpp>
 
 namespace mapnik {
@@ -50,3 +53,5 @@ private:
     filter_type filter_;
 };
 }
+
+#endif //MAPNIK_FILTER_FEATURESET_HPP
\ No newline at end of file
diff --git a/include/mapnik/jpeg_io.hpp b/include/mapnik/jpeg_io.hpp
index dfc467936..33a7fba74 100644
--- a/include/mapnik/jpeg_io.hpp
+++ b/include/mapnik/jpeg_io.hpp
@@ -21,6 +21,10 @@
  *****************************************************************************/
 
 //$Id$
+
+#ifndef MAPNIK_JPEG_IO_HPP
+#define MAPNIK_JPEG_IO_HPP
+
 #if defined(HAVE_JPEG)
 
 #include <mapnik/global.hpp>
@@ -128,3 +132,6 @@ void save_as_jpeg(T1 & file,int quality, T2 const& image)
 }
 
 #endif
+
+#endif // MAPNIK_JPEG_IO_HPP
+
diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index c33816ab5..61a4c7469 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -21,6 +21,10 @@
  *****************************************************************************/
 
 //$Id$
+
+#ifndef MAPNIK_PNG_IO_HPP
+#define MAPNIK_PNG_IO_HPP
+
 #include <mapnik/global.hpp>
 #include <mapnik/octree.hpp>
 #include <mapnik/hextree.hpp>
@@ -532,3 +536,5 @@ void save_as_png256_hex(T1 & file, T2 const& image, int colors = 256, int trans_
     }
 }   
 }
+
+#endif // MAPNIK_PNG_IO_HPP
diff --git a/include/mapnik/scale_denominator.hpp b/include/mapnik/scale_denominator.hpp
index 2ad8cc39a..0c163ed96 100644
--- a/include/mapnik/scale_denominator.hpp
+++ b/include/mapnik/scale_denominator.hpp
@@ -21,6 +21,9 @@
  *****************************************************************************/
 
 //$Id$
+#ifndef MAPNIK_SCALE_DENOMINATOR_HPP
+#define MAPNIK_SCALE_DENOMINATOR_HPP
+
 #include <mapnik/config.hpp>
 
 namespace mapnik {
@@ -28,3 +31,5 @@ namespace mapnik {
 class Map;
 MAPNIK_DECL double scale_denominator(Map const& map, bool geographic);
 }
+
+#endif // MAPNIK_SCALE_DENOMINATOR_HPP
\ No newline at end of file