diff --git a/debian/rules b/debian/rules
@@ -13,7 +13,7 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_TEST_TARGET ?= Experimental
 
 DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze wheezy lucid maverick natty oneiric precise"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise"))
 DISTRIBUTION := sid
 endif
 
@@ -43,28 +43,16 @@ CMAKE_OPTS := \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-D WITH_APIDOC=TRUE
 
-ifneq (,$(findstring $(DISTRIBUTION),"sid"))
-	CMAKE_OPTS += -D WITH_PYSPATIALITE=FALSE
+ifeq (,$(findstring $(DISTRIBUTION),"sid"))
+	CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
-	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
-else
-	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
-endif
-
-ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
 	CMAKE_OPTS += -D WITH_GLOBE=FALSE
 else
 	CMAKE_OPTS += -D WITH_GLOBE=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"lenny"))
-	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=TRUE
-else
-	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE
-endif
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -94,13 +94,11 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_ASTYLE=TRUE ^
 	-D WITH_GLOBE=TRUE ^
-	-D WITH_INTERNAL_SPATIALITE=FALSE ^
-	-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
-	-D SQLITE3_LIBRARY=%OSGEO4W_ROOT%/lib/sqlite3_i.lib ^
-	-D SPATIALITE_LIBRARY=%OSGEO4W_ROOT%/lib/spatialite_i.lib ^
+	-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c_i.lib ^
+	-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
+	-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
@@ -130,11 +128,11 @@ if not errorlevel 1 goto error
 
 echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
-if errorlevel 1 goto error 
+if errorlevel 1 goto error
 
 echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
-if errorlevel 1 goto error 
+if errorlevel 1 goto error
 
 echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -90,8 +90,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_GLOBE=TRUE ^
-	-D WITH_INTERNAL_SPATIALITE=FALSE ^
-	-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -7,13 +7,6 @@ IF (WITH_PYSPATIALITE)
   ADD_SUBDIRECTORY(pyspatialite)
 ENDIF (WITH_PYSPATIALITE)
 
-IF (WITH_INTERNAL_SPATIALITE)
-  INCLUDE_DIRECTORIES(
-    ../src/core/spatialite/headers
-    ../src/core/spatialite/headers/spatialite
-  )
-ENDIF (WITH_INTERNAL_SPATIALITE)
-
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
 SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
 
@@ -34,7 +27,6 @@ INCLUDE_DIRECTORIES(
     ../src/core/gps/qextserialport
     ../src/core/raster
     ../src/core/renderer
-    ../src/core/spatialindex
     ../src/core/symbology
     ../src/core/symbology-ng
     ${CMAKE_BINARY_DIR}  # qgsconfig.h, qgsversion.h

diff --git a/python/pyspatialite/CMakeLists.txt b/python/pyspatialite/CMakeLists.txt
@@ -1,13 +1,6 @@
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
 SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
 
-IF(WITH_INTERNAL_SPATIALITE)
-  INCLUDE_DIRECTORIES(
-    ../../src/core/spatialite/headers
-    ../../src/core/spatialite/headers/spatialite
-  )
-ENDIF(WITH_INTERNAL_SPATIALITE)
-
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_PATH}
   ${GEOS_INCLUDE_DIR}
@@ -44,11 +37,7 @@ IF (NOT APPLE)
   TARGET_LINK_LIBRARIES(pyspatialite ${PYTHON_LIBRARY})
 ENDIF (NOT APPLE)
 
-TARGET_LINK_LIBRARIES(pyspatialite qgis_core)
-
-IF(NOT WITH_INTERNAL_SPATIALITE)
-  TARGET_LINK_LIBRARIES(pyspatialite ${SPATIALITE_LIBRARY})
-ENDIF(NOT WITH_INTERNAL_SPATIALITE)
+TARGET_LINK_LIBRARIES(pyspatialite qgis_core ${SPATIALITE_LIBRARY})
 
 IF (APPLE)
   SET_TARGET_PROPERTIES(pyspatialite PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
@@ -60,11 +49,7 @@ IF (WIN32)
   SET_TARGET_PROPERTIES(pyspatialite PROPERTIES SUFFIX ".pyd")
 ENDIF (WIN32)
 
-FOREACH(file
-  lib/__init__.py
-  lib/dbapi2.py
-  lib/dump.py
-)
+FOREACH(file lib/__init__.py lib/dbapi2.py lib/dump.py)
   ADD_CUSTOM_COMMAND(TARGET pyspatialite
 	  POST_BUILD
 	  COMMAND ${CMAKE_COMMAND} -E copy ${file} ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite/${file}

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -341,11 +341,11 @@ ENDIF (POSTGRES_FOUND)
 IF (HAVE_SPATIALITE)
   SET (QGIS_APP_SRCS ${QGIS_APP_SRCS}
     qgsnewspatialitelayerdialog.cpp
-    )
+  )
   SET (QGIS_APP_MOC_HDRS ${QGIS_APP_MOC_HDRS}
     qgsnewspatialitelayerdialog.h
-    )
-ENDIF (HAVE_SPATIALITE)
+  )
+ENDIF(HAVE_SPATIALITE)
 
 
 SET(IMAGE_RCCS ../../images/images.qrc)
