diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 30b785f330..d98066d1bf 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -1,13 +1,13 @@
-# c stands for core, i stands for Interface
+# i stands for Interface
+add_library(corei_gameengine_include INTERFACE)
 add_library(corei_libraries_include INTERFACE)
 add_library(corei_libraries_source_wwvegas INTERFACE)
-add_library(corei_libraries_source_wwvegas_wwdebug INTERFACE)
 add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(corei_always INTERFACE)
 
+target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(corei_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
 target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
 target_link_libraries(corei_always INTERFACE
     core_utility
diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
index 838818eff2..64042c36d2 100644
--- a/Generals/Code/CMakeLists.txt
+++ b/Generals/Code/CMakeLists.txt
@@ -1,23 +1,13 @@
 # g stands for Generals, i stands for Interface
-add_library(gi_gameengine INTERFACE)
 add_library(gi_gameengine_include INTERFACE)
-add_library(gi_gameenginedevice_include INTERFACE)
 add_library(gi_libraries_include INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
-add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwmath INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(gi_main INTERFACE)
 add_library(gi_always INTERFACE)
 
-target_include_directories(gi_gameengine INTERFACE "GameEngine")
 target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
-target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
 target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
-target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")
 
 target_compile_definitions(gi_always INTERFACE
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
index b55deed164..6396b3c62a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
+++ b/Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
@@ -2,6 +2,7 @@ add_library(g_wwdownload STATIC)
 set_target_properties(g_wwdownload PROPERTIES OUTPUT_NAME wwdownload)
 
 target_link_libraries(g_wwdownload PRIVATE
+    corei_gameengine_include
     corei_wwdownload
     gi_always
     gi_gameengine_include
diff --git a/Generals/Code/Tools/ParticleEditor/CMakeLists.txt b/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
index bf7005ea58..97a86421c3 100644
--- a/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
+++ b/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
@@ -39,6 +39,7 @@ target_include_directories(g_particleeditor PRIVATE
 target_compile_definitions(g_particleeditor PRIVATE _AFXDLL)
 
 target_link_libraries(g_particleeditor PRIVATE
+    corei_gameengine_include
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     d3d8lib
diff --git a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
index 42bd24e67e..47f98e75ee 100644
--- a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
+++ b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -210,8 +210,6 @@ target_link_libraries(g_worldbuilder PRIVATE
     core_browserdispatch
     g_gameengine
     g_gameenginedevice
-    gi_gameengine_include
-    gi_gameenginedevice_include
     gi_always
     imm32
     vfw32
diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt
index 856b64d0b7..9e2dd712e5 100644
--- a/GeneralsMD/Code/CMakeLists.txt
+++ b/GeneralsMD/Code/CMakeLists.txt
@@ -1,23 +1,13 @@
 # z stands for Zero Hour, i stands for Interface
-add_library(zi_gameengine INTERFACE)
 add_library(zi_gameengine_include INTERFACE)
-add_library(zi_gameenginedevice_include INTERFACE)
 add_library(zi_libraries_include INTERFACE)
 add_library(zi_libraries_source_wwvegas INTERFACE)
-add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(zi_libraries_source_wwvegas_wwmath INTERFACE)
-add_library(zi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(zi_main INTERFACE)
 add_library(zi_always INTERFACE)
 
-target_include_directories(zi_gameengine INTERFACE "GameEngine")
 target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include")
-target_include_directories(zi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
 target_include_directories(zi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(zi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(zi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
-target_include_directories(zi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(zi_main INTERFACE "Main")
 
 target_compile_definitions(zi_always INTERFACE
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
index df1e5ef920..c1e5aecb31 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
@@ -2,6 +2,7 @@ add_library(z_wwdownload STATIC)
 set_target_properties(z_wwdownload PROPERTIES OUTPUT_NAME wwdownload)
 
 target_link_libraries(z_wwdownload PRIVATE
+    corei_gameengine_include
     corei_wwdownload
     zi_always
     zi_gameengine_include
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
index 0b410f3470..2dcf62fb15 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
@@ -39,6 +39,7 @@ target_include_directories(z_particleeditor PRIVATE
 target_link_libraries(z_particleeditor PRIVATE
     core_debug
     core_profile
+    corei_gameengine_include
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     d3d8lib
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
index d984b45440..ba3dac3441 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -220,8 +220,6 @@ target_link_libraries(z_worldbuilder PRIVATE
     core_browserdispatch
     z_gameengine
     z_gameenginedevice
-    zi_gameengine_include
-    zi_gameenginedevice_include
     zi_always
 )