diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index b2ca5195cf718a278d3e2ef8f323fac8cf5f7efa..13cbea764ea57063cfa3b3c9dcd4872450d4679b 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -135,7 +135,6 @@ set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}/../Base
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/DiagramView
 	${CMAKE_CURRENT_BINARY_DIR}/StratView
 	${SOURCE_DIR_REL}/BaseLib
@@ -144,7 +143,6 @@ include_directories(
 	${SOURCE_DIR_REL}/MeshGeoToolsLib
 	${SOURCE_DIR_REL}/MeshLib
 	${SOURCE_DIR_REL}/FileIO
-	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
 	${CMAKE_CURRENT_SOURCE_DIR}/StratView
 	${GUI_SOURCE_DIR_REL}/Base
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 96b539bb74b41710cee3a725e9353aa44e19e3f4..a554c71675a91cc829d1cc0466391154fde9890f 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -44,7 +44,6 @@ include_directories(
 	${SOURCE_DIR_REL}/BaseLib
 	${SOURCE_DIR_REL}/GeoLib
 	${SOURCE_DIR_REL}/MathLib
-	${CMAKE_CURRENT_SOURCE_DIR}
 	${GUI_SOURCE_DIR_REL}/Base
 	${GUI_SOURCE_DIR_REL}/DataView
 	${CMAKE_CURRENT_BINARY_DIR}/../../DataView
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 0c210c8c020b41e9bff0c747643ff0797a9a700d..aff61e9cdce9cd1624a77b0b0fc69665adba4f14 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -34,8 +34,6 @@ qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
 	${SOURCE_DIR_REL}/BaseLib
 	${SOURCE_DIR_REL}/GeoLib
 	${SOURCE_DIR_REL}/MathLib
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 913eceacf04b81c0d8b083c2cdbf67e80b913c0a..8a6a30005ef20fef9d0d681bfa6f9b77685f5275 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -18,8 +18,6 @@ source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index d29b7b0bcf25087fa30a6e8c3f2f16926044c8f8..39879af65c067c5b5b26d679c5c1cb7c1721adfb 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -124,7 +124,6 @@ qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
 	${SOURCE_DIR_REL}/BaseLib
 	${SOURCE_DIR_REL}/GeoLib
 	${SOURCE_DIR_REL}/MathLib
@@ -134,7 +133,6 @@ include_directories(
 	${GUI_SOURCE_DIR_REL}/Base
 	${GUI_SOURCE_DIR_REL}/DataView
 
-	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
 	${CMAKE_CURRENT_BINARY_DIR}/../DataView
 )
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index 4eb8b7366c3b2b8d98ebe705617c18df2ac459fa..d7a9effb4acaac41215e2ff2dbd671dd71e974ce 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(
-	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/FileIO
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 3ec91b0cfb5262f315c7818e06a73d0d4cffdd53..9c3ef3235741e4ea36f92f213528efcb45ea4c35 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 include_directories(
-	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/FileIO
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 5fb35a4cf014bdd9d3a3c2b16303469c51770d64..8d67ddb55f439b3c147f261e9026d59e6a473ead 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 include_directories(
-	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/FileIO
 	${CMAKE_SOURCE_DIR}/FileIO/Legacy
diff --git a/ThirdParty/gtest/CMakeLists.txt b/ThirdParty/gtest/CMakeLists.txt
index e1e88d24158b2ac64e4909e42d5a963d34ae9db5..b4edeff3698b2564f26e68f128b0b7313c36d272 100644
--- a/ThirdParty/gtest/CMakeLists.txt
+++ b/ThirdParty/gtest/CMakeLists.txt
@@ -10,7 +10,7 @@ else ()
   add_definitions (-DGTEST_HAS_PTHREAD=0)
 endif ()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_library (GTest src/gtest-all.cc)
 
 set_target_properties(GTest PROPERTIES FOLDER Testing)
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index eec1f587ff4a95fbefaf5d7ead1db766dea57287..158c797a2620e8c5efa0ddd6f77147353644b91a 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -71,3 +71,5 @@ if(APPLE)
 	endif()
 endif()
 mark_as_advanced(OSX_VERSION OSX_VERSION_NAME)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)