fwd declare layer

bindings/python/mapnik_python.cpp

@@ -88,6 +88,7 @@ void export_wkt_reader();
 
 #include <mapnik/version.hpp>
 #include <mapnik/map.hpp>
+#include <mapnik/layer.hpp>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/rule.hpp>

include/mapnik/map.hpp

@@ -28,8 +28,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/enumeration.hpp>
-#include <mapnik/datasource.hpp>  // for featureset_ptr
-#include <mapnik/layer.hpp>
+#include <mapnik/box2d.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/well_known_srs.hpp>
 #include <mapnik/image_compositing.hpp>
@@ -37,11 +36,20 @@
 // boost
 #include <boost/optional.hpp>
 
+// stl
+#include <map>
+#include <memory>
+#include <vector>
+#include <string>
+
 namespace mapnik
 {
 
+struct Featureset;
+using featureset_ptr = std::shared_ptr<Featureset>;
 class feature_type_style;
 class CoordTransform;
+class layer;
 
 class MAPNIK_DECL Map : boost::equality_comparable<Map>
 {

src/svg/output/svg_renderer.cpp

@@ -26,6 +26,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/map.hpp>
+#include <mapnik/layer.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/font_set.hpp>

tests/cpp_tests/copy_move_test.cpp

@@ -1,10 +1,8 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <iostream>
-//#include <mapnik/value_types.hpp>
+#include <mapnik/layer.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/datasource_cache.hpp>
-//#include <mapnik/params.hpp>
-//#include <mapnik/boolean.hpp>
 
 #include <vector>
 #include <algorithm>