include fixups

include/mapnik/text/placement_finder.hpp

@@ -26,7 +26,6 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/text/text_layout.hpp>
-#include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/glyph_positions.hpp>
 #include <mapnik/text/rotation.hpp>
 #include <mapnik/util/noncopyable.hpp>

include/mapnik/text/placement_finder_impl.hpp

@@ -19,23 +19,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-//mapnik
-#include <mapnik/debug.hpp>
-#include <mapnik/label_collision_detector.hpp>
-#include <mapnik/view_transform.hpp>
-#include <mapnik/expression_evaluator.hpp>
+
+// mapnik
+//#include <mapnik/label_collision_detector.hpp>
+//#include <mapnik/view_transform.hpp>
 #include <mapnik/text/placement_finder.hpp>
 #include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/text_properties.hpp>
-#include <mapnik/text/glyph_positions.hpp>
+//#include <mapnik/text/glyph_positions.hpp>
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/tolerance_iterator.hpp>
+#include <mapnik/symbolizer_enumerations.hpp>
 
-// agg
-#include "agg_conv_clip_polyline.h"
-
-// stl
-#include <vector>
+#include <memory>
 
 namespace mapnik
 {

include/mapnik/text/symbolizer_helpers.hpp

@@ -22,10 +22,13 @@
 #ifndef SYMBOLIZER_HELPERS_HPP
 #define SYMBOLIZER_HELPERS_HPP
 
-//mapnik
+// mapnik
 #include <mapnik/text/placement_finder.hpp>
+#include <mapnik/text/placements/base.hpp>
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/geometry.hpp>
+#include <mapnik/text/glyph_positions.hpp>
+#include <mapnik/text/text_properties.hpp>
 
 namespace mapnik {
 

src/agg/process_line_pattern_symbolizer.cpp

@@ -50,7 +50,6 @@
 #include "agg_span_allocator.h"
 #include "agg_span_pattern_rgba.h"
 #include "agg_renderer_outline_image.h"
-#include "agg_conv_clip_polyline.h"
 
 namespace mapnik {
 

src/agg/process_markers_symbolizer.cpp

@@ -50,7 +50,6 @@
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_scanline_u.h"
 #include "agg_path_storage.h"
-#include "agg_conv_clip_polyline.h"
 #include "agg_conv_transform.h"
 
 

src/group/group_symbolizer_helper.cpp

@@ -34,9 +34,6 @@
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/tolerance_iterator.hpp>
 
-//agg
-#include "agg_conv_clip_polyline.h"
-
 namespace mapnik { namespace detail {
 
 template <typename Helper>

src/text/placement_finder.cpp

@@ -25,6 +25,7 @@
 #include <mapnik/view_transform.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/text/placement_finder_impl.hpp>
+#include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/glyph_info.hpp>
 #include <mapnik/text/text_properties.hpp>
@@ -32,9 +33,6 @@
 #include <mapnik/vertex_cache.hpp>
 #include <mapnik/util/math.hpp>
 
-// agg
-#include "agg_conv_clip_polyline.h"
-
 // stl
 #include <vector>
 

src/text/symbolizer_helpers.cpp

@@ -41,8 +41,6 @@
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 
-//agg
-#include "agg_conv_clip_polyline.h"
 
 namespace mapnik { namespace detail {