diff --git a/plugins/input/occi/occi_datasource.cpp b/plugins/input/occi/occi_datasource.cpp
index b45c6281a..cb998a830 100644
--- a/plugins/input/occi/occi_datasource.cpp
+++ b/plugins/input/occi/occi_datasource.cpp
@@ -252,10 +252,10 @@ occi_datasource::occi_datasource(parameters const& params)
                     case oracle::occi::OCCIBFLOAT:
                     case oracle::occi::OCCIDOUBLE:
                     case oracle::occi::OCCIBDOUBLE:
-                        desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
-                        break;
                     case oracle::occi::OCCINUMBER:
                     case oracle::occi::OCCI_SQLT_NUM:
+                        desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
+                        break;
                     case oracle::occi::OCCICHAR:
                     case oracle::occi::OCCISTRING:
                     case oracle::occi::OCCI_SQLT_AFC:
diff --git a/plugins/input/occi/occi_featureset.cpp b/plugins/input/occi/occi_featureset.cpp
index c902520ae..220702020 100644
--- a/plugins/input/occi/occi_featureset.cpp
+++ b/plugins/input/occi/occi_featureset.cpp
@@ -155,10 +155,10 @@ feature_ptr occi_featureset::next()
                 break;
             case oracle::occi::OCCIDOUBLE:
             case oracle::occi::OCCIBDOUBLE:
-                feature->put(fld_name, rs_->getDouble(i + 1));
-                break;
             case oracle::occi::OCCINUMBER:
             case oracle::occi::OCCI_SQLT_NUM:
+                feature->put(fld_name, rs_->getDouble(i + 1));
+                break;
             case oracle::occi::OCCICHAR:
             case oracle::occi::OCCISTRING:
             case oracle::occi::OCCI_SQLT_AFC:
diff --git a/workspace/All.files b/workspace/All.files
index 8ea8c6349..efe7e531e 100644
--- a/workspace/All.files
+++ b/workspace/All.files
@@ -30,6 +30,7 @@ HEADERS += \
   ../deps/agg/include/agg_conv_bspline.h \
   ../deps/agg/include/agg_conv_clip_polygon.h \
   ../deps/agg/include/agg_conv_clip_polyline.h \
+  ../deps/agg/include/agg_conv_clipper.h \
   ../deps/agg/include/agg_conv_close_polygon.h \
   ../deps/agg/include/agg_conv_concat.h \
   ../deps/agg/include/agg_conv_contour.h \
@@ -134,6 +135,7 @@ HEADERS += \
   ../deps/agg/include/agg_vpgen_clip_polygon.h \
   ../deps/agg/include/agg_vpgen_clip_polyline.h \
   ../deps/agg/include/agg_vpgen_segmentator.h \
+  ../deps/clipper/include/clipper.hpp \
   ../deps/mapnik/sparsehash/internal/densehashtable.h \
   ../deps/mapnik/sparsehash/internal/hashtable-common.h \
   ../deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h \
@@ -142,414 +144,626 @@ HEADERS += \
   ../deps/mapnik/sparsehash/type_traits.h \
   ../include/mapnik/agg_helpers.hpp \
   ../include/mapnik/agg_helpers.hpp \
+  ../include/mapnik/agg_helpers.hpp \
+  ../include/mapnik/agg_pattern_source.hpp \
   ../include/mapnik/agg_pattern_source.hpp \
   ../include/mapnik/agg_pattern_source.hpp \
   ../include/mapnik/agg_rasterizer.hpp \
   ../include/mapnik/agg_rasterizer.hpp \
+  ../include/mapnik/agg_rasterizer.hpp \
+  ../include/mapnik/agg_renderer.hpp \
   ../include/mapnik/agg_renderer.hpp \
   ../include/mapnik/agg_renderer.hpp \
   ../include/mapnik/attribute.hpp \
   ../include/mapnik/attribute.hpp \
+  ../include/mapnik/attribute.hpp \
+  ../include/mapnik/attribute_collector.hpp \
   ../include/mapnik/attribute_collector.hpp \
   ../include/mapnik/attribute_collector.hpp \
   ../include/mapnik/attribute_descriptor.hpp \
   ../include/mapnik/attribute_descriptor.hpp \
+  ../include/mapnik/attribute_descriptor.hpp \
+  ../include/mapnik/boolean.hpp \
   ../include/mapnik/boolean.hpp \
   ../include/mapnik/boolean.hpp \
   ../include/mapnik/box2d.hpp \
   ../include/mapnik/box2d.hpp \
+  ../include/mapnik/box2d.hpp \
+  ../include/mapnik/building_symbolizer.hpp \
   ../include/mapnik/building_symbolizer.hpp \
   ../include/mapnik/building_symbolizer.hpp \
   ../include/mapnik/cairo_context.hpp \
   ../include/mapnik/cairo_context.hpp \
+  ../include/mapnik/cairo_context.hpp \
+  ../include/mapnik/cairo_renderer.hpp \
   ../include/mapnik/cairo_renderer.hpp \
   ../include/mapnik/cairo_renderer.hpp \
   ../include/mapnik/char_info.hpp \
   ../include/mapnik/char_info.hpp \
+  ../include/mapnik/char_info.hpp \
+  ../include/mapnik/color.hpp \
   ../include/mapnik/color.hpp \
   ../include/mapnik/color.hpp \
   ../include/mapnik/color_factory.hpp \
   ../include/mapnik/color_factory.hpp \
+  ../include/mapnik/color_factory.hpp \
+  ../include/mapnik/config.hpp \
   ../include/mapnik/config.hpp \
   ../include/mapnik/config.hpp \
   ../include/mapnik/config_error.hpp \
   ../include/mapnik/config_error.hpp \
+  ../include/mapnik/config_error.hpp \
+  ../include/mapnik/coord.hpp \
   ../include/mapnik/coord.hpp \
   ../include/mapnik/coord.hpp \
   ../include/mapnik/coord_array.hpp \
   ../include/mapnik/coord_array.hpp \
+  ../include/mapnik/coord_array.hpp \
+  ../include/mapnik/css_color_grammar.hpp \
   ../include/mapnik/css_color_grammar.hpp \
   ../include/mapnik/css_color_grammar.hpp \
   ../include/mapnik/css_color_grammar_def.hpp \
   ../include/mapnik/css_color_grammar_def.hpp \
+  ../include/mapnik/css_color_grammar_def.hpp \
+  ../include/mapnik/ctrans.hpp \
   ../include/mapnik/ctrans.hpp \
   ../include/mapnik/ctrans.hpp \
   ../include/mapnik/datasource.hpp \
   ../include/mapnik/datasource.hpp \
+  ../include/mapnik/datasource.hpp \
+  ../include/mapnik/datasource_cache.hpp \
   ../include/mapnik/datasource_cache.hpp \
   ../include/mapnik/datasource_cache.hpp \
   ../include/mapnik/debug.hpp \
   ../include/mapnik/debug.hpp \
+  ../include/mapnik/debug.hpp \
+  ../include/mapnik/debug_symbolizer.hpp \
   ../include/mapnik/debug_symbolizer.hpp \
   ../include/mapnik/debug_symbolizer.hpp \
   ../include/mapnik/distance.hpp \
   ../include/mapnik/distance.hpp \
