diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp index 8caa3ef70..01b0dee4b 100644 --- a/include/mapnik/placement_finder.hpp +++ b/include/mapnik/placement_finder.hpp @@ -27,8 +27,7 @@ #include #include #include -//#include -#include +#include #include #include #include diff --git a/include/mapnik/symbolizer_helpers.hpp b/include/mapnik/symbolizer_helpers.hpp index 479b02db9..1b4956f87 100644 --- a/include/mapnik/symbolizer_helpers.hpp +++ b/include/mapnik/symbolizer_helpers.hpp @@ -28,6 +28,7 @@ #include #include #include +#include //boost #include @@ -47,10 +48,7 @@ namespace mapnik { namespace mapnik { -typedef boost::ptr_vector placements_type; -template class placement_finder; - -/** Helper object that does all the TextSymbolizer placment finding +/** Helper object that does all the TextSymbolizer placement finding * work except actually rendering the object. */ template class text_symbolizer_helper diff --git a/include/mapnik/text_path.hpp b/include/mapnik/text_path.hpp index 7ef60c83e..1b71176d0 100644 --- a/include/mapnik/text_path.hpp +++ b/include/mapnik/text_path.hpp @@ -34,6 +34,8 @@ // boost #include +#include + namespace mapnik { @@ -196,6 +198,8 @@ public: }; typedef boost::shared_ptr text_path_ptr; +typedef boost::ptr_vector placements_type; + } #endif // MAPNIK_TEXT_PATH_HPP diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp index 41b5f7823..19ee790c2 100644 --- a/src/placement_finder.cpp +++ b/src/placement_finder.cpp @@ -34,7 +34,6 @@ // boost #include -#include #include #include