include cleanup around symbolizer helpers

mapnik · Jan 21, 2013 · ba6f3cf · ba6f3cf
1 parent 70008ca
commit ba6f3cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
@@ -30,9 +30,12 @@
 #include <mapnik/simplify.hpp>
 
 // boost
-#include <boost/array.hpp>
 #include <boost/optional.hpp>
 
+// stl
+#include <vector>
+#include <string>
+
 namespace agg { struct trans_affine; }
 
 namespace mapnik
@@ -44,7 +47,6 @@ namespace detail { struct transform_node; }
 typedef std::vector<detail::transform_node>         transform_list;
 typedef boost::shared_ptr<transform_list>   transform_list_ptr;
 typedef transform_list_ptr transform_type;
-class Map;
 class feature_impl;
 
 MAPNIK_DECL void evaluate_transform(agg::trans_affine& tr, feature_impl const& feature,

diff --git a/include/mapnik/symbolizer_helpers.hpp b/include/mapnik/symbolizer_helpers.hpp
@@ -25,19 +25,25 @@
 //mapnik
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/shield_symbolizer.hpp>
-#include <mapnik/expression_evaluator.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
-#include <mapnik/proj_transform.hpp>
-#include <mapnik/ctrans.hpp>
-#include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/processed_text.hpp>
-#include <mapnik/text_path.hpp>
 
 //boost
 #include <boost/shared_ptr.hpp>
 
+// agg
+#include "agg_trans_affine.h"
+
+// fwd declares
+namespace mapnik {
+  class CoordTransform;
+  class marker;
+  class proj_transform;
+  class string_info;
+  class text_path;
+  template <typename DetectorT> class placement_finder;
+}
 
 namespace mapnik {
 

diff --git a/src/symbolizer.cpp b/src/symbolizer.cpp
@@ -23,7 +23,6 @@
 //mapnik
 #include <mapnik/feature.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/map.hpp>
 #include <mapnik/transform_processor.hpp>
 
 namespace mapnik {

diff --git a/src/symbolizer_helpers.cpp b/src/symbolizer_helpers.cpp
@@ -22,13 +22,16 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
+#include <mapnik/value.hpp>
 #include <mapnik/feature.hpp>
+#include <mapnik/geom_util.hpp>
 #include <mapnik/parse_path.hpp>
 #include <mapnik/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/placement_finder.hpp>
 #include <mapnik/geom_util.hpp>
-#include <mapnik/parse_path.hpp>
+#include <mapnik/marker.hpp>
+#include <mapnik/expression_evaluator.hpp>
 
 // agg
 #include "agg_conv_clip_polyline.h"