diff --git a/include/mapnik/agg_pattern_source.hpp b/include/mapnik/agg_pattern_source.hpp
index 8d64a50a0..0f24ddaf4 100644
--- a/include/mapnik/agg_pattern_source.hpp
+++ b/include/mapnik/agg_pattern_source.hpp
@@ -19,15 +19,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #ifndef MAPNIK_AGG_PATTERN_SOURCE_HPP
 #define MAPNIK_AGG_PATTERN_SOURCE_HPP
 
 // mapnik
 #include <mapnik/image_data.hpp>
+
 // boost
 #include <boost/utility.hpp>
+
 // agg
 #include "agg_color_rgba.h"
 
@@ -61,4 +62,4 @@ private:
 };
 }
 
-#endif //MAPNIK_AGG_PATTERN_SOURCE_HPP
+#endif // MAPNIK_AGG_PATTERN_SOURCE_HPP
diff --git a/include/mapnik/agg_rasterizer.hpp b/include/mapnik/agg_rasterizer.hpp
index 60be2f4f9..49ac23b81 100644
--- a/include/mapnik/agg_rasterizer.hpp
+++ b/include/mapnik/agg_rasterizer.hpp
@@ -19,12 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #ifndef MAPNIK_AGG_RASTERIZER_HPP
 #define MAPNIK_AGG_RASTERIZER_HPP
 
+// boost
 #include <boost/utility.hpp>
+
+// agg
 #include "agg_rasterizer_scanline_aa.h"
 
 namespace mapnik {
@@ -33,4 +35,4 @@ struct rasterizer :  agg::rasterizer_scanline_aa<>, boost::noncopyable {};
 
 }
 
-#endif //MAPNIK_AGG_RASTERIZER_HPP
+#endif // MAPNIK_AGG_RASTERIZER_HPP
diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 2c9653f8e..1a74dd461 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef AGG_RENDERER_HPP
-#define AGG_RENDERER_HPP
+#ifndef MAPNIK_AGG_RENDERER_HPP
+#define MAPNIK_AGG_RENDERER_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -134,4 +132,4 @@ private:
 };
 }
 
-#endif //AGG_RENDERER_HPP
+#endif // MAPNIK_AGG_RENDERER_HPP
diff --git a/include/mapnik/arrow.hpp b/include/mapnik/arrow.hpp
index 6f2706350..93a56db67 100644
--- a/include/mapnik/arrow.hpp
+++ b/include/mapnik/arrow.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef ARROW_HPP
-#define ARROW_HPP
+#ifndef MAPNIK_ARROW_HPP
+#define MAPNIK_ARROW_HPP
 
 #include <mapnik/box2d.hpp>
 
@@ -44,4 +42,4 @@ private:
 };   
 }
 
-#endif // ARROW_HPP
+#endif // MAPNIK_ARROW_HPP
diff --git a/include/mapnik/attribute.hpp b/include/mapnik/attribute.hpp
index 92fbb6a90..196874392 100644
--- a/include/mapnik/attribute.hpp
+++ b/include/mapnik/attribute.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_ATTRIBUTE_HPP
 #define MAPNIK_ATTRIBUTE_HPP
 
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index afa364b41..b9b62a89c 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -20,20 +20,20 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef ATTRIBUTE_COLLECTOR_HPP
-#define ATTRIBUTE_COLLECTOR_HPP
+#ifndef MAPNIK_ATTRIBUTE_COLLECTOR_HPP
+#define MAPNIK_ATTRIBUTE_COLLECTOR_HPP
 
 // mapnik
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/rule.hpp>
 #include <mapnik/path_expression_grammar.hpp>
 #include <mapnik/parse_path.hpp>
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/variant.hpp>
 #include <boost/concept_check.hpp>
+
 // stl
 #include <set>
 #include <iostream>
@@ -271,4 +271,4 @@ private:
 
 } // namespace mapnik
 
-#endif //ATTRIBUTE_COLLECTOR_HPP
+#endif // MAPNIK_ATTRIBUTE_COLLECTOR_HPP
diff --git a/include/mapnik/attribute_descriptor.hpp b/include/mapnik/attribute_descriptor.hpp
index 2f06bfab5..7ba2e665d 100644
--- a/include/mapnik/attribute_descriptor.hpp
+++ b/include/mapnik/attribute_descriptor.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef ATTRIBUTE_DESCRIPTOR
-#define ATTRIBUTE_DESCRIPTOR
+#ifndef MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
+#define MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
 
 #include <string>
 
@@ -118,4 +116,4 @@ operator << (std::basic_ostream<charT,traits>& out,
 
 }
 
-#endif // ATTRIBUTE_DESCRIPTOR_HPP
+#endif // MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index 5fde3d7f9..16d7f85c4 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -20,16 +20,16 @@
  *
  *****************************************************************************/
 
-//$Id: box2d.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
 #ifndef MAPNIK_BOX2D_HPP
 #define MAPNIK_BOX2D_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/coord.hpp>
+
 // boost
 #include <boost/operators.hpp>
+
 // stl
 #include <iomanip>
 
diff --git a/include/mapnik/cairo_renderer.hpp b/include/mapnik/cairo_renderer.hpp
index 3261ed379..821ed1334 100644
--- a/include/mapnik/cairo_renderer.hpp
+++ b/include/mapnik/cairo_renderer.hpp
@@ -20,14 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #if defined(HAVE_CAIRO)
 
-#ifndef CAIRO_RENDERER_HPP
-#define CAIRO_RENDERER_HPP
-
-
+#ifndef MAPNIK_CAIRO_RENDERER_HPP
+#define MAPNIK_CAIRO_RENDERER_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -152,6 +148,6 @@ public:
 };
 }
 
-#endif
+#endif // MAPNIK_CAIRO_RENDERER_HPP
 
-#endif //CAIRO_RENDERER_HPP
+#endif
diff --git a/include/mapnik/color.hpp b/include/mapnik/color.hpp
index d42225050..37c10cc93 100644
--- a/include/mapnik/color.hpp
+++ b/include/mapnik/color.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: color.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef COLOR_HPP
-#define COLOR_HPP
+#ifndef MAPNIK_COLOR_HPP
+#define MAPNIK_COLOR_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -32,6 +30,7 @@
 //boost
 #include <boost/cstdint.hpp>
 #include <boost/operators.hpp>
+
 // stl
 #include <sstream>
 
@@ -141,4 +140,4 @@ public:
 
 }
 
-#endif //COLOR_HPP
+#endif // MAPNIK_COLOR_HPP
diff --git a/include/mapnik/color_factory.hpp b/include/mapnik/color_factory.hpp
index 15a3e07a8..c27af5fa4 100644
--- a/include/mapnik/color_factory.hpp
+++ b/include/mapnik/color_factory.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_COLOR_FACTORY_HPP
 #define MAPNIK_COLOR_FACTORY_HPP
 
@@ -120,4 +118,4 @@ public:
 
 #endif
 
-#endif //MAPNIK_COLOR_FACTORY_HPP
+#endif // MAPNIK_COLOR_FACTORY_HPP
diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp
index 8670d1bd8..a79ade04d 100644
--- a/include/mapnik/config.hpp
+++ b/include/mapnik/config.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef CONFIG_HPP
-#define CONFIG_HPP
+#ifndef MAPNIK_CONFIG_HPP
+#define MAPNIK_CONFIG_HPP
 
 // Windows DLL support
 
@@ -47,4 +47,5 @@
 #endif
 
 #define PROJ_ENVELOPE_POINTS 20
-#endif // CONFIG_HPP
+
+#endif // MAPNIK_CONFIG_HPP
diff --git a/include/mapnik/config_error.hpp b/include/mapnik/config_error.hpp
index 56996751e..c43169e50 100644
--- a/include/mapnik/config_error.hpp
+++ b/include/mapnik/config_error.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_CONFIG_ERROR_INCLUDED
-#define MAPNIK_CONFIG_ERROR_INCLUDED
+#ifndef MAPNIK_CONFIG_ERROR_HPP
+#define MAPNIK_CONFIG_ERROR_HPP
 
 #include <iostream>
 #include <sstream>
@@ -54,4 +54,4 @@ protected:
 };
 }
 
-#endif // MAPNIK_CONFIG_ERROR_INCLUDED
+#endif // MAPNIK_CONFIG_ERROR_HPP
diff --git a/include/mapnik/coord.hpp b/include/mapnik/coord.hpp
index 0dedcaff7..340929801 100644
--- a/include/mapnik/coord.hpp
+++ b/include/mapnik/coord.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id: coord.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef COORD_HPP
-#define COORD_HPP
+#ifndef MAPNIK_COORD_HPP
+#define MAPNIK_COORD_HPP
 
+// boost
 #include <boost/operators.hpp>
+
+// stl
 #include <iomanip>
 #include <sstream>
 
@@ -187,4 +188,4 @@ operator << (std::basic_ostream<charT,traits>& out,
 } 
 }
 
-#endif // COORD_HPP
+#endif // MAPNIK_COORD_HPP
diff --git a/include/mapnik/coord_array.hpp b/include/mapnik/coord_array.hpp
index 8fc59c3a9..410e8e5d0 100644
--- a/include/mapnik/coord_array.hpp
+++ b/include/mapnik/coord_array.hpp
@@ -20,13 +20,12 @@
  *
  *****************************************************************************/
 
-//$Id: coord_array.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef COORD_ARRAY_HPP
-#define COORD_ARRAY_HPP
+#ifndef MAPNIK_COORD_ARRAY_HPP
+#define MAPNIK_COORD_ARRAY_HPP
 
 //mapnik
 #include <mapnik/coord.hpp>
+
 // stl
 #include <cassert>
 
@@ -89,4 +88,4 @@ private:
 }
 
 
-#endif //COORD_ARRAY_HPP
+#endif // MAPNIK_COORD_ARRAY_HPP
diff --git a/include/mapnik/css_color_grammar.hpp b/include/mapnik/css_color_grammar.hpp
index 8e04011de..28166b5fb 100644
--- a/include/mapnik/css_color_grammar.hpp
+++ b/include/mapnik/css_color_grammar.hpp
@@ -20,22 +20,23 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
 #define MAPNIK_CSS_COLOR_GRAMMAR_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
+
 // spirit2
 #include <boost/config/warning_disable.hpp>
 #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>
+
 // fusion
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/fusion/include/adapt_adt.hpp>
@@ -387,4 +388,4 @@ struct css_color_grammar : qi::grammar<Iterator, color(), ascii_space_type>
 
 }
 
-#endif //MAPNIK_CSS_COLOR_GRAMMAR_HPP 
+#endif // MAPNIK_CSS_COLOR_GRAMMAR_HPP
diff --git a/include/mapnik/css_color_grammar_deprecated.hpp b/include/mapnik/css_color_grammar_deprecated.hpp
index d0ad92654..336dd2f56 100644
--- a/include/mapnik/css_color_grammar_deprecated.hpp
+++ b/include/mapnik/css_color_grammar_deprecated.hpp
@@ -20,22 +20,23 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
-#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
+#ifndef MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
+#define MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
+
 // spirit2
 #include <boost/config/warning_disable.hpp>
 #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>
+
 // fusion
 #include <boost/fusion/include/adapt_struct.hpp>
 
@@ -45,7 +46,6 @@
 // stl
 #include <string>
 
-
 //BOOST_FUSION_ADAPT_CLASS(
 //    mapnik::color,
 //   (unsigned, unsigned, obj.red(), obj.set_red(val))
@@ -417,4 +417,4 @@ struct css_color_grammar : qi::grammar<Iterator, css(), ascii_space_type>
 
 }
 
