diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 71cbb64b29c..15d618b088d 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,6 +1,11 @@
-
 SUBDIRS(plugins)
 
+IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(
+    ../src/core/spatialite/headers
+    ../src/core/spatialite/headers/spatialite
+  )
+ENDIF (WITH_INTERNAL_SPATIALITE)
 
 INCLUDE_DIRECTORIES(
     ${PYTHON_INCLUDE_PATH}
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 14db19bc236..4c11f2c50f0 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -317,9 +317,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${QT_QTUITOOLS_INCLUDE_DIR}
-  ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
-  ${GDAL_INCLUDE_DIR}
   ../core
   ../core/gps ../core/gps/qextserialport
   ../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
@@ -330,19 +327,27 @@ INCLUDE_DIRECTORIES(
   gps/qwtpolar
   )
 
+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)
+ENDIF (HAVE_SPATIALITE)
+
+INCLUDE_DIRECTORIES(
+  ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
+  ${GDAL_INCLUDE_DIR}
+)
+
 IF (POSTGRES_FOUND)
   INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
 ENDIF (POSTGRES_FOUND)
 
-IF (HAVE_SPATIALITE)
-  INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
-
-  IF (NOT WITH_INTERNAL_SPATIALITE)
-    INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-    ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
-  ENDIF (NOT WITH_INTERNAL_SPATIALITE)
-ENDIF (HAVE_SPATIALITE)
-
 #############
 
 IF (WIN32)
diff --git a/src/app/qgsspatialitesourceselect.h b/src/app/qgsspatialitesourceselect.h
index 522ba426106..97f72cef935 100644
--- a/src/app/qgsspatialitesourceselect.h
+++ b/src/app/qgsspatialitesourceselect.h
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-#include <spatialite/sqlite3.h>
+#include <sqlite3.h>
 }
 
 #include <QThread>
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 3353c644735..09e1ff2df26 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -95,25 +95,27 @@ qgsprojectbadlayerguihandler.h
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(
-${QT_QTUITOOLS_INCLUDE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
-../core
-../core/composer
-../core/raster
-../core/renderer
-../core/symbology
-../core/symbology-ng
-${CMAKE_CURRENT_BINARY_DIR}
-${CMAKE_CURRENT_BINARY_DIR}/../ui
-${GEOS_INCLUDE_DIR}
+  ${QT_QTUITOOLS_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
+  ../core
+  ../core/composer
+  ../core/raster
+  ../core/renderer
+  ../core/symbology
+  ../core/symbology-ng
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui
 )
 IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(../core/spatialite/headers)
   INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
 ELSE (WITH_INTERNAL_SPATIALITE)
   INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
+INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
+
 IF (WIN32)
   IF (MSVC)
     ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")