Fix headers for 04c0fa0.

include/mapnik/attribute_collector.hpp

@@ -44,7 +44,7 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/parse_path.hpp>  // for path_processor_type
 #include <mapnik/path_expression.hpp>  // for path_expression_ptr
-#include <mapnik/text_placements/base.hpp>  // for text_placements
+#include <mapnik/text/placements/base.hpp>  // for text_placements
 
 // boost
 #include <boost/concept_check.hpp>

include/mapnik/cairo_context.hpp

@@ -25,23 +25,24 @@
 #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/text/text_properties.hpp>
 #include <mapnik/text/placements_list.hpp>
 // boost
 #include <boost/utility.hpp>
+#include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 // cairo
 #include <cairo.h>
 #include <cairo-ft.h>
+#include <cairomm/cairomm.h>
 // stl
 #include <valarray>
 // agg
@@ -316,7 +317,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);
@@ -328,7 +329,7 @@ public:
     void restore();
     void show_glyph(unsigned long index, pixel_position const pos);
     void glyph_path(unsigned long index, pixel_position const pos);
-    void add_text(glyph_position_ptr pos,
+    void add_text(glyph_positions_ptr pos,
                   cairo_face_manager & manager,
                   face_manager<freetype_engine> & font_manager,
                   double scale_factor = 1.0);

src/cairo_context.cpp

@@ -402,7 +402,7 @@ void cairo_context::glyph_path(unsigned long index, pixel_position const pos)
     check_object_status_and_throw_exception(*this);
 }
 
-void cairo_context::add_text(glyph_position_ptr pos,
+void cairo_context::add_text(glyph_positions_ptr pos,
                              cairo_face_manager & manager,
                              face_manager<freetype_engine> & font_manager,
                              double scale_factor)

src/grid/process_shield_symbolizer.cpp

@@ -31,6 +31,9 @@
 // agg
 #include "agg_trans_affine.h"
 
+//boost
+#include <boost/foreach.hpp>
+
 namespace mapnik {
 
 template <typename T>

src/text/placement_finder.cpp

@@ -32,6 +32,7 @@
 
 //boost
 #include <boost/make_shared.hpp>
+#include <boost/foreach.hpp>
 
 // agg
 #include "agg_conv_clip_polyline.h"

src/text/symbolizer_helpers.cpp

@@ -26,6 +26,10 @@
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/text/layout.hpp>
 #include <mapnik/geom_util.hpp>
+#include <mapnik/parse_path.hpp>
+#include <mapnik/debug.hpp>
+
+//agg
 #include "agg_conv_clip_polyline.h"
 
 namespace mapnik {