-#endif //MAPNIK_CSS_COLOR_GRAMMAR_HPP 
+#endif // MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
diff --git a/include/mapnik/ctrans.hpp b/include/mapnik/ctrans.hpp
index da7db679e..6fc2297f4 100644
--- a/include/mapnik/ctrans.hpp
+++ b/include/mapnik/ctrans.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef CTRANS_HPP
-#define CTRANS_HPP
+#ifndef MAPNIK_CTRANS_HPP
+#define MAPNIK_CTRANS_HPP
 
 // mapnik
 #include <mapnik/box2d.hpp>
@@ -518,4 +517,4 @@ public:
 };
 }
 
-#endif //CTRANS_HPP
+#endif // MAPNIK_CTRANS_HPP
diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp
index 7c78905b1..0495ab450 100644
--- a/include/mapnik/datasource.hpp
+++ b/include/mapnik/datasource.hpp
@@ -20,10 +20,9 @@
  *
  *****************************************************************************/
 
-//$Id: datasource.hpp 43 2005-04-22 18:52:47Z pavlenko $
+#ifndef MAPNIK_DATASOURCE_HPP
+#define MAPNIK_DATASOURCE_HPP
 
-#ifndef DATASOURCE_HPP
-#define DATASOURCE_HPP
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/ctrans.hpp>
@@ -31,9 +30,11 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/query.hpp>
 #include <mapnik/feature_layer_desc.hpp>
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+
 // stl
 #include <map>
 #include <string>
@@ -142,6 +143,7 @@ typedef boost::shared_ptr<datasource> datasource_ptr;
         delete ds;                                                      \
     }                                                                   \
     //
+
 }
 
-#endif //DATASOURCE_HPP
+#endif // MAPNIK_DATASOURCE_HPP
diff --git a/include/mapnik/datasource_cache.hpp b/include/mapnik/datasource_cache.hpp
index 84ac1bdb9..08cb18a47 100644
--- a/include/mapnik/datasource_cache.hpp
+++ b/include/mapnik/datasource_cache.hpp
@@ -20,18 +20,18 @@
  *
  *****************************************************************************/
 
-//$Id: datasource_cache.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef DATASOURCE_CACHE_HPP
-#define DATASOURCE_CACHE_HPP
+#ifndef MAPNIK_DATASOURCE_CACHE_HPP
+#define MAPNIK_DATASOURCE_CACHE_HPP
 
 // mapnik
 #include <mapnik/utils.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/plugin.hpp>
 #include <mapnik/datasource.hpp>
+
 // boost
 #include <boost/shared_ptr.hpp>
+
 // stl
 #include <map>
 
@@ -57,4 +57,4 @@ public:
 };
 }
 
-#endif   //DATASOURCE_CACHE_HPP
+#endif // MAPNIK_DATASOURCE_CACHE_HPP
diff --git a/include/mapnik/distance.hpp b/include/mapnik/distance.hpp
index b0bceed87..5c1b8f7eb 100644
--- a/include/mapnik/distance.hpp
+++ b/include/mapnik/distance.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef DISTANCE_HPP
-#define DISTANCE_HPP
+#ifndef MAPNIK_DISTANCE_HPP
+#define MAPNIK_DISTANCE_HPP
 
 #include <mapnik/coord.hpp>
 
@@ -52,4 +50,4 @@ public:
 */
 }
 
-#endif // GEO_UTILS_HPP
+#endif // MAPNIK_DISTANCE_HPP
diff --git a/include/mapnik/ellipsoid.hpp b/include/mapnik/ellipsoid.hpp
index bffc528cd..82c3e7231 100644
--- a/include/mapnik/ellipsoid.hpp
+++ b/include/mapnik/ellipsoid.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_ELLIPSOID_HPP
 #define MAPNIK_ELLIPSOID_HPP
 
diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp
index 413054e44..19ffc2828 100644
--- a/include/mapnik/enumeration.hpp
+++ b/include/mapnik/enumeration.hpp
@@ -20,11 +20,13 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_ENUMERATION_INCLUDED
-#define MAPNIK_ENUMERATION_INCLUDED
+#ifndef MAPNIK_ENUMERATION_HPP
+#define MAPNIK_ENUMERATION_HPP
 
+// mapnik
 #include <mapnik/config.hpp>
 
+// stl
 #include <vector>
 #include <bitset>
 #include <iostream>
@@ -325,4 +327,4 @@ operator>>(std::istream & is, mapnik::enumeration<ENUM, THE_MAX> & e)
     template <> std::string name ::our_name_ = #name;                   \
     template <> bool name ::our_verified_flag_( name ::verify(__FILE__, __LINE__));
 
-#endif // MAPNIK_ENUMERATION_INCLUDED
+#endif // MAPNIK_ENUMERATION_HPP
diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index f01185fe4..3c1fe7c3b 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_EXPRESSION_EVALUATOR_HPP
 #define MAPNIK_EXPRESSION_EVALUATOR_HPP
 
@@ -104,4 +102,4 @@ struct evaluate : boost::static_visitor<T1>
 
 }
 
-#endif //MAPNIK_EXPRESSION_EVALUATOR_HPP
+#endif // MAPNIK_EXPRESSION_EVALUATOR_HPP
diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
index 111588db8..8f91aaf52 100644
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
 #define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
 
@@ -34,12 +32,15 @@
 #include <boost/variant.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/concept_check.hpp>
-//spirit2
+
+// spirit2
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_action.hpp>
-//fusion
+
+// fusion
 #include <boost/fusion/include/adapt_struct.hpp>
-//phoenix
+
+// phoenix
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index b42df9355..c83ed795d 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-#ifndef  MAPNIK_EXPRESSION_NODE_HPP
-#define  MAPNIK_EXPRESSION_NODE_HPP
+#ifndef MAPNIK_EXPRESSION_NODE_HPP
+#define MAPNIK_EXPRESSION_NODE_HPP
 
 // mapnik
 #include <mapnik/value.hpp>
 #include <mapnik/attribute.hpp>
+
 // boost
 #include <boost/variant.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/include/mapnik/expression_string.hpp b/include/mapnik/expression_string.hpp
index 3ffa2bb58..1f8279a87 100644
--- a/include/mapnik/expression_string.hpp
+++ b/include/mapnik/expression_string.hpp
@@ -20,14 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_EXPRESSION_STRING_HPP
 #define MAPNIK_EXPRESSION_STRING_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/expression_node.hpp>
+
 // stl
 #include <string>
 
diff --git a/include/mapnik/factory.hpp b/include/mapnik/factory.hpp
index 768cc1f3c..71d09d703 100644
--- a/include/mapnik/factory.hpp
+++ b/include/mapnik/factory.hpp
@@ -20,13 +20,12 @@
  *
  *****************************************************************************/
 
-//$Id: factory.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef FACTORY_HPP
-#define FACTORY_HPP
+#ifndef MAPNIK_FACTORY_HPP
+#define MAPNIK_FACTORY_HPP
 
 // mapnik
 #include <mapnik/utils.hpp>
+
 // stl
 #include <stdexcept>
 #include <map>
@@ -89,4 +88,4 @@ public:
 };
 }
 
-#endif //FACTORY_HPP
+#endif // MAPNIK_FACTORY_HPP
diff --git a/include/mapnik/fastmath.hpp b/include/mapnik/fastmath.hpp
index 78259e5a9..c5b086727 100644
--- a/include/mapnik/fastmath.hpp
+++ b/include/mapnik/fastmath.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef FASTMATH_HPP
-#define FASTMATH_HPP
+#ifndef MAPNIK_FASTMATH_HPP
+#define MAPNIK_FASTMATH_HPP
 
 /* Timings:
  * fast_sin(not inlined) 8.95s
@@ -109,4 +109,4 @@ static inline double fast_atan2(double y, double x)
     return result;
 }
 
-#endif // FASTMATH_HPP
+#endif // MAPNIK_FASTMATH_HPP
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index ee86567a2..e2b57e3eb 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -20,10 +20,9 @@
  *
  *****************************************************************************/
 
-//$Id: feature.hpp 40 2005-04-13 20:20:46Z pavlenko $
+#ifndef MAPNIK_FEATURE_HPP
+#define MAPNIK_FEATURE_HPP
 
-#ifndef FEATURE_HPP
-#define FEATURE_HPP
 // mapnik
 #include <mapnik/value.hpp>
 #include <mapnik/geometry.hpp>
@@ -36,9 +35,9 @@
 #else
 #include <boost/property_map.hpp>
 #endif
-
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+
 // stl
 #include <map>
 
@@ -181,4 +180,4 @@ inline std::ostream& operator<< (std::ostream & out,Feature const& f)
 }
 }
 
-#endif //FEATURE_HPP
+#endif // MAPNIK_FEATURE_HPP
diff --git a/include/mapnik/feature_factory.hpp b/include/mapnik/feature_factory.hpp
index 3a55caf07..dd550a16d 100644
--- a/include/mapnik/feature_factory.hpp
+++ b/include/mapnik/feature_factory.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef FEATURE_FACTORY_HPP
-#define FEATURE_FACTORY_HPP
+#ifndef MAPNIK_FEATURE_FACTORY_HPP
+#define MAPNIK_FEATURE_FACTORY_HPP
 
+// mapnik
 #include <mapnik/feature.hpp>
+
+// boost
 #include <boost/make_shared.hpp>
 //#include <boost/pool/pool_alloc.hpp>
 
@@ -39,8 +40,7 @@ struct feature_factory
         //return boost::allocate_shared<Feature>(boost::fast_pool_allocator<Feature>(),fid);
         return boost::make_shared<Feature>(fid);
     }
-
 }; 
 }
 
-#endif //FEATURE_FACTORY_HPP
+#endif // MAPNIK_FEATURE_FACTORY_HPP
diff --git a/include/mapnik/feature_layer_desc.hpp b/include/mapnik/feature_layer_desc.hpp
index fc1b06f20..14adb6d4e 100644
--- a/include/mapnik/feature_layer_desc.hpp
+++ b/include/mapnik/feature_layer_desc.hpp
@@ -20,14 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef FEATURE_LAYER_DESC_HPP
-#define FEATURE_LAYER_DESC_HPP
+#ifndef MAPNIK_FEATURE_LAYER_DESC_HPP
+#define MAPNIK_FEATURE_LAYER_DESC_HPP
 
 // mapnik
 #include <mapnik/attribute_descriptor.hpp>
 
+// stl
 #include <string>
 #include <vector>
 #include <iostream>
@@ -106,4 +105,4 @@ operator << (std::basic_ostream<charT,traits>& out,
 }
 }
 
-#endif //FEATURE_LAYER_DESC_HPP
+#endif // MAPNIK_FEATURE_LAYER_DESC_HPP
diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index 2379a9734..d0e1b3b99 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef FEATURE_STYLE_PROCESSOR_HPP
-#define FEATURE_STYLE_PROCESSOR_HPP
+#ifndef MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
+#define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
 
 #include <set>
 #include <string>
@@ -74,4 +72,4 @@ private:
 };
 }
 
-#endif //FEATURE_STYLE_PROCESSOR_HPP
+#endif // MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
diff --git a/include/mapnik/feature_type_style.hpp b/include/mapnik/feature_type_style.hpp
index 9cdeda192..d1a0fc6e1 100644
--- a/include/mapnik/feature_type_style.hpp
+++ b/include/mapnik/feature_type_style.hpp
@@ -20,14 +20,14 @@
  *
  *****************************************************************************/
 
-//$Id$
+#ifndef MAPNIK_FEATURE_TYPE_STYLE_HPP
+#define MAPNIK_FEATURE_TYPE_STYLE_HPP
 
-#ifndef FEATURE_TYPE_STYLE_HPP
-#define FEATURE_TYPE_STYLE_HPP
 // mapnik 
 #include <mapnik/rule.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/enumeration.hpp>
+
 // stl
 #include <vector>
 
