diff --git a/include/mapnik/memory_datasource.hpp b/include/mapnik/memory_datasource.hpp
index d00a2c9ec..f344ff1d7 100644
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@@ -26,7 +26,6 @@
 #define MEMORY_DATASOURCE_HPP
 
 #include <mapnik/datasource.hpp>
-#include <mapnik/feature_factory.hpp> // TODO remove
 #include <mapnik/feature_layer_desc.hpp>
 #include <vector>
 
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index af2fdf113..d22bcbd8a 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -21,9 +21,11 @@
  *****************************************************************************/
 
 //$Id$
+// mapnik
 #include <mapnik/memory_datasource.hpp>
-
 #include <mapnik/memory_featureset.hpp>
+#include <mapnik/feature_factory.hpp>
+// stl
 #include <algorithm>
 
 namespace mapnik {
@@ -117,5 +119,6 @@ void point_datasource::add_point(double x, double y, const char* key, const char
         transcoder tr("utf-8");
         (*feature)[key] = tr.transcode(value);
         this->push(feature);
-    }
+}
+
 }