diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
index 480a3419a8..5dfd35fbe9 100644
--- a/Generals/Code/CMakeLists.txt
+++ b/Generals/Code/CMakeLists.txt
@@ -3,7 +3,6 @@ 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 INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
 add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwdebug INTERFACE)
@@ -16,7 +15,6 @@ 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 INTERFACE "Libraries/Source")
 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_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
index af054998b4..0ee15c5a09 100644
--- a/Generals/Code/GameEngine/CMakeLists.txt
+++ b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1084,7 +1084,6 @@ target_include_directories(g_gameengine PRIVATE
 
 target_link_libraries(g_gameengine PRIVATE
     gi_libraries_include
-    gi_libraries_source
 )
 
 target_link_libraries(g_gameengine PUBLIC
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index 6727e578d9..fe21dd9020 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -193,7 +193,6 @@ target_include_directories(g_gameenginedevice PUBLIC
 
 target_link_libraries(g_gameenginedevice PRIVATE
     gi_libraries_include
-    gi_libraries_source
     gi_main
 )
 
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
index 3c435234cb..27a507a32a 100644
--- a/Generals/Code/Main/CMakeLists.txt
+++ b/Generals/Code/Main/CMakeLists.txt
@@ -18,7 +18,6 @@ target_link_libraries(g_generals PRIVATE
     g_gameengine
     g_gameenginedevice
     gi_libraries_include
-    gi_libraries_source
     imm32
     milesstub
     safedisc
diff --git a/Generals/Code/Tools/Compress/CMakeLists.txt b/Generals/Code/Tools/Compress/CMakeLists.txt
index 4a3d175cd2..fa9bb1f38e 100644
--- a/Generals/Code/Tools/Compress/CMakeLists.txt
+++ b/Generals/Code/Tools/Compress/CMakeLists.txt
@@ -12,7 +12,6 @@ target_sources(g_compress PRIVATE ${COMRPESS_SRC})
 target_link_libraries(g_compress PRIVATE
     g_compression
     gi_libraries_include
-    gi_libraries_source
     gz_config
 )
 
diff --git a/Generals/Code/Tools/Compress/Compress.cpp b/Generals/Code/Tools/Compress/Compress.cpp
index 70584e5408..b6a505938f 100644
--- a/Generals/Code/Tools/Compress/Compress.cpp
+++ b/Generals/Code/Tools/Compress/Compress.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdio>
 #include "Lib/BaseType.h"
-#include "Compression/Compression.h"
+#include "Compression.h"
 #include "../CRCDiff/debug.h"
 
 #ifndef DEBUG
diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt
index 8cd99b0cdd..589f534b18 100644
--- a/GeneralsMD/Code/CMakeLists.txt
+++ b/GeneralsMD/Code/CMakeLists.txt
@@ -3,7 +3,6 @@ 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 INTERFACE)
 add_library(zi_libraries_source_wwvegas INTERFACE)
 add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
 add_library(zi_libraries_source_wwvegas_wwdebug INTERFACE)
@@ -16,7 +15,6 @@ 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 INTERFACE "Libraries/Source")
 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_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
index f2caf0c03d..41bf376983 100644
--- a/GeneralsMD/Code/GameEngine/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -1167,7 +1167,6 @@ target_include_directories(z_gameengine PRIVATE
 
 target_link_libraries(z_gameengine PRIVATE
     zi_libraries_include
-    zi_libraries_source
 )
 
 target_link_libraries(z_gameengine PUBLIC
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index 646c2abf2c..6e2342d91f 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -206,7 +206,6 @@ target_include_directories(z_gameenginedevice PUBLIC
 
 target_link_libraries(z_gameenginedevice PRIVATE
     zi_libraries_include
-    zi_libraries_source
     zi_main
 )
 
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
index 4c4f7638bc..f1a9f03c40 100644
--- a/GeneralsMD/Code/Main/CMakeLists.txt
+++ b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -25,7 +25,6 @@ target_link_libraries(z_generals PRIVATE
     z_gameenginedevice
     z_profile
     zi_libraries_include
-    zi_libraries_source
 )
 
 # TODO Originally referred to build host and user, replace with git info perhaps?
diff --git a/GeneralsMD/Code/Tools/Compress/CMakeLists.txt b/GeneralsMD/Code/Tools/Compress/CMakeLists.txt
index dc867ecb88..a6d1528300 100644
--- a/GeneralsMD/Code/Tools/Compress/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/Compress/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(z_compress PRIVATE
     gz_config
     z_compression
     zi_libraries_include
-    zi_libraries_source
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/GeneralsMD/Code/Tools/Compress/Compress.cpp b/GeneralsMD/Code/Tools/Compress/Compress.cpp
index 3f77d2f40f..6b12e69038 100644
--- a/GeneralsMD/Code/Tools/Compress/Compress.cpp
+++ b/GeneralsMD/Code/Tools/Compress/Compress.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdio>
 #include "Lib/BaseType.h"
-#include "Compression/Compression.h"
+#include "Compression.h"
 #include "../CRCDiff/debug.h"
 
 #ifndef DEBUG