@@ -69,4 +69,4 @@ public:
 };
 }
 
-#endif //FEATURE_TYPE_STYLE_HPP
+#endif // MAPNIK_FEATURE_TYPE_STYLE_HPP
diff --git a/include/mapnik/fill.hpp b/include/mapnik/fill.hpp
index b0e89cae3..a802c4925 100644
--- a/include/mapnik/fill.hpp
+++ b/include/mapnik/fill.hpp
@@ -20,17 +20,16 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef FILL_HPP
-#define FILL_HPP
+#ifndef MAPNIK_FILL_HPP
+#define MAPNIK_FILL_HPP
 
 namespace mapnik
 {
+
 class fill 
 {
-        
 };
+
 }
 
-#endif //FILL_HPP
+#endif // MAPNIK_FILL_HPP
diff --git a/include/mapnik/filter_factory.hpp b/include/mapnik/filter_factory.hpp
index 8918db9bd..3e25c4014 100644
--- a/include/mapnik/filter_factory.hpp
+++ b/include/mapnik/filter_factory.hpp
@@ -20,14 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_FILTER_FACTORY_HPP
 #define MAPNIK_FILTER_FACTORY_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/expression_node.hpp>
+
 // stl
 #include <string>
 
@@ -41,4 +40,4 @@ MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt);
    
 }
 
-#endif //MAPNIK_FILTER_FACTORY_HPP
+#endif // MAPNIK_FILTER_FACTORY_HPP
diff --git a/include/mapnik/filter_featureset.hpp b/include/mapnik/filter_featureset.hpp
index bc2e8834e..37b57803f 100644
--- a/include/mapnik/filter_featureset.hpp
+++ b/include/mapnik/filter_featureset.hpp
@@ -20,11 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_FILTER_FEATURESET_HPP
 #define MAPNIK_FILTER_FEATURESET_HPP
 
+// mapnik
 #include <mapnik/datasource.hpp>
 
 namespace mapnik {
@@ -54,4 +53,4 @@ private:
 };
 }
 
-#endif //MAPNIK_FILTER_FEATURESET_HPP
+#endif // MAPNIK_FILTER_FEATURESET_HPP
diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
index 0235d4c0d..5754e6471 100644
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@@ -20,10 +20,9 @@
  *
  *****************************************************************************/
 
-//$Id$
+#ifndef MAPNIK_FONT_ENGINE_FREETYPE_HPP
+#define MAPNIK_FONT_ENGINE_FREETYPE_HPP
 
-#ifndef FONT_ENGINE_FREETYPE_HPP
-#define FONT_ENGINE_FREETYPE_HPP
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/utils.hpp>
@@ -50,7 +49,6 @@ extern "C"
 #include <boost/thread/mutex.hpp>
 #endif
 
-
 // stl
 #include <string>
 #include <vector>
@@ -602,4 +600,4 @@ private:
 };
 }
 
-#endif // FONT_ENGINE_FREETYPE_HPP
+#endif // MAPNIK_FONT_ENGINE_FREETYPE_HPP
diff --git a/include/mapnik/font_set.hpp b/include/mapnik/font_set.hpp
index 8d532f96d..11c73a316 100644
--- a/include/mapnik/font_set.hpp
+++ b/include/mapnik/font_set.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef FONT_SET_HPP
-#define FONT_SET_HPP
+#ifndef MAPNIK_FONT_SET_HPP
+#define MAPNIK_FONT_SET_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -52,4 +50,4 @@ private:
 };
 }
 
-#endif //FONT_SET_HPP
+#endif // MAPNIK_FONT_SET_HPP
diff --git a/include/mapnik/gamma.hpp b/include/mapnik/gamma.hpp
index b09c4c354..5267c3e89 100644
--- a/include/mapnik/gamma.hpp
+++ b/include/mapnik/gamma.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: gamma.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef GAMMA_HPP
-#define GAMMA_HPP
+#ifndef MAPNIK_GAMMA_HPP
+#define MAPNIK_GAMMA_HPP
 
 #include <cmath>
 
@@ -50,4 +48,4 @@ struct MAPNIK_DECL gamma
 };
 }
 
-#endif  //GAMMA_HPP
+#endif // MAPNIK_GAMMA_HPP
diff --git a/include/mapnik/geom_util.hpp b/include/mapnik/geom_util.hpp
index 318e805eb..87c91e02a 100644
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@@ -20,15 +20,16 @@
  *
  *****************************************************************************/
 
-//$Id: geom_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
+#ifndef MAPNIK_GEOM_UTIL_HPP
+#define MAPNIK_GEOM_UTIL_HPP
 
-#ifndef GEOM_UTIL_HPP
-#define GEOM_UTIL_HPP
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/vertex.hpp>
+
 // boost
 #include <boost/tuple/tuple.hpp>
+
 // stl
 #include <cmath>
 
@@ -217,4 +218,4 @@ struct filter_at_point
 };
 }
 
-#endif //GEOM_UTIL_HPP
+#endif // MAPNIK_GEOM_UTIL_HPP
diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp
index 8e51b0810..f083d5102 100644
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@@ -20,15 +20,14 @@
  *
  *****************************************************************************/
 
-//$Id: geometry.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef GEOMETRY_HPP
-#define GEOMETRY_HPP
+#ifndef MAPNIK_GEOMETRY_HPP
+#define MAPNIK_GEOMETRY_HPP
 
 // mapnik
 #include <mapnik/vertex_vector.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/geom_util.hpp>
+
 // boost
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
@@ -392,4 +391,4 @@ typedef boost::ptr_vector<geometry_type> geometry_containter;
 
 }
 
-#endif //GEOMETRY_HPP
+#endif // MAPNIK_GEOMETRY_HPP
diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp
index 11f14922b..f834552c7 100644
--- a/include/mapnik/global.hpp
+++ b/include/mapnik/global.hpp
@@ -20,14 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef GLOBAL_HPP
-#define GLOBAL_HPP
+#ifndef MAPNIK_GLOBAL_HPP
+#define MAPNIK_GLOBAL_HPP
 
 // boost
 #include <boost/cstdint.hpp>
 #include <boost/detail/endian.hpp>
+
 // stl
 #include <cstring>
 
@@ -183,4 +182,4 @@ inline double round (double val)
 
 
 
-#endif //GLOBAL_HPP
+#endif // MAPNIK_GLOBAL_HPP
diff --git a/include/mapnik/glyph_symbolizer.hpp b/include/mapnik/glyph_symbolizer.hpp
index a45830a08..25daf62b8 100644
--- a/include/mapnik/glyph_symbolizer.hpp
+++ b/include/mapnik/glyph_symbolizer.hpp
@@ -1,5 +1,27 @@
-#ifndef GLYPH_SYMBOLIZER_HPP
-#define GLYPH_SYMBOLIZER_HPP
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2011 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_GLYPH_SYMBOLIZER_HPP
+#define MAPNIK_GLYPH_SYMBOLIZER_HPP
 
 // mapnik
 #include <mapnik/enumeration.hpp>
@@ -190,4 +212,4 @@ private:
 
 }  // end mapnik namespace
 
-#endif
+#endif // MAPNIK_GLYPH_SYMBOLIZER_HPP
diff --git a/include/mapnik/gradient.hpp b/include/mapnik/gradient.hpp
index 96b08aaf4..896765133 100644
--- a/include/mapnik/gradient.hpp
+++ b/include/mapnik/gradient.hpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef GRADIENT_HPP
-#define GRADIENT_HPP
+#ifndef MAPNIK_GRADIENT_HPP
+#define MAPNIK_GRADIENT_HPP
 
+// agg
 #include <agg_trans_affine.h>
 
 // mapnik
@@ -104,4 +104,4 @@ private:
 };
 }
 
-#endif //GRADIENT_HPP
+#endif // MAPNIK_GRADIENT_HPP
diff --git a/include/mapnik/graphics.hpp b/include/mapnik/graphics.hpp
index 240870418..6774da392 100644
--- a/include/mapnik/graphics.hpp
+++ b/include/mapnik/graphics.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: graphics.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef GRAPHICS_HPP
-#define GRAPHICS_HPP
+#ifndef MAPNIK_GRAPHICS_HPP
+#define MAPNIK_GRAPHICS_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
@@ -520,4 +518,5 @@ public:
     }
 };
 }
-#endif //GRAPHICS_HPP
+
+#endif // MAPNIK_GRAPHICS_HPP
diff --git a/include/mapnik/hextree.hpp b/include/mapnik/hextree.hpp
index e91eedac2..9c42d5798 100644
--- a/include/mapnik/hextree.hpp
+++ b/include/mapnik/hextree.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef _HEXTREE_HPP_
-#define _HEXTREE_HPP_
+#ifndef MAPNIK_HEXTREE_HPP
+#define MAPNIK_HEXTREE_HPP
 
 // mapnik
 #include <mapnik/global.hpp>
@@ -455,4 +454,4 @@ private:
 };
 } // namespace mapnik
 
-#endif // _HEXTREE_HPP_
+#endif // MAPNIK_HEXTREE_HPP
diff --git a/include/mapnik/hit_test_filter.hpp b/include/mapnik/hit_test_filter.hpp
index 3592efbb3..67c3837ca 100644
--- a/include/mapnik/hit_test_filter.hpp
+++ b/include/mapnik/hit_test_filter.hpp
@@ -20,11 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef HIT_TEST_FILTER_HPP
-#define HIT_TEST_FILTER_HPP
+#ifndef MAPNIK_HIT_TEST_FILTER_HPP
+#define MAPNIK_HIT_TEST_FILTER_HPP
 
+// mapnik
 #include <mapnik/feature.hpp>
 
 namespace mapnik {
@@ -54,4 +53,4 @@ private:
 };
 }
 
-#endif // HIT_TEST_FILTER_HPP
+#endif // MAPNIK_HIT_TEST_FILTER_HPP
diff --git a/include/mapnik/image_compositing.hpp b/include/mapnik/image_compositing.hpp
index adf5df9ab..dcd35676e 100644
--- a/include/mapnik/image_compositing.hpp
+++ b/include/mapnik/image_compositing.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef IMAGE_COMPOSITING_HPP
-#define IMAGE_COMPOSITING_HPP
+#ifndef MAPNIK_IMAGE_COMPOSITING_HPP
+#define MAPNIK_IMAGE_COMPOSITING_HPP
 
 // agg
 #include "agg_rendering_buffer.h"
@@ -186,4 +184,4 @@ void composite(T1 & im, T2 & im2, composite_mode_e mode)
 
 }
 
-#endif // IMAGE_COMPOSITING_HPP
+#endif // MAPNIK_IMAGE_COMPOSITING_HPP
diff --git a/include/mapnik/image_data.hpp b/include/mapnik/image_data.hpp
index 33a1d117c..d381f1393 100644
--- a/include/mapnik/image_data.hpp
+++ b/include/mapnik/image_data.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef IMAGE_DATA_HPP
-#define IMAGE_DATA_HPP
+#ifndef MAPNIK_IMAGE_DATA_HPP
+#define MAPNIK_IMAGE_DATA_HPP
 
+// mapnik
 #include <mapnik/global.hpp>
+
+// stl
 #include <cassert>
 #include <cstring>
 
@@ -139,4 +140,4 @@ typedef ImageData<unsigned> image_data_32;
 typedef ImageData<byte>  image_data_8;
 }
 
-#endif //IMAGE_DATA_HPP
+#endif // MAPNIK_IMAGE_DATA_HPP
diff --git a/include/mapnik/image_reader.hpp b/include/mapnik/image_reader.hpp
index d5ff4db3c..144863c1e 100644
--- a/include/mapnik/image_reader.hpp
+++ b/include/mapnik/image_reader.hpp
@@ -20,13 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id: image_reader.hpp 39 2005-04-10 20:39:53Z pavlenko $
+#ifndef MAPNIK_IMAGE_READER_HPP
+#define MAPNIK_IMAGE_READER_HPP
 
