diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index dc3308abd..9d86dd990 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -24,11 +24,15 @@
 #define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
 
 // mapnik
-#include <mapnik/datasource.hpp> // for featureset_ptr
 #include <mapnik/config.hpp>
+#include <mapnik/featureset.hpp>
+
+// boost
+#include <boost/optional.hpp>
 
 // stl
 #include <set>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -41,6 +45,7 @@ class projection;
 class proj_transform;
 class feature_type_style;
 class rule_cache;
+template <typename T> class box2d;
 
 enum eAttributeCollectionPolicy
 {
diff --git a/include/mapnik/featureset.hpp b/include/mapnik/featureset.hpp
new file mode 100644
index 000000000..a681b605c
--- /dev/null
+++ b/include/mapnik/featureset.hpp
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2013 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_FEATURESET_HPP
+#define MAPNIK_FEATURESET_HPP
+
+// mapnik
+#include <mapnik/config.hpp>
+#include <mapnik/noncopyable.hpp>
+
+// boost
+#include <boost/shared_ptr.hpp>
+
+namespace mapnik {
+
+class feature_impl;
+
+struct MAPNIK_DECL Featureset : private mapnik::noncopyable
+{
+    virtual boost::shared_ptr<feature_impl> next() = 0;
+    virtual ~Featureset() {}
+};
+
+typedef boost::shared_ptr<Featureset> featureset_ptr;
+
+}
+
+#endif // MAPNIK_FEATURESET_HPP