From 06803de192edc3a518f03e8c547b222e24993013 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 14 Mar 2013 15:13:02 -0700
Subject: [PATCH] iwyu

---
 include/mapnik/cairo_context.hpp     | 19 +++++++++++++------
 include/mapnik/memory_featureset.hpp |  5 +++--
 src/agg/agg_renderer.cpp             |  1 -
 src/cairo_context.cpp                |  4 ++++
 src/grid/grid_renderer.cpp           |  1 -
 src/placement_finder.cpp             |  1 -
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/include/mapnik/cairo_context.hpp b/include/mapnik/cairo_context.hpp
index 5858cf501..db4e8b1e3 100644
--- a/include/mapnik/cairo_context.hpp
+++ b/include/mapnik/cairo_context.hpp
@@ -25,29 +25,36 @@
 #define MAPNIK_CAIRO_CONTEXT_HPP
 
 // mapnik
+#include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/stroke.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/font_set.hpp>
-#include <mapnik/text_path.hpp>
-#include <mapnik/text_properties.hpp>
 #include <mapnik/gradient.hpp>
+#include <mapnik/vertex.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
-#include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+
 // cairo
 #include <cairo.h>
 #include <cairo-ft.h>
+
 // stl
-#include <valarray>
+#include <map>
+#include <vector>
+#include <stdexcept>
+
 // agg
 #include "agg_basics.h"
 
 namespace mapnik {
 
+class text_path;
+
 typedef cairo_status_t ErrorStatus;
 
 /// Throws the appropriate exception, if exceptions are enabled.
@@ -301,7 +308,7 @@ public:
     void fill();
     void paint();
     void set_pattern(cairo_pattern const& pattern);
-    void set_gradient(cairo_gradient const& pattern, const box2d<double> &bbox);
+    void set_gradient(cairo_gradient const& pattern, box2d<double> const& bbox);
     void add_image(double x, double y, image_data_32 & data, double opacity = 1.0);
     void add_image(agg::trans_affine const& tr, image_data_32 & data, double opacity = 1.0);
     void set_font_face(cairo_face_manager & manager, face_ptr face);
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index 13ab3d4cf..f334b1d5e 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -24,13 +24,14 @@
 #define MAPNIK_MEMORY_FEATURESET_HPP
 
 // mapnik
+#include <mapnik/box2d.hpp>
+#include <mapnik/geometry.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/raster.hpp>
 
-// boost
-#include <boost/utility.hpp>
+#include <deque>
 
 namespace mapnik {
 
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 7dae9f4c2..a0d016f62 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -56,7 +56,6 @@
 #include "agg_image_accessors.h"
 #include "agg_span_image_filter_rgba.h"
 // boost
-#include <boost/utility.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/math/special_functions/round.hpp>
 
diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp
index 83aea2783..a810534ca 100644
--- a/src/cairo_context.cpp
+++ b/src/cairo_context.cpp
@@ -22,7 +22,11 @@
 
 #include <mapnik/cairo_context.hpp>
 #include <mapnik/font_util.hpp>
+#include <mapnik/text_properties.hpp>
+#include <mapnik/text_path.hpp>
+#include <mapnik/font_set.hpp>
 
+#include <valarray>
 namespace mapnik {
 
 cairo_face::cairo_face(boost::shared_ptr<freetype_engine> const& engine, face_ptr const& face)
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index 374d8d842..285e0c6b9 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -46,7 +46,6 @@
 #include <mapnik/pixel_position.hpp>
 
 // boost
-#include <boost/utility.hpp>
 #include <boost/math/special_functions/round.hpp>
 
 // agg
diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp
index 204297fc6..0f7a3906e 100644
--- a/src/placement_finder.cpp
+++ b/src/placement_finder.cpp
@@ -34,7 +34,6 @@
 
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>