-#ifndef IMAGE_READER_HPP
-#define IMAGE_READER_HPP
 // mapnik
 #include <mapnik/image_data.hpp>
 #include <mapnik/config.hpp>
+
 // stl
 #include <stdexcept>
 #include <string>
@@ -63,4 +63,4 @@ MAPNIK_DECL image_reader* get_image_reader(const std::string& file);
    
 }
 
-#endif //IMAGE_READER_HPP
+#endif // MAPNIK_IMAGE_READER_HPP
diff --git a/include/mapnik/image_util.hpp b/include/mapnik/image_util.hpp
index 6772231f5..3f621dff8 100644
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: image_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef IMAGE_UTIL_HPP
-#define IMAGE_UTIL_HPP
+#ifndef MAPNIK_IMAGE_UTIL_HPP
+#define MAPNIK_IMAGE_UTIL_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -298,4 +296,4 @@ template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (ima
 
 }
 
-#endif //IMAGE_UTIL_HPP
+#endif // MAPNIK_IMAGE_UTIL_HPP
diff --git a/include/mapnik/image_view.hpp b/include/mapnik/image_view.hpp
index 226da2ad7..c942d17d2 100644
--- a/include/mapnik/image_view.hpp
+++ b/include/mapnik/image_view.hpp
@@ -20,11 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef IMAGE_VIEW_HPP
-#define IMAGE_VIEW_HPP
-
+#ifndef MAPNIK_IMAGE_VIEW_HPP
+#define MAPNIK_IMAGE_VIEW_HPP
 
 namespace mapnik {
     
@@ -107,5 +104,5 @@ private:
 };
 }
 
-#endif // IMAGE_VIEW_HPP
+#endif // MAPNIK_IMAGE_VIEW_HPP
 
diff --git a/include/mapnik/jpeg_io.hpp b/include/mapnik/jpeg_io.hpp
index 3b4c0eab5..f5d96bc71 100644
--- a/include/mapnik/jpeg_io.hpp
+++ b/include/mapnik/jpeg_io.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_JPEG_IO_HPP
 #define MAPNIK_JPEG_IO_HPP
 
diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp
index 0178930b9..48de5f647 100644
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@@ -20,13 +20,12 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef LABEL_COLLISION_DETECTOR_HPP
-#define LABEL_COLLISION_DETECTOR_HPP
+#ifndef MAPNIK_LABEL_COLLISION_DETECTOR_HPP
+#define MAPNIK_LABEL_COLLISION_DETECTOR_HPP
 
 // mapnik
 #include <mapnik/quad_tree.hpp>
+
 // stl
 #include <vector>
 #include <unicode/unistr.h>
@@ -233,4 +232,4 @@ public:
 };
 }
 
-#endif // LABEL_COLLISION_DETECTOR_HPP
+#endif // MAPNIK_LABEL_COLLISION_DETECTOR_HPP
diff --git a/include/mapnik/label_placement.hpp b/include/mapnik/label_placement.hpp
index c0f1ded34..a667516a9 100644
--- a/include/mapnik/label_placement.hpp
+++ b/include/mapnik/label_placement.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef LABEL_PLACEMENT_HPP
-#define LABEL_PLACEMENT_HPP
+#ifndef MAPNIK_LABEL_PLACEMENT_HPP
+#define MAPNIK_LABEL_PLACEMENT_HPP
 
 namespace mapnik
 {
@@ -51,4 +50,4 @@ public:
 };
 }
  
-#endif //LABEL_PLACEMENT_HPP
+#endif // MAPNIK_LABEL_PLACEMENT_HPP
diff --git a/include/mapnik/layer.hpp b/include/mapnik/layer.hpp
index 9371ac83b..337bc1872 100644
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: layer.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef LAYER_HPP
-#define LAYER_HPP
+#ifndef MAPNIK_LAYER_HPP
+#define MAPNIK_LAYER_HPP
+
 // mapnik
 #include <mapnik/feature.hpp>
 #include <mapnik/datasource.hpp>
@@ -217,4 +217,4 @@ private:
 };
 }
 
-#endif //LAYER_HPP
+#endif // MAPNIK_LAYER_HPP
diff --git a/include/mapnik/libxml2_loader.hpp b/include/mapnik/libxml2_loader.hpp
index da7babba4..c4e5ca893 100644
--- a/include/mapnik/libxml2_loader.hpp
+++ b/include/mapnik/libxml2_loader.hpp
@@ -20,11 +20,13 @@
  *
  *****************************************************************************/
 
-#ifndef LIBXML2_LOADER_INCLUDED
-#define LIBXML2_LOADER_INCLUDED
+#ifndef MAPNIK_LIBXML2_LOADER_HPP
+#define MAPNIK_LIBXML2_LOADER_HPP
 
+// boost
 #include <boost/property_tree/ptree.hpp>
 
+// stl
 #include <string>
 
 namespace mapnik 
@@ -33,4 +35,4 @@ void read_xml2( std::string const & filename, boost::property_tree::ptree & pt);
 void read_xml2_string( std::string const & str, boost::property_tree::ptree & pt, std::string const & base_path="");
 }
 
-#endif // LIBXML2_LOADER_INCLUDED
+#endif // MAPNIK_LIBXML2_LOADER_HPP
diff --git a/include/mapnik/line_pattern_symbolizer.hpp b/include/mapnik/line_pattern_symbolizer.hpp
index 401101af1..8a65bf043 100644
--- a/include/mapnik/line_pattern_symbolizer.hpp
+++ b/include/mapnik/line_pattern_symbolizer.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: polygon_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef LINE_PATTERN_SYMBOLIZER_HPP
-#define LINE_PATTERN_SYMBOLIZER_HPP
+#ifndef MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
+#define MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
 
 // mapnik
 #include <mapnik/symbolizer.hpp>
@@ -38,4 +37,4 @@ struct MAPNIK_DECL line_pattern_symbolizer :
 };    
 }
 
-#endif // LINE_PATTERN_SYMBOLIZER_HPP
+#endif // MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
diff --git a/include/mapnik/line_symbolizer.hpp b/include/mapnik/line_symbolizer.hpp
index caefa3295..39df6685d 100644
--- a/include/mapnik/line_symbolizer.hpp
+++ b/include/mapnik/line_symbolizer.hpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: line_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef LINE_SYMBOLIZER_HPP
-#define LINE_SYMBOLIZER_HPP
+#ifndef MAPNIK_LINE_SYMBOLIZER_HPP
+#define MAPNIK_LINE_SYMBOLIZER_HPP
 
+// mapnik
 #include <mapnik/stroke.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/enumeration.hpp>
@@ -82,4 +82,4 @@ private:
 };
 }
 
-#endif //LINE_SYMBOLIZER_HPP
+#endif // MAPNIK_LINE_SYMBOLIZER_HPP
diff --git a/include/mapnik/load_map.hpp b/include/mapnik/load_map.hpp
index 3b151ecb4..3a22c6f93 100644
--- a/include/mapnik/load_map.hpp
+++ b/include/mapnik/load_map.hpp
@@ -19,16 +19,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-// $Id$
 
-#ifndef MAP_LOADER_HPP
-#define MAP_LOADER_HPP
+#ifndef MAPNIK_LOAD_MAP_HPP
+#define MAPNIK_LOAD_MAP_HPP
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+// mapnik
 #include <mapnik/map.hpp>
+
+// stl
 #include <string>
 
 namespace mapnik
@@ -37,4 +39,4 @@ MAPNIK_DECL void load_map(Map & map, std::string const& filename, bool strict =
 MAPNIK_DECL void load_map_string(Map & map, std::string const& str, bool strict = false, std::string const& base_path="");
 }
 
-#endif // LOAD_MAP_HPP
+#endif // MAPNIK_LOAD_MAP_HPP
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index e90bab61b..2be677e24 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: map.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef MAP_HPP
-#define MAP_HPP
+#ifndef MAPNIK_MAP_HPP
+#define MAPNIK_MAP_HPP
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -461,4 +460,4 @@ private:
 DEFINE_ENUM(aspect_fix_mode_e,Map::aspect_fix_mode);
 }
 
-#endif //MAP_HPP
+#endif // MAPNIK_MAP_HPP
diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp
index b143a6f30..d6bb27f5c 100644
--- a/include/mapnik/mapped_memory_cache.hpp
+++ b/include/mapnik/mapped_memory_cache.hpp
@@ -20,21 +20,19 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef MEMORY_REGION_CACHE_HPP
-#define MEMORY_REGION_CACHE_HPP
+#ifndef MAPNIK_MAPPED_MEMORY_CACHE_HPP
+#define MAPNIK_MAPPED_MEMORY_CACHE_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/utils.hpp>
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
 #endif
@@ -61,5 +59,5 @@ struct MAPNIK_DECL mapped_memory_cache :
 
 }
 
-#endif // MAPNIK_MARKER_CACHE_HPP
+#endif // MAPNIK_MAPPED_MEMORY_CACHE_HPP
 
diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index 3c4779a0a..571180ecd 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -20,18 +20,19 @@
  *
  *****************************************************************************/
 
-//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef MARKER_HPP
-#define MARKER_HPP
+#ifndef MAPNIK_MARKER_HPP
+#define MAPNIK_MARKER_HPP
 
+// mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 
+// agg
 #include "agg_path_storage.h"
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
@@ -39,6 +40,7 @@
 #include <boost/optional.hpp>
 #include <boost/make_shared.hpp>
 
+// stl
 #include <cassert>
 #include <cstring>
 
@@ -125,4 +127,4 @@ private:
 
 }
 
-#endif //MARKER_HPP
+#endif // MAPNIK_MARKER_HPP
diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp
index 4d05ca59d..7595334ea 100644
--- a/include/mapnik/marker_cache.hpp
+++ b/include/mapnik/marker_cache.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_MARKER_CACHE_HPP
 #define MAPNIK_MARKER_CACHE_HPP
 
@@ -32,8 +30,10 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+
 // agg
 #include "agg_path_storage.h"
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
diff --git a/include/mapnik/markers_placement.hpp b/include/mapnik/markers_placement.hpp
index c01acb818..259fd4ae4 100644
--- a/include/mapnik/markers_placement.hpp
+++ b/include/mapnik/markers_placement.hpp
@@ -20,13 +20,19 @@
  *
  *****************************************************************************/
 
-#ifndef MARKERS_PLACEMENT_HPP
-#define MARKERS_PLACEMENT_HPP
+#ifndef MAPNIK_MARKERS_PLACEMENT_HPP
+#define MAPNIK_MARKERS_PLACEMENT_HPP
 
+// agg
 #include "agg_basics.h"
+
+// mapnik
 #include <mapnik/box2d.hpp>
 
+// boost
 #include <boost/utility.hpp>
+
+// stl
 #include <cmath>
 
 namespace mapnik {
@@ -242,5 +248,7 @@ template <typename Locator, typename Detector> box2d<double> markers_placement<L
 
     return box2d<double>(x1_, y1_, x2_, y2_);
 }
-} /* end namespace */
-#endif // MARKERS_PLACEMENT_HPP
+
+}
+
+#endif // MAPNIK_MARKERS_PLACEMENT_HPP
diff --git a/include/mapnik/markers_symbolizer.hpp b/include/mapnik/markers_symbolizer.hpp
index 86560de6f..09d568cca 100644
--- a/include/mapnik/markers_symbolizer.hpp
+++ b/include/mapnik/markers_symbolizer.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef MARKERS_SYMBOLIZER_HPP
-#define MARKERS_SYMBOLIZER_HPP
+#ifndef MAPNIK_MARKERS_SYMBOLIZER_HPP
+#define MAPNIK_MARKERS_SYMBOLIZER_HPP
 
 //mapnik
 #include <mapnik/symbolizer.hpp>