+  ../include/mapnik/distance.hpp \
+  ../include/mapnik/ellipsoid.hpp \
   ../include/mapnik/ellipsoid.hpp \
   ../include/mapnik/ellipsoid.hpp \
   ../include/mapnik/enumeration.hpp \
   ../include/mapnik/enumeration.hpp \
+  ../include/mapnik/enumeration.hpp \
+  ../include/mapnik/expression.hpp \
   ../include/mapnik/expression.hpp \
   ../include/mapnik/expression.hpp \
   ../include/mapnik/expression_evaluator.hpp \
   ../include/mapnik/expression_evaluator.hpp \
+  ../include/mapnik/expression_evaluator.hpp \
+  ../include/mapnik/expression_grammar.hpp \
   ../include/mapnik/expression_grammar.hpp \
   ../include/mapnik/expression_grammar.hpp \
   ../include/mapnik/expression_node.hpp \
   ../include/mapnik/expression_node.hpp \
+  ../include/mapnik/expression_node.hpp \
+  ../include/mapnik/expression_node_types.hpp \
   ../include/mapnik/expression_node_types.hpp \
   ../include/mapnik/expression_node_types.hpp \
   ../include/mapnik/expression_string.hpp \
   ../include/mapnik/expression_string.hpp \
+  ../include/mapnik/expression_string.hpp \
+  ../include/mapnik/factory.hpp \
   ../include/mapnik/factory.hpp \
   ../include/mapnik/factory.hpp \
   ../include/mapnik/fastmath.hpp \
   ../include/mapnik/fastmath.hpp \
+  ../include/mapnik/fastmath.hpp \
+  ../include/mapnik/feature.hpp \
   ../include/mapnik/feature.hpp \
   ../include/mapnik/feature.hpp \
   ../include/mapnik/feature_factory.hpp \
   ../include/mapnik/feature_factory.hpp \
+  ../include/mapnik/feature_factory.hpp \
+  ../include/mapnik/feature_kv_iterator.hpp \
   ../include/mapnik/feature_kv_iterator.hpp \
   ../include/mapnik/feature_kv_iterator.hpp \
   ../include/mapnik/feature_layer_desc.hpp \
   ../include/mapnik/feature_layer_desc.hpp \
+  ../include/mapnik/feature_layer_desc.hpp \
+  ../include/mapnik/feature_style_processor.hpp \
   ../include/mapnik/feature_style_processor.hpp \
   ../include/mapnik/feature_style_processor.hpp \
   ../include/mapnik/feature_style_processor_impl.hpp \
   ../include/mapnik/feature_style_processor_impl.hpp \
+  ../include/mapnik/feature_style_processor_impl.hpp \
+  ../include/mapnik/feature_type_style.hpp \
   ../include/mapnik/feature_type_style.hpp \
   ../include/mapnik/feature_type_style.hpp \
   ../include/mapnik/filter_factory.hpp \
   ../include/mapnik/filter_factory.hpp \
+  ../include/mapnik/filter_factory.hpp \
+  ../include/mapnik/filter_featureset.hpp \
   ../include/mapnik/filter_featureset.hpp \
   ../include/mapnik/filter_featureset.hpp \
   ../include/mapnik/font_engine_freetype.hpp \
   ../include/mapnik/font_engine_freetype.hpp \
+  ../include/mapnik/font_engine_freetype.hpp \
+  ../include/mapnik/font_set.hpp \
   ../include/mapnik/font_set.hpp \
   ../include/mapnik/font_set.hpp \
   ../include/mapnik/formatting/base.hpp \
   ../include/mapnik/formatting/base.hpp \
+  ../include/mapnik/formatting/base.hpp \
+  ../include/mapnik/formatting/expression_format.hpp \
   ../include/mapnik/formatting/expression_format.hpp \
   ../include/mapnik/formatting/expression_format.hpp \
   ../include/mapnik/formatting/format.hpp \
   ../include/mapnik/formatting/format.hpp \
+  ../include/mapnik/formatting/format.hpp \
+  ../include/mapnik/formatting/list.hpp \
   ../include/mapnik/formatting/list.hpp \
   ../include/mapnik/formatting/list.hpp \
   ../include/mapnik/formatting/registry.hpp \
   ../include/mapnik/formatting/registry.hpp \
+  ../include/mapnik/formatting/registry.hpp \
+  ../include/mapnik/formatting/text.hpp \
   ../include/mapnik/formatting/text.hpp \
   ../include/mapnik/formatting/text.hpp \
   ../include/mapnik/gamma_method.hpp \
   ../include/mapnik/gamma_method.hpp \
+  ../include/mapnik/gamma_method.hpp \
+  ../include/mapnik/geom_util.hpp \
   ../include/mapnik/geom_util.hpp \
   ../include/mapnik/geom_util.hpp \
   ../include/mapnik/geometry.hpp \
   ../include/mapnik/geometry.hpp \
+  ../include/mapnik/geometry.hpp \
+  ../include/mapnik/global.hpp \
   ../include/mapnik/global.hpp \
   ../include/mapnik/global.hpp \
   ../include/mapnik/gradient.hpp \
   ../include/mapnik/gradient.hpp \
+  ../include/mapnik/gradient.hpp \
+  ../include/mapnik/graphics.hpp \
   ../include/mapnik/graphics.hpp \
   ../include/mapnik/graphics.hpp \
   ../include/mapnik/grid/grid.hpp \
   ../include/mapnik/grid/grid.hpp \
+  ../include/mapnik/grid/grid.hpp \
+  ../include/mapnik/grid/grid_marker_helpers.hpp \
   ../include/mapnik/grid/grid_marker_helpers.hpp \
   ../include/mapnik/grid/grid_marker_helpers.hpp \
   ../include/mapnik/grid/grid_pixel.hpp \
   ../include/mapnik/grid/grid_pixel.hpp \
+  ../include/mapnik/grid/grid_pixel.hpp \
+  ../include/mapnik/grid/grid_pixfmt.hpp \
   ../include/mapnik/grid/grid_pixfmt.hpp \
   ../include/mapnik/grid/grid_pixfmt.hpp \
   ../include/mapnik/grid/grid_rasterizer.hpp \
   ../include/mapnik/grid/grid_rasterizer.hpp \
+  ../include/mapnik/grid/grid_rasterizer.hpp \
+  ../include/mapnik/grid/grid_renderer.hpp \
   ../include/mapnik/grid/grid_renderer.hpp \
   ../include/mapnik/grid/grid_renderer.hpp \
   ../include/mapnik/grid/grid_renderer_base.hpp \
   ../include/mapnik/grid/grid_renderer_base.hpp \
+  ../include/mapnik/grid/grid_renderer_base.hpp \
+  ../include/mapnik/grid/grid_rendering_buffer.hpp \
   ../include/mapnik/grid/grid_rendering_buffer.hpp \
   ../include/mapnik/grid/grid_rendering_buffer.hpp \
   ../include/mapnik/grid/grid_util.hpp \
   ../include/mapnik/grid/grid_util.hpp \
+  ../include/mapnik/grid/grid_util.hpp \
   ../include/mapnik/grid/grid_view.hpp \
   ../include/mapnik/grid/grid_view.hpp \
