diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp index fd2ab689e..da67b1e79 100644 --- a/include/mapnik/feature_kv_iterator.hpp +++ b/include/mapnik/feature_kv_iterator.hpp @@ -29,7 +29,6 @@ // boost #include -#include #include #include #include @@ -37,7 +36,7 @@ // stl #include - +#include namespace mapnik { diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp index a60532d9b..1d4b1392b 100644 --- a/include/mapnik/json/geometry_generator_grammar.hpp +++ b/include/mapnik/json/geometry_generator_grammar.hpp @@ -31,7 +31,6 @@ #include // for CommandType::SEG_MOVETO // boost -#include #include #include #include @@ -41,6 +40,9 @@ #include #include // for vc++ and android whose c++11 libs lack std::trunct +//stl +#include + namespace boost { namespace spirit { namespace traits { // make gcc and darwin toolsets happy. diff --git a/include/mapnik/polygon_clipper.hpp b/include/mapnik/polygon_clipper.hpp index d866a7a5d..a9384fc0a 100644 --- a/include/mapnik/polygon_clipper.hpp +++ b/include/mapnik/polygon_clipper.hpp @@ -32,8 +32,6 @@ #include // boost - -#include #include #include #include diff --git a/include/mapnik/query.hpp b/include/mapnik/query.hpp index 0a435110c..d74608969 100644 --- a/include/mapnik/query.hpp +++ b/include/mapnik/query.hpp @@ -27,12 +27,10 @@ #include #include -// boost -#include - // stl #include #include +#include namespace mapnik { diff --git a/include/mapnik/segment.hpp b/include/mapnik/segment.hpp index 903fa55b7..f5ea1605f 100644 --- a/include/mapnik/segment.hpp +++ b/include/mapnik/segment.hpp @@ -23,7 +23,8 @@ #ifndef MAPNIK_SEGMENT_HPP #define MAPNIK_SEGMENT_HPP -#include +#include +#include namespace mapnik { diff --git a/include/mapnik/svg/output/svg_path_iterator.hpp b/include/mapnik/svg/output/svg_path_iterator.hpp index 40b3e397c..5ef39b424 100644 --- a/include/mapnik/svg/output/svg_path_iterator.hpp +++ b/include/mapnik/svg/output/svg_path_iterator.hpp @@ -29,7 +29,6 @@ // boost #include -#include #include namespace mapnik { diff --git a/include/mapnik/util/geometry_svg_generator.hpp b/include/mapnik/util/geometry_svg_generator.hpp index 996bae98c..ead767e75 100644 --- a/include/mapnik/util/geometry_svg_generator.hpp +++ b/include/mapnik/util/geometry_svg_generator.hpp @@ -32,7 +32,6 @@ #include // boost -#include #include #include #include diff --git a/include/mapnik/util/geometry_wkt_generator.hpp b/include/mapnik/util/geometry_wkt_generator.hpp index cfe18e5bd..afb55935a 100644 --- a/include/mapnik/util/geometry_wkt_generator.hpp +++ b/include/mapnik/util/geometry_wkt_generator.hpp @@ -29,7 +29,6 @@ #include // for CommandType::SEG_MOVETO // boost -#include #include #include #include @@ -40,6 +39,9 @@ #include #include // for vc++ and android whose c++11 libs lack std::trunct +// stl +#include + namespace boost { namespace spirit { namespace traits { // make gcc and darwin toolsets happy. diff --git a/include/mapnik/util/path_iterator.hpp b/include/mapnik/util/path_iterator.hpp index f3d22de08..f9e60e0b2 100644 --- a/include/mapnik/util/path_iterator.hpp +++ b/include/mapnik/util/path_iterator.hpp @@ -27,9 +27,11 @@ #include // boost -#include #include +// stl +#include + namespace mapnik { namespace util { template diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp index 9ea7d6a05..174b43d4c 100644 --- a/include/mapnik/vertex_vector.hpp +++ b/include/mapnik/vertex_vector.hpp @@ -31,9 +31,8 @@ #include #include -// boost -#include - +// stl +#include #include // required for memcpy with linux/g++ namespace mapnik