@@ -92,4 +90,4 @@ private:
 
 }
 
-#endif // MARKERS_SYMBOLIZER_HPP
+#endif // MAPNIK_MARKERS_SYMBOLIZER_HPP
diff --git a/include/mapnik/memory.hpp b/include/mapnik/memory.hpp
index e6f867e30..ecdb05dcc 100644
--- a/include/mapnik/memory.hpp
+++ b/include/mapnik/memory.hpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: memory.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef MEMORY_HPP
-#define MEMORY_HPP
+#ifndef MAPNIK_MEMORY_HPP
+#define MAPNIK_MEMORY_HPP
 
+// stl
 #include <iostream>
 #include <cassert>
 
@@ -85,4 +85,4 @@ public:
 };
 
 }
-#endif //MEMORY_HPP
+#endif // MAPNIK_MEMORY_HPP
diff --git a/include/mapnik/memory_datasource.hpp b/include/mapnik/memory_datasource.hpp
index 775544519..4a51b46a2 100644
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@@ -20,13 +20,14 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef MEMORY_DATASOURCE_HPP
-#define MEMORY_DATASOURCE_HPP
+#ifndef MAPNIK_MEMORY_DATASOURCE_HPP
+#define MAPNIK_MEMORY_DATASOURCE_HPP
 
+// mapnik
 #include <mapnik/datasource.hpp>
 #include <mapnik/feature_layer_desc.hpp>
+
+// stl
 #include <vector>
 
 namespace mapnik {
@@ -65,4 +66,4 @@ private:
 };   
 }
 
-#endif // MEMORY_DATASOURCE_HPP
+#endif // MAPNIK_MEMORY_DATASOURCE_HPP
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index 5127d9d4a..2b6557521 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -20,11 +20,13 @@
  *
  *****************************************************************************/
 
-//$Id$
-#ifndef MEMORY_FEATURESET_HPP
-#define MEMORY_FEATURESET_HPP
+#ifndef MAPNIK_MEMORY_FEATURESET_HPP
+#define MAPNIK_MEMORY_FEATURESET_HPP
 
+// mapnik
 #include <mapnik/memory_datasource.hpp>
+
+// boost
 #include <boost/utility.hpp>
 
 namespace mapnik {
@@ -73,4 +75,4 @@ private:
 };
 }
 
-#endif // MEMORY_FEATURESET_HPP
+#endif // MAPNIK_MEMORY_FEATURESET_HPP
diff --git a/include/mapnik/metawriter.hpp b/include/mapnik/metawriter.hpp
index 93d70cd19..3b2838b5d 100644
--- a/include/mapnik/metawriter.hpp
+++ b/include/mapnik/metawriter.hpp
@@ -20,21 +20,21 @@
  *
  *****************************************************************************/
 
+#ifndef MAPNIK_METAWRITER_HPP
+#define MAPNIK_METAWRITER_HPP
 
-#ifndef METAWRITER_HPP
-#define METAWRITER_HPP
-
-// Mapnik
+// mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/font_engine_freetype.hpp>
 
-// Boost
+// boost
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/concept_check.hpp>
-// STL
+
+// stl
 #include <set>
 #include <string>
 
@@ -139,4 +139,4 @@ typedef std::pair<metawriter_ptr, metawriter_properties> metawriter_with_propert
 
 }
 
-#endif
+#endif // MAPNIK_METAWRITER_HPP
diff --git a/include/mapnik/metawriter_factory.hpp b/include/mapnik/metawriter_factory.hpp
index 1d4e1b59a..cb0150fd4 100644
--- a/include/mapnik/metawriter_factory.hpp
+++ b/include/mapnik/metawriter_factory.hpp
@@ -20,9 +20,8 @@
  *
  *****************************************************************************/
 
-
-#ifndef METAWRITER_FACTORY_HPP
-#define METAWRITER_FACTORY_HPP
+#ifndef MAPNIK_METAWRITER_FACTORY_HPP
+#define MAPNIK_METAWRITER_FACTORY_HPP
 
 // mapnik
 #include <mapnik/metawriter.hpp>
@@ -51,5 +50,5 @@ void metawriter_save(
 
 }
 
-#endif /* METAWRITER_FACTORY_HPP */
+#endif // MAPNIK_METAWRITER_FACTORY_HPP
 
diff --git a/include/mapnik/metawriter_inmem.hpp b/include/mapnik/metawriter_inmem.hpp
index a7d98dc09..5fb00d624 100644
--- a/include/mapnik/metawriter_inmem.hpp
+++ b/include/mapnik/metawriter_inmem.hpp
@@ -20,9 +20,8 @@
  *
  *****************************************************************************/
 
-
-#ifndef METAWRITER_INMEM_HPP
-#define METAWRITER_INMEM_HPP
+#ifndef MAPNIK_METAWRITER_INMEM_HPP
+#define MAPNIK_METAWRITER_INMEM_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -117,4 +116,4 @@ typedef boost::shared_ptr<metawriter_inmem> metawriter_inmem_ptr;
 
 }
 
-#endif /* METAWRITER_INMEM_HPP */
+#endif // MAPNIK_METAWRITER_INMEM_HPP
diff --git a/include/mapnik/metawriter_json.hpp b/include/mapnik/metawriter_json.hpp
index b92d6250e..eb7ae8ca9 100644
--- a/include/mapnik/metawriter_json.hpp
+++ b/include/mapnik/metawriter_json.hpp
@@ -20,9 +20,8 @@
  *
  *****************************************************************************/
 
-
-#ifndef METAWRITER_JSON_HPP
-#define METAWRITER_JSON_HPP
+#ifndef MAPNIK_METAWRITER_JSON_HPP
+#define MAPNIK_METAWRITER_JSON_HPP
 
 // mapnik
 #include <mapnik/metawriter.hpp>
@@ -150,4 +149,4 @@ typedef boost::shared_ptr<metawriter_json> metawriter_json_ptr;
 
 }
 
-#endif
+#endif // MAPNIK_METAWRITER_JSON_HPP
diff --git a/include/mapnik/octree.hpp b/include/mapnik/octree.hpp
index 0cd59ff6a..755fbb3cc 100644
--- a/include/mapnik/octree.hpp
+++ b/include/mapnik/octree.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef _OCTREE_HPP_
-#define _OCTREE_HPP_
+#ifndef MAPNIK_OCTREE_HPP
+#define MAPNIK_OCTREE_HPP
 
 // mapnik
 #include <mapnik/global.hpp>
@@ -303,6 +302,7 @@ public:
 private:        
     node * root_;               
 };
+
 } // namespace mapnik
 
-#endif /* _OCTREE_HPP_ */
+#endif // MAPNIK_OCTREE_HPP
diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp
index 7dd4746ac..ea1f66a33 100644
--- a/include/mapnik/palette.hpp
+++ b/include/mapnik/palette.hpp
@@ -19,11 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
-
-#ifndef _PALETTE_HPP_
-#define _PALETTE_HPP_
 
+#ifndef MAPNIK_PALETTE_HPP
+#define MAPNIK_PALETTE_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -164,5 +162,5 @@ private:
 
 } // namespace mapnik
 
-#endif // _PALETTE_HPP_
+#endif // MAPNIK_PALETTE_HPP
 
diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp
index a9c997958..97f4fd4f6 100644
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@@ -19,15 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: params.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef PARAMS_HPP
-#define PARAMS_HPP
+#ifndef MAPNIK_PARAMS_HPP
+#define MAPNIK_PARAMS_HPP
 
+// mapnik
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
 #include <boost/none.hpp>
 #include <boost/lexical_cast.hpp>
+
+// stl
 #include <string>
 #include <map>
 
@@ -100,4 +102,4 @@ public:
 };
 }
 
-#endif //PARAMS_HPP
+#endif // MAPNIK_PARAMS_HPP
diff --git a/include/mapnik/parse_path.hpp b/include/mapnik/parse_path.hpp
index f4fde4a8f..250a175ef 100644
--- a/include/mapnik/parse_path.hpp
+++ b/include/mapnik/parse_path.hpp
@@ -28,10 +28,12 @@
 #include <mapnik/attribute.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/value.hpp>
+
 // boost
 #include <boost/shared_ptr.hpp>
 #include <boost/variant.hpp>
 #include <boost/foreach.hpp>
+
 // stl
 #include <string>
 #include <vector>
@@ -140,4 +142,4 @@ typedef mapnik::path_processor<Feature> path_processor_type;
 
 }
 
-#endif //MAPNIK_PARSE_PATH_HPP
+#endif // MAPNIK_PARSE_PATH_HPP
diff --git a/include/mapnik/path_expression_grammar.hpp b/include/mapnik/path_expression_grammar.hpp
index 107c7cf74..632745dad 100644
--- a/include/mapnik/path_expression_grammar.hpp
+++ b/include/mapnik/path_expression_grammar.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
 #define MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
 
@@ -29,22 +27,26 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/feature.hpp>
+
 // boost
 #include <boost/variant.hpp>
 #include <boost/concept_check.hpp>
 
-//spirit2
+// spirit2
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_action.hpp>
-//fusion
+
+// fusion
 #include <boost/fusion/include/adapt_struct.hpp>
-//phoenix
+
+// phoenix
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/spirit/home/phoenix/object/construct.hpp>
+
 // stl
 #include <string>
 #include <vector>
@@ -56,11 +58,9 @@ namespace qi = boost::spirit::qi;
 namespace phoenix = boost::phoenix;
 namespace standard_wide =  boost::spirit::standard_wide;
 
-//
 using standard_wide::space_type;
 using standard_wide::space;
 
-
 template <typename Iterator>
 struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_component>(), space_type>
 {    
@@ -92,8 +92,6 @@ struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_componen
     qi::rule<Iterator, std::string() > str;
 };
 
-
 }
 
 #endif  // MAPNIK_PATH_EXPRESSIONS_GRAMMAR_HPP
-
diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp
index 8514e5d02..bf8869ec4 100644
--- a/include/mapnik/placement_finder.hpp
+++ b/include/mapnik/placement_finder.hpp
@@ -20,11 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef __PLACEMENT_FINDER__
-#define __PLACEMENT_FINDER__
+#ifndef MAPNIK_PLACEMENT_FINDER_HPP
+#define MAPNIK_PLACEMENT_FINDER_HPP
 
+// mapnik
 #include <mapnik/ctrans.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/text_symbolizer.hpp>
@@ -33,6 +32,7 @@
 #include <mapnik/text_path.hpp>
 #include <mapnik/text_placements.hpp>
 
+// stl
 #include <queue>
 
 namespace mapnik
@@ -144,7 +144,7 @@ private:
     DetectorT & detector_;
     box2d<double> const& dimensions_;
 };
+
 }
 
-#endif
-
+#endif // MAPNIK_PLACEMENT_FINDER_HPP
diff --git a/include/mapnik/plugin.hpp b/include/mapnik/plugin.hpp
index 65ff1917d..5ccd3ca78 100644
--- a/include/mapnik/plugin.hpp
+++ b/include/mapnik/plugin.hpp
@@ -20,14 +20,15 @@
  *
  *****************************************************************************/
 
-//$Id: plugin.hpp 39 2005-04-10 20:39:53Z pavlenko $
+#ifndef MAPNIK_PLUGIN_HPP
+#define MAPNIK_PLUGIN_HPP
 
-#ifndef PLUGIN_HPP
-#define PLUGIN_HPP
 // boost
 #include <boost/utility.hpp>
+
 // stl
 #include <string>
+
 // ltdl
 #include <ltdl.h>
 
@@ -46,4 +47,4 @@ public:
 };
 }
 