+  ../include/mapnik/grid/grid_view.hpp \
+  ../include/mapnik/hash_variant.hpp \
+  ../include/mapnik/hash_variant.hpp \
+  ../include/mapnik/hash_variant.hpp \
+  ../include/mapnik/hextree.hpp \
   ../include/mapnik/hextree.hpp \
   ../include/mapnik/hextree.hpp \
   ../include/mapnik/hit_test_filter.hpp \
   ../include/mapnik/hit_test_filter.hpp \
+  ../include/mapnik/hit_test_filter.hpp \
+  ../include/mapnik/image_compositing.hpp \
   ../include/mapnik/image_compositing.hpp \
   ../include/mapnik/image_compositing.hpp \
   ../include/mapnik/image_data.hpp \
   ../include/mapnik/image_data.hpp \
+  ../include/mapnik/image_data.hpp \
+  ../include/mapnik/image_filter.hpp \
   ../include/mapnik/image_filter.hpp \
   ../include/mapnik/image_filter.hpp \
   ../include/mapnik/image_filter_grammar.hpp \
   ../include/mapnik/image_filter_grammar.hpp \
+  ../include/mapnik/image_filter_grammar.hpp \
+  ../include/mapnik/image_filter_types.hpp \
   ../include/mapnik/image_filter_types.hpp \
   ../include/mapnik/image_filter_types.hpp \
   ../include/mapnik/image_reader.hpp \
   ../include/mapnik/image_reader.hpp \
+  ../include/mapnik/image_reader.hpp \
+  ../include/mapnik/image_scaling.hpp \
   ../include/mapnik/image_scaling.hpp \
   ../include/mapnik/image_scaling.hpp \
   ../include/mapnik/image_util.hpp \
   ../include/mapnik/image_util.hpp \
+  ../include/mapnik/image_util.hpp \
+  ../include/mapnik/image_view.hpp \
   ../include/mapnik/image_view.hpp \
   ../include/mapnik/image_view.hpp \
   ../include/mapnik/internal/dump_xml.hpp \
   ../include/mapnik/internal/dump_xml.hpp \
+  ../include/mapnik/internal/dump_xml.hpp \
+  ../include/mapnik/jpeg_io.hpp \
   ../include/mapnik/jpeg_io.hpp \
   ../include/mapnik/jpeg_io.hpp \
   ../include/mapnik/json/feature_collection_grammar.hpp \
   ../include/mapnik/json/feature_collection_grammar.hpp \
+  ../include/mapnik/json/feature_collection_grammar.hpp \
+  ../include/mapnik/json/feature_collection_parser.hpp \
   ../include/mapnik/json/feature_collection_parser.hpp \
   ../include/mapnik/json/feature_collection_parser.hpp \
   ../include/mapnik/json/feature_generator_grammar.hpp \
   ../include/mapnik/json/feature_generator_grammar.hpp \
+  ../include/mapnik/json/feature_generator_grammar.hpp \
+  ../include/mapnik/json/feature_grammar.hpp \
   ../include/mapnik/json/feature_grammar.hpp \
   ../include/mapnik/json/feature_grammar.hpp \
   ../include/mapnik/json/geojson_generator.hpp \
   ../include/mapnik/json/geojson_generator.hpp \
+  ../include/mapnik/json/geojson_generator.hpp \
+  ../include/mapnik/json/geometry_generator_grammar.hpp \
   ../include/mapnik/json/geometry_generator_grammar.hpp \
   ../include/mapnik/json/geometry_generator_grammar.hpp \
   ../include/mapnik/json/geometry_grammar.hpp \
   ../include/mapnik/json/geometry_grammar.hpp \
+  ../include/mapnik/json/geometry_grammar.hpp \
+  ../include/mapnik/json/geometry_parser.hpp \
   ../include/mapnik/json/geometry_parser.hpp \
   ../include/mapnik/json/geometry_parser.hpp \
   ../include/mapnik/label_collision_detector.hpp \
   ../include/mapnik/label_collision_detector.hpp \
+  ../include/mapnik/label_collision_detector.hpp \
+  ../include/mapnik/layer.hpp \
   ../include/mapnik/layer.hpp \
   ../include/mapnik/layer.hpp \
   ../include/mapnik/line_pattern_symbolizer.hpp \
   ../include/mapnik/line_pattern_symbolizer.hpp \
+  ../include/mapnik/line_pattern_symbolizer.hpp \
+  ../include/mapnik/line_symbolizer.hpp \
   ../include/mapnik/line_symbolizer.hpp \
   ../include/mapnik/line_symbolizer.hpp \
   ../include/mapnik/load_map.hpp \
   ../include/mapnik/load_map.hpp \
+  ../include/mapnik/load_map.hpp \
+  ../include/mapnik/map.hpp \
   ../include/mapnik/map.hpp \
   ../include/mapnik/map.hpp \
   ../include/mapnik/mapped_memory_cache.hpp \
   ../include/mapnik/mapped_memory_cache.hpp \
+  ../include/mapnik/mapped_memory_cache.hpp \
+  ../include/mapnik/marker.hpp \
   ../include/mapnik/marker.hpp \
   ../include/mapnik/marker.hpp \
   ../include/mapnik/marker_cache.hpp \
   ../include/mapnik/marker_cache.hpp \
+  ../include/mapnik/marker_cache.hpp \
+  ../include/mapnik/marker_helpers.hpp \
   ../include/mapnik/marker_helpers.hpp \
   ../include/mapnik/marker_helpers.hpp \
   ../include/mapnik/markers_placement.hpp \
   ../include/mapnik/markers_placement.hpp \
+  ../include/mapnik/markers_placement.hpp \
+  ../include/mapnik/markers_symbolizer.hpp \
   ../include/mapnik/markers_symbolizer.hpp \
   ../include/mapnik/markers_symbolizer.hpp \
   ../include/mapnik/memory.hpp \
   ../include/mapnik/memory.hpp \
+  ../include/mapnik/memory.hpp \
+  ../include/mapnik/memory_datasource.hpp \
   ../include/mapnik/memory_datasource.hpp \
   ../include/mapnik/memory_datasource.hpp \
   ../include/mapnik/memory_featureset.hpp \
   ../include/mapnik/memory_featureset.hpp \
+  ../include/mapnik/memory_featureset.hpp \
+  ../include/mapnik/miniz_png.hpp \
   ../include/mapnik/miniz_png.hpp \
   ../include/mapnik/miniz_png.hpp \
   ../include/mapnik/noncopyable.hpp \
   ../include/mapnik/noncopyable.hpp \
+  ../include/mapnik/noncopyable.hpp \
+  ../include/mapnik/octree.hpp \
   ../include/mapnik/octree.hpp \
   ../include/mapnik/octree.hpp \
   ../include/mapnik/offset_converter.hpp \
   ../include/mapnik/offset_converter.hpp \
+  ../include/mapnik/offset_converter.hpp \
+  ../include/mapnik/palette.hpp \
   ../include/mapnik/palette.hpp \
   ../include/mapnik/palette.hpp \
   ../include/mapnik/params.hpp \
   ../include/mapnik/params.hpp \
+  ../include/mapnik/params.hpp \
+  ../include/mapnik/params_impl.hpp \
   ../include/mapnik/params_impl.hpp \
   ../include/mapnik/params_impl.hpp \
   ../include/mapnik/parse_path.hpp \
   ../include/mapnik/parse_path.hpp \
