diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index 901fb8fb1..3eaaebec8 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -25,25 +25,22 @@
 
 // mapnik
 #include <mapnik/image.hpp>
-#include <mapnik/image_util.hpp>
 #include <mapnik/svg/svg_storage.hpp>
-#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
-#include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/variant.hpp>
 
 // agg
 #include "agg_array.h"
 
-// boost
-#include <boost/optional.hpp>
-
 // stl
 #include <memory>
 
 namespace mapnik
 {
 
+struct image_any;
+namespace svg { struct path_attributes; }
+
 using attr_storage = agg::pod_bvector<mapnik::svg::path_attributes>;
 using svg_storage_type = mapnik::svg::svg_storage<mapnik::svg::svg_path_storage,attr_storage>;
 using svg_path_ptr = std::shared_ptr<svg_storage_type>;
diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp
index 43719c4f5..d685cc94b 100644
--- a/include/mapnik/marker_cache.hpp
+++ b/include/mapnik/marker_cache.hpp
@@ -31,7 +31,6 @@
 // boost
 #include <boost/unordered_map.hpp>
 #include <memory>
-#include <boost/optional.hpp>
 
 namespace mapnik
 {
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 1457cdcf9..15dca626d 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -23,39 +23,32 @@
 #ifndef MAPNIK_MARKER_HELPERS_HPP
 #define MAPNIK_MARKER_HELPERS_HPP
 
-#include <mapnik/color.hpp>
 #include <mapnik/feature.hpp>
+#include <mapnik/color.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry_type.hpp>
 #include <mapnik/geometry_centroid.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/expression_node.hpp>
-#include <mapnik/expression_evaluator.hpp>
-#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/marker.hpp> // for svg_storage_type
 #include <mapnik/markers_placement.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/vertex_converters.hpp>
 #include <mapnik/vertex_processor.hpp>
-#include <mapnik/label_collision_detector.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 
 // agg
 #include "agg_trans_affine.h"
 
-// boost
-#include <boost/optional.hpp>
 // stl
 #include <memory>
-#include <type_traits> // remove_reference
-#include <cmath>
 
 namespace mapnik {
 
 struct clip_poly_tag;
 
+namespace svg { struct path_attributes; }
+
 using svg_attribute_type = agg::pod_bvector<svg::path_attributes>;
 
 template <typename Detector>
diff --git a/include/mapnik/markers_placements/point.hpp b/include/mapnik/markers_placements/point.hpp
index d4b15d0e1..37cda8457 100644
--- a/include/mapnik/markers_placements/point.hpp
+++ b/include/mapnik/markers_placements/point.hpp
@@ -23,13 +23,19 @@
 #ifndef MAPNIK_MARKERS_PLACEMENTS_POINT_HPP
 #define MAPNIK_MARKERS_PLACEMENTS_POINT_HPP
 
+#include <mapnik/box2d.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/geometry_types.hpp>
 #include <mapnik/util/math.hpp>
+#include <mapnik/label_collision_detector.hpp>
+#include <mapnik/symbolizer_enumerations.hpp>
+#include <mapnik/util/noncopyable.hpp>
 
 #include "agg_basics.h"
 #include "agg_trans_affine.h"
 
+#include <cmath>
+
 namespace mapnik {
 
 struct markers_placement_params
diff --git a/include/mapnik/renderer_common/process_group_symbolizer.hpp b/include/mapnik/renderer_common/process_group_symbolizer.hpp
index 66e2392e3..c072ca5db 100644
--- a/include/mapnik/renderer_common/process_group_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_group_symbolizer.hpp
@@ -25,8 +25,7 @@
 
 // mapnik
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/marker_cache.hpp>
-#include <mapnik/marker_helpers.hpp>
+#include <mapnik/marker.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/renderer_common.hpp>
diff --git a/include/mapnik/renderer_common/process_markers_symbolizer.hpp b/include/mapnik/renderer_common/process_markers_symbolizer.hpp
index 79d09cee0..3bc1f314c 100644
--- a/include/mapnik/renderer_common/process_markers_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_markers_symbolizer.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_RENDERER_COMMON_PROCESS_MARKERS_SYMBOLIZER_HPP
 #define MAPNIK_RENDERER_COMMON_PROCESS_MARKERS_SYMBOLIZER_HPP
 
-#include <mapnik/renderer_common.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/vertex_converters.hpp>