diff --git a/include/mapnik/agg_render_marker.hpp b/include/mapnik/agg_render_marker.hpp
index 283807a93..c0f9d1876 100644
--- a/include/mapnik/agg_render_marker.hpp
+++ b/include/mapnik/agg_render_marker.hpp
@@ -20,6 +20,9 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_AGG_RENDER_MARKER_HPP
+#define MAPNIK_AGG_RENDER_MARKER_HPP
+
 #include <mapnik/color.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/geom_util.hpp>
@@ -148,3 +151,5 @@ void render_raster_marker(RendererType renb, RasterizerType & ras, image_rgba8 c
 }
 
 }
+
+#endif // MAPNIK_AGG_RENDER_MARKER_HPP
diff --git a/include/mapnik/csv/csv_grammar_x3_def.hpp b/include/mapnik/csv/csv_grammar_x3_def.hpp
index b40507030..d284cbbce 100644
--- a/include/mapnik/csv/csv_grammar_x3_def.hpp
+++ b/include/mapnik/csv/csv_grammar_x3_def.hpp
@@ -20,11 +20,15 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
+
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <mapnik/csv/csv_grammar_x3.hpp>
 #pragma GCC diagnostic pop
-#include <iostream>
+
+
 namespace mapnik { namespace grammar {
 
 namespace x3 = boost::spirit::x3;
@@ -111,3 +115,6 @@ grammar::csv_line_grammar_type const& csv_line_grammar()
 }
 
 } // namespace mapnik
+
+
+#endif // MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/json/geometry_grammar_x3_def.hpp b/include/mapnik/json/geometry_grammar_x3_def.hpp
index 9ec425e37..69d5a2e90 100644
--- a/include/mapnik/json/geometry_grammar_x3_def.hpp
+++ b/include/mapnik/json/geometry_grammar_x3_def.hpp
@@ -20,6 +20,9 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
+#define MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
+
 // mapnik
 #include <mapnik/json/geometry_grammar_x3.hpp>
 #include <mapnik/json/positions_grammar_x3.hpp>
@@ -153,3 +156,6 @@ grammar::geometry_grammar_type const& geometry_grammar()
     return grammar::geometry;
 }
 }}
+
+
+#endif // MAPNIK_JSON_GEOMETRY_GRAMMAR_X3_DEF_HPP
diff --git a/include/mapnik/stringify_macro.hpp b/include/mapnik/stringify_macro.hpp
index 41f947467..a450b98c8 100644
--- a/include/mapnik/stringify_macro.hpp
+++ b/include/mapnik/stringify_macro.hpp
@@ -20,7 +20,12 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_STRINGIFY_MACRO_HPP
+#define MAPNIK_STRINGIFY_MACRO_HPP
+
 #ifndef MAPNIK_STRINGIFY
 #define MAPNIK_STRINGIFY(n) MAPNIK_STRINGIFY_HELPER(n)
 #define MAPNIK_STRINGIFY_HELPER(n) #n
-#endif
\ No newline at end of file
+#endif
+
+#endif // MAPNIK_STRINGIFY_MACRO_HPP
diff --git a/include/mapnik/svg/output/svg_output_attributes.hpp b/include/mapnik/svg/output/svg_output_attributes.hpp
index 06a00f276..0c5351305 100644
--- a/include/mapnik/svg/output/svg_output_attributes.hpp
+++ b/include/mapnik/svg/output/svg_output_attributes.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES
-#define MAPNIK_SVG_OUTPUT_ATTRIBUTES
+#ifndef MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
+#define MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
@@ -199,4 +199,4 @@ namespace mapnik { namespace svg {
     };
     }}
 
-#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES
+#endif // MAPNIK_SVG_OUTPUT_ATTRIBUTES_HPP
diff --git a/include/mapnik/xml_node.hpp b/include/mapnik/xml_node.hpp
index bf7130c20..b0952f289 100644
--- a/include/mapnik/xml_node.hpp
+++ b/include/mapnik/xml_node.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_XML_NODE_H
-#define MAPNIK_XML_NODE_H
+#ifndef MAPNIK_XML_NODE_HPP
+#define MAPNIK_XML_NODE_HPP
 
 //mapnik
 #include <mapnik/config.hpp> // for MAPNIK_DECL
@@ -150,4 +150,4 @@ private:
 
 } //ns mapnik
 
-#endif // MAPNIK_XML_NODE_H
+#endif // MAPNIK_XML_NODE_HPP
diff --git a/include/mapnik/xml_tree.hpp b/include/mapnik/xml_tree.hpp
index 535d96763..042421836 100644
--- a/include/mapnik/xml_tree.hpp
+++ b/include/mapnik/xml_tree.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_XML_TREE_H
-#define MAPNIK_XML_TREE_H
+#ifndef MAPNIK_XML_TREE_HPP
+#define MAPNIK_XML_TREE_HPP
 
 // mapnik
 #include <mapnik/xml_node.hpp>
@@ -50,4 +50,4 @@ public:
 
 } //ns mapnik
 
-#endif // MAPNIK_XML_TREE_H
+#endif // MAPNIK_XML_TREE_HPP