@@ -407,14 +407,9 @@ IF (ANDROID)
 ENDIF (ANDROID)
 
 IF (HAVE_SPATIALITE)
-  IF (WITH_INTERNAL_SPATIALITE)
-    INCLUDE_DIRECTORIES(../core/spatialite/headers)
-    INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
-  ELSE (WITH_INTERNAL_SPATIALITE)
-    INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
-    INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
-  ENDIF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
+  ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
 ENDIF (HAVE_SPATIALITE)
 
 INCLUDE_DIRECTORIES(
@@ -453,13 +448,11 @@ IF (ANDROID)
     TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} log)
 ENDIF (ANDROID)
 
-IF( WIN32 )
+IF(WIN32)
   ADD_DEFINITIONS(-DQWT_DLL)
 ENDIF( WIN32 )
 
-IF(NOT WITH_INTERNAL_SPATIALITE)
-  TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${SQLITE_LIBRARY})
-ENDIF(NOT WITH_INTERNAL_SPATIALITE)
+TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${SQLITE_LIBRARY})
 
 IF (APPLE)
   TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${APP_SERVICES_LIBRARY} )

diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
@@ -62,21 +62,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_CURRENT_BINARY_DIR}
   ${GDAL_INCLUDE_DIR} # remove once raster layer is cleaned up
+  ${SQLITE3_INCLUDE_DIR}
 )
 
-IF (WITH_INTERNAL_SPATIALITE)
-  INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
-ELSE (WITH_INTERNAL_SPATIALITE)
-  INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-ENDIF (WITH_INTERNAL_SPATIALITE)
-
-TARGET_LINK_LIBRARIES(qbrowser qgis_core qgis_gui)
-
-IF (NOT WITH_INTERNAL_SPATIALITE)
-  TARGET_LINK_LIBRARIES(qbrowser ${SQLITE3_LIBRARY})
-ENDIF (NOT WITH_INTERNAL_SPATIALITE)
-
 TARGET_LINK_LIBRARIES(qbrowser
+  qgis_core
+  qgis_gui
+  ${SQLITE3_LIBRARY}
   ${QT_QTCORE_LIBRARY}
   ${QT_QTGUI_LIBRARY}
   ${QT_QTNETWORK_LIBRARY}

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -195,58 +195,25 @@ IF(HAVE_ZLIB)
 ENDIF(HAVE_ZLIB)
 
 IF(WIN32)
-    SET(QGIS_CORE_SRCS
-        ${QGIS_CORE_SRCS}
-        gps/qextserialport/win_qextserialport.cpp
-        )
-    ADD_DEFINITIONS(-D_TTY_WIN_)
+  SET(QGIS_CORE_SRCS
+    ${QGIS_CORE_SRCS}
+    gps/qextserialport/win_qextserialport.cpp
+  )
+  ADD_DEFINITIONS(-D_TTY_WIN_)
 ELSE(WIN32)
-    SET(QGIS_CORE_SRCS
-        ${QGIS_CORE_SRCS}
-        gps/qextserialport/posix_qextserialport.cpp
-    )
-    ADD_DEFINITIONS(-D_TTY_POSIX_)
+  SET(QGIS_CORE_SRCS
+    ${QGIS_CORE_SRCS}
+    gps/qextserialport/posix_qextserialport.cpp
+  )
+  ADD_DEFINITIONS(-D_TTY_POSIX_)
 ENDIF(WIN32)
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-    SET(QGIS_CORE_SRCS
-        ${QGIS_CORE_SRCS}
-        gps/qgsqtlocationconnection.cpp
-        )
-ENDIF (QT_MOBILITY_LOCATION_FOUND)
-
-IF (WITH_INTERNAL_SPATIALITE)
-  IF (WIN32 OR APPLE OR ANDROID)
-    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
-  ENDIF (WIN32 OR APPLE OR ANDROID)
-  IF (WIN32)
-    ADD_DEFINITIONS(-DDLL_EXPORT)
-  ENDIF (WIN32)
-
-#
-# sqlite3 requires some extraflags to be defined
-# in order to support:
-# - huge database > 2 GB
-# - RTree Spatial Index
-#
-  ADD_DEFINITIONS(-D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1)
-  ADD_DEFINITIONS(-DSQLITE_ENABLE_RTREE=1)
-
   SET(QGIS_CORE_SRCS
     ${QGIS_CORE_SRCS}
-    spatialite/sqlite3.c
-    spatialite/spatialite.c
-    )
-
-  IF(MSVC)
-    # dirty code
-    SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS /W0)
-  ELSE(MSVC)
-    SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS -w)
-  ENDIF(MSVC)
-
-  INCLUDE_DIRECTORIES(BEFORE spatialite/headers/spatialite)
-ENDIF (WITH_INTERNAL_SPATIALITE)
+    gps/qgsqtlocationconnection.cpp
+  )
+ENDIF (QT_MOBILITY_LOCATION_FOUND)
 
 ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll qgsexpressionlexer.ll)
 
