diff --git a/cmake/FindSpatialindex.cmake b/cmake/FindSpatialindex.cmake
index 7a564649497..35393aa54ab 100644
--- a/cmake/FindSpatialindex.cmake
+++ b/cmake/FindSpatialindex.cmake
@@ -11,7 +11,7 @@
 #
 
 
-FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
+FIND_PATH(SPATIALINDEX_INCLUDE_DIR spatialindex/SpatialIndex.h PATHS
   /usr/include
   /usr/local/include
   "$ENV{LIB_DIR}/include"
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
index ccfce6ab262..dc911488d2d 100644
--- a/src/core/qgspointlocator.cpp
+++ b/src/core/qgspointlocator.cpp
@@ -23,7 +23,7 @@
 #include "qgslogger.h"
 #include "qgsrenderer.h"
 
-#include <SpatialIndex.h>
+#include <spatialindex/SpatialIndex.h>
 
 #include <QLinkedListIterator>
 
diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp
index b99fae8c12c..ddac2a5a2ae 100644
--- a/src/core/qgsspatialindex.cpp
+++ b/src/core/qgsspatialindex.cpp
@@ -23,7 +23,7 @@
 #include "qgsfeaturesource.h"
 #include "qgsfeedback.h"
 
-#include "SpatialIndex.h"
+#include <spatialindex/SpatialIndex.h>
 #include <QMutex>
 #include <QMutexLocker>