+  ../include/mapnik/parse_path.hpp \
+  ../include/mapnik/parse_transform.hpp \
   ../include/mapnik/parse_transform.hpp \
   ../include/mapnik/parse_transform.hpp \
   ../include/mapnik/path_expression.hpp \
   ../include/mapnik/path_expression.hpp \
+  ../include/mapnik/path_expression.hpp \
+  ../include/mapnik/path_expression_grammar.hpp \
   ../include/mapnik/path_expression_grammar.hpp \
   ../include/mapnik/path_expression_grammar.hpp \
   ../include/mapnik/pixel_position.hpp \
   ../include/mapnik/pixel_position.hpp \
+  ../include/mapnik/pixel_position.hpp \
+  ../include/mapnik/placement_finder.hpp \
   ../include/mapnik/placement_finder.hpp \
   ../include/mapnik/placement_finder.hpp \
   ../include/mapnik/plugin.hpp \
   ../include/mapnik/plugin.hpp \
+  ../include/mapnik/plugin.hpp \
+  ../include/mapnik/png_io.hpp \
   ../include/mapnik/png_io.hpp \
   ../include/mapnik/png_io.hpp \
   ../include/mapnik/point_symbolizer.hpp \
   ../include/mapnik/point_symbolizer.hpp \
+  ../include/mapnik/point_symbolizer.hpp \
+  ../include/mapnik/polygon_pattern_symbolizer.hpp \
   ../include/mapnik/polygon_pattern_symbolizer.hpp \
   ../include/mapnik/polygon_pattern_symbolizer.hpp \
   ../include/mapnik/polygon_symbolizer.hpp \
   ../include/mapnik/polygon_symbolizer.hpp \
+  ../include/mapnik/polygon_symbolizer.hpp \
+  ../include/mapnik/pool.hpp \
   ../include/mapnik/pool.hpp \
   ../include/mapnik/pool.hpp \
   ../include/mapnik/processed_text.hpp \
   ../include/mapnik/processed_text.hpp \
+  ../include/mapnik/processed_text.hpp \
+  ../include/mapnik/proj_transform.hpp \
   ../include/mapnik/proj_transform.hpp \
   ../include/mapnik/proj_transform.hpp \
   ../include/mapnik/projection.hpp \
   ../include/mapnik/projection.hpp \
+  ../include/mapnik/projection.hpp \
+  ../include/mapnik/ptree_helpers.hpp \
   ../include/mapnik/ptree_helpers.hpp \
   ../include/mapnik/ptree_helpers.hpp \
   ../include/mapnik/quad_tree.hpp \
   ../include/mapnik/quad_tree.hpp \
+  ../include/mapnik/quad_tree.hpp \
+  ../include/mapnik/query.hpp \
   ../include/mapnik/query.hpp \
   ../include/mapnik/query.hpp \
   ../include/mapnik/raster.hpp \
   ../include/mapnik/raster.hpp \
+  ../include/mapnik/raster.hpp \
+  ../include/mapnik/raster_colorizer.hpp \
   ../include/mapnik/raster_colorizer.hpp \
   ../include/mapnik/raster_colorizer.hpp \
   ../include/mapnik/raster_symbolizer.hpp \
   ../include/mapnik/raster_symbolizer.hpp \
+  ../include/mapnik/raster_symbolizer.hpp \
   ../include/mapnik/rule.hpp \
   ../include/mapnik/rule.hpp \
+  ../include/mapnik/rule.hpp \
+  ../include/mapnik/rule_cache.hpp \
+  ../include/mapnik/rule_cache.hpp \
+  ../include/mapnik/rule_cache.hpp \
+  ../include/mapnik/save_map.hpp \
   ../include/mapnik/save_map.hpp \
   ../include/mapnik/save_map.hpp \
   ../include/mapnik/scale_denominator.hpp \
   ../include/mapnik/scale_denominator.hpp \
+  ../include/mapnik/scale_denominator.hpp \
+  ../include/mapnik/segment.hpp \
   ../include/mapnik/segment.hpp \
   ../include/mapnik/segment.hpp \
   ../include/mapnik/shield_symbolizer.hpp \
   ../include/mapnik/shield_symbolizer.hpp \
+  ../include/mapnik/shield_symbolizer.hpp \
+  ../include/mapnik/simplify.hpp \
   ../include/mapnik/simplify.hpp \
   ../include/mapnik/simplify.hpp \
   ../include/mapnik/simplify_converter.hpp \
   ../include/mapnik/simplify_converter.hpp \
+  ../include/mapnik/simplify_converter.hpp \
+  ../include/mapnik/span_image_filter.hpp \
   ../include/mapnik/span_image_filter.hpp \
   ../include/mapnik/span_image_filter.hpp \
   ../include/mapnik/sql_utils.hpp \
   ../include/mapnik/sql_utils.hpp \
+  ../include/mapnik/sql_utils.hpp \
+  ../include/mapnik/stroke.hpp \
   ../include/mapnik/stroke.hpp \
   ../include/mapnik/stroke.hpp \
   ../include/mapnik/svg/output/svg_generator.hpp \
   ../include/mapnik/svg/output/svg_generator.hpp \
+  ../include/mapnik/svg/output/svg_generator.hpp \
+  ../include/mapnik/svg/output/svg_output_attributes.hpp \
   ../include/mapnik/svg/output/svg_output_attributes.hpp \
   ../include/mapnik/svg/output/svg_output_attributes.hpp \
   ../include/mapnik/svg/output/svg_output_grammars.hpp \
   ../include/mapnik/svg/output/svg_output_grammars.hpp \
+  ../include/mapnik/svg/output/svg_output_grammars.hpp \
+  ../include/mapnik/svg/output/svg_path_iterator.hpp \
   ../include/mapnik/svg/output/svg_path_iterator.hpp \
   ../include/mapnik/svg/output/svg_path_iterator.hpp \
   ../include/mapnik/svg/output/svg_renderer.hpp \
   ../include/mapnik/svg/output/svg_renderer.hpp \
+  ../include/mapnik/svg/output/svg_renderer.hpp \
+  ../include/mapnik/svg/svg_converter.hpp \
   ../include/mapnik/svg/svg_converter.hpp \
   ../include/mapnik/svg/svg_converter.hpp \
   ../include/mapnik/svg/svg_parser.hpp \
   ../include/mapnik/svg/svg_parser.hpp \
+  ../include/mapnik/svg/svg_parser.hpp \
+  ../include/mapnik/svg/svg_path_adapter.hpp \
   ../include/mapnik/svg/svg_path_adapter.hpp \
   ../include/mapnik/svg/svg_path_adapter.hpp \
   ../include/mapnik/svg/svg_path_attributes.hpp \
   ../include/mapnik/svg/svg_path_attributes.hpp \
+  ../include/mapnik/svg/svg_path_attributes.hpp \
+  ../include/mapnik/svg/svg_path_commands.hpp \
   ../include/mapnik/svg/svg_path_commands.hpp \
   ../include/mapnik/svg/svg_path_commands.hpp \
   ../include/mapnik/svg/svg_path_grammar.hpp \
   ../include/mapnik/svg/svg_path_grammar.hpp \
+  ../include/mapnik/svg/svg_path_grammar.hpp \
+  ../include/mapnik/svg/svg_path_parser.hpp \
   ../include/mapnik/svg/svg_path_parser.hpp \
   ../include/mapnik/svg/svg_path_parser.hpp \
   ../include/mapnik/svg/svg_points_grammar.hpp \
   ../include/mapnik/svg/svg_points_grammar.hpp \
