diff --git a/DebugUtils/CMakeLists.txt b/DebugUtils/CMakeLists.txt
index 52c1d2b..b094e4a 100644
--- a/DebugUtils/CMakeLists.txt
+++ b/DebugUtils/CMakeLists.txt
@@ -1,19 +1,21 @@
 file(GLOB SOURCES Source/*.cpp)
 
-include_directories(../Recast/Include)
-include_directories(../Detour/Include)
-include_directories(../DetourTileCache/Include)
-include_directories(Include)
-
 if (RECASTNAVIGATION_STATIC)
     add_library(DebugUtils STATIC ${SOURCES})
 else()
     add_library(DebugUtils SHARED ${SOURCES})
 endif()
 
+set(DebugUtils_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
+
+target_include_directories(DebugUtils PUBLIC
+    "$<BUILD_INTERFACE:${DebugUtils_INCLUDE_DIR}>"
+)
+
 target_link_libraries(DebugUtils
     Recast
     Detour
+    DetourTileCache
 )
 
 set_target_properties(DebugUtils PROPERTIES
diff --git a/Detour/CMakeLists.txt b/Detour/CMakeLists.txt
index eb6dd18..fedf468 100644
--- a/Detour/CMakeLists.txt
+++ b/Detour/CMakeLists.txt
@@ -1,13 +1,17 @@
 file(GLOB SOURCES Source/*.cpp)
 
-include_directories(Include)
-
 if(RECASTNAVIGATION_STATIC)
     add_library(Detour STATIC ${SOURCES})
 else()
     add_library(Detour SHARED ${SOURCES})
 endif()
 
+set(Detour_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
+
+target_include_directories(Detour PUBLIC
+    "$<BUILD_INTERFACE:${Detour_INCLUDE_DIR}>"
+)
+
 set_target_properties(Detour PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}
diff --git a/DetourCrowd/CMakeLists.txt b/DetourCrowd/CMakeLists.txt
index 7eab20e..a321d34 100644
--- a/DetourCrowd/CMakeLists.txt
+++ b/DetourCrowd/CMakeLists.txt
@@ -1,14 +1,17 @@
 file(GLOB SOURCES Source/*.cpp)
 
-include_directories(../Detour/Include)
-include_directories(Include)
-
 if (RECASTNAVIGATION_STATIC)
     add_library(DetourCrowd STATIC ${SOURCES})
 else ()
     add_library(DetourCrowd SHARED ${SOURCES})
 endif ()
 
+set(DetourCrowd_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
+
+target_include_directories(DetourCrowd PUBLIC
+    "$<BUILD_INTERFACE:${DetourCrowd_INCLUDE_DIR}>"
+)
+
 target_link_libraries(DetourCrowd
     Detour
 )
diff --git a/DetourTileCache/CMakeLists.txt b/DetourTileCache/CMakeLists.txt
index 1760cf7..12a99a7 100644
--- a/DetourTileCache/CMakeLists.txt
+++ b/DetourTileCache/CMakeLists.txt
@@ -1,14 +1,17 @@
 file(GLOB SOURCES Source/*.cpp)
 
-include_directories(../Detour/Include)
-include_directories(Include)
-
 if (RECASTNAVIGATION_STATIC)
     add_library(DetourTileCache STATIC ${SOURCES})
 else ()
     add_library(DetourTileCache SHARED ${SOURCES})
 endif ()
 
+set(DetourTileCache_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
+
+target_include_directories(DetourTileCache PUBLIC
+    "$<BUILD_INTERFACE:${DetourTileCache_INCLUDE_DIR}>"
+)
+
 target_link_libraries(DetourTileCache
     Detour
 )
diff --git a/Recast/CMakeLists.txt b/Recast/CMakeLists.txt
index 94da596..6400576 100644
--- a/Recast/CMakeLists.txt
+++ b/Recast/CMakeLists.txt
@@ -1,13 +1,17 @@
 file(GLOB SOURCES Source/*.cpp)
 
-include_directories(Include)
-
 if (RECASTNAVIGATION_STATIC)
     add_library(Recast STATIC ${SOURCES})
 else ()
     add_library(Recast SHARED ${SOURCES})
 endif ()
 
+set(Recast_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Include")
+
+target_include_directories(Recast PUBLIC
+    "$<BUILD_INTERFACE:${Recast_INCLUDE_DIR}>"
+)
+
 set_target_properties(Recast PROPERTIES
         SOVERSION ${SOVERSION}
         VERSION ${VERSION}