diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index a06fff487..bc4b06f57 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -21,6 +21,8 @@
  *****************************************************************************/
 //$Id$
 
+// boost
+#include <boost/foreach.hpp>
 // mapnik
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_helpers.hpp>
@@ -116,16 +118,14 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         if (stroke_.has_dash()) converter.set<dash_tag>();        
         converter.set<stroke_tag>(); //always stroke
         
-        for (unsigned i=0;i<feature->num_geometries();++i)
+        BOOST_FOREACH( geometry_type & geom, feature->paths())
         {
-            geometry_type & geom = feature->get_geometry(i);
             if (geom.num_points() > 1)
             {
                 converter.apply(geom);                
             }
         }
         
- 
         agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
 
         if (sym.comp_op() == clear)
diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp
index f32b7c60c..8d65487ab 100644
--- a/src/agg/process_polygon_pattern_symbolizer.cpp
+++ b/src/agg/process_polygon_pattern_symbolizer.cpp
@@ -21,6 +21,8 @@
  *****************************************************************************/
 //$Id$
 
+// boost
+#include <boost/foreach.hpp>
 // mapnik
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_helpers.hpp>
@@ -142,9 +144,8 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
     converter.set<transform_tag>(); //always transform 
     //if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter
 
-    for (unsigned i=0;i<num_geometries;++i)
+    BOOST_FOREACH( geometry_type & geom, feature->paths())
     {
-        geometry_type & geom = feature->get_geometry(i);
         if (geom.num_points() > 2)
         {
             converter.apply(geom);        
diff --git a/src/agg/process_polygon_symbolizer.cpp b/src/agg/process_polygon_symbolizer.cpp
index 1b6e33a0f..b607b54e7 100644
--- a/src/agg/process_polygon_symbolizer.cpp
+++ b/src/agg/process_polygon_symbolizer.cpp
@@ -21,6 +21,8 @@
  *****************************************************************************/
 //$Id$
 
+// boost
+#include <boost/foreach.hpp>
 // mapnik
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/agg_helpers.hpp>
@@ -56,9 +58,8 @@ void agg_renderer<T>::process(polygon_symbolizer const& sym,
     converter.set<transform_tag>(); //always transform 
     if (sym.smooth() > 0.0) converter.set<smooth_tag>(); // optional smooth converter
     
-    for (unsigned i=0;i<feature->num_geometries();++i)
+    BOOST_FOREACH( geometry_type & geom, feature->paths())
     {
-        geometry_type & geom=feature->get_geometry(i);
         if (geom.num_points() > 2)
         {          
             converter.apply(geom);