+  ../include/mapnik/svg/svg_points_grammar.hpp \
+  ../include/mapnik/svg/svg_renderer_agg.hpp \
   ../include/mapnik/svg/svg_renderer_agg.hpp \
   ../include/mapnik/svg/svg_renderer_agg.hpp \
   ../include/mapnik/svg/svg_storage.hpp \
   ../include/mapnik/svg/svg_storage.hpp \
+  ../include/mapnik/svg/svg_storage.hpp \
+  ../include/mapnik/svg/svg_transform_grammar.hpp \
   ../include/mapnik/svg/svg_transform_grammar.hpp \
   ../include/mapnik/svg/svg_transform_grammar.hpp \
   ../include/mapnik/symbolizer.hpp \
   ../include/mapnik/symbolizer.hpp \
+  ../include/mapnik/symbolizer.hpp \
+  ../include/mapnik/symbolizer_hash.hpp \
   ../include/mapnik/symbolizer_hash.hpp \
   ../include/mapnik/symbolizer_hash.hpp \
   ../include/mapnik/symbolizer_helpers.hpp \
   ../include/mapnik/symbolizer_helpers.hpp \
+  ../include/mapnik/symbolizer_helpers.hpp \
+  ../include/mapnik/text_path.hpp \
   ../include/mapnik/text_path.hpp \
   ../include/mapnik/text_path.hpp \
   ../include/mapnik/text_placements/base.hpp \
   ../include/mapnik/text_placements/base.hpp \
+  ../include/mapnik/text_placements/base.hpp \
+  ../include/mapnik/text_placements/dummy.hpp \
   ../include/mapnik/text_placements/dummy.hpp \
   ../include/mapnik/text_placements/dummy.hpp \
   ../include/mapnik/text_placements/list.hpp \
   ../include/mapnik/text_placements/list.hpp \
+  ../include/mapnik/text_placements/list.hpp \
+  ../include/mapnik/text_placements/registry.hpp \
   ../include/mapnik/text_placements/registry.hpp \
   ../include/mapnik/text_placements/registry.hpp \
   ../include/mapnik/text_placements/simple.hpp \
   ../include/mapnik/text_placements/simple.hpp \
+  ../include/mapnik/text_placements/simple.hpp \
+  ../include/mapnik/text_properties.hpp \
   ../include/mapnik/text_properties.hpp \
   ../include/mapnik/text_properties.hpp \
   ../include/mapnik/text_symbolizer.hpp \
   ../include/mapnik/text_symbolizer.hpp \
+  ../include/mapnik/text_symbolizer.hpp \
+  ../include/mapnik/tiff_io.hpp \
   ../include/mapnik/tiff_io.hpp \
   ../include/mapnik/tiff_io.hpp \
   ../include/mapnik/timer.hpp \
   ../include/mapnik/timer.hpp \
+  ../include/mapnik/timer.hpp \
+  ../include/mapnik/transform_expression.hpp \
   ../include/mapnik/transform_expression.hpp \
   ../include/mapnik/transform_expression.hpp \
   ../include/mapnik/transform_expression_grammar.hpp \
   ../include/mapnik/transform_expression_grammar.hpp \
+  ../include/mapnik/transform_expression_grammar.hpp \
+  ../include/mapnik/transform_processor.hpp \
   ../include/mapnik/transform_processor.hpp \
   ../include/mapnik/transform_processor.hpp \
   ../include/mapnik/unicode.hpp \
   ../include/mapnik/unicode.hpp \
+  ../include/mapnik/unicode.hpp \
+  ../include/mapnik/util/container_adapter.hpp \
   ../include/mapnik/util/container_adapter.hpp \
   ../include/mapnik/util/container_adapter.hpp \
   ../include/mapnik/util/conversions.hpp \
   ../include/mapnik/util/conversions.hpp \
+  ../include/mapnik/util/conversions.hpp \
+  ../include/mapnik/util/dasharray_parser.hpp \
   ../include/mapnik/util/dasharray_parser.hpp \
   ../include/mapnik/util/dasharray_parser.hpp \
   ../include/mapnik/util/deepcopy.hpp \
   ../include/mapnik/util/deepcopy.hpp \
+  ../include/mapnik/util/deepcopy.hpp \
+  ../include/mapnik/util/geometry_svg_generator.hpp \
   ../include/mapnik/util/geometry_svg_generator.hpp \
   ../include/mapnik/util/geometry_svg_generator.hpp \
   ../include/mapnik/util/geometry_to_ds_type.hpp \
   ../include/mapnik/util/geometry_to_ds_type.hpp \
+  ../include/mapnik/util/geometry_to_ds_type.hpp \
+  ../include/mapnik/util/geometry_to_svg.hpp \
   ../include/mapnik/util/geometry_to_svg.hpp \
   ../include/mapnik/util/geometry_to_svg.hpp \
   ../include/mapnik/util/geometry_to_wkb.hpp \
   ../include/mapnik/util/geometry_to_wkb.hpp \
+  ../include/mapnik/util/geometry_to_wkb.hpp \
+  ../include/mapnik/util/geometry_to_wkt.hpp \
   ../include/mapnik/util/geometry_to_wkt.hpp \
   ../include/mapnik/util/geometry_to_wkt.hpp \
   ../include/mapnik/util/geometry_wkt_generator.hpp \
   ../include/mapnik/util/geometry_wkt_generator.hpp \
+  ../include/mapnik/util/geometry_wkt_generator.hpp \
+  ../include/mapnik/util/path_iterator.hpp \
   ../include/mapnik/util/path_iterator.hpp \
   ../include/mapnik/util/path_iterator.hpp \
   ../include/mapnik/util/trim.hpp \
   ../include/mapnik/util/trim.hpp \
+  ../include/mapnik/util/trim.hpp \
+  ../include/mapnik/utils.hpp \
   ../include/mapnik/utils.hpp \
   ../include/mapnik/utils.hpp \
   ../include/mapnik/value.hpp \
   ../include/mapnik/value.hpp \
+  ../include/mapnik/value.hpp \
+  ../include/mapnik/value_error.hpp \
   ../include/mapnik/value_error.hpp \
   ../include/mapnik/value_error.hpp \
   ../include/mapnik/value_types.hpp \
   ../include/mapnik/value_types.hpp \
+  ../include/mapnik/value_types.hpp \
+  ../include/mapnik/version.hpp \
   ../include/mapnik/version.hpp \
   ../include/mapnik/version.hpp \
   ../include/mapnik/vertex.hpp \
   ../include/mapnik/vertex.hpp \
+  ../include/mapnik/vertex.hpp \
+  ../include/mapnik/vertex_converters.hpp \
   ../include/mapnik/vertex_converters.hpp \
   ../include/mapnik/vertex_converters.hpp \
   ../include/mapnik/vertex_vector.hpp \
   ../include/mapnik/vertex_vector.hpp \
+  ../include/mapnik/vertex_vector.hpp \
+  ../include/mapnik/warp.hpp \
   ../include/mapnik/warp.hpp \
   ../include/mapnik/warp.hpp \
   ../include/mapnik/well_known_srs.hpp \
   ../include/mapnik/well_known_srs.hpp \