@@ -307,10 +274,10 @@ ENDIF(HAVE_ZLIB)
 
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-    SET(QGIS_CORE_MOC_HDRS
-        ${QGIS_CORE_MOC_HDRS}
-        gps/qgsqtlocationconnection.h
-        )
+  SET(QGIS_CORE_MOC_HDRS
+    ${QGIS_CORE_MOC_HDRS}
+    gps/qgsqtlocationconnection.h
+  )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
 
 QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
@@ -434,10 +401,10 @@ SET(QGIS_CORE_HDRS
 )
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-    SET(QGIS_CORE_HDRS
-        ${QGIS_CORE_HDRS}
-        gps/qgsqtlocationconnection.h
-        )
+  SET(QGIS_CORE_HDRS
+    ${QGIS_CORE_HDRS}
+    gps/qgsqtlocationconnection.h
+  )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
 
 INCLUDE_DIRECTORIES(
@@ -449,23 +416,13 @@ INCLUDE_DIRECTORIES(
   symbology
   symbology-ng
   gps/qextserialport
+  ${SPATIALINDEX_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
+  ${SQLITE3_INCLUDE_DIR}
 )
 
-# put SPATIALINDEX include dir in front
-# (otherwise GEOS's spatialite.h might be found first)
-IF (NOT WITH_INTERNAL_SPATIALINDEX)
-  INCLUDE_DIRECTORIES(BEFORE ${SPATIALINDEX_INCLUDE_DIR})
-ELSE (NOT WITH_INTERNAL_SPATIALINDEX)
-  INCLUDE_DIRECTORIES(BEFORE spatialindex/include)
-ENDIF (NOT WITH_INTERNAL_SPATIALINDEX)
-
-IF (NOT WITH_INTERNAL_SPATIALITE)
-  INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-ENDIF (NOT WITH_INTERNAL_SPATIALITE)
-
 IF (WIN32)
   IF (MSVC)
     ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
@@ -481,30 +438,6 @@ ELSE (WIN32)
     ADD_DEFINITIONS("-D_HAVE_PTHREAD_")
 ENDIF (WIN32)
 
-#############################################################
-# spatial indexing library
-
-IF (WITH_INTERNAL_SPATIALINDEX)
-  # add path prefix to every specified file
-  MACRO(PATH_PREFIX OUTPUT PREFIX)
-    FOREACH(F ${ARGN})
-      SET(${OUTPUT} ${${OUTPUT}} ${PREFIX}/${F})
-    ENDFOREACH(F)
-  ENDMACRO(PATH_PREFIX)
-
-  # tools library
-  PATH_PREFIX(TOOLS_SRC tools Tools.cc)
-
-  # spatial index library
-  PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc LineSegment.cc Point.cc Region.cc)
-  PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
-  PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
-
-  SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
-
-  PATH_PREFIX(INDEX_SRC spatialindex/src ${SPINDEX_SRC})
-ENDIF (WITH_INTERNAL_SPATIALINDEX)
-
 #############################################################
 # qgis_core library
 
@@ -555,29 +488,13 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${PROJ_LIBRARY}
   ${GEOS_LIBRARY}
   ${GDAL_LIBRARY}
+  ${SQLITE3_LIBRARY}
+  ${SPATIALINDEX_LIBRARY}
 )
 
