diff --git a/bindings/python/mapnik_building_symbolizer.cpp b/bindings/python/mapnik_building_symbolizer.cpp
index f8892f167..3660dcd42 100644
--- a/bindings/python/mapnik_building_symbolizer.cpp
+++ b/bindings/python/mapnik_building_symbolizer.cpp
@@ -21,6 +21,8 @@
  *****************************************************************************/
 
 #include <boost/python.hpp>
+#include <mapnik/value.hpp>
+#include <mapnik/attribute.hpp>
 #include <mapnik/building_symbolizer.hpp>
 
 using namespace mapnik;
diff --git a/bindings/python/mapnik_symbolizer.cpp b/bindings/python/mapnik_symbolizer.cpp
index ec25d7ea7..a849ddc1c 100644
--- a/bindings/python/mapnik_symbolizer.cpp
+++ b/bindings/python/mapnik_symbolizer.cpp
@@ -22,6 +22,7 @@
 
 // boost
 #include <boost/python.hpp>
+#include <boost/variant.hpp>
 
 // mapnik
 //symbolizer typdef here rather than mapnik/symbolizer.hpp
diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp
index 56461b124..f97e5d23b 100644
--- a/include/mapnik/attribute_collector.hpp
+++ b/include/mapnik/attribute_collector.hpp
@@ -27,6 +27,7 @@
 #include <mapnik/transform_processor.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/attribute.hpp>
+#include <mapnik/symbolizer.hpp>  // for transform_list_ptr
 #include <mapnik/building_symbolizer.hpp>
 #include <mapnik/line_symbolizer.hpp>
 #include <mapnik/line_pattern_symbolizer.hpp>
@@ -39,15 +40,17 @@
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/rule.hpp> // for rule::symbolizers
 #include <mapnik/expression.hpp>  // for expression_ptr, etc
+#include <mapnik/expression_node_types.hpp>
 #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/transform_expression.hpp>
 
 // boost
-#include <boost/variant.hpp>
 #include <boost/concept_check.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 // stl
 #include <set>
 
diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index 0568e2788..5da143a1d 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -29,6 +29,8 @@
 #include <mapnik/expression_node.hpp>
 
 // boost
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 #include <boost/regex.hpp>
 #if defined(BOOST_REGEX_HAS_ICU)
 #include <boost/regex/icu.hpp>
diff --git a/include/mapnik/expression_node.hpp b/include/mapnik/expression_node.hpp
index 104341aa4..e344f62ce 100644
--- a/include/mapnik/expression_node.hpp
+++ b/include/mapnik/expression_node.hpp
@@ -33,7 +33,6 @@
 #if defined(BOOST_REGEX_HAS_ICU)
 #include <boost/regex/icu.hpp>
 #endif
-#include <boost/variant.hpp>
 #include <boost/function.hpp>
 
 namespace mapnik
diff --git a/include/mapnik/expression_node_types.hpp b/include/mapnik/expression_node_types.hpp
index 6b1b30fb0..6c1af39e6 100644
--- a/include/mapnik/expression_node_types.hpp
+++ b/include/mapnik/expression_node_types.hpp
@@ -28,7 +28,9 @@
 //#include <mapnik/attribute.hpp>
 
 // boost
