diff --git a/plugins/input/occi/occi_featureset.cpp b/plugins/input/occi/occi_featureset.cpp
index e7361827e..3d2f120a0 100644
--- a/plugins/input/occi/occi_featureset.cpp
+++ b/plugins/input/occi/occi_featureset.cpp
@@ -41,9 +41,6 @@ using mapnik::box2d;
 using mapnik::CoordTransform;
 using mapnik::Feature;
 using mapnik::feature_ptr;
-using mapnik::point_impl;
-using mapnik::line_string_impl;
-using mapnik::polygon_impl;
 using mapnik::geometry_type;
 using mapnik::geometry_utils;
 using mapnik::transcoder;
diff --git a/plugins/input/ogr/ogr_converter.cpp b/plugins/input/ogr/ogr_converter.cpp
index a25592b14..32fa60350 100644
--- a/plugins/input/ogr/ogr_converter.cpp
+++ b/plugins/input/ogr/ogr_converter.cpp
@@ -151,7 +151,7 @@ void ogr_converter::convert_multipoint (OGRMultiPoint* geom, feature_ptr feature
     {
         OGRPoint* ogrpoint = static_cast<OGRPoint*>(geom->getGeometryRef (i));
         point->move_to (ogrpoint->getX(), ogrpoint->getY());
-        //Todo - need to accept multiple points per point_impl
+        //Todo - need to accept multiple points per mapnik::Point
     }
     
     // Todo - this only gets last point
diff --git a/plugins/input/rasterlite/rasterlite_featureset.cpp b/plugins/input/rasterlite/rasterlite_featureset.cpp
index 7564473f0..7e71f6453 100644
--- a/plugins/input/rasterlite/rasterlite_featureset.cpp
+++ b/plugins/input/rasterlite/rasterlite_featureset.cpp
@@ -33,7 +33,6 @@ using mapnik::box2d;
 using mapnik::Feature;
 using mapnik::feature_ptr;
 using mapnik::CoordTransform;
-using mapnik::point_impl;
 using mapnik::geometry_type;
 using mapnik::query;