diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
index 418a7089f74..a41095ab897 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
@@ -35,7 +35,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "definition.h"
-#include "chunkio.h"
+#include "WWLib/chunkio.h"
 
 //////////////////////////////////////////////////////////////////////////////////
 //	Constants
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
index e87b19d4c15..d742ed7a3d7 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
@@ -36,7 +36,7 @@
 
 #include "definitionfactorymgr.h"
 #include "definitionfactory.h"
-#include "wwdebug.h"
+#include "WWDebug/wwdebug.h"
 
 #ifdef _UNIX
 #include "osdep.h"
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
index 997bd8085c1..468bab109ad 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
@@ -39,12 +39,12 @@
 #include "definitionfactory.h"
 #include "definitionfactorymgr.h"
 #include "definitionclassids.h"
-#include "chunkio.h"
+#include "WWLib/chunkio.h"
 #include "persistfactory.h"
-#include "wwdebug.h"
-#include "wwmemlog.h"
+#include "WWDebug/wwdebug.h"
+#include "WWDebug/wwmemlog.h"
 #include "twiddler.h"
-#include "wwprofile.h"
+#include "WWDebug/wwprofile.h"
 
 
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
index c947f3de843..26e8ef21ff0 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
@@ -40,7 +40,7 @@
 #include "parameter.h"
 #include "parametertypes.h"
 #include "simpleparameter.h"
-#include "wwstring.h"
+#include "WWLib/wwstring.h"
 #include "definitionclassids.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
index 615c4c51c49..73301dfe1a5 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
@@ -36,7 +36,7 @@
 
 
 #include "pointerremap.h"
-#include "wwdebug.h"
+#include "WWDebug/wwdebug.h"
 
 
 const int POINTER_TABLES_GROWTH_STEP = 4096;
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
index eb13fa35165..a384a6eaa46 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
@@ -39,15 +39,15 @@
 #include "saveloadsubsystem.h"
 #include "persist.h"
 #include "persistfactory.h"
-#include "chunkio.h"
-#include "wwdebug.h"
+#include "WWLib/chunkio.h"
+#include "WWDebug/wwdebug.h"
 #include "saveloadstatus.h"
-#include "wwhack.h"
-#include "wwprofile.h"
+#include "WWDebug/wwhack.h"
+#include "WWDebug/wwprofile.h"
 
 #pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union
 #include <windows.h>
-#include "systimer.h"
+#include "WWLib/systimer.h"
 
 
 SaveLoadSubSystemClass *		SaveLoadSystemClass::SubSystemListHead = nullptr;
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.cpp
index ed1b533bba6..11998389a39 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "saveloadstatus.h"
-#include "mutex.h"
+#include "WWLib/mutex.h"
 
 #define MAX_STATUS_TEXT_ID 2
 
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
index 9340de585ce..0ab0673f6d6 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
@@ -36,13 +36,13 @@
 
 
 #include "twiddler.h"
-#include "RANDOM.h"
+#include "WWLib/RANDOM.h"
 #include "saveloadids.h"
 #include "simpledefinitionfactory.h"
 #include "persistfactory.h"
-#include "win.h"
-#include "wwhack.h"
-#include "systimer.h"
+#include "WWLib/win.h"
+#include "WWDebug/wwhack.h"
+#include "WWLib/systimer.h"
 
 
 DECLARE_FORCE_LINK( Twiddler )
diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
index eb4ea7ec38d..0a608705bf6 100644
--- a/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
+++ b/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
@@ -18,7 +18,7 @@
 
 // TheSuperHackers @build feliwir 15/04/2025 Simple allocator implementation useful for tools
 
-#include "always.h"
+#include "WWLib/always.h"
 #include <stdlib.h>
 
 #ifdef _OPERATOR_NEW_DEFINED_
diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
index 903b170c453..d3e912c3c61 100644
--- a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
+++ b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
@@ -18,7 +18,7 @@
 
 // TheSuperHackers @build feliwir 15/04/2025 Simple debug implementation useful for tools
 
-#include "wwdebug.h"
+#include "WWDebug/wwdebug.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <Utility/stdio_adapter.h>