geometry.hpp does not need to use geom_util.hpp - this include cleanup exposed #1430

include/mapnik/geometry.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/vertex_vector.hpp>
-#include <mapnik/geom_util.hpp>
+#include <mapnik/box2d.hpp>
 
 // boost
 #include <boost/shared_ptr.hpp>

include/mapnik/grid/grid_marker_helpers.hpp

@@ -26,6 +26,8 @@
 // mapnik
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/markers_placement.hpp>
+#include <mapnik/geometry.hpp>
+#include <mapnik/geom_util.hpp>
 
 // agg
 #include "agg_renderer_scanline.h"

include/mapnik/marker_helpers.hpp

@@ -24,6 +24,8 @@
 #define MAPNIK_MARKER_HELPERS_HPP
 
 #include <mapnik/color.hpp>
+#include <mapnik/geometry.hpp>
+#include <mapnik/geom_util.hpp>
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>

src/symbolizer_helpers.cpp

@@ -24,6 +24,9 @@
 #include <mapnik/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/placement_finder.hpp>
+#include <mapnik/geom_util.hpp>
+
+// agg
 #include "agg_conv_clip_polyline.h"
 
 namespace mapnik {