-#include <boost/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+namespace boost { template <typename T> class recursive_wrapper; }
 
 namespace mapnik
 {
diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp
index 6607af3da..baafb5f04 100644
--- a/include/mapnik/feature_kv_iterator.hpp
+++ b/include/mapnik/feature_kv_iterator.hpp
@@ -26,7 +26,9 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/value.hpp>
+
 // boost
+#include <boost/variant/apply_visitor.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp
index 7a6d3c8cb..9cbf0818a 100644
--- a/include/mapnik/feature_style_processor_impl.hpp
+++ b/include/mapnik/feature_style_processor_impl.hpp
@@ -46,6 +46,8 @@
 #include <mapnik/proj_transform.hpp>
 
 // boost
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
 #include <boost/foreach.hpp>
 #include <boost/concept_check.hpp>
 
diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
index d1967d504..b8936a198 100644
--- a/include/mapnik/image_filter.hpp
+++ b/include/mapnik/image_filter.hpp
@@ -26,9 +26,12 @@
 
 //mapnik
 #include <mapnik/image_filter_types.hpp>
+
 // boost
+#include <boost/variant/static_visitor.hpp>
 #include <boost/gil/gil_all.hpp>
 #include <boost/concept_check.hpp>
+
 // agg
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
diff --git a/include/mapnik/image_filter_types.hpp b/include/mapnik/image_filter_types.hpp
index 185f0337e..0a7185019 100644
--- a/include/mapnik/image_filter_types.hpp
+++ b/include/mapnik/image_filter_types.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_IMAGE_FILTER_TYPES_HPP
 
 // boost
-#include <boost/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/config/warning_disable.hpp>
 
 // stl
diff --git a/include/mapnik/json/feature_collection_grammar.hpp b/include/mapnik/json/feature_collection_grammar.hpp
index 7c1464334..2f6a20c03 100644
--- a/include/mapnik/json/feature_collection_grammar.hpp
+++ b/include/mapnik/json/feature_collection_grammar.hpp
@@ -29,11 +29,8 @@
 #include <mapnik/feature.hpp>
 
 // spirit::qi
-#include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant.hpp>
 
 namespace mapnik { namespace json {
 
diff --git a/include/mapnik/json/feature_grammar.hpp b/include/mapnik/json/feature_grammar.hpp
index fbffaed07..18c2125e2 100644
--- a/include/mapnik/json/feature_grammar.hpp
+++ b/include/mapnik/json/feature_grammar.hpp
@@ -31,12 +31,11 @@
 #include <mapnik/value.hpp>
 
 // spirit::qi
-#include <boost/config/warning_disable.hpp>
-#include <boost/cstdint.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 namespace mapnik { namespace json {
 
diff --git a/include/mapnik/json/geometry_grammar.hpp b/include/mapnik/json/geometry_grammar.hpp
index e328ca0bd..058950433 100644
--- a/include/mapnik/json/geometry_grammar.hpp
+++ b/include/mapnik/json/geometry_grammar.hpp
@@ -24,15 +24,12 @@
 #define MAPNIK_GEOMETRY_GRAMMAR_HPP
 
 // mapnik
-#include <mapnik/geometry.hpp>
-#include <mapnik/feature.hpp>
+#include <mapnik/geometry.hpp>  // for geometry_type
+#include <mapnik/vertex.hpp>  // for CommandType
 
 // spirit::qi
-#include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant.hpp>
 
 namespace mapnik { namespace json {
 
diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp
index 607908c07..707fbf2ab 100644
--- a/include/mapnik/marker_helpers.hpp
+++ b/include/mapnik/marker_helpers.hpp
@@ -51,6 +51,7 @@
 
 // boost
 #include <boost/optional.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 namespace mapnik {
 
diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp
index 13d030a23..439415f06 100644
--- a/include/mapnik/params.hpp
+++ b/include/mapnik/params.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/value_types.hpp>
 
 // boost
-#include <boost/variant/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/optional.hpp>
 
 // stl
diff --git a/include/mapnik/parse_transform.hpp b/include/mapnik/parse_transform.hpp
index 275d2a78d..2a98b213d 100644
--- a/include/mapnik/parse_transform.hpp
+++ b/include/mapnik/parse_transform.hpp
@@ -25,14 +25,14 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/transform_expression.hpp>
+#include <mapnik/symbolizer.hpp>  // for transform_list_ptr
 
 namespace mapnik {
 
 template <typename Iterator> struct transform_expression_grammar;
 
 typedef transform_expression_grammar<std::string::const_iterator>
-    transform_expression_grammar__string;
+    transform_expression_grammar_string;
 
 MAPNIK_DECL transform_list_ptr parse_transform(std::string const& str);
 
@@ -41,7 +41,7 @@ MAPNIK_DECL transform_list_ptr parse_transform(std::string const& str,
 
 MAPNIK_DECL bool parse_transform(transform_list& list,
                                  std::string const& str,
-                                 transform_expression_grammar__string const& g);
+                                 transform_expression_grammar_string const& g);
 
 } // namespace mapnik
 
diff --git a/include/mapnik/path_expression.hpp b/include/mapnik/path_expression.hpp
index 0967fbbe9..b031f4512 100644
--- a/include/mapnik/path_expression.hpp
+++ b/include/mapnik/path_expression.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_PATH_EXPRESSION_HPP
 
 // boost
-#include <boost/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/shared_ptr.hpp>
 
 // stl
diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp
index 68a48c67e..65f3408f6 100644
--- a/include/mapnik/rule.hpp
+++ b/include/mapnik/rule.hpp
@@ -41,7 +41,7 @@
 #include <mapnik/config.hpp> // MAPNIK_DECL
 
 // boost
-#include <boost/variant.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 // stl
 #include <string>
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 842d6e18c..0dbbfd3bb 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -38,6 +38,7 @@
 #include <mapnik/pixel_position.hpp>
 
 // boost
+#include <boost/variant/static_visitor.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp
index f807b821d..c3e57bc95 100644
--- a/include/mapnik/symbolizer.hpp
+++ b/include/mapnik/symbolizer.hpp
@@ -27,18 +27,23 @@
 #include <mapnik/config.hpp>
 #include <mapnik/path_expression.hpp>
 #include <mapnik/image_compositing.hpp>
-#include <mapnik/transform_expression.hpp>
 #include <mapnik/simplify.hpp>
 
 // boost
 #include <boost/array.hpp>
 #include <boost/optional.hpp>
 
+namespace agg { struct trans_affine; }
+
 namespace mapnik
 {
 
+// fwd declares
+// TODO - move these transform declares to own header
+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;
 
diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp
index 901ff9951..0b9ed99ad 100644
--- a/include/mapnik/transform_expression.hpp
+++ b/include/mapnik/transform_expression.hpp
@@ -29,7 +29,7 @@
 // boost
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/variant.hpp>
+#include <boost/variant/variant.hpp>
 
 // fusion
 #include <boost/fusion/include/at.hpp>
diff --git a/include/mapnik/transform_processor.hpp b/include/mapnik/transform_processor.hpp
index 0cf603010..d720c4350 100644
--- a/include/mapnik/transform_processor.hpp
+++ b/include/mapnik/transform_processor.hpp
@@ -28,19 +28,22 @@
 #ifdef MAPNIK_LOG
 #include <mapnik/debug.hpp>
 #endif
-#include <mapnik/feature.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/transform_expression.hpp>
 #include <mapnik/expression_evaluator.hpp>
 
 // boost
 #include <boost/foreach.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 // agg
 #include <agg_trans_affine.h>
 
 namespace mapnik {
 
+class feature_impl;
+
 template <typename Container> struct expression_attributes;
 
 template <typename T>
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index 69f6c3b63..41f51a087 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -30,7 +30,10 @@
 #include <mapnik/util/conversions.hpp>
 
 // boost
-#include <boost/variant.hpp>
+#include <boost/variant/recursive_wrapper.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/concept_check.hpp>
 
diff --git a/src/building_symbolizer.cpp b/src/building_symbolizer.cpp
index 4cf722882..a92808163 100644
--- a/src/building_symbolizer.cpp
+++ b/src/building_symbolizer.cpp
@@ -22,6 +22,8 @@
 
 // mapnik
 #include <mapnik/building_symbolizer.hpp>
+#include <mapnik/value.hpp>
+#include <mapnik/attribute.hpp>
 
 namespace mapnik
 {
diff --git a/src/markers_symbolizer.cpp b/src/markers_symbolizer.cpp
index cf9d47e2a..dc0ad85ca 100644
--- a/src/markers_symbolizer.cpp
+++ b/src/markers_symbolizer.cpp
@@ -22,6 +22,8 @@
 
 // mapnik
 #include <mapnik/markers_symbolizer.hpp>
+#include <mapnik/value.hpp>
+#include <mapnik/attribute.hpp>
 
 // boost
 #include <boost/make_shared.hpp>
diff --git a/src/parse_transform.cpp b/src/parse_transform.cpp
index 6892c2cb9..b837f906e 100644
--- a/src/parse_transform.cpp
+++ b/src/parse_transform.cpp
@@ -39,7 +39,7 @@ transform_list_ptr parse_transform(std::string const& str, std::string const& en
     transform_list_ptr tl = boost::make_shared<transform_list>();
     transcoder tc(encoding);
     expression_grammar<std::string::const_iterator> ge(tc);
-    transform_expression_grammar__string gte(ge);
+    transform_expression_grammar_string gte(ge);
 
     if (!parse_transform(*tl, str, gte))
     {
@@ -50,7 +50,7 @@ transform_list_ptr parse_transform(std::string const& str, std::string const& en
 
 bool parse_transform(transform_list& transform,
                      std::string const& str,
-                     transform_expression_grammar__string const& g)
+                     transform_expression_grammar_string const& g)
 {
     std::string::const_iterator itr = str.begin();
     std::string::const_iterator end = str.end();
diff --git a/src/point_symbolizer.cpp b/src/point_symbolizer.cpp
index fe55e4779..c470cfbe1 100644
--- a/src/point_symbolizer.cpp
+++ b/src/point_symbolizer.cpp
@@ -22,6 +22,8 @@
 
 // mapnik
 #include <mapnik/point_symbolizer.hpp>
+#include <mapnik/value.hpp>
+#include <mapnik/attribute.hpp>
 #include <mapnik/enumeration.hpp>
 
 namespace mapnik
diff --git a/src/rule.cpp b/src/rule.cpp
index 77a2db306..32ba4d694 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -22,6 +22,7 @@
 
 // mapnik
 #include <mapnik/rule.hpp>
+#include <mapnik/expression_node.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/raster_colorizer.hpp>
 #include <mapnik/expression_string.hpp>
diff --git a/tests/cpp_tests/params_test.cpp b/tests/cpp_tests/params_test.cpp
index e338a2a32..fe2e717dd 100644
--- a/tests/cpp_tests/params_test.cpp
+++ b/tests/cpp_tests/params_test.cpp
@@ -1,9 +1,12 @@
 #include <boost/version.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include <iostream>
+#include <mapnik/value_types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/boolean.hpp>
 
+#include <boost/variant.hpp>
+
 int main( int, char*[] )
 {