+  ../include/mapnik/well_known_srs.hpp \
+  ../include/mapnik/wkb.hpp \
   ../include/mapnik/wkb.hpp \
   ../include/mapnik/wkb.hpp \
   ../include/mapnik/wkt/wkt_factory.hpp \
   ../include/mapnik/wkt/wkt_factory.hpp \
+  ../include/mapnik/wkt/wkt_factory.hpp \
+  ../include/mapnik/wkt/wkt_grammar.hpp \
   ../include/mapnik/wkt/wkt_grammar.hpp \
   ../include/mapnik/wkt/wkt_grammar.hpp \
   ../include/mapnik/xml_attribute_cast.hpp \
   ../include/mapnik/xml_attribute_cast.hpp \
+  ../include/mapnik/xml_attribute_cast.hpp \
+  ../include/mapnik/xml_loader.hpp \
   ../include/mapnik/xml_loader.hpp \
   ../include/mapnik/xml_loader.hpp \
   ../include/mapnik/xml_node.hpp \
   ../include/mapnik/xml_node.hpp \
+  ../include/mapnik/xml_node.hpp \
+  ../include/mapnik/xml_tree.hpp \
   ../include/mapnik/xml_tree.hpp \
   ../include/mapnik/xml_tree.hpp \
   ../plugins/input/csv/csv_datasource.hpp \
@@ -687,6 +901,7 @@ SOURCES += \
   ../deps/agg/src/agg_vpgen_clip_polygon.cpp \
   ../deps/agg/src/agg_vpgen_clip_polyline.cpp \
   ../deps/agg/src/agg_vpgen_segmentator.cpp \
+  ../deps/clipper/src/clipper.cpp \
   ../plugins/input/csv/csv_datasource.cpp \
   ../plugins/input/gdal/gdal_datasource.cpp \
   ../plugins/input/gdal/gdal_featureset.cpp \
@@ -736,282 +951,422 @@ SOURCES += \
   ../plugins/input/templates/helloworld/hello_featureset.cpp \
   ../src/agg/agg_renderer.cpp \
   ../src/agg/agg_renderer.cpp \
+  ../src/agg/agg_renderer.cpp \
+  ../src/agg/process_building_symbolizer.cpp \
   ../src/agg/process_building_symbolizer.cpp \
   ../src/agg/process_building_symbolizer.cpp \
   ../src/agg/process_debug_symbolizer.cpp \
   ../src/agg/process_debug_symbolizer.cpp \
+  ../src/agg/process_debug_symbolizer.cpp \
+  ../src/agg/process_line_pattern_symbolizer.cpp \
   ../src/agg/process_line_pattern_symbolizer.cpp \
   ../src/agg/process_line_pattern_symbolizer.cpp \
   ../src/agg/process_line_symbolizer.cpp \
   ../src/agg/process_line_symbolizer.cpp \
+  ../src/agg/process_line_symbolizer.cpp \
+  ../src/agg/process_markers_symbolizer.cpp \
   ../src/agg/process_markers_symbolizer.cpp \
   ../src/agg/process_markers_symbolizer.cpp \
   ../src/agg/process_point_symbolizer.cpp \
   ../src/agg/process_point_symbolizer.cpp \
+  ../src/agg/process_point_symbolizer.cpp \
+  ../src/agg/process_polygon_pattern_symbolizer.cpp \
   ../src/agg/process_polygon_pattern_symbolizer.cpp \
   ../src/agg/process_polygon_pattern_symbolizer.cpp \
   ../src/agg/process_polygon_symbolizer.cpp \
   ../src/agg/process_polygon_symbolizer.cpp \
+  ../src/agg/process_polygon_symbolizer.cpp \
+  ../src/agg/process_raster_symbolizer.cpp \
   ../src/agg/process_raster_symbolizer.cpp \
   ../src/agg/process_raster_symbolizer.cpp \
   ../src/agg/process_shield_symbolizer.cpp \
   ../src/agg/process_shield_symbolizer.cpp \
+  ../src/agg/process_shield_symbolizer.cpp \
+  ../src/agg/process_text_symbolizer.cpp \
   ../src/agg/process_text_symbolizer.cpp \
   ../src/agg/process_text_symbolizer.cpp \
   ../src/box2d.cpp \
   ../src/box2d.cpp \
+  ../src/box2d.cpp \
+  ../src/building_symbolizer.cpp \
   ../src/building_symbolizer.cpp \
   ../src/building_symbolizer.cpp \
   ../src/cairo_context.cpp \
   ../src/cairo_context.cpp \
+  ../src/cairo_context.cpp \
+  ../src/cairo_renderer.cpp \
   ../src/cairo_renderer.cpp \
   ../src/cairo_renderer.cpp \
   ../src/color.cpp \
   ../src/color.cpp \
+  ../src/color.cpp \
+  ../src/color_factory.cpp \
   ../src/color_factory.cpp \
   ../src/color_factory.cpp \
   ../src/config_error.cpp \
   ../src/config_error.cpp \
+  ../src/config_error.cpp \
+  ../src/conversions.cpp \
   ../src/conversions.cpp \
   ../src/conversions.cpp \
   ../src/css_color_grammar.cpp \
   ../src/css_color_grammar.cpp \
+  ../src/css_color_grammar.cpp \
+  ../src/datasource_cache.cpp \
   ../src/datasource_cache.cpp \
   ../src/datasource_cache.cpp \
   ../src/debug.cpp \
   ../src/debug.cpp \
+  ../src/debug.cpp \
+  ../src/deepcopy.cpp \
   ../src/deepcopy.cpp \
   ../src/deepcopy.cpp \
   ../src/distance.cpp \
   ../src/distance.cpp \
+  ../src/distance.cpp \
+  ../src/expression.cpp \
   ../src/expression.cpp \
   ../src/expression.cpp \
   ../src/expression_grammar.cpp \
   ../src/expression_grammar.cpp \
+  ../src/expression_grammar.cpp \
+  ../src/expression_node.cpp \
   ../src/expression_node.cpp \
   ../src/expression_node.cpp \
   ../src/expression_string.cpp \
   ../src/expression_string.cpp \
+  ../src/expression_string.cpp \
+  ../src/feature_kv_iterator.cpp \
   ../src/feature_kv_iterator.cpp \
   ../src/feature_kv_iterator.cpp \
   ../src/feature_style_processor.cpp \
   ../src/feature_style_processor.cpp \
+  ../src/feature_style_processor.cpp \
+  ../src/feature_type_style.cpp \
   ../src/feature_type_style.cpp \
   ../src/feature_type_style.cpp \
   ../src/font_engine_freetype.cpp \
   ../src/font_engine_freetype.cpp \
+  ../src/font_engine_freetype.cpp \
+  ../src/font_set.cpp \
   ../src/font_set.cpp \
   ../src/font_set.cpp \
   ../src/formatting/base.cpp \
   ../src/formatting/base.cpp \
+  ../src/formatting/base.cpp \
+  ../src/formatting/expression.cpp \
   ../src/formatting/expression.cpp \
   ../src/formatting/expression.cpp \
   ../src/formatting/format.cpp \
   ../src/formatting/format.cpp \
+  ../src/formatting/format.cpp \
+  ../src/formatting/list.cpp \
   ../src/formatting/list.cpp \
   ../src/formatting/list.cpp \
   ../src/formatting/registry.cpp \
   ../src/formatting/registry.cpp \