-#endif //PLUGIN_HPP
+#endif // MAPNIK_PLUGIN_HPP
diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp
index 59c059110..fd47535b3 100644
--- a/include/mapnik/png_io.hpp
+++ b/include/mapnik/png_io.hpp
@@ -20,16 +20,16 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_PNG_IO_HPP
 #define MAPNIK_PNG_IO_HPP
 
+// mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/palette.hpp>
 #include <mapnik/octree.hpp>
 #include <mapnik/hextree.hpp>
 
+// zlib
 #include <zlib.h>
 
 extern "C"
diff --git a/include/mapnik/point_symbolizer.hpp b/include/mapnik/point_symbolizer.hpp
index 5a462d695..c1f7c1382 100644
--- a/include/mapnik/point_symbolizer.hpp
+++ b/include/mapnik/point_symbolizer.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: image_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
 #ifndef MAPNIK_POINT_SYMBOLIZER_HPP
 #define MAPNIK_POINT_SYMBOLIZER_HPP
diff --git a/include/mapnik/polygon_pattern_symbolizer.hpp b/include/mapnik/polygon_pattern_symbolizer.hpp
index 71236e0db..e1ffc39b9 100644
--- a/include/mapnik/polygon_pattern_symbolizer.hpp
+++ b/include/mapnik/polygon_pattern_symbolizer.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef POLYGON_PATTERN_SYMBOLIZER_HPP
-#define POLYGON_PATTERN_SYMBOLIZER_HPP
+#ifndef MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
+#define MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
 
 // mapnik 
 #include <mapnik/symbolizer.hpp>
@@ -57,4 +56,4 @@ private:
 };
 }
 
-#endif //POLYGON_PATTERN_SYMBOLIZER_HPP
+#endif // MAPNIK_POLYGON_PATTERN_SYMBOLIZER_HPP
diff --git a/include/mapnik/polygon_symbolizer.hpp b/include/mapnik/polygon_symbolizer.hpp
index d14743c4a..809ceced3 100644
--- a/include/mapnik/polygon_symbolizer.hpp
+++ b/include/mapnik/polygon_symbolizer.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: polygon_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef POLYGON_SYMBOLIZER_HPP
-#define POLYGON_SYMBOLIZER_HPP
+#ifndef MAPNIK_POLYGON_SYMBOLIZER_HPP
+#define MAPNIK_POLYGON_SYMBOLIZER_HPP
 
 // mapnik
 #include <mapnik/color.hpp>
@@ -122,4 +120,4 @@ private:
 };  
 }
 
-#endif // POLYGON_SYMBOLIZER_HPP
+#endif // MAPNIK_POLYGON_SYMBOLIZER_HPP
diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp
index 416a1bf1e..518744a9c 100644
--- a/include/mapnik/pool.hpp
+++ b/include/mapnik/pool.hpp
@@ -20,17 +20,15 @@
  *
  *****************************************************************************/
 
-//$Id: pool.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef POOL_HPP
-#define POOL_HPP
+#ifndef MAPNIK_POOL_HPP
+#define MAPNIK_POOL_HPP
 
 // mapnik
 #include <mapnik/utils.hpp>
+
 // boost
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
-
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
 #endif
@@ -164,5 +162,7 @@ public:
         return size;
     }
 };
+
 }
-#endif //POOL_HPP
+
+#endif // MAPNIK_POOL_HPP
diff --git a/include/mapnik/proj_transform.hpp b/include/mapnik/proj_transform.hpp
index 606d8e931..8c156a0a8 100644
--- a/include/mapnik/proj_transform.hpp
+++ b/include/mapnik/proj_transform.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef PROJ_TRANSFORM_HPP
-#define PROJ_TRANSFORM_HPP
+#ifndef MAPNIK_PROJ_TRANSFORM_HPP
+#define MAPNIK_PROJ_TRANSFORM_HPP
 
 // mapnik
 #include <mapnik/projection.hpp>
@@ -62,4 +60,4 @@ private:
 };
 }
 
-#endif // PROJ_TRANSFORM_HPP
+#endif // MAPNIK_PROJ_TRANSFORM_HPP
diff --git a/include/mapnik/projection.hpp b/include/mapnik/projection.hpp
index 7e3e5c10a..26d64466a 100644
--- a/include/mapnik/projection.hpp
+++ b/include/mapnik/projection.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef PROJECTION_HPP
-#define PROJECTION_HPP
+#ifndef MAPNIK_PROJECTION_HPP
+#define MAPNIK_PROJECTION_HPP
 
 // mapnik
 #include <mapnik/box2d.hpp>
@@ -35,8 +33,8 @@
 #if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
 #include <boost/thread/mutex.hpp>
 #endif
-
 #include <boost/utility.hpp>
+
 // stl
 #include <string>
 #include <iostream>
@@ -85,6 +83,7 @@ private:
     static boost::mutex mutex_;
 #endif
 };
+
 }
 
-#endif //PROJECTION_HPP
+#endif // MAPNIK_PROJECTION_HPP
diff --git a/include/mapnik/ptree_helpers.hpp b/include/mapnik/ptree_helpers.hpp
index b49f4db52..c97ce4d55 100644
--- a/include/mapnik/ptree_helpers.hpp
+++ b/include/mapnik/ptree_helpers.hpp
@@ -20,17 +20,20 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_CONFIG_HELPERS_INCLUDED
-#define MAPNIK_CONFIG_HELPERS_INCLUDED
+#ifndef MAPNIK_PTREE_HELPERS_HPP
+#define MAPNIK_PTREE_HELPERS_HPP
 
+// mapnik
 #include <mapnik/enumeration.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/color_factory.hpp>
 
+// boost
 #include <boost/property_tree/ptree.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 
+// stl
 #include <iostream>
 #include <sstream>
 
@@ -422,6 +425,7 @@ inline boost::optional<color> get_optional(const boost::property_tree::ptree & n
         
     return result;
 }
+
 } // end of namespace mapnik
 
-#endif // MAPNIK_CONFIG_HELPERS_INCLUDED
+#endif // MAPNIK_PTREE_HELPERS_HPP
diff --git a/include/mapnik/quad_tree.hpp b/include/mapnik/quad_tree.hpp
index 0f8486a23..63b305c73 100644
--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@@ -19,15 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef QUAD_TREE_HPP
-#define QUAD_TREE_HPP
+#ifndef MAPNIK_QUAD_TREE_HPP
+#define MAPNIK_QUAD_TREE_HPP
+
 // mapnik
 #include <mapnik/box2d.hpp>
+
 // boost
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/noncopyable.hpp>
+
 // stl
 #include <vector>
 #include <cstring>
@@ -220,4 +222,4 @@ private:
 };    
 } 
 
-#endif
+#endif // MAPNIK_QUAD_TREE_HPP
diff --git a/include/mapnik/query.hpp b/include/mapnik/query.hpp
index 9f0dbe15b..db607c587 100644
--- a/include/mapnik/query.hpp
+++ b/include/mapnik/query.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef QUERY_HPP
-#define QUERY_HPP
+#ifndef MAPNIK_QUERY_HPP
+#define MAPNIK_QUERY_HPP
 
 //mapnik
 #include <mapnik/box2d.hpp>
@@ -123,7 +121,7 @@ public:
         return names_;
     }
 };
+
 }
 
-
-#endif //QUERY_HPP
+#endif // MAPNIK_QUERY_HPP
diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp
index ce3d547ed..cd26af27a 100644
--- a/include/mapnik/raster.hpp
+++ b/include/mapnik/raster.hpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: raster.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef RASTER_HPP
-#define RASTER_HPP
+#ifndef MAPNIK_RASTER_HPP
+#define MAPNIK_RASTER_HPP
 
+// mapnik
 #include <mapnik/graphics.hpp>
 
 namespace mapnik {
@@ -37,5 +37,5 @@ struct raster
 };
 }
 
-#endif //RASTER_HPP
+#endif // MAPNIK_RASTER_HPP
 
diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp
index b69562304..fcf0bb333 100644
--- a/include/mapnik/raster_colorizer.hpp
+++ b/include/mapnik/raster_colorizer.hpp
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 /** \brief Raster Colouriser
  * 
@@ -35,9 +34,8 @@
  * 
  */
 
-
-#ifndef RASTER_COLORIZER_HPP
-#define RASTER_COLORIZER_HPP
+#ifndef MAPNIK_RASTER_COLORIZER_HPP
+#define MAPNIK_RASTER_COLORIZER_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -214,14 +212,9 @@ private:
 };
 
 
-
-
-
-
-
 typedef boost::shared_ptr<raster_colorizer> raster_colorizer_ptr;
 
 
 } // mapnik namespace
 
-#endif //RASTER_COLORIZER_HPP
+#endif // MAPNIK_RASTER_COLORIZER_HPP
diff --git a/include/mapnik/raster_symbolizer.hpp b/include/mapnik/raster_symbolizer.hpp
index d58fe5639..76366b4a8 100644
--- a/include/mapnik/raster_symbolizer.hpp
+++ b/include/mapnik/raster_symbolizer.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef RASTER_SYMBOLIZER_HPP
-#define RASTER_SYMBOLIZER_HPP
+#ifndef MAPNIK_RASTER_SYMBOLIZER_HPP
+#define MAPNIK_RASTER_SYMBOLIZER_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -159,4 +158,4 @@ private:
 };
 }
 
-#endif //RASTER_SYMBOLIZER_HPP
+#endif // MAPNIK_RASTER_SYMBOLIZER_HPP
diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp
index 10d2f3353..53780dfc4 100644
--- a/include/mapnik/rule.hpp
+++ b/include/mapnik/rule.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef RULE_HPP
-#define RULE_HPP
+#ifndef MAPNIK_RULE_HPP
+#define MAPNIK_RULE_HPP
 
 // mapnik
 #include <mapnik/line_symbolizer.hpp>
@@ -327,4 +327,4 @@ private:
 
 }
 
-#endif //RULE_HPP
+#endif // MAPNIK_RULE_HPP
diff --git a/include/mapnik/save_map.hpp b/include/mapnik/save_map.hpp
index ee80faadd..65ca13dac 100644
--- a/include/mapnik/save_map.hpp
+++ b/include/mapnik/save_map.hpp
@@ -19,22 +19,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-// $Id$
 
-#ifndef SAVE_MAP_HPP
-#define SAVE_MAP_HPP
+#ifndef MAPNIK_SAVE_MAP_HPP
+#define MAPNIK_SAVE_MAP_HPP
+
 // mapnik
 #include <mapnik/config.hpp>
+
 // stl
 #include <string>
 
 namespace mapnik
 {
 class Map;
+
 MAPNIK_DECL void save_map(Map const& map, std::string const& filename, bool explicit_defaults = false);
-
 MAPNIK_DECL std::string save_map_to_string(Map const& map, bool explicit_defaults = false);
-
 }
 
-#endif // SAVE_MAP_HPP
+#endif // MAPNIK_SAVE_MAP_HPP
diff --git a/include/mapnik/scale_denominator.hpp b/include/mapnik/scale_denominator.hpp
index 26e3945c7..c42b15788 100644
--- a/include/mapnik/scale_denominator.hpp
+++ b/include/mapnik/scale_denominator.hpp
@@ -20,10 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id$
 #ifndef MAPNIK_SCALE_DENOMINATOR_HPP
 #define MAPNIK_SCALE_DENOMINATOR_HPP
 
+// mapnik
 #include <mapnik/config.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/segment.hpp b/include/mapnik/segment.hpp
index 1836eb69c..12fa2a74b 100644
--- a/include/mapnik/segment.hpp
+++ b/include/mapnik/segment.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_SEGMENT_HPP
 #define MAPNIK_SEGMENT_HPP
 
