diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 592105ef1..d7e09049a 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -66,7 +66,7 @@ public:
     void start_layer_processing(layer const& lay, box2d<double> const& query_extent);
     void end_layer_processing(layer const& lay);
     void render_marker(pixel_position const& pos, marker const& marker, agg::trans_affine const& tr, double opacity);
-    
+
     void process(point_symbolizer const& sym,
                  mapnik::feature_ptr const& feature,
                  proj_transform const& prj_trans);
diff --git a/include/mapnik/color_factory.hpp b/include/mapnik/color_factory.hpp
index 93f368a48..418c244a0 100644
--- a/include/mapnik/color_factory.hpp
+++ b/include/mapnik/color_factory.hpp
@@ -41,7 +41,7 @@ public:
     static void init_from_string(color & c, std::string const& css_color);
 
     static bool parse_from_string(color & c, std::string const& css_color,
-                                 mapnik::css_color_grammar<std::string::const_iterator> const& g);
+                                  mapnik::css_color_grammar<std::string::const_iterator> const& g);
 
     static color from_string(std::string const& css_color);
 };
diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
index b5d478c5e..702e18a9b 100644
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@@ -229,7 +229,7 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
             ("\\r", '\r')("\\t", '\t')("\\v", '\v')("\\\\", '\\')
             ("\\\'", '\'')("\\\"", '\"')
             ;
-        
+
 #if BOOST_VERSION > 104500
         quote_char %= char_('\'') | char_('"');
         ustring %= omit[quote_char[_a = _1]]
@@ -237,7 +237,7 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
             >> lit(_a);
         attr %= '[' >> no_skip[+~char_(']')] >> ']';
 #else
-        ustring %= lit('\'') 
+        ustring %= lit('\'')
             >> *(unesc_char | "\\x" >> hex | (char_ - lit('\'')))
             >> lit('\'');
         attr %= '[' >> lexeme[+(char_ - ']')] >> ']';
diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 9b636824d..8a8d75bd5 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -99,11 +99,11 @@ public:
 
     feature_impl(context_ptr const& ctx, int id)
         : id_(id),
-          ctx_(ctx),
-          data_(ctx_->mapping_.size()),
-          geom_cont_(),
-          raster_()
-    {}
+        ctx_(ctx),
+        data_(ctx_->mapping_.size()),
+        geom_cont_(),
+        raster_()
+        {}
 
     inline int id() const { return id_;}
 
@@ -163,25 +163,25 @@ public:
     {
         context_type::map_type::const_iterator itr = ctx_->mapping_.find(key);
         if (itr != ctx_->mapping_.end())
-            return get(itr->second);        
-        else        
-            throw std::out_of_range(std::string("Key does not exist: '") + key + "'");    
+            return get(itr->second);
+        else
+            throw std::out_of_range(std::string("Key does not exist: '") + key + "'");
     }
-    
+
     value_type const& get(std::size_t index) const
     {
         if (index < data_.size())
             return data_[index];
         throw std::out_of_range("Index out of range");
     }
-    
+
     boost::optional<value_type const&> get_optional(std::size_t index) const
     {
         if (index < data_.size())
             return boost::optional<value_type const&>(data_[index]);
         return boost::optional<value_type const&>();
     }
-    
+
     std::size_t size() const
     {
         return data_.size();
@@ -273,7 +273,7 @@ public:
             if (index < data_.size())
             {
                 ss << "  " << itr->first  << ":" <<  data_[itr->second] << std::endl;
-            }          
+            }
         }
         ss << ")" << std::endl;
         return ss.str();
diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
index ab8cad809..ffb0950e5 100644
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@@ -153,7 +153,7 @@ class MAPNIK_DECL font_face_set : private boost::noncopyable
 public:
     font_face_set(void)
         : faces_(),
-          dimension_cache_() {}
+        dimension_cache_() {}
 
     void add(face_ptr face)
     {
diff --git a/include/mapnik/formatting/registry.hpp b/include/mapnik/formatting/registry.hpp
index 7c4faa4d7..1c44e68dd 100644
--- a/include/mapnik/formatting/registry.hpp
+++ b/include/mapnik/formatting/registry.hpp
@@ -41,7 +41,7 @@ namespace formatting
 typedef node_ptr (*from_xml_function_ptr)(xml_node const& xml);
 
 class registry : public singleton<registry, CreateStatic>,
-        private boost::noncopyable
+                 private boost::noncopyable
 {
 public:
     registry();
diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp
index 16eb3c0cc..691bf5404 100644
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@@ -390,7 +390,7 @@ public:
         }
         return false;
     }
-    
+
 };
 
 typedef geometry<double,vertex_vector> geometry_type;