+  ../src/formatting/registry.cpp \
+  ../src/formatting/text.cpp \
   ../src/formatting/text.cpp \
   ../src/formatting/text.cpp \
   ../src/gamma_method.cpp \
   ../src/gamma_method.cpp \
+  ../src/gamma_method.cpp \
+  ../src/gradient.cpp \
   ../src/gradient.cpp \
   ../src/gradient.cpp \
   ../src/graphics.cpp \
   ../src/graphics.cpp \
+  ../src/graphics.cpp \
+  ../src/grid/grid.cpp \
   ../src/grid/grid.cpp \
   ../src/grid/grid.cpp \
   ../src/grid/grid_renderer.cpp \
   ../src/grid/grid_renderer.cpp \
+  ../src/grid/grid_renderer.cpp \
+  ../src/grid/process_building_symbolizer.cpp \
   ../src/grid/process_building_symbolizer.cpp \
   ../src/grid/process_building_symbolizer.cpp \
   ../src/grid/process_line_pattern_symbolizer.cpp \
   ../src/grid/process_line_pattern_symbolizer.cpp \
+  ../src/grid/process_line_pattern_symbolizer.cpp \
+  ../src/grid/process_line_symbolizer.cpp \
   ../src/grid/process_line_symbolizer.cpp \
   ../src/grid/process_line_symbolizer.cpp \
   ../src/grid/process_markers_symbolizer.cpp \
   ../src/grid/process_markers_symbolizer.cpp \
+  ../src/grid/process_markers_symbolizer.cpp \
+  ../src/grid/process_point_symbolizer.cpp \
   ../src/grid/process_point_symbolizer.cpp \
   ../src/grid/process_point_symbolizer.cpp \
   ../src/grid/process_polygon_pattern_symbolizer.cpp \
   ../src/grid/process_polygon_pattern_symbolizer.cpp \
+  ../src/grid/process_polygon_pattern_symbolizer.cpp \
+  ../src/grid/process_polygon_symbolizer.cpp \
   ../src/grid/process_polygon_symbolizer.cpp \
   ../src/grid/process_polygon_symbolizer.cpp \
   ../src/grid/process_raster_symbolizer.cpp \
   ../src/grid/process_raster_symbolizer.cpp \
+  ../src/grid/process_raster_symbolizer.cpp \
+  ../src/grid/process_shield_symbolizer.cpp \
   ../src/grid/process_shield_symbolizer.cpp \
   ../src/grid/process_shield_symbolizer.cpp \
   ../src/grid/process_text_symbolizer.cpp \
   ../src/grid/process_text_symbolizer.cpp \
+  ../src/grid/process_text_symbolizer.cpp \
+  ../src/image_compositing.cpp \
   ../src/image_compositing.cpp \
   ../src/image_compositing.cpp \
   ../src/image_filter_grammar.cpp \
   ../src/image_filter_grammar.cpp \
+  ../src/image_filter_grammar.cpp \
+  ../src/image_filter_types.cpp \
   ../src/image_filter_types.cpp \
   ../src/image_filter_types.cpp \
   ../src/image_reader.cpp \
   ../src/image_reader.cpp \
+  ../src/image_reader.cpp \
+  ../src/image_scaling.cpp \
   ../src/image_scaling.cpp \
   ../src/image_scaling.cpp \
   ../src/image_util.cpp \
   ../src/image_util.cpp \
+  ../src/image_util.cpp \
+  ../src/jpeg_reader.cpp \
   ../src/jpeg_reader.cpp \
   ../src/jpeg_reader.cpp \
   ../src/json/feature_collection_parser.cpp \
   ../src/json/feature_collection_parser.cpp \
+  ../src/json/feature_collection_parser.cpp \
+  ../src/json/feature_grammar.cpp \
   ../src/json/feature_grammar.cpp \
   ../src/json/feature_grammar.cpp \
   ../src/json/geojson_generator.cpp \
   ../src/json/geojson_generator.cpp \
+  ../src/json/geojson_generator.cpp \
+  ../src/json/geometry_grammar.cpp \
   ../src/json/geometry_grammar.cpp \
   ../src/json/geometry_grammar.cpp \
   ../src/json/geometry_parser.cpp \
   ../src/json/geometry_parser.cpp \
+  ../src/json/geometry_parser.cpp \
+  ../src/layer.cpp \
   ../src/layer.cpp \
   ../src/layer.cpp \
   ../src/libxml2_loader.cpp \
   ../src/libxml2_loader.cpp \
+  ../src/libxml2_loader.cpp \
+  ../src/line_pattern_symbolizer.cpp \
   ../src/line_pattern_symbolizer.cpp \
   ../src/line_pattern_symbolizer.cpp \
   ../src/line_symbolizer.cpp \
   ../src/line_symbolizer.cpp \
+  ../src/line_symbolizer.cpp \
+  ../src/load_map.cpp \
   ../src/load_map.cpp \
   ../src/load_map.cpp \
   ../src/map.cpp \
   ../src/map.cpp \
+  ../src/map.cpp \
+  ../src/mapped_memory_cache.cpp \
   ../src/mapped_memory_cache.cpp \
   ../src/mapped_memory_cache.cpp \
   ../src/marker_cache.cpp \
   ../src/marker_cache.cpp \
+  ../src/marker_cache.cpp \
+  ../src/markers_symbolizer.cpp \
   ../src/markers_symbolizer.cpp \
   ../src/markers_symbolizer.cpp \
   ../src/memory.cpp \
   ../src/memory.cpp \
+  ../src/memory.cpp \
+  ../src/memory_datasource.cpp \
   ../src/memory_datasource.cpp \
   ../src/memory_datasource.cpp \
   ../src/miniz.c \
   ../src/miniz.c \
+  ../src/miniz.c \
+  ../src/miniz_png.cpp \
   ../src/miniz_png.cpp \
   ../src/miniz_png.cpp \
   ../src/palette.cpp \
   ../src/palette.cpp \
+  ../src/palette.cpp \
+  ../src/params.cpp \
   ../src/params.cpp \
   ../src/params.cpp \
   ../src/parse_path.cpp \
   ../src/parse_path.cpp \
+  ../src/parse_path.cpp \
+  ../src/parse_transform.cpp \
   ../src/parse_transform.cpp \
   ../src/parse_transform.cpp \
   ../src/path_expression_grammar.cpp \
   ../src/path_expression_grammar.cpp \
+  ../src/path_expression_grammar.cpp \
+  ../src/placement_finder.cpp \
   ../src/placement_finder.cpp \
   ../src/placement_finder.cpp \
   ../src/plugin.cpp \
   ../src/plugin.cpp \
+  ../src/plugin.cpp \
+  ../src/png_reader.cpp \
   ../src/png_reader.cpp \
   ../src/png_reader.cpp \
   ../src/point_symbolizer.cpp \
   ../src/point_symbolizer.cpp \
+  ../src/point_symbolizer.cpp \
+  ../src/polygon_pattern_symbolizer.cpp \
   ../src/polygon_pattern_symbolizer.cpp \
   ../src/polygon_pattern_symbolizer.cpp \
   ../src/polygon_symbolizer.cpp \
   ../src/polygon_symbolizer.cpp \
