- more include order reversion

2007-10-08 18:10:31 +00:00 · 2007-10-08 18:10:31 +00:00 · 3c97052c5e
commit 3c97052c5e
parent bc54b150ea
52 changed files with 165 additions and 166 deletions
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@ -25,9 +25,6 @@
 #ifndef AGG_RENDERER_HPP
 #define AGG_RENDERER_HPP

-// boost
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/feature_style_processor.hpp>
@ -39,6 +36,9 @@
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_scanline_aa.h"
+// boost
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>

 namespace mapnik {
    template <typename T>
--- a/include/mapnik/attribute.hpp
+++ b/include/mapnik/attribute.hpp
@ -25,12 +25,12 @@
 #ifndef ATTRIBUTE_HPP
 #define ATTRIBUTE_HPP

+// boost
+#include <boost/any.hpp>
 // stl
 #include <typeinfo>
 #include <sstream>
 #include <map>
-// boost
-#include <boost/any.hpp>

 namespace mapnik {
    template <typename T>
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@ -25,14 +25,14 @@
 #ifndef ATTRIBUTE_COLLECTOR_HPP
 #define ATTRIBUTE_COLLECTOR_HPP

-// stl
-#include <set>
-#include <iostream>
 // mapnik
 #include <mapnik/filter.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/rule.hpp>
+// stl
+#include <set>
+#include <iostream>

 namespace mapnik {
    
--- a/include/mapnik/color.hpp
+++ b/include/mapnik/color.hpp
@ -25,9 +25,9 @@
 #ifndef COLOR_HPP
 #define COLOR_HPP

-#include <sstream>
-#include <boost/format.hpp>
 #include <mapnik/config.hpp>
+#include <boost/format.hpp>
+#include <sstream>

 namespace mapnik {

--- a/include/mapnik/coord.hpp
+++ b/include/mapnik/coord.hpp
@ -25,9 +25,9 @@
 #ifndef COORD_HPP
 #define COORD_HPP

+#include <boost/operators.hpp>
 #include <iomanip>
 #include <sstream>
-#include <boost/operators.hpp>

 namespace mapnik {   
    template <typename T,int dim>
--- a/include/mapnik/coord_array.hpp
+++ b/include/mapnik/coord_array.hpp
@ -25,10 +25,10 @@
 #ifndef COORD_ARRAY_HPP
 #define COORD_ARRAY_HPP

-// stl
-#include <cassert>
 //mapnik
 #include <mapnik/coord.hpp>
+// stl
+#include <cassert>

 namespace mapnik {
    template <typename T>
--- a/include/mapnik/datasource.hpp
+++ b/include/mapnik/datasource.hpp
@ -24,12 +24,6 @@

 #ifndef DATASOURCE_HPP
 #define DATASOURCE_HPP
-// stl
-#include <map>
-#include <string>
-// boost
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/ctrans.hpp>
@ -37,6 +31,12 @@
 #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>

 namespace mapnik {    
    typedef MAPNIK_DECL boost::shared_ptr<Feature> feature_ptr;
--- a/include/mapnik/datasource_cache.hpp
+++ b/include/mapnik/datasource_cache.hpp
@ -25,15 +25,15 @@
 #ifndef DATASOURCE_CACHE_HPP
 #define DATASOURCE_CACHE_HPP

-// stl
-#include <map>
-// boost
-#include <boost/shared_ptr.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>

 namespace mapnik {
    class MAPNIK_DECL datasource_cache : 
--- a/include/mapnik/envelope.hpp
+++ b/include/mapnik/envelope.hpp
@ -25,13 +25,13 @@
 #ifndef ENVELOPE_HPP
 #define ENVELOPE_HPP

-// stl
-#include <iomanip>
-// boost
-#include <boost/operators.hpp>
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/coord.hpp>
+// boost
+#include <boost/operators.hpp>
+// stl
+#include <iomanip>

 namespace mapnik {
 	template <typename T> class MAPNIK_DECL Envelope 
--- a/include/mapnik/factory.hpp
+++ b/include/mapnik/factory.hpp
@ -25,11 +25,11 @@
 #ifndef FACTORY_HPP
 #define FACTORY_HPP

+// mapnik
+#include <mapnik/utils.hpp>
 // stl
 #include <stdexcept>
 #include <map>
-// mapnik
-#include <mapnik/utils.hpp>

 namespace mapnik {
    template <typename key_type,
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@ -24,16 +24,16 @@

 #ifndef FEATURE_HPP
 #define FEATURE_HPP
-// stl
-#include <map>
-// boost
-#include <boost/property_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
 // mapnik
 #include <mapnik/value.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/raster.hpp>
+// boost
+#include <boost/property_map.hpp>
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+// stl
+#include <map>

 namespace mapnik {
   typedef boost::shared_ptr<raster> raster_ptr;    
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@ -25,10 +25,6 @@
 #ifndef FEATURE_STYLE_PROCESSOR_HPP
 #define FEATURE_STYLE_PROCESSOR_HPP

-//stl
-#include <vector>
-// boost
-#include <boost/progress.hpp>
 // mapnik
 #include <mapnik/envelope.hpp>
 #include <mapnik/datasource.hpp>
@ -38,6 +34,10 @@
 #include <mapnik/utils.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/scale_denominator.hpp>
+// boost
+#include <boost/progress.hpp>
+//stl
+#include <vector>

 namespace mapnik
 {       
--- a/include/mapnik/feature_type_style.hpp
+++ b/include/mapnik/feature_type_style.hpp
@ -24,11 +24,11 @@

 #ifndef FEATURE_TYPE_STYLE_HPP
 #define FEATURE_TYPE_STYLE_HPP
-// stl
-#include <vector>
 // mapnik 
 #include <mapnik/rule.hpp>
 #include <mapnik/feature.hpp>
+// stl
+#include <vector>

 namespace mapnik
 {
--- a/include/mapnik/filter_expression.hpp
+++ b/include/mapnik/filter_expression.hpp
@ -25,11 +25,11 @@
 #ifndef FILTER_TO_STRING_HPP
 #define FILTER_TO_STRING_HPP

-// stl
-#include <set>
 // mapnik
 #include <mapnik/filter.hpp>
 #include <mapnik/expression.hpp>
+// stl
+#include <set>

 namespace mapnik
 {
--- a/include/mapnik/filter_parser.hpp
+++ b/include/mapnik/filter_parser.hpp
@ -25,19 +25,6 @@

 #ifndef FILTER_PARSER_HPP
 #define FILTER_PARSER_HPP
-// stl
-#include <stack>
-#include <iostream>
-// boost
-
-//#define BOOST_SPIRIT_DEBUG
-
-#include <boost/shared_ptr.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
-#include <boost/spirit/utility/chset.hpp> 
 // mapnik
 #include <mapnik/value.hpp>
 #include <mapnik/comparison.hpp>
@ -47,6 +34,19 @@
 #include <mapnik/regex_filter.hpp>
 #include <mapnik/logical.hpp>

+// boost
+//#define BOOST_SPIRIT_DEBUG
+#include <boost/shared_ptr.hpp>
+#include <boost/spirit/core.hpp>
+#include <boost/spirit/symbols.hpp>
+#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/utility/chset.hpp> 
+
+// stl
+#include <stack>
+#include <iostream>
+
 using namespace boost::spirit;
 using boost::shared_ptr;

--- a/include/mapnik/filter_parser_ast.hpp
+++ b/include/mapnik/filter_parser_ast.hpp
@ -24,11 +24,11 @@

 #ifndef FILTER_PARSER_AST_HPP
 #define FILTER_PARSER_AST_HPP
-// stl
-#include <iostream>
 // boost
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/tree/ast.hpp>
+// stl
+#include <iostream>

 using namespace std;
 using namespace boost::spirit;
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@ -24,6 +24,12 @@

 #ifndef FONT_ENGINE_FREETYPE_HPP
 #define FONT_ENGINE_FREETYPE_HPP
+// mapnik
+#include <mapnik/color.hpp>
+#include <mapnik/utils.hpp>
+#include <mapnik/ctrans.hpp>
+#include <mapnik/geometry.hpp>
+#include <mapnik/text_path.hpp>

 // freetype2
 extern "C"
@ -33,13 +39,6 @@ extern "C"
 #include FT_GLYPH_H
 }

-// mapnik
-#include <mapnik/color.hpp>
-#include <mapnik/utils.hpp>
-#include <mapnik/ctrans.hpp>
-#include <mapnik/geometry.hpp>
-#include <mapnik/text_path.hpp>
-
 // boost
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
--- a/include/mapnik/gamma.hpp
+++ b/include/mapnik/gamma.hpp
@ -25,6 +25,8 @@
 #ifndef GAMMA_HPP
 #define GAMMA_HPP

+#include <cmath>
+
 namespace mapnik 
 {
    struct MAPNIK_DECL gamma
--- a/include/mapnik/geom_util.hpp
+++ b/include/mapnik/geom_util.hpp
@ -24,13 +24,13 @@

 #ifndef GEOM_UTIL_HPP
 #define GEOM_UTIL_HPP
-// stl
-#include <cmath>
-// boost
-#include <boost/tuple/tuple.hpp>
 // mapnik
 #include <mapnik/envelope.hpp>
 #include <mapnik/vertex.hpp>
+// boost
+#include <boost/tuple/tuple.hpp>
+// stl
+#include <cmath>

 namespace mapnik
 {
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@ -26,14 +26,14 @@
 #ifndef GEOMETRY_HPP
 #define GEOMETRY_HPP

-// boost
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <boost/ptr_container/ptr_vector.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>
+#include <boost/ptr_container/ptr_vector.hpp>

 namespace mapnik {
    enum GeomType {
--- a/include/mapnik/graphics.hpp
+++ b/include/mapnik/graphics.hpp
@ -24,16 +24,16 @@

 #ifndef GRAPHICS_HPP
 #define GRAPHICS_HPP
-// stl
-#include <cmath>
-#include <string>
-#include <cassert>
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/gamma.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/envelope.hpp>
 #include <mapnik/image_view.hpp>
+// stl
+#include <cmath>
+#include <string>
+#include <cassert>

 namespace mapnik
 {
--- a/include/mapnik/image_reader.hpp
+++ b/include/mapnik/image_reader.hpp
@ -24,12 +24,12 @@

 #ifndef IMAGE_READER_HPP
 #define IMAGE_READER_HPP
-// stl
-#include <stdexcept>
-#include <string>
 // mapnik
 #include <mapnik/image_data.hpp>
 #include <mapnik/config.hpp>
+// stl
+#include <stdexcept>
+#include <string>

 namespace mapnik 
 {
--- a/include/mapnik/image_util.hpp
+++ b/include/mapnik/image_util.hpp
@ -25,11 +25,11 @@
 #ifndef IMAGE_UTIL_HPP
 #define IMAGE_UTIL_HPP

-// stl
-#include <string>
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/graphics.hpp>
+// stl
+#include <string>

 namespace mapnik {
    
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@ -24,10 +24,10 @@

 #if !defined LABEL_COLLISION_DETECTOR
 #define LABEL_COLLISION_DETECTOR
-// stl
-#include <vector>
 // mapnik
 #include <mapnik/quad_tree.hpp>
+// stl
+#include <vector>

 namespace mapnik
 {
--- a/include/mapnik/layer.hpp
+++ b/include/mapnik/layer.hpp
@ -23,13 +23,13 @@

 #ifndef LAYER_HPP
 #define LAYER_HPP
-// stl
-#include <vector>
-// boost
-#include <boost/shared_ptr.hpp>
 // mapnik
 #include <mapnik/feature.hpp>
 #include <mapnik/datasource.hpp>
+// boost
+#include <boost/shared_ptr.hpp>
+// stl
+#include <vector>

 namespace mapnik
 {
--- a/include/mapnik/libxml2_loader.hpp
+++ b/include/mapnik/libxml2_loader.hpp
@ -20,8 +20,8 @@
 *
 *****************************************************************************/

-#ifndef LOAD_MAP_XML2_INCLUDED
-#define LOAD_MAP_XML2_INCLUDED
+#ifndef LIBXML2_LOADER_INCLUDED
+#define LIBXML2_LOADER_INCLUDED

 #include <boost/property_tree/ptree.hpp>

@ -32,4 +32,4 @@ namespace mapnik
    void read_xml2( std::string const & filename, boost::property_tree::ptree & pt);
 }

-#endif // LOAD_MAP_XML2_INCLUDED
+#endif // LIBXML2_LOADER_INCLUDED
--- a/include/mapnik/line_pattern_symbolizer.hpp
+++ b/include/mapnik/line_pattern_symbolizer.hpp
@ -24,9 +24,9 @@
 #ifndef LINE_PATTERN_SYMBOLIZER_HPP
 #define LINE_PATTERN_SYMBOLIZER_HPP

-#include <boost/shared_ptr.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/symbolizer.hpp>
+#include <boost/shared_ptr.hpp>

 namespace mapnik 
 {      
--- a/include/mapnik/load_map.hpp
+++ b/include/mapnik/load_map.hpp
@ -28,8 +28,8 @@
  #include <config.h>
 #endif

-#include <string>
 #include <mapnik/map.hpp>
+#include <string>

 namespace mapnik
 {
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@ -25,8 +25,8 @@
 #ifndef MEMORY_DATASOURCE_HPP
 #define MEMORY_DATASOURCE_HPP

-#include <vector>
 #include <mapnik/datasource.hpp>
+#include <vector>

 namespace mapnik {
    
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@ -24,8 +24,8 @@
 #ifndef MEMORY_FEATURESET_HPP
 #define MEMORY_FEATURESET_HPP

-#include <boost/utility.hpp>
 #include <mapnik/memory_datasource.hpp>
+#include <boost/utility.hpp>

 namespace mapnik {
    
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@ -24,13 +24,13 @@
 #ifndef PARAMS_HPP
 #define PARAMS_HPP

-#include <string>
-#include <map>
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
 #include <boost/none.hpp>
 #include <boost/lexical_cast.hpp>
 //#include <boost/iterator/transform_iterator.hpp>
+#include <string>
+#include <map>

 namespace mapnik
 {
--- a/include/mapnik/placement_finder.hpp
+++ b/include/mapnik/placement_finder.hpp
@ -26,14 +26,14 @@
 #ifndef __PLACEMENT_FINDER__
 #define __PLACEMENT_FINDER__

-#include <queue>
-
 #include <mapnik/ctrans.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/text_path.hpp>

+#include <queue>
+
 namespace mapnik
 {
   typedef text_path placement_element;
--- a/include/mapnik/plugin.hpp
+++ b/include/mapnik/plugin.hpp
@ -24,10 +24,10 @@

 #ifndef PLUGIN_HPP
 #define PLUGIN_HPP
-// stl
-#include <string>
 // boost
 #include <boost/utility.hpp>
+// stl
+#include <string>

 typedef struct lt_dlhandle_struct * lt_dlhandle;
 namespace mapnik
--- a/include/mapnik/point_symbolizer.hpp
+++ b/include/mapnik/point_symbolizer.hpp
@ -24,9 +24,9 @@
 #ifndef POINT_SYMBOLIZER_HPP
 #define POINT_SYMBOLIZER_HPP

-#include <boost/shared_ptr.hpp>
 #include <mapnik/graphics.hpp> 
 #include <mapnik/symbolizer.hpp> 
+#include <boost/shared_ptr.hpp>

 namespace mapnik 
 {   
--- a/include/mapnik/polygon_pattern_symbolizer.hpp
+++ b/include/mapnik/polygon_pattern_symbolizer.hpp
@ -24,9 +24,9 @@
 #ifndef POLYGON_PATTERN_SYMBOLIZER_HPP
 #define POLYGON_PATTERN_SYMBOLIZER_HPP

-#include <boost/shared_ptr.hpp>
 #include <mapnik/graphics.hpp> 
 #include <mapnik/symbolizer.hpp> 
+#include <boost/shared_ptr.hpp>

 namespace mapnik
 {
--- a/include/mapnik/pool.hpp
+++ b/include/mapnik/pool.hpp
@ -25,17 +25,17 @@
 #ifndef POOL_HPP
 #define POOL_HPP

+// mapnik
+#include <mapnik/utils.hpp>
+// boost
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/utility.hpp>
 // stl
 #include <iostream>
 #include <map>
 #include <deque>
 #include <ctime>
-// boost
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/utility.hpp>
-// mapnik
-#include <mapnik/utils.hpp>

 namespace mapnik
 {
--- a/include/mapnik/proj_transform.hpp
+++ b/include/mapnik/proj_transform.hpp
@ -25,10 +25,10 @@
 #ifndef PROJ_TRANSFORM_HPP
 #define PROJ_TRANSFORM_HPP

-// boost
-#include <boost/utility.hpp>
 // mapnik
 #include <mapnik/projection.hpp>
+// boost
+#include <boost/utility.hpp>

 namespace mapnik {
    
--- a/include/mapnik/projection.hpp
+++ b/include/mapnik/projection.hpp
@ -25,14 +25,14 @@
 #ifndef PROJECTION_HPP
 #define PROJECTION_HPP

+// mapnik
+#include <mapnik/envelope.hpp>
+// boost
+#include <boost/utility.hpp>
 // stl
 #include <string>
 #include <iostream>
 #include <stdexcept>
-// boost
-#include <boost/utility.hpp>
-// mapnik
-#include <mapnik/envelope.hpp>

 namespace mapnik {
    
--- a/include/mapnik/ptree_helpers.hpp
+++ b/include/mapnik/ptree_helpers.hpp
@ -23,16 +23,16 @@
 #ifndef MAPNIK_CONFIG_HELPERS_INCLUDED
 #define MAPNIK_CONFIG_HELPERS_INCLUDED

-#include <iostream>
-#include <sstream>
+#include <mapnik/enumeration.hpp>
+#include <mapnik/config_error.hpp>
+#include <mapnik/color_factory.hpp>

 #include <boost/property_tree/ptree.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>

-#include <mapnik/enumeration.hpp>
-#include <mapnik/config_error.hpp>
-#include <mapnik/color_factory.hpp>
+#include <iostream>
+#include <sstream>

 namespace mapnik {

--- a/include/mapnik/quad_tree.hpp
+++ b/include/mapnik/quad_tree.hpp
@ -23,13 +23,13 @@

 #ifndef QUAD_TREE_HPP
 #define QUAD_TREE_HPP
-// stl
-#include <vector>
+// mapnik
+#include <mapnik/envelope.hpp>
 // boost
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/noncopyable.hpp>
-// mapnik
-#include <mapnik/envelope.hpp>
+// stl
+#include <vector>

 namespace mapnik
 {
--- a/include/mapnik/query.hpp
+++ b/include/mapnik/query.hpp
@ -24,13 +24,13 @@

 #ifndef QUERY_HPP
 #define QUERY_HPP
-// stl
-#include <set>
-#include <limits>
 //mapnik
 #include <mapnik/filter.hpp>
 #include <mapnik/envelope.hpp>
 #include <mapnik/feature.hpp>
+// stl
+#include <set>
+#include <limits>

 namespace mapnik {
   class query 
--- a/include/mapnik/regex_filter.hpp
+++ b/include/mapnik/regex_filter.hpp
@ -25,12 +25,12 @@

 #ifndef REGEX_FILTER_HPP
 #define REGEX_FILTER_HPP
-// boost
-#include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
 // mapnik
 #include <mapnik/filter.hpp>
 #include <mapnik/expression.hpp>
+// boost
+#include <boost/regex.hpp>
+#include <boost/algorithm/string.hpp>

 namespace mapnik
 { 
--- a/include/mapnik/rule.hpp
+++ b/include/mapnik/rule.hpp
@ -22,12 +22,6 @@

 #ifndef RULE_HPP
 #define RULE_HPP
-// stl
-#include <string>
-#include <vector>
-// boost
-#include <boost/shared_ptr.hpp>
-#include <boost/variant.hpp>
 // mapnik
 #include <mapnik/line_symbolizer.hpp>
 #include <mapnik/line_pattern_symbolizer.hpp>
@ -39,6 +33,12 @@
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/filter.hpp>
 #include <mapnik/filter_visitor.hpp>
+// boost
+#include <boost/shared_ptr.hpp>
+#include <boost/variant.hpp>
+// stl
+#include <string>
+#include <vector>

 namespace mapnik
 {
--- a/include/mapnik/save_map.hpp
+++ b/include/mapnik/save_map.hpp
@ -23,10 +23,10 @@

 #ifndef SAVE_MAP_HPP
 #define SAVE_MAP_HPP
-// stl
-#include <string>
 // mapnik
 #include <mapnik/map.hpp>
+// stl
+#include <string>

 namespace mapnik
 {
--- a/include/mapnik/stroke.hpp
+++ b/include/mapnik/stroke.hpp
@ -23,11 +23,11 @@

 #ifndef STROKE_HPP
 #define STROKE_HPP
-// stl
-#include <vector>
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/enumeration.hpp>
+// stl
+#include <vector>
 
 namespace mapnik
 {
--- a/include/mapnik/style.hpp
+++ b/include/mapnik/style.hpp
@ -23,15 +23,15 @@

 #ifndef STYLE_HPP
 #define STYLE_HPP
+// mapnik
+#include <mapnik/color.hpp>
+#include <mapnik/symbolizer.hpp>
+// boost
+#include <boost/shared_ptr.hpp>
 // stl
 #include <vector>
 #include <algorithm>
 #include <functional>
-// boost
-#include <boost/shared_ptr.hpp>
-// mapnik
-#include <mapnik/color.hpp>
-#include <mapnik/symbolizer.hpp>

 namespace mapnik { }

--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@ -24,8 +24,8 @@
 #ifndef SYMBOLIZER_HPP
 #define SYMBOLIZER_HPP

-#include <boost/shared_ptr.hpp>
 #include <mapnik/graphics.hpp> 
+#include <boost/shared_ptr.hpp>

 namespace mapnik 
 {
--- a/include/mapnik/text_symbolizer.hpp
+++ b/include/mapnik/text_symbolizer.hpp
@ -24,15 +24,15 @@

 #ifndef TEXT_SYMBOLIZER_HPP
 #define TEXT_SYMBOLIZER_HPP
-// stl
-#include <string>
-// boost
-#include <boost/tuple/tuple.hpp>
-#include <boost/shared_ptr.hpp>
 // mapnik
 #include <mapnik/enumeration.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/graphics.hpp> 
+// boost
+#include <boost/tuple/tuple.hpp>
+#include <boost/shared_ptr.hpp>
+// stl
+#include <string>

 namespace mapnik
 {
--- a/include/mapnik/unicode.hpp
+++ b/include/mapnik/unicode.hpp
@ -24,14 +24,13 @@
 #ifndef UNICODE_HPP
 #define UNICODE_HPP

-#include <string>
-#include <boost/utility.hpp>

 #ifdef USE_FRIBIDI
 #include <fribidi/fribidi.h>
 #endif
-
+#include <boost/utility.hpp>
 #include <iconv.h>
+#include <string>

 namespace mapnik {
    
--- a/include/mapnik/utils.hpp
+++ b/include/mapnik/utils.hpp
@ -24,6 +24,8 @@

 #ifndef UTILS_HPP
 #define UTILS_HPP
+// boost
+#include <boost/thread/mutex.hpp>
 // stl
 #include <stdexcept>
 #include <cstdlib>
@ -33,8 +35,6 @@
 #include <iostream>
 #include <algorithm>
 #include <cmath>
-// boost
-#include <boost/thread/mutex.hpp>

 namespace mapnik
 {
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@ -24,17 +24,16 @@
 #ifndef VALUE_HPP
 #define VALUE_HPP

+// mapnik
+#include <mapnik/unicode.hpp>
+// boost
+#include <boost/variant.hpp>
 // stl
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <iomanip>

-// boost
-#include <boost/variant.hpp>
-// mapnik
-#include <mapnik/unicode.hpp>
-
 namespace mapnik  {
   
   typedef boost::variant<int,double,std::wstring> value_base;
--- a/include/mapnik/vertex_vector.hpp
+++ b/include/mapnik/vertex_vector.hpp
@ -29,14 +29,14 @@

 #ifndef VERTEX_VECTOR_HPP
 #define VERTEX_VECTOR_HPP
-// stl
-#include <vector>
-// boost
-#include <boost/utility.hpp>
-#include <boost/tuple/tuple.hpp>
 // mapnik
 #include <mapnik/vertex.hpp>
 #include <mapnik/ctrans.hpp>
+// boost
+#include <boost/utility.hpp>
+#include <boost/tuple/tuple.hpp>
+// stl
+#include <vector>

 namespace mapnik
 {