@@ -41,4 +39,4 @@ static bool y_order(segment_t const& first,segment_t const& second)
 
 }
 
-#endif //MAPNIK_SEGMENT_HPP
+#endif // MAPNIK_SEGMENT_HPP
diff --git a/include/mapnik/shield_symbolizer.hpp b/include/mapnik/shield_symbolizer.hpp
index 6151b8f5a..b8b3bfe47 100644
--- a/include/mapnik/shield_symbolizer.hpp
+++ b/include/mapnik/shield_symbolizer.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #ifndef MAPNIK_SHIELD_SYMBOLIZER_HPP
 #define MAPNIK_SHIELD_SYMBOLIZER_HPP
@@ -61,4 +60,4 @@ private:
 };
 }
 
-#endif // SHIELD_SYMBOLIZER_HPP
+#endif // MAPNIK_SHIELD_SYMBOLIZER_HPP
diff --git a/include/mapnik/sql_utils.hpp b/include/mapnik/sql_utils.hpp
index 7fcd16fc9..666cf1dbd 100644
--- a/include/mapnik/sql_utils.hpp
+++ b/include/mapnik/sql_utils.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: sql_utils.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef SQL_UTILS_HPP
-#define SQL_UTILS_HPP
+#ifndef MAPNIK_SQL_UTILS_HPP
+#define MAPNIK_SQL_UTILS_HPP
 
 // boost
 #include <boost/algorithm/string.hpp>
@@ -196,4 +194,4 @@ inline std::string numeric2string(const char* buf)
 
 }
 
-#endif //SQL_UTILS_HPP
+#endif // MAPNIK_SQL_UTILS_HPP
diff --git a/include/mapnik/stroke.hpp b/include/mapnik/stroke.hpp
index c7ce8b76e..36b6a882c 100644
--- a/include/mapnik/stroke.hpp
+++ b/include/mapnik/stroke.hpp
@@ -19,13 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef STROKE_HPP
-#define STROKE_HPP
+#ifndef MAPNIK_STROKE_HPP
+#define MAPNIK_STROKE_HPP
+
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/enumeration.hpp>
+
 // stl
 #include <vector>
  
@@ -107,4 +108,4 @@ private:
 };
 }
 
-#endif //STROKE_HPP
+#endif // MAPNIK_STROKE_HPP
diff --git a/include/mapnik/style_factory.hpp b/include/mapnik/style_factory.hpp
index a96ebd3d2..fb0982f40 100644
--- a/include/mapnik/style_factory.hpp
+++ b/include/mapnik/style_factory.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: style_factory.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef STYLE_FACTORY_HPP
-#define STYLE_FACTORY_HPP
+#ifndef MAPNIK_STYLE_FACTORY_HPP
+#define MAPNIK_STYLE_FACTORY_HPP
 
 //#include <mapnik/style.hpp>
 
@@ -34,4 +33,4 @@ class style_factory
 }
 
 
-#endif //STYLE_FACTORY_HPP
+#endif // MAPNIK_STYLE_FACTORY_HPP
diff --git a/include/mapnik/svg/svg_converter.hpp b/include/mapnik/svg/svg_converter.hpp
index 2fa43e834..74689971c 100644
--- a/include/mapnik/svg/svg_converter.hpp
+++ b/include/mapnik/svg/svg_converter.hpp
@@ -20,15 +20,16 @@
  *
  *****************************************************************************/
 
-// $Id$
-
 #ifndef MAPNIK_SVG_CONVERTER_HPP
 #define MAPNIK_SVG_CONVERTER_HPP
+
 // mapnik
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+
 // boost
 #include <boost/utility.hpp>
+
 // agg
 #include "agg_path_storage.h"
 #include "agg_conv_transform.h"
@@ -37,6 +38,7 @@
 #include "agg_conv_curve.h"
 #include "agg_color_rgba.h"
 #include "agg_bounding_rect.h"
+
 // stl
 #include <stdexcept>
 
@@ -327,5 +329,4 @@ typedef svg_converter<svg_path_adapter,agg::pod_bvector<mapnik::svg::path_attrib
 
 }}
 
-
-#endif // #ifndef MAPNIK_SVG_CONVERTER_HPP
+#endif // MAPNIK_SVG_CONVERTER_HPP
diff --git a/include/mapnik/svg/svg_parser.hpp b/include/mapnik/svg/svg_parser.hpp
index fa9f4269f..468fc1e94 100644
--- a/include/mapnik/svg/svg_parser.hpp
+++ b/include/mapnik/svg/svg_parser.hpp
@@ -33,6 +33,7 @@
 #include <boost/utility.hpp>
 #include <libxml/xmlreader.h>
 
+// stl
 #include <map>
 
 namespace  mapnik { namespace svg {
diff --git a/include/mapnik/svg/svg_path_adapter.hpp b/include/mapnik/svg/svg_path_adapter.hpp
index 2da466450..86e6f728f 100644
--- a/include/mapnik/svg/svg_path_adapter.hpp
+++ b/include/mapnik/svg/svg_path_adapter.hpp
@@ -19,17 +19,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef MAPNIK_SVG_PATH_ADAPTER
-#define MAPNIK_SVG_PATH_ADAPTER
+#ifndef MAPNIK_SVG_PATH_ADAPTER_HPP
+#define MAPNIK_SVG_PATH_ADAPTER_HPP
 
 // mapnik
 #include <boost/utility.hpp>
+
 // agg
 #include "agg_math.h"
 #include "agg_array.h"
 #include "agg_bezier_arc.h"
+
 // stl
 #include <cmath>
 #include <vector>
diff --git a/include/mapnik/svg/svg_path_attributes.hpp b/include/mapnik/svg/svg_path_attributes.hpp
index 74a7cef25..66df711fb 100644
--- a/include/mapnik/svg/svg_path_attributes.hpp
+++ b/include/mapnik/svg/svg_path_attributes.hpp
@@ -20,16 +20,16 @@
  *
  *****************************************************************************/
 
-// $Id$
-
 #ifndef MAPNIK_SVG_PATH_ATTRIBUTES_HPP
 #define MAPNIK_SVG_PATH_ATTRIBUTES_HPP
 
+// agg
 #include "agg_math_stroke.h"
 #include "agg_color_rgba.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_trans_affine.h"
 
+// mapnik
 #include <mapnik/gradient.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/svg/svg_path_commands.hpp b/include/mapnik/svg/svg_path_commands.hpp
index 78ceff1dd..ab6bcee46 100644
--- a/include/mapnik/svg/svg_path_commands.hpp
+++ b/include/mapnik/svg/svg_path_commands.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-#ifndef SVG_COMMANDS_HPP
-#define SVG_COMMANDS_HPP
+#ifndef MAPNIK_SVG_PATH_COMMANDS_HPP
+#define MAPNIK_SVG_PATH_COMMANDS_HPP
 
 // mapnik
 #include <mapnik/global.hpp>
-//
+
+// boost
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
@@ -262,4 +263,4 @@ namespace mapnik { namespace svg {
     }}
 
 
-#endif // SVG_COMMANDS_HPP
+#endif // MAPNIK_SVG_COMMANDS_HPP
diff --git a/include/mapnik/svg/svg_path_grammar.hpp b/include/mapnik/svg/svg_path_grammar.hpp
index e639295db..5411db679 100644
--- a/include/mapnik/svg/svg_path_grammar.hpp
+++ b/include/mapnik/svg/svg_path_grammar.hpp
@@ -20,11 +20,12 @@
  *
  *****************************************************************************/
 
-#ifndef SVG_PATH_GRAMMAR_HPP
-#define SVG_PATH_GRAMMAR_HPP
+#ifndef MAPNIK_SVG_PATH_GRAMMAR_HPP
+#define MAPNIK_SVG_PATH_GRAMMAR_HPP
 
 // mapnik
 #include <mapnik/svg/svg_path_commands.hpp>
+
 // spirit
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
@@ -152,4 +153,4 @@ namespace mapnik { namespace svg {
     }}
 
 
-#endif // SVG_PATH_GRAMMAR_HPP
+#endif // MAPNIK_SVG_PATH_GRAMMAR_HPP
diff --git a/include/mapnik/svg/svg_path_parser.hpp b/include/mapnik/svg/svg_path_parser.hpp
index 2803a8c43..4d249cb9d 100644
--- a/include/mapnik/svg/svg_path_parser.hpp
+++ b/include/mapnik/svg/svg_path_parser.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef SVG_PATH_PARSER_HPP
-#define SVG_PATH_PARSER_HPP
+#ifndef MAPNIK_SVG_PATH_PARSER_HPP
+#define MAPNIK_SVG_PATH_PARSER_HPP
 
 #include <mapnik/config.hpp>
 #include <string>
@@ -42,5 +42,4 @@ bool MAPNIK_DECL parse_transform(const char * wkt, TransformType & tr);
 
 }}
 
-
-#endif // SVG_PATH_PARSER_HPP
+#endif // MAPNIK_SVG_PATH_PARSER_HPP
diff --git a/include/mapnik/svg/svg_storage.hpp b/include/mapnik/svg/svg_storage.hpp
index bfd279c9b..f3600646a 100644
--- a/include/mapnik/svg/svg_storage.hpp
+++ b/include/mapnik/svg/svg_storage.hpp
@@ -20,12 +20,13 @@
  *
  *****************************************************************************/
 
-// $Id$
-
 #ifndef MAPNIK_SVG_STORAGE_HPP
 #define MAPNIK_SVG_STORAGE_HPP
 
+// mapnik
 #include <mapnik/box2d.hpp>
+
+// boost
 #include <boost/utility.hpp>
 
 namespace mapnik {
diff --git a/include/mapnik/svg/svg_transform_grammar.hpp b/include/mapnik/svg/svg_transform_grammar.hpp
index 305ff4132..9d9bab750 100644
--- a/include/mapnik/svg/svg_transform_grammar.hpp
+++ b/include/mapnik/svg/svg_transform_grammar.hpp
@@ -20,15 +20,15 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef SVG_TRANSFORM_GRAMMAR_HPP
-#define SVG_TRANSFORM_GRAMMAR_HPP
+#ifndef MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
+#define MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
 
 // mapnik
 #include <mapnik/global.hpp>
+
 // agg
 #include <agg_trans_affine.h>
+
 // spirit
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
@@ -260,4 +260,4 @@ namespace mapnik { namespace svg {
 
     }}
 
-#endif // SVG_TRANSFORM_GRAMMAR_HPP
+#endif // MAPNIK_SVG_TRANSFORM_GRAMMAR_HPP
diff --git a/include/mapnik/svg_renderer.hpp b/include/mapnik/svg_renderer.hpp
index ae7a888c7..3459d0eb3 100644
--- a/include/mapnik/svg_renderer.hpp
+++ b/include/mapnik/svg_renderer.hpp
@@ -20,15 +20,12 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef SVG_RENDERER_HPP
-#define SVG_RENDERER_HPP
+#ifndef MAPNIK_SVG_RENDERER_HPP
+#define MAPNIK_SVG_RENDERER_HPP
 
 // mapnik
 #include <mapnik/feature_style_processor.hpp>
 #include <mapnik/map.hpp>
-
 #include <mapnik/svg/svg_generator.hpp>
 #include <mapnik/svg/svg_output_attributes.hpp>
 
@@ -150,4 +147,4 @@ namespace mapnik
     };
 }
 
-#endif //SVG_RENDERER_HPP
+#endif // MAPNIK_SVG_RENDERER_HPP
diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
index 844be9133..546c4c1fe 100644
--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
 #ifndef MAPNIK_SYMBOLIZER_HPP
 #define MAPNIK_SYMBOLIZER_HPP
@@ -105,4 +104,4 @@ protected:
 };
 }
 
