diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
index a35b6be91115..aac471013928 100644
--- a/src/core/qgspointlocator.cpp
+++ b/src/core/qgspointlocator.cpp
@@ -20,7 +20,7 @@
 #include "qgswkbptr.h"
 #include "qgis.h"
 
-#include <spatialindex/SpatialIndex.h>
+#include <SpatialIndex.h>
 
 #include <QLinkedListIterator>
 
diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
index dc5591039088..09aad1bfb3b4 100644
--- a/src/core/qgspointlocator.h
+++ b/src/core/qgspointlocator.h
@@ -23,10 +23,6 @@ class QgsVectorLayer;
 #include "qgspoint.h"
 #include "qgsrectangle.h"
 
-
-#include <spatialindex/SpatialIndex.h>
-
-
 class QgsCoordinateTransform;
 class QgsCoordinateReferenceSystem;
 
@@ -35,6 +31,12 @@ class QgsPointLocator_VisitorNearestEdge;
 class QgsPointLocator_VisitorArea;
 class QgsPointLocator_VisitorEdgesInRect;
 
+namespace SpatialIndex
+{
+  class IStorageManager;
+  class ISpatialIndex;
+}
+
 /**
  * @brief The class defines interface for querying point location:
  *  - query nearest vertices / edges to a point
diff --git a/src/plugins/topology/checkDock.h b/src/plugins/topology/checkDock.h
index e6457ddddbd1..dc2c3c7c252f 100644
--- a/src/plugins/topology/checkDock.h
+++ b/src/plugins/topology/checkDock.h
@@ -24,7 +24,6 @@
 #include <qgsgeometry.h>
 //#include <qgsvertexmarker.h>
 #include "qgsspatialindex.h"
-//#include <spatialindex/qgsspatialindex.h>
 
 #include "ui_checkDock.h"
 #include "rulesDialog.h"