diff --git a/plugins/input/shape/SConscript b/plugins/input/shape/SConscript
index 8d9bd9be6..851033dec 100644
--- a/plugins/input/shape/SConscript
+++ b/plugins/input/shape/SConscript
@@ -30,7 +30,7 @@ plugin_env = env.Clone()
 shape_src = Split(
   """
         dbfile.cpp
-        shape.cpp
+        shape_datasource.cpp
         shape_featureset.cpp
         shape_index_featureset.cpp
         shape_io.cpp
diff --git a/plugins/input/shape/shape.cpp b/plugins/input/shape/shape_datasource.cpp
similarity index 99%
rename from plugins/input/shape/shape.cpp
rename to plugins/input/shape/shape_datasource.cpp
index f089b44c6..d8f1978f4 100644
--- a/plugins/input/shape/shape.cpp
+++ b/plugins/input/shape/shape_datasource.cpp
@@ -32,9 +32,9 @@
 #include <boost/filesystem/operations.hpp>
 
 
+#include "shape_datasource.hpp"
 #include "shape_featureset.hpp"
 #include "shape_index_featureset.hpp"
-#include "shape.hpp"
 
 DATASOURCE_PLUGIN(shape_datasource)
 
diff --git a/plugins/input/shape/shape.hpp b/plugins/input/shape/shape_datasource.hpp
similarity index 100%
rename from plugins/input/shape/shape.hpp
rename to plugins/input/shape/shape_datasource.hpp
diff --git a/plugins/input/shape/shape_featureset.hpp b/plugins/input/shape/shape_featureset.hpp
index 32ad3ead8..92271b6c6 100644
--- a/plugins/input/shape/shape_featureset.hpp
+++ b/plugins/input/shape/shape_featureset.hpp
@@ -20,16 +20,22 @@
  *
  *****************************************************************************/
 
-#ifndef SHAPE_FS_HH
-#define SHAPE_FS_HH
+#ifndef SHAPE_FEATURESET_HPP
+#define SHAPE_FEATURESET_HPP
 
-#include <boost/scoped_ptr.hpp>
+//mapnik
 #include <mapnik/geom_util.hpp>
-#include "shape.hpp"
+#include <mapnik/datasource.hpp>
+
+#include "shape_io.hpp"
+
+//boost
+#include <boost/scoped_ptr.hpp>
 
 using mapnik::Featureset;
 using mapnik::box2d;
 using mapnik::feature_ptr;
+using mapnik::transcoder;
 
 template <typename filterT>
 class shape_featureset : public Featureset
@@ -58,4 +64,4 @@ class shape_featureset : public Featureset
       
 };
 
-#endif //SHAPE_FS_HH
+#endif //SHAPE_FEATURESET_HPP
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index d003a7fbe..036fc7d61 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -26,7 +26,7 @@
 #include <mapnik/geom_util.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include "shape.hpp"
+#include "shape_datasource.hpp"
 #include "shape_io.hpp"
 #include <set>
 #include <vector>
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index 69890434f..3e89520bd 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -23,7 +23,9 @@
 //$Id: shape_io.cc 26 2005-03-29 19:18:59Z pavlenko $
 
 #include "shape_io.hpp"
-#include "shape.hpp"
+
+#include <mapnik/datasource.hpp>
+// boost
 #include <boost/filesystem/operations.hpp>
 
 using mapnik::datasource_exception;