diff --git a/include/mapnik/memory_datasource.hpp b/include/mapnik/memory_datasource.hpp
index 8ebb8f281..35a172f22 100644
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@@ -28,7 +28,7 @@
 #include <mapnik/feature_layer_desc.hpp>
 
 // stl
-#include <vector>
+#include <deque>
 
 namespace mapnik {
 
@@ -48,7 +48,7 @@ public:
     size_t size() const;
     void clear();
 private:
-    std::vector<feature_ptr> features_;
+    std::deque<feature_ptr> features_;
     mapnik::layer_descriptor desc_;
     datasource::datasource_t type_;
     bool bbox_check_;
diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp
index 7fd5d1e47..13ab3d4cf 100644
--- a/include/mapnik/memory_featureset.hpp
+++ b/include/mapnik/memory_featureset.hpp
@@ -45,7 +45,7 @@ public:
           bbox_check_(bbox_check)
     {}
 
-    memory_featureset(box2d<double> const& bbox, std::vector<feature_ptr> const& features, bool bbox_check = true)
+    memory_featureset(box2d<double> const& bbox, std::deque<feature_ptr> const& features, bool bbox_check = true)
         : bbox_(bbox),
           pos_(features.begin()),
           end_(features.end()),
@@ -92,8 +92,8 @@ public:
 
 private:
     box2d<double> bbox_;
-    std::vector<feature_ptr>::const_iterator pos_;
-    std::vector<feature_ptr>::const_iterator end_;
+    std::deque<feature_ptr>::const_iterator pos_;
+    std::deque<feature_ptr>::const_iterator end_;
     datasource::datasource_t type_;
     bool bbox_check_;
 };
diff --git a/plugins/input/csv/csv_datasource.hpp b/plugins/input/csv/csv_datasource.hpp
index 96931878c..0d9e28b34 100644
--- a/plugins/input/csv/csv_datasource.hpp
+++ b/plugins/input/csv/csv_datasource.hpp
@@ -38,6 +38,7 @@
 
 // stl
 #include <vector>
+#include <deque>
 #include <string>
 
 class csv_datasource : public mapnik::datasource
@@ -66,7 +67,7 @@ private:
     std::string inline_string_;
     unsigned file_length_;
     mapnik::value_integer row_limit_;
-    std::vector<mapnik::feature_ptr> features_;
+    std::deque<mapnik::feature_ptr> features_;
     std::string escape_;
     std::string separator_;
     std::string quote_;