+  ../src/polygon_symbolizer.cpp \
+  ../src/processed_text.cpp \
   ../src/processed_text.cpp \
   ../src/processed_text.cpp \
   ../src/proj_transform.cpp \
   ../src/proj_transform.cpp \
+  ../src/proj_transform.cpp \
+  ../src/projection.cpp \
   ../src/projection.cpp \
   ../src/projection.cpp \
   ../src/rapidxml_loader.cpp \
   ../src/rapidxml_loader.cpp \
+  ../src/rapidxml_loader.cpp \
+  ../src/raster_colorizer.cpp \
   ../src/raster_colorizer.cpp \
   ../src/raster_colorizer.cpp \
   ../src/raster_symbolizer.cpp \
   ../src/raster_symbolizer.cpp \
+  ../src/raster_symbolizer.cpp \
+  ../src/rule.cpp \
   ../src/rule.cpp \
   ../src/rule.cpp \
   ../src/save_map.cpp \
   ../src/save_map.cpp \
+  ../src/save_map.cpp \
+  ../src/scale_denominator.cpp \
   ../src/scale_denominator.cpp \
   ../src/scale_denominator.cpp \
   ../src/shield_symbolizer.cpp \
   ../src/shield_symbolizer.cpp \
+  ../src/shield_symbolizer.cpp \
+  ../src/simplify.cpp \
   ../src/simplify.cpp \
   ../src/simplify.cpp \
   ../src/stroke.cpp \
   ../src/stroke.cpp \
+  ../src/stroke.cpp \
+  ../src/svg/output/process_building_symbolizer.cpp \
   ../src/svg/output/process_building_symbolizer.cpp \
   ../src/svg/output/process_building_symbolizer.cpp \
   ../src/svg/output/process_line_pattern_symbolizer.cpp \
   ../src/svg/output/process_line_pattern_symbolizer.cpp \
+  ../src/svg/output/process_line_pattern_symbolizer.cpp \
+  ../src/svg/output/process_line_symbolizer.cpp \
   ../src/svg/output/process_line_symbolizer.cpp \
   ../src/svg/output/process_line_symbolizer.cpp \
   ../src/svg/output/process_markers_symbolizer.cpp \
   ../src/svg/output/process_markers_symbolizer.cpp \
+  ../src/svg/output/process_markers_symbolizer.cpp \
+  ../src/svg/output/process_point_symbolizer.cpp \
   ../src/svg/output/process_point_symbolizer.cpp \
   ../src/svg/output/process_point_symbolizer.cpp \
   ../src/svg/output/process_polygon_pattern_symbolizer.cpp \
   ../src/svg/output/process_polygon_pattern_symbolizer.cpp \
+  ../src/svg/output/process_polygon_pattern_symbolizer.cpp \
+  ../src/svg/output/process_polygon_symbolizer.cpp \
   ../src/svg/output/process_polygon_symbolizer.cpp \
   ../src/svg/output/process_polygon_symbolizer.cpp \
   ../src/svg/output/process_raster_symbolizer.cpp \
   ../src/svg/output/process_raster_symbolizer.cpp \
+  ../src/svg/output/process_raster_symbolizer.cpp \
+  ../src/svg/output/process_shield_symbolizer.cpp \
   ../src/svg/output/process_shield_symbolizer.cpp \
   ../src/svg/output/process_shield_symbolizer.cpp \
   ../src/svg/output/process_symbolizers.cpp \
   ../src/svg/output/process_symbolizers.cpp \
+  ../src/svg/output/process_symbolizers.cpp \
+  ../src/svg/output/process_text_symbolizer.cpp \
   ../src/svg/output/process_text_symbolizer.cpp \
   ../src/svg/output/process_text_symbolizer.cpp \
   ../src/svg/output/svg_generator.cpp \
   ../src/svg/output/svg_generator.cpp \
+  ../src/svg/output/svg_generator.cpp \
+  ../src/svg/output/svg_output_attributes.cpp \
   ../src/svg/output/svg_output_attributes.cpp \
   ../src/svg/output/svg_output_attributes.cpp \
   ../src/svg/output/svg_renderer.cpp \
   ../src/svg/output/svg_renderer.cpp \
+  ../src/svg/output/svg_renderer.cpp \
+  ../src/svg/svg_parser.cpp \
   ../src/svg/svg_parser.cpp \
   ../src/svg/svg_parser.cpp \
   ../src/svg/svg_path_parser.cpp \
   ../src/svg/svg_path_parser.cpp \
+  ../src/svg/svg_path_parser.cpp \
+  ../src/svg/svg_points_parser.cpp \
   ../src/svg/svg_points_parser.cpp \
   ../src/svg/svg_points_parser.cpp \
   ../src/svg/svg_transform_parser.cpp \
   ../src/svg/svg_transform_parser.cpp \
+  ../src/svg/svg_transform_parser.cpp \
+  ../src/symbolizer.cpp \
   ../src/symbolizer.cpp \
   ../src/symbolizer.cpp \
   ../src/symbolizer_helpers.cpp \
   ../src/symbolizer_helpers.cpp \
+  ../src/symbolizer_helpers.cpp \
+  ../src/text_placements/base.cpp \
   ../src/text_placements/base.cpp \
   ../src/text_placements/base.cpp \
   ../src/text_placements/dummy.cpp \
   ../src/text_placements/dummy.cpp \
+  ../src/text_placements/dummy.cpp \
+  ../src/text_placements/list.cpp \
   ../src/text_placements/list.cpp \
   ../src/text_placements/list.cpp \
   ../src/text_placements/registry.cpp \
   ../src/text_placements/registry.cpp \
+  ../src/text_placements/registry.cpp \
+  ../src/text_placements/simple.cpp \
   ../src/text_placements/simple.cpp \
   ../src/text_placements/simple.cpp \
   ../src/text_properties.cpp \
   ../src/text_properties.cpp \
+  ../src/text_properties.cpp \
+  ../src/text_symbolizer.cpp \
   ../src/text_symbolizer.cpp \
   ../src/text_symbolizer.cpp \
   ../src/tiff_reader.cpp \
   ../src/tiff_reader.cpp \
+  ../src/tiff_reader.cpp \
+  ../src/transform_expression.cpp \
   ../src/transform_expression.cpp \
   ../src/transform_expression.cpp \
   ../src/transform_expression_grammar.cpp \
   ../src/transform_expression_grammar.cpp \
+  ../src/transform_expression_grammar.cpp \
+  ../src/unicode.cpp \
   ../src/unicode.cpp \
   ../src/unicode.cpp \
   ../src/warp.cpp \
   ../src/warp.cpp \
+  ../src/warp.cpp \
+  ../src/well_known_srs.cpp \
   ../src/well_known_srs.cpp \
   ../src/well_known_srs.cpp \
   ../src/wkb.cpp \
   ../src/wkb.cpp \
+  ../src/wkb.cpp \
+  ../src/wkt/wkt_factory.cpp \
   ../src/wkt/wkt_factory.cpp \
   ../src/wkt/wkt_factory.cpp \
   ../src/wkt/wkt_generator.cpp \
   ../src/wkt/wkt_generator.cpp \
+  ../src/wkt/wkt_generator.cpp \
+  ../src/xml_tree.cpp \
   ../src/xml_tree.cpp \
   ../src/xml_tree.cpp \