diff --git a/include/mapnik/hextree.hpp b/include/mapnik/hextree.hpp
index 36ab40857..50102a812 100644
--- a/include/mapnik/hextree.hpp
+++ b/include/mapnik/hextree.hpp
@@ -160,7 +160,7 @@ public:
 
     ~hextree()
     {}
-    
+
     void setMaxColors(unsigned max_colors)
     {
         max_colors_ = max_colors;
@@ -335,7 +335,7 @@ public:
 
         sorted_pal_.reserve(colors_);
         create_palette_rek(sorted_pal_, root_.get());
-   
+
         // sort palette for binary searching in quantization
 #if BOOST_VERSION >= 104600
         boost::sort(sorted_pal_, rgba::mean_sort_cmp());
diff --git a/include/mapnik/internal/dump_xml.hpp b/include/mapnik/internal/dump_xml.hpp
index 391b89d15..7bdf78f66 100644
--- a/include/mapnik/internal/dump_xml.hpp
+++ b/include/mapnik/internal/dump_xml.hpp
@@ -3,7 +3,7 @@
 #include <mapnik/xml_node.hpp>
 
 /* Debug dump ptree XML representation.
-*/
+ */
 void dump_xml(xml_node const& xml, unsigned level=0)
 {
     std::string indent;
diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp
index 662078238..1ee636349 100644
--- a/include/mapnik/placement_finder.hpp
+++ b/include/mapnik/placement_finder.hpp
@@ -124,16 +124,16 @@ private:
     text_symbolizer_properties const& p;
     text_placement_info const& pi;
     /** Length of the longest line after linebreaks.
-      * Before find_line_breaks() this is the total length of the string.
-      */
+     * Before find_line_breaks() this is the total length of the string.
+     */
     double string_width_;
     /** Height of the string after linebreaks.
-      * Before find_line_breaks() this is the total length of the string.
-      */
+     * Before find_line_breaks() this is the total length of the string.
+     */
     double string_height_;
     /** Height of the tallest font in the first line not including line spacing.
-      * Used to determine the correct offset for the first line.
-      */
+     * Used to determine the correct offset for the first line.
+     */
     double first_line_space_;
     vertical_alignment_e valign_;
     horizontal_alignment_e halign_;
diff --git a/include/mapnik/text_placements/registry.hpp b/include/mapnik/text_placements/registry.hpp
index 35fd59f46..f3bd123bf 100644
--- a/include/mapnik/text_placements/registry.hpp
+++ b/include/mapnik/text_placements/registry.hpp
@@ -42,7 +42,7 @@ typedef text_placements_ptr (*from_xml_function_ptr)(
     xml_node const& xml, fontset_map const & fontsets);
 
 class registry : public singleton<registry, CreateStatic>,
-        private boost::noncopyable
+                 private boost::noncopyable
 {
 public:
     registry();
diff --git a/include/mapnik/util/conversions.hpp b/include/mapnik/util/conversions.hpp
index 1b38dee3d..c4d4a321b 100644
--- a/include/mapnik/util/conversions.hpp
+++ b/include/mapnik/util/conversions.hpp
@@ -30,16 +30,16 @@
 
 namespace mapnik { namespace conversions {
 
-bool string2int(const char * value, int & result);
-bool string2int(std::string const& value, int & result);
-    
-bool string2double(std::string const& value, double & result);
-bool string2double(const char * value, double & result);
-    
-bool string2float(std::string const& value, float & result);
-bool string2float(const char * value, float & result);
+    bool string2int(const char * value, int & result);
+    bool string2int(std::string const& value, int & result);
 
-}
+    bool string2double(std::string const& value, double & result);
+    bool string2double(const char * value, double & result);
+
+    bool string2float(std::string const& value, float & result);
+    bool string2float(const char * value, float & result);
+
+    }
 }
 
 #endif // MAPNIK_CONVERSIONS_UTIL_HPP
diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp
index e326aa284..85bcd8857 100644
--- a/include/mapnik/vertex_vector.hpp
+++ b/include/mapnik/vertex_vector.hpp
@@ -55,16 +55,16 @@ public:
     // required for iterators support
     typedef boost::tuple<unsigned,coord_type,coord_type> value_type;
     typedef std::size_t size_type;
-    
+
 private:
     unsigned num_blocks_;
     unsigned max_blocks_;
     coord_type** vertices_;
     unsigned char** commands_;
     size_type pos_;
-    
+
 public:
-    
+
     vertex_vector()
         : num_blocks_(0),
           max_blocks_(0),
@@ -114,7 +114,7 @@ public:
         *y = (*vertex);
         return commands_[block] [pos & block_mask];
     }
-    
+
 private:
     void allocate_block(unsigned block)
     {