-IF (WITH_INTERNAL_SPATIALITE)
-  IF (WIN32 OR APPLE)
-    TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
-  ENDIF (WIN32 OR APPLE)
-  IF (ANDROID)
-    TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY} ${CHARSET_LIBRARY})
-  ENDIF (ANDROID)
-  IF (UNIX AND NOT ANDROID)
-    TARGET_LINK_LIBRARIES(qgis_core pthread ${CMAKE_DL_LIBS})
-  ENDIF (UNIX AND NOT ANDROID)
-ELSE (WITH_INTERNAL_SPATIALITE)
-  TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
-ENDIF (WITH_INTERNAL_SPATIALITE)
-
-IF (NOT WITH_INTERNAL_SPATIALINDEX)
-  TARGET_LINK_LIBRARIES(qgis_core ${SPATIALINDEX_LIBRARY})
-ENDIF (NOT WITH_INTERNAL_SPATIALINDEX)
-
 IF (HAVE_ZLIB)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
-  TARGET_LINK_LIBRARIES(qgis_core ${ZLIB_LIBRARIES})
+  TARGET_LINK_LIBRARIES(qgis_core ${ZLIB_LIBRARY})
 ENDIF (HAVE_ZLIB)
 
 IF (APPLE)

diff --git a/src/core/spatialindex/README b/src/core/spatialindex/README
diff --git a/src/core/spatialindex/include/LineSegment.h b/src/core/spatialindex/include/LineSegment.h
diff --git a/src/core/spatialindex/include/Point.h b/src/core/spatialindex/include/Point.h
diff --git a/src/core/spatialindex/include/RTree.h b/src/core/spatialindex/include/RTree.h
diff --git a/src/core/spatialindex/include/Region.h b/src/core/spatialindex/include/Region.h
diff --git a/src/core/spatialindex/include/SpatialIndex.h b/src/core/spatialindex/include/SpatialIndex.h
diff --git a/src/core/spatialindex/include/Version.h b/src/core/spatialindex/include/Version.h
diff --git a/src/core/spatialindex/include/tools/PointerPool.h b/src/core/spatialindex/include/tools/PointerPool.h
diff --git a/src/core/spatialindex/include/tools/PoolPointer.h b/src/core/spatialindex/include/tools/PoolPointer.h
diff --git a/src/core/spatialindex/include/tools/SmartPointer.h b/src/core/spatialindex/include/tools/SmartPointer.h
diff --git a/src/core/spatialindex/include/tools/Tools.h b/src/core/spatialindex/include/tools/Tools.h
diff --git a/src/core/spatialindex/src/rtree/BulkLoader.cc b/src/core/spatialindex/src/rtree/BulkLoader.cc
diff --git a/src/core/spatialindex/src/rtree/BulkLoader.h b/src/core/spatialindex/src/rtree/BulkLoader.h
diff --git a/src/core/spatialindex/src/rtree/Index.cc b/src/core/spatialindex/src/rtree/Index.cc
diff --git a/src/core/spatialindex/src/rtree/Index.h b/src/core/spatialindex/src/rtree/Index.h
diff --git a/src/core/spatialindex/src/rtree/Leaf.cc b/src/core/spatialindex/src/rtree/Leaf.cc
diff --git a/src/core/spatialindex/src/rtree/Leaf.h b/src/core/spatialindex/src/rtree/Leaf.h
diff --git a/src/core/spatialindex/src/rtree/Node.cc b/src/core/spatialindex/src/rtree/Node.cc
diff --git a/src/core/spatialindex/src/rtree/Node.h b/src/core/spatialindex/src/rtree/Node.h
diff --git a/src/core/spatialindex/src/rtree/PointerPoolNode.h b/src/core/spatialindex/src/rtree/PointerPoolNode.h
diff --git a/src/core/spatialindex/src/rtree/RTree.cc b/src/core/spatialindex/src/rtree/RTree.cc
diff --git a/src/core/spatialindex/src/rtree/RTree.h b/src/core/spatialindex/src/rtree/RTree.h
diff --git a/src/core/spatialindex/src/rtree/Statistics.cc b/src/core/spatialindex/src/rtree/Statistics.cc
diff --git a/src/core/spatialindex/src/rtree/Statistics.h b/src/core/spatialindex/src/rtree/Statistics.h