diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp
index 514723b8d..915655f6a 100644
--- a/plugins/input/shape/shape_index_featureset.cpp
+++ b/plugins/input/shape/shape_index_featureset.cpp
@@ -87,7 +87,7 @@ feature_ptr shape_index_featureset<filterT>::next()
 
     while ( itr_ != offsets_.end())
     {
-        int offset = itr_->offset;
+        std::uint64_t offset = itr_->offset;
         shape_ptr_->move_to(offset);
         std::vector<std::pair<int,int>> parts;
         while (itr_ != offsets_.end() && itr_->offset == offset)
diff --git a/plugins/input/shape/shape_index_featureset.hpp b/plugins/input/shape/shape_index_featureset.hpp
index e045fa4ad..2bed21b2a 100644
--- a/plugins/input/shape/shape_index_featureset.hpp
+++ b/plugins/input/shape/shape_index_featureset.hpp
@@ -50,13 +50,13 @@ namespace mapnik { namespace detail
 struct node
 {
     node() = default;
-    node(int offset_, int start_, int end_)
+    node(std::uint64_t offset_, std::int32_t start_, std::int32_t end_)
         : offset(offset_),
           start(start_),
           end(end_) {}
-    int offset;
-    int start;
-    int end;
+    std::uint64_t offset;
+    std::int32_t start;
+    std::int32_t end;
 };
 }} // ns
 
diff --git a/utils/shapeindex/shapeindex.cpp b/utils/shapeindex/shapeindex.cpp
index 5dc525fd3..5b00bce95 100644
--- a/utils/shapeindex/shapeindex.cpp
+++ b/utils/shapeindex/shapeindex.cpp
@@ -26,6 +26,7 @@
 #include <mapnik/version.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/quad_tree.hpp>
+#include <mapnik/util/spatial_index.hpp>
 #include <mapnik/geometry/envelope.hpp>
 #include "shapefile.hpp"
 #include "shape_io.hpp"