diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1c91108d188a11f6c15da2f4cd465cb9a1ed092..b6e63560011f6ee0a317a8cf9aef90953b3503f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,6 +181,8 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     # MSVC warning C4996 mostly fires on completely valid code. The changes
     # proposed in the warning text often seriously compromise the code
diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
index 00a4a283bdcfd4ed2c8a88f6ebd466bb4da82a42..81d1206538833849c395b343eb8b98ff0a8ce533 100644
--- a/cmd/dot/CMakeLists.txt
+++ b/cmd/dot/CMakeLists.txt
@@ -2,7 +2,6 @@ add_definitions(-DDEMAND_LOADING=1)
 
 include_directories(
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 087bf15cf0d5d4bfbb2a4549cdddbea678976472..9d0bd26f4b31fb6b0dabed2f72aeb416d0187ecb 100644
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -27,8 +27,6 @@ function(add_simple_tool name)
 
     target_include_directories(${name} PRIVATE
         ${GRAPHVIZ_LIB_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
         ${GRAPHVIZ_LIB_DIR}/cdt
         ${GRAPHVIZ_LIB_DIR}/cgraph
         ${GRAPHVIZ_LIB_DIR}/common
@@ -68,8 +66,6 @@ add_executable(dijkstra
 
 target_include_directories(dijkstra PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -104,8 +100,6 @@ add_executable(gml2gv
 
 target_include_directories(gml2gv PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -177,8 +171,6 @@ add_executable(graphml2gv
 
 target_include_directories(graphml2gv PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -212,8 +204,6 @@ add_executable(gvcolor
 
 target_include_directories(gvcolor PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -240,8 +230,6 @@ add_executable(gvgen
 
 target_include_directories(gvgen PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -273,8 +261,6 @@ add_executable(gvpack
 
 target_include_directories(gvpack PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -307,8 +293,6 @@ add_executable(gxl2gv
 
 target_include_directories(gxl2gv PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -340,8 +324,6 @@ add_executable(mm2gv
 
 target_include_directories(mm2gv PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
@@ -372,8 +354,6 @@ add_executable(sccmap
 
 target_include_directories(sccmap PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common
diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 2620f1867b7d51b26b021da21728148262f0be24..eec3a4fbca8418a81eb3629f09f098eb88ba3dc0 100644
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -107,8 +107,6 @@ add_library(common_obj OBJECT
 
 target_include_directories(common_obj PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/gvc
diff --git a/lib/expr/CMakeLists.txt b/lib/expr/CMakeLists.txt
index d58a7d455f086d5ba53d72644acad436acd430e9..1e91608894e8bdf2672b864ea72ed397449eb8cc 100644
--- a/lib/expr/CMakeLists.txt
+++ b/lib/expr/CMakeLists.txt
@@ -62,7 +62,6 @@ add_library(expr STATIC
 
 target_include_directories(expr PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/.. # needed to find generated expr/exparse.h
     ${GRAPHVIZ_LIB_DIR}/ast
     ${GRAPHVIZ_LIB_DIR}/vmalloc
diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
index 0796c86efc6ca25241c4273b0039a2f3909625c9..9ab21541d3c9195ae1f702839d2d5b49243e4aff 100644
--- a/lib/gvpr/CMakeLists.txt
+++ b/lib/gvpr/CMakeLists.txt
@@ -38,7 +38,6 @@ add_library(gvpr STATIC
 
 target_include_directories(gvpr PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/.. # needed to find generated expr/exparse.h
     ${CMAKE_CURRENT_BINARY_DIR}/../common # needed to find generated common/colortbl.h
     ${GRAPHVIZ_LIB_DIR}/ast
diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt
index 2f003e7791863b971e7bede8a124074095bf69de..a7d4f45ccc2a95e713cf902aac5294ed9457e5c8 100644
--- a/plugin/core/CMakeLists.txt
+++ b/plugin/core/CMakeLists.txt
@@ -28,8 +28,6 @@ add_library(gvplugin_core SHARED
 
 target_include_directories(gvplugin_core PRIVATE
     ${GRAPHVIZ_LIB_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
     ${GRAPHVIZ_LIB_DIR}/common