Merge commit '06803de192edc3a518f03e8c547b222e24993013' into harfbuzz

Conflicts:
	include/mapnik/cairo_context.hpp
	src/cairo_context.cpp
	src/placement_finder.cpp

include/mapnik/cairo_context.hpp

@@ -35,20 +35,29 @@
 #include <mapnik/gradient.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/text/placements_list.hpp>
+#include <mapnik/vertex.hpp>
+#include <mapnik/noncopyable.hpp>
+
 // boost
-#include <boost/utility.hpp>
 #include <boost/foreach.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.

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 {
 

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>
 

src/cairo_context.cpp

@@ -22,7 +22,11 @@
 
 #include <mapnik/cairo_context.hpp>
 #include <mapnik/text/face.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)

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