From 20fcdc80348f4f44944a1eeeabacd021aa051288 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 12 Mar 2013 16:56:47 -0700
Subject: [PATCH] iwyu

---
 include/mapnik/cairo_renderer.hpp       | 1 +
 include/mapnik/font_engine_freetype.hpp | 5 +++--
 src/agg/agg_renderer.cpp                | 1 +
 src/agg/process_point_symbolizer.cpp    | 2 ++
 src/agg/process_shield_symbolizer.cpp   | 1 +
 src/cairo_renderer.cpp                  | 1 +
 src/font_engine_freetype.cpp            | 2 ++
 src/grid/grid_renderer.cpp              | 1 +
 src/grid/process_point_symbolizer.cpp   | 1 +
 src/grid/process_shield_symbolizer.cpp  | 1 +
 src/symbolizer_helpers.cpp              | 1 +
 11 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/cairo_renderer.hpp b/include/mapnik/cairo_renderer.hpp
index a00792bef..4f5dd9144 100644
--- a/include/mapnik/cairo_renderer.hpp
+++ b/include/mapnik/cairo_renderer.hpp
@@ -35,6 +35,7 @@
 #include <mapnik/rule.hpp> // for all symbolizers
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/cairo_context.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // cairo
 #include <cairo.h>
diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp
index 02bb44bc2..8fa4a62d7 100644
--- a/include/mapnik/font_engine_freetype.hpp
+++ b/include/mapnik/font_engine_freetype.hpp
@@ -27,15 +27,16 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/utils.hpp>
+#include <mapnik/box2d.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/char_info.hpp>
-#include <mapnik/pixel_position.hpp>
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // freetype2
 extern "C"
@@ -59,7 +60,6 @@ extern "C"
 #include <string>
 #include <vector>
 #include <map>
-#include <algorithm>
 
 // uci
 #include <unicode/unistr.h>
@@ -69,6 +69,7 @@ namespace mapnik
 class font_face;
 class text_path;
 class string_info;
+struct char_properties;
 
 typedef boost::shared_ptr<font_face> face_ptr;
 
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 32ea6d9be..7dae9f4c2 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -40,6 +40,7 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/pixel_position.hpp>
 
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_filter.hpp>
diff --git a/src/agg/process_point_symbolizer.cpp b/src/agg/process_point_symbolizer.cpp
index be25d5bf3..c2ff52c14 100644
--- a/src/agg/process_point_symbolizer.cpp
+++ b/src/agg/process_point_symbolizer.cpp
@@ -32,6 +32,8 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/parse_path.hpp>
+#include <mapnik/pixel_position.hpp>
+
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index ff85bd636..d522e9be0 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -26,6 +26,7 @@
 #include <mapnik/agg_rasterizer.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // boost
 #include <boost/make_shared.hpp>
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index 53fbaa2dd..0830438c1 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -53,6 +53,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/noncopyable.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // cairo
 #include <cairo.h>
diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp
index 8c41dea9e..a6af3137b 100644
--- a/src/font_engine_freetype.cpp
+++ b/src/font_engine_freetype.cpp
@@ -27,6 +27,8 @@
 #include <mapnik/graphics.hpp>
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/text_path.hpp>
+#include <mapnik/pixel_position.hpp>
+
 
 // boost
 #include <boost/algorithm/string.hpp>
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index 485a9c9ef..374d8d842 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -43,6 +43,7 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // boost
 #include <boost/utility.hpp>
diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp
index 55d104861..a0d0f05ea 100644
--- a/src/grid/process_point_symbolizer.cpp
+++ b/src/grid/process_point_symbolizer.cpp
@@ -33,6 +33,7 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/parse_path.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp
index c33f8a46c..5d80ed1ac 100644
--- a/src/grid/process_shield_symbolizer.cpp
+++ b/src/grid/process_shield_symbolizer.cpp
@@ -28,6 +28,7 @@
 #include <mapnik/grid/grid_renderer_base.hpp>
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // agg
 #include "agg_trans_affine.h"
diff --git a/src/symbolizer_helpers.cpp b/src/symbolizer_helpers.cpp
index b859da27f..65c020c56 100644
--- a/src/symbolizer_helpers.cpp
+++ b/src/symbolizer_helpers.cpp
@@ -32,6 +32,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/expression_evaluator.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // agg
 #include "agg_conv_clip_polyline.h"