-#endif //MAPNIK_SYMBOLIZER_HPP
+#endif // MAPNIK_SYMBOLIZER_HPP
diff --git a/include/mapnik/text_path.hpp b/include/mapnik/text_path.hpp
index 282778a36..eeebd97c4 100644
--- a/include/mapnik/text_path.hpp
+++ b/include/mapnik/text_path.hpp
@@ -20,13 +20,14 @@
  *
  *****************************************************************************/
 
-//$Id$
-
-#ifndef __TEXT_PATH_H__
-#define __TEXT_PATH_H__
+#ifndef MAPNIK_TEXT_PATH_HPP
+#define MAPNIK_TEXT_PATH_HPP
 
+// boost
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+
+// uci
 #include <unicode/unistr.h>
 
 namespace mapnik
@@ -179,6 +180,4 @@ struct text_path : boost::noncopyable
 typedef boost::shared_ptr<text_path> text_path_ptr;
 }
 
-#endif
-
-
+#endif // MAPNIK_TEXT_PATH_HPP
diff --git a/include/mapnik/text_placements.hpp b/include/mapnik/text_placements.hpp
index 9c99e7ffb..47c088636 100644
--- a/include/mapnik/text_placements.hpp
+++ b/include/mapnik/text_placements.hpp
@@ -19,18 +19,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-#ifndef TEXT_PLACEMENTS_HPP
-#define TEXT_PLACEMENTS_HPP
 
-//mapnik
+#ifndef MAPNIK_TEXT_PLACEMENTS_HPP
+#define MAPNIK_TEXT_PLACEMENTS_HPP
+
+// mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/enumeration.hpp>
 
-//stl
+// stl
 #include <vector>
 #include <string>
 
-//boost
+// boost
 #include <boost/tuple/tuple.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
@@ -176,7 +177,6 @@ private:
 };
 
 
-
 } //namespace
 
-#endif // TEXT_PLACEMENTS_HPP
+#endif // MAPNIK_TEXT_PLACEMENTS_HPP
diff --git a/include/mapnik/text_placements_simple.hpp b/include/mapnik/text_placements_simple.hpp
index 384bf7f5d..fe0e541ca 100644
--- a/include/mapnik/text_placements_simple.hpp
+++ b/include/mapnik/text_placements_simple.hpp
@@ -19,8 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-#ifndef TEXT_PLACEMENTS_SIMPLE_HPP
-#define TEXT_PLACEMENTS_SIMPLE_HPP
+
+#ifndef MAPNIK_TEXT_PLACEMENTS_SIMPLE_HPP
+#define MAPNIK_TEXT_PLACEMENTS_SIMPLE_HPP
+
+// mapnik
 #include <mapnik/text_placements.hpp>
 
 namespace mapnik {
@@ -70,6 +73,6 @@ private:
     text_placements_simple const* parent_;
 };
 
-
 } //namespace
-#endif
+
+#endif // MAPNIK_TEXT_PLACEMENTS_SIMPLE_HPP
diff --git a/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp
index dc7e62bc5..e4d57d8ed 100644
--- a/include/mapnik/text_symbolizer.hpp
+++ b/include/mapnik/text_symbolizer.hpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-//$Id$
-
 #ifndef MAPNIK_TEXT_SYMBOLIZER_HPP
 #define MAPNIK_TEXT_SYMBOLIZER_HPP
 
@@ -154,4 +152,4 @@ private:
 };
 }
 
-#endif //MAPNIK_TEXT_SYMBOLIZER_HPP
+#endif // MAPNIK_TEXT_SYMBOLIZER_HPP
diff --git a/include/mapnik/timer.hpp b/include/mapnik/timer.hpp
index 4791b8772..e747e9e7b 100644
--- a/include/mapnik/timer.hpp
+++ b/include/mapnik/timer.hpp
@@ -20,9 +20,10 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_TIMER_INCLUDED
-#define MAPNIK_TIMER_INCLUDED
+#ifndef MAPNIK_TIMER_HPP
+#define MAPNIK_TIMER_HPP
 
+// stl
 #include <cstdlib>
 #include <string>
 #include <sstream>
@@ -121,4 +122,4 @@ private:
 };
     
 };
-#endif // MAPNIK_TIMER_INCLUDED
+#endif // MAPNIK_TIMER_HPP
diff --git a/include/mapnik/unicode.hpp b/include/mapnik/unicode.hpp
index a072f526a..1d9cb077d 100644
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@@ -20,18 +20,20 @@
  *
  *****************************************************************************/
 
-//$Id$
-#ifndef UNICODE_HPP
-#define UNICODE_HPP
+#ifndef MAPNIK_UNICODE_HPP
+#define MAPNIK_UNICODE_HPP
 
 //mapnik
 #include <mapnik/config.hpp>
+
 // icu
 #include <unicode/unistr.h>
 #include <unicode/ucnv.h>
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/cstdint.hpp>
+
 // stl
 #include <string>
 
@@ -49,4 +51,4 @@ private:
 };
 }
 
-#endif // UNICODE_HPP
+#endif // MAPNIK_UNICODE_HPP
diff --git a/include/mapnik/utils.hpp b/include/mapnik/utils.hpp
index c2de168c7..b6acd5e58 100644
--- a/include/mapnik/utils.hpp
+++ b/include/mapnik/utils.hpp
@@ -20,10 +20,8 @@
  *
  *****************************************************************************/
 
-//$Id: utils.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef UTILS_HPP
-#define UTILS_HPP
+#ifndef MAPNIK_UTILS_HPP
+#define MAPNIK_UTILS_HPP
 
 #ifdef MAPNIK_THREADSAFE
 #include <boost/thread/mutex.hpp>
@@ -165,9 +163,8 @@ template <typename T,
 template <typename T,
           template <typename U> class CreatePolicy> T* singleton<T,CreatePolicy>::pInstance_=0;
 template <typename T,
-          template <typename U> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;
-   
+          template <typename U> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;  
+
 }
 
-
-#endif //UTILS_HPP
+#endif // MAPNIK_UTILS_HPP
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index d6aab5bdd..f6ac076d0 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef VALUE_HPP
-#define VALUE_HPP
+#ifndef MAPNIK_VALUE_HPP
+#define MAPNIK_VALUE_HPP
 
 // mapnik
 #include <mapnik/global.hpp>
@@ -30,17 +29,18 @@
 #include <mapnik/config_error.hpp>
 
 // boost
-
 #include <boost/variant.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/lexical_cast.hpp>
+
 // stl
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <iomanip>
 #include <cmath>
+
 // uci
 #include <unicode/unistr.h>
 #include <unicode/ustring.h>
@@ -823,4 +823,4 @@ operator << (std::basic_ostream<charT,traits>& out,
 }
 }
 
-#endif //VALUE_HPP
+#endif // MAPNIK_VALUE_HPP
diff --git a/include/mapnik/value_error.hpp b/include/mapnik/value_error.hpp
index 9ac2f1dcb..22a692946 100644
--- a/include/mapnik/value_error.hpp
+++ b/include/mapnik/value_error.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_VALUE_ERROR_INCLUDED
-#define MAPNIK_VALUE_ERROR_INCLUDED
+#ifndef MAPNIK_VALUE_ERROR_HPP
+#define MAPNIK_VALUE_ERROR_HPP
 
 #include <iostream>
 #include <sstream>
@@ -54,4 +54,4 @@ protected:
 };
 }
 
-#endif // MAPNIK_VALUE_ERROR_INCLUDED
+#endif // MAPNIK_VALUE_ERROR_HPP
diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
index 83569f7ed..dd69d20bd 100644
--- a/include/mapnik/version.hpp
+++ b/include/mapnik/version.hpp
@@ -19,14 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
 #ifndef MAPNIK_VERSION_HPP
 #define MAPNIK_VERSION_HPP
 
 #define MAPNIK_VERSION 200000
 
-#endif //MAPNIK_VERSION_HPP
-
-
-
+#endif // MAPNIK_VERSION_HPP
diff --git a/include/mapnik/vertex.hpp b/include/mapnik/vertex.hpp
index 397b5f517..ca76b48dc 100644
--- a/include/mapnik/vertex.hpp
+++ b/include/mapnik/vertex.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: vertex.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef VERTEX_HPP
-#define VERTEX_HPP
+#ifndef MAPNIK_VERTEX_HPP
+#define MAPNIK_VERTEX_HPP
 
 #include <iostream>
 #include <sstream>
@@ -109,4 +108,4 @@ operator << (std::basic_ostream<charT,traits>& out,
 
 }
 
-#endif // VERTEX_HPP
+#endif // MAPNIK_VERTEX_HPP
diff --git a/include/mapnik/vertex_transform.hpp b/include/mapnik/vertex_transform.hpp
index 906c683cf..3d8390fb1 100644
--- a/include/mapnik/vertex_transform.hpp
+++ b/include/mapnik/vertex_transform.hpp
@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id: vertex_transform.hpp 39 2005-04-10 20:39:53Z pavlenko $
 
-#ifndef VERTEX_TRANSFORM_HPP
-#define VERTEX_TRANSFORM_HPP
+#ifndef MAPNIK_VERTEX_TRANSFORM_HPP
+#define MAPNIK_VERTEX_TRANSFORM_HPP
 
 // mapnik
 #include <mapnik/box2d.hpp>
diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp
index bda35d57c..43adc1cde 100644
--- a/include/mapnik/vertex_vector.hpp
+++ b/include/mapnik/vertex_vector.hpp
@@ -24,17 +24,17 @@
 //  author of Anti-Grain Geometry (http://www.antigrain.com). I have used 
 //  the datastructure from AGG as a template for my own. 
 
+#ifndef MAPNIK_VERTEX_VECTOR_HPP
+#define MAPNIK_VERTEX_VECTOR_HPP
 
-//$Id: vertex_vector.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef VERTEX_VECTOR_HPP
-#define VERTEX_VECTOR_HPP
 // mapnik
 #include <mapnik/vertex.hpp>
 #include <mapnik/ctrans.hpp>
+
 // boost
 #include <boost/utility.hpp>
 #include <boost/tuple/tuple.hpp>
+
 // stl
 #include <vector>
 #include <cstring>
@@ -143,4 +143,4 @@ private:
 
 }
 
-#endif //VERTEX_VECTOR_HPP
+#endif // MAPNIK_VERTEX_VECTOR_HPP
diff --git a/include/mapnik/warp.hpp b/include/mapnik/warp.hpp
index 58d000775..4fc30877d 100644
--- a/include/mapnik/warp.hpp
+++ b/include/mapnik/warp.hpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//$Id$
 
-#ifndef WARP_HPP
-#define WARP_HPP
+#ifndef MAPNIK_WARP_HPP
+#define MAPNIK_WARP_HPP
 
+// mapnik
 #include <mapnik/raster.hpp>
 #include <mapnik/proj_transform.hpp>
 
@@ -38,4 +38,5 @@ void reproject_raster(raster &target, raster const& source,
                       std::string scaling_method_name);
 
 }
-#endif //WARP_HPP
+
+#endif // MAPNIK_WARP_HPP
diff --git a/include/mapnik/wkb.hpp b/include/mapnik/wkb.hpp
index 5f29403ca..77c7c04c6 100644
--- a/include/mapnik/wkb.hpp
+++ b/include/mapnik/wkb.hpp
@@ -20,11 +20,10 @@
  *
  *****************************************************************************/
 
-//$Id: wkb.hpp 39 2005-04-10 20:39:53Z pavlenko $
-
-#ifndef WKB_HPP
-#define WKB_HPP
+#ifndef MAPNIK_WKB_HPP
+#define MAPNIK_WKB_HPP
 
+// mapnik
 #include <mapnik/geometry.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/feature.hpp>
@@ -66,4 +65,4 @@ private:
 };
 }
 
-#endif //WKB_HPP
+#endif // MAPNIK_WKB_HPP