diff --git a/dGame/CMakeLists.txt b/dGame/CMakeLists.txt
index b40d4e53..76af2e7e 100644
--- a/dGame/CMakeLists.txt
+++ b/dGame/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(dGameBase OBJECT ${DGAME_SOURCES})
 target_precompile_headers(dGameBase PRIVATE ${HEADERS_DGAME})
 target_include_directories(dGameBase PUBLIC "." "dEntity"
 	PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory"
+	$<TARGET_PROPERTY:dPropertyBehaviors,INTERFACE_INCLUDE_DIRECTORIES>
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 	"${PROJECT_SOURCE_DIR}/dCommon/dClient"
diff --git a/dGame/dComponents/CMakeLists.txt b/dGame/dComponents/CMakeLists.txt
index 4b691154..c9f0177c 100644
--- a/dGame/dComponents/CMakeLists.txt
+++ b/dGame/dComponents/CMakeLists.txt
@@ -51,6 +51,8 @@ set(DGAME_DCOMPONENTS_SOURCES
 
 add_library(dComponents OBJECT ${DGAME_DCOMPONENTS_SOURCES})
 target_include_directories(dComponents PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # via ModelComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors/ControlBehaviorMessages"
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt
index f3f57ba4..8717da79 100644
--- a/dNet/CMakeLists.txt
+++ b/dNet/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(dNet PRIVATE
 	${PROJECT_SOURCE_DIR}/dCommon/dEnums
 
 	${PROJECT_SOURCE_DIR}/dZoneManager
-	
+
 	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase
 	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables
 	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase
diff --git a/dScripts/02_server/CMakeLists.txt b/dScripts/02_server/CMakeLists.txt
index 53a8ee46..8114b226 100644
--- a/dScripts/02_server/CMakeLists.txt
+++ b/dScripts/02_server/CMakeLists.txt
@@ -55,4 +55,3 @@ target_include_directories(dScriptsServer INTERFACE
 	$<TARGET_PROPERTY:dScriptsServerMap,INTERFACE_INCLUDE_DIRECTORIES>
 	$<TARGET_PROPERTY:dScriptsServerPets,INTERFACE_INCLUDE_DIRECTORIES>
 )
-