diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index ecebd564696..357022a1975 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -237,6 +237,10 @@ add_library(corei_ww3d2 INTERFACE)
 
 target_sources(corei_ww3d2 INTERFACE ${WW3D2_SRC})
 
+target_include_directories(corei_ww3d2 INTERFACE
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
 if (MSVC AND NOT IS_VS6_BUILD)
     target_link_libraries(corei_ww3d2 INTERFACE
         comsuppw
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
index c0ded889965..4575787c265 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
@@ -63,14 +63,14 @@
 
 
 #include "aabtree.h"
-#include "WW3D2/aabtreebuilder.h"
+#include "aabtreebuilder.h"
 #include "WWDebug/wwdebug.h"
 #include "WWMath/tri.h"
-#include "WW3D2/meshgeometry.h"
+#include "meshgeometry.h"
 #include "coltest.h"
 #include "inttest.h"
 #include "WWMath/colmathinlines.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "WWLib/chunkio.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
index e25b3025e97..50b348b8f8a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
@@ -38,7 +38,7 @@
 #include "w3derr.h"
 #include "WWLib/chunkio.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "matinfo.h"
 #include "texture.h"
 #include "WWLib/wwstring.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
index 27090e0293b..e9891096184 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
@@ -39,10 +39,10 @@
 
 #include "bmp2d.h"
 #include "WWMath/pot.h"
-#include "WW3D2/ww3d.h"
+#include "ww3d.h"
 #include "texture.h"
 #include "surfaceclass.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "textureloader.h"
 #include "ww3dformat.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
index 21263e451b4..de9f20afc2b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
@@ -73,11 +73,11 @@
 
 #include "collect.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/camera.h"
+#include "camera.h"
 #include "WWDebug/wwdebug.h"
 #include "snapPts.h"
-#include "WW3D2/assetmgr.h"
-#include "WW3D2/ww3d.h"
+#include "assetmgr.h"
+#include "ww3d.h"
 #include "w3derr.h"
 //#include "sr.hpp"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
index a7b54dc0b7b..ff6e93eb84d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
@@ -49,9 +49,9 @@
 
 #include "decalsys.h"
 #include "rendobj.h"
-#include "WW3D2/mesh.h"
-#include "WW3D2/decalmsh.h"
-#include "WW3D2/matrixmapper.h"
+#include "mesh.h"
+#include "decalmsh.h"
+#include "matrixmapper.h"
 #include "texture.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
index ce5a900357f..c2db8f3d1f6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
@@ -79,14 +79,14 @@
 
 #include "distlod.h"
 #include "WWLib/nstrdup.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/assetmgr.h"
-#include "WW3D2/camera.h"
+#include "ww3d.h"
+#include "assetmgr.h"
+#include "camera.h"
 #include "w3derr.h"
 #include "WWDebug/wwdebug.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/hlod.h"
-#include "WW3D2/rinfo.h"
+#include "hlod.h"
+#include "rinfo.h"
 #include "coltest.h"
 #include "inttest.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
index 31394a37617..17307f627a2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
@@ -51,15 +51,15 @@
 #include "WWDebug/wwdebug.h"
 #include "WWDebug/wwprofile.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/rinfo.h"
+#include "rinfo.h"
 #include "statistics.h"
-#include "WW3D2/meshmdl.h"
+#include "meshmdl.h"
 #include "WWMath/vp.h"
-#include "WW3D2/decalmsh.h"
+#include "decalmsh.h"
 #include "matpass.h"
-#include "WW3D2/camera.h"
+#include "camera.h"
 #include "stripoptimizer.h"
-#include "WW3D2/meshgeometry.h"
+#include "meshgeometry.h"
 
 /*
 ** Global Instance of the DX8MeshRender
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp
index bb0b3b0fb6f..11e8c0b789a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp
@@ -18,8 +18,8 @@
 
 #include "dx8rendererdebugger.h"
 #include "WWLib/hashtemplate.h"
-#include "WW3D2/mesh.h"
-#include "WW3D2/meshmdl.h"
+#include "mesh.h"
+#include "meshmdl.h"
 
 static HashTemplateClass<unsigned, MeshClass*> MeshHash;
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
index ab9bcdce743..180e3aa03e0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
@@ -31,7 +31,7 @@
 //******************************************************************************************
 
 #include "dx8webbrowser.h"
-#include "WW3D2/ww3d.h"
+#include "ww3d.h"
 #include "dx8wrapper.h"
 
 #if ENABLE_EMBEDDED_BROWSER
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
index bc2a6eeeeca..ba897a753a5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
@@ -56,22 +56,22 @@
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
 #include "dx8renderer.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/camera.h"
+#include "ww3d.h"
+#include "camera.h"
 #include "WWLib/wwstring.h"
 #include "WWMath/matrix4.h"
-#include "WW3D2/vertmaterial.h"
+#include "vertmaterial.h"
 #include "rddesc.h"
-#include "WW3D2/lightenvironment.h"
+#include "lightenvironment.h"
 #include "statistics.h"
 #include "WWLib/registry.h"
-#include "WW3D2/boxrobj.h"
+#include "boxrobj.h"
 #include "pointgr.h"
-#include "WW3D2/render2d.h"
+#include "render2d.h"
 #include "sortingrenderer.h"
 #include "shattersystem.h"
-#include "WW3D2/light.h"
-#include "WW3D2/assetmgr.h"
+#include "light.h"
+#include "assetmgr.h"
 #include "textureloader.h"
 #include "missingtexture.h"
 #include "WWLib/thread.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
index 74276b2aecd..08750d2a9dd 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
@@ -39,8 +39,8 @@
 #include "dx8indexbuffer.h"
 #include "dx8wrapper.h"
 #include "sortingrenderer.h"
-#include "WW3D2/rinfo.h"
-#include "WW3D2/camera.h"
+#include "rinfo.h"
+#include "camera.h"
 #include "dx8fvf.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
index b9ef97b93e7..873d0262b31 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
@@ -38,7 +38,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "font3d.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "texture.h"
 #include <assert.h>
 #include <WWDebug/wwdebug.h>
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
index 3770dc0ba95..a5430b62c8e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
@@ -37,11 +37,11 @@
 
 
 #include "hanim.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "htree.h"
-#include "WW3D2/motchan.h"
+#include "motchan.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "WWDebug/wwdebug.h"
 #include <WWLib/nstrdup.h>
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
index ace4a88c04d..c9c77237875 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
@@ -50,11 +50,11 @@
 
 
 #include "hcanim.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "htree.h"
-#include "WW3D2/motchan.h"
+#include "motchan.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "WWDebug/wwdebug.h"
 #include <WWLib/nstrdup.h>
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
index 7dcbe793b2e..954d3e72bd5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
@@ -38,7 +38,7 @@
 
 #include "hmdldef.h"
 #include <assert.h>
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "WWLib/chunkio.h"
 #include "snapPts.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
index 1f04fa29ba0..fc64894f36b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
@@ -57,11 +57,11 @@
 #include <assert.h>
 #include "WWMath/wwmath.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/hrawanim.h"
-#include "WW3D2/motchan.h"
-#include "WW3D2/ww3d.h"
+#include "hrawanim.h"
+#include "motchan.h"
+#include "ww3d.h"
 
 /***********************************************************************************************
  * HTreeClass::HTreeClass -- constructor                                                       *
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
index f4cd4b15d2e..1709f956bb0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
@@ -37,8 +37,8 @@
 
 
 #include "intersec.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/scene.h"
+#include "camera.h"
+#include "scene.h"
 #include "intersec.inl"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
index 65cf42df756..2ea246a4f76 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
@@ -46,8 +46,8 @@
 
 
 #include "layer.h"
-#include "WW3D2/scene.h"
-#include "WW3D2/camera.h"
+#include "scene.h"
+#include "camera.h"
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
index 0bfaa121587..b2baa3f81aa 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
@@ -48,11 +48,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "line3d.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/shader.h"
+#include "vertmaterial.h"
+#include "shader.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/rinfo.h"
+#include "ww3d.h"
+#include "rinfo.h"
 #include "dx8wrapper.h"
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
index 7113e636137..0926bd796b8 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
@@ -37,7 +37,7 @@
 
 #include "matinfo.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/meshmdl.h"
+#include "meshmdl.h"
 #include "texture.h"
 
 MaterialInfoClass::MaterialInfoClass()
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp
index d300e5ffe36..f0a6dbb72b9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp
@@ -47,8 +47,8 @@
 
 
 #include "matpass.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/shader.h"
+#include "vertmaterial.h"
+#include "shader.h"
 #include "texture.h"
 #include "statistics.h"
 #include "dx8wrapper.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
index e05282725ac..e98445be210 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
@@ -39,7 +39,7 @@
 
 
 #include "meshdam.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "w3derr.h"
 #include "WWLib/chunkio.h"
 //#include <sr.hpp>
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
index ba9a32ca3f0..48f5f08199e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
@@ -49,7 +49,7 @@
 #include "metalmap.h"
 #include "texture.h"
 #include "ww3dformat.h"
-#include "WW3D2/ww3d.h"
+#include "ww3d.h"
 #include <WWMath/vp.h>
 #include <WWLib/INI.h>
 #include <WWLib/Point.h>
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
index 4bbbd6f0534..b2eb666b7cd 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
@@ -71,8 +71,8 @@
  *   PointGroupClass::Peek_Texture -- Peeks texture                        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include "pointgr.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/ww3d.h"
+#include "vertmaterial.h"
+#include "ww3d.h"
 #include "WWMath/aabox.h"
 #include "statistics.h"
 #include "WWLib/simplevec.h"
@@ -83,8 +83,8 @@
 #include "dx8wrapper.h"
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
-#include "WW3D2/rinfo.h"
-#include "WW3D2/camera.h"
+#include "rinfo.h"
+#include "camera.h"
 #include "dx8fvf.h"
 #include "d3dx8math.h"
 #include "sortingrenderer.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
index c4409d4ae4e..0e5751d1939 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
@@ -39,8 +39,8 @@
 
 #include "polyinfo.h"
 #include "texture.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/shader.h"
+#include "vertmaterial.h"
+#include "shader.h"
 
 void PolygonInfoClass::Set_Texture(TextureClass *texture)
 {
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
index c1b70e7ae89..aea6a1777ee 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
@@ -46,7 +46,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "projector.h"
-#include "WW3D2/matrixmapper.h"
+#include "matrixmapper.h"
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
index 50529d3a135..d8ef8aa5cd6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
@@ -41,9 +41,9 @@
 
 
 #include "proto.h"
-#include "WW3D2/mesh.h"
+#include "mesh.h"
 #include "hmdldef.h"
-#include "WW3D2/hlod.h"
+#include "hlod.h"
 #include "w3derr.h"
 
 /*
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
index a11b783fdc5..46b1d962fa9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
@@ -43,8 +43,8 @@
 
 #include "renderobjectrecycler.h"
 #include "rendobj.h"
-#include "WW3D2/assetmgr.h"
-#include "WW3D2/part_emt.h"
+#include "assetmgr.h"
+#include "part_emt.h"
 #include "WWMath/matrix3d.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
index be20233d3c6..47954075d76 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
@@ -73,10 +73,10 @@
 
 
 #include "rendobj.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "WWLib/win.h"
 #include "WWMath/pot.h"
-#include "WW3D2/scene.h"
+#include "scene.h"
 #include "WWMath/colmath.h"
 #include "coltest.h"
 #include "inttest.h"
@@ -84,8 +84,8 @@
 #include "matinfo.h"
 #include "htree.h"
 #include "predlod.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/ww3d.h"
+#include "camera.h"
+#include "ww3d.h"
 #include "WWLib/chunkio.h"
 #include "WWSaveLoad/persistfactory.h"
 #include "WWSaveLoad/saveload.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
index 7f246b51432..9ee3d934f1a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
@@ -74,18 +74,18 @@
 #include "ringobj.h"
 #include "w3d_util.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/ww3d.h"
+#include "vertmaterial.h"
+#include "ww3d.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/rinfo.h"
+#include "rinfo.h"
 #include "coltest.h"
 #include "inttest.h"
 #include	"WWMath/matrix3.h"
 #include	"WWMath/wwmath.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "WWLib/wwstring.h"
 #include "WWLib/bound.h"
-#include "WW3D2/camera.h"
+#include "camera.h"
 #include "statistics.h"
 #include "predlod.h"
 #include "dx8wrapper.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
index 4cec2125f36..9ae92675552 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
@@ -35,13 +35,13 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "segline.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/rinfo.h"
+#include "ww3d.h"
+#include "rinfo.h"
 #include "predlod.h"
 #include "WWMath/v3_rnd.h"
 #include "texture.h"
 #include "coltest.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "texture.h"
 #include "dx8wrapper.h"
 #include "WWMath/vp.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
index 0d96c6b3a70..b3e04ad981f 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
@@ -38,15 +38,15 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "seglinerenderer.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/rinfo.h"
+#include "ww3d.h"
+#include "rinfo.h"
 #include "dx8wrapper.h"
 #include "sortingrenderer.h"
 #include "WWMath/vp.h"
 #include "WWMath/Vector3i.h"
 #include "WWLib/RANDOM.h"
 #include "WWMath/v3_rnd.h"
-#include "WW3D2/meshgeometry.h"
+#include "meshgeometry.h"
 
 
 /* We have chunking logic which handles N segments at a time. To simplify the subdivision logic,
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
index f216f34d64a..9a1c2de806d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
@@ -37,16 +37,16 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "shattersystem.h"
-#include "WW3D2/assetmgr.h"
-#include "WW3D2/mesh.h"
-#include "WW3D2/meshmdl.h"
+#include "assetmgr.h"
+#include "mesh.h"
+#include "meshmdl.h"
 #include "dynamesh.h"
 #include "htree.h"
 #include "WWMath/plane.h"
 #include "WWLib/simplevec.h"
 #include "WWLib/wwstring.h"
 #include "WWMath/vp.h"
-#include "WW3D2/meshmatdesc.h"
+#include "meshmatdesc.h"
 #include <stdlib.h>
 
 /*
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
index 13d453474f8..e285512cb76 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
@@ -36,7 +36,7 @@
 
 #include "snapPts.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "w3derr.h"
 
 WW3DErrorType SnapPointsClass::Load_W3D(ChunkLoadClass & cload)
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
index 14b51020152..66b1a7f873e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
@@ -42,7 +42,7 @@
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
 #include "dx8wrapper.h"
-#include "WW3D2/vertmaterial.h"
+#include "vertmaterial.h"
 #include "texture.h"
 #include "d3d8.h"
 #include "d3dx8math.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
index ce7269dc048..648af77cb82 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
@@ -44,7 +44,7 @@
 #include "WWLib/ffactory.h"
 #include "WWLib/WWFILE.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/scene.h"
+#include "scene.h"
 
 
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
index ad4bb0bc549..b4d3cde9dad 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
@@ -71,19 +71,19 @@
 #include "sphereobj.h"
 #include "w3d_util.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/ww3d.h"
+#include "vertmaterial.h"
+#include "ww3d.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/rinfo.h"
+#include "rinfo.h"
 #include "coltest.h"
 #include "WWLib/bound.h"
 #include "inttest.h"
 #include "predlod.h"
 #include "WWMath/matrix3.h"
 #include "WWMath/wwmath.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "WWLib/wwstring.h"
-#include "WW3D2/camera.h"
+#include "camera.h"
 #include "statistics.h"
 #include "dx8wrapper.h"
 #include "dx8vertexbuffer.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
index aec9cd74c56..b373dead1f7 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
@@ -35,13 +35,13 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "streak.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/rinfo.h"
+#include "ww3d.h"
+#include "rinfo.h"
 #include "predlod.h"
 #include "WWMath/v3_rnd.h"
 #include "texture.h"
 #include "coltest.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include "texture.h"
 #include "dx8wrapper.h"
 #include "WWMath/vp.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
index 4341c24d7b2..58d67966d7d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
@@ -26,8 +26,8 @@
 
 
 #include "streakRender.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/rinfo.h"
+#include "ww3d.h"
+#include "rinfo.h"
 #include "dx8wrapper.h"
 #include "sortingrenderer.h"
 #include "WWMath/vp.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp
index c0d3b1fd71c..ae718524197 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp
@@ -75,15 +75,15 @@
 
 
 #include "texproject.h"
-#include "WW3D2/vertmaterial.h"
-#include "WW3D2/shader.h"
+#include "vertmaterial.h"
+#include "shader.h"
 #include "texture.h"
 #include "rendobj.h"
-#include "WW3D2/rinfo.h"
-#include "WW3D2/camera.h"
+#include "rinfo.h"
+#include "camera.h"
 #include "matpass.h"
 #include "bwrender.h"
-#include "WW3D2/assetmgr.h"
+#include "assetmgr.h"
 #include "dx8wrapper.h"
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp
index 35993b849bf..36d0d362579 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp
@@ -46,15 +46,15 @@
 #include "dx8wrapper.h"
 #include "WWLib/TARGA.h"
 #include <WWLib/nstrdup.h>
-#include "WW3D2/w3d_file.h"
-#include "WW3D2/assetmgr.h"
+#include "w3d_file.h"
+#include "assetmgr.h"
 #include "formconv.h"
 #include "textureloader.h"
 #include "missingtexture.h"
 #include "WWLib/ffactory.h"
 #include "dx8caps.h"
 #include "dx8texman.h"
-#include "WW3D2/meshmatdesc.h"
+#include "meshmatdesc.h"
 #include "texturethumbnail.h"
 #include "WWDebug/wwprofile.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
index a717414d252..4626a7d8fa9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
@@ -46,8 +46,8 @@
 #include "WWLib/ffactory.h"
 #include "WWLib/wwstring.h"
 #include	"WWLib/bufffile.h"
-#include "WW3D2/ww3d.h"
-#include "WW3D2/assetmgr.h"
+#include "ww3d.h"
+#include "assetmgr.h"
 #include "dx8wrapper.h"
 #include "dx8caps.h"
 #include "missingtexture.h"
@@ -56,7 +56,7 @@
 #include "WWDebug/wwmemlog.h"
 #include "formconv.h"
 #include "texturethumbnail.h"
-#include "WW3D2/ddsfile.h"
+#include "ddsfile.h"
 #include "bitmaphandler.h"
 #include "WWDebug/wwprofile.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
index 0fee1ed70bd..181f18745c9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
@@ -21,7 +21,7 @@
 #include "missingtexture.h"
 #include "WWLib/TARGA.h"
 #include "ww3dformat.h"
-#include "WW3D2/ddsfile.h"
+#include "ddsfile.h"
 #include "textureloader.h"
 #include "bitmaphandler.h"
 #include "WWLib/ffactory.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
index 6f2f39a666a..ac61acc0257 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
@@ -37,7 +37,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "visrasterizer.h"
-#include "WW3D2/camera.h"
+#include "camera.h"
 #include "WWMath/plane.h"
 #include "WWMath/vp.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
index e4cd16f7755..e1dba6df305 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
@@ -60,7 +60,7 @@ class STLSpecialAlloc
 
 
 #include "w3d_dep.h"
-#include "WW3D2/w3d_file.h"
+#include "w3d_file.h"
 #include <assert.h>
 #include <WWLib/chunkio.h>
 #include "WWLib/ffactory.h"
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
index a2f1c35476b..d18a9c661c1 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
@@ -39,7 +39,7 @@
 #include "WWMath/vector3.h"
 #include "WWMath/vector4.h"
 #include "WWMath/quat.h"
-#include "WW3D2/shader.h"
+#include "shader.h"
 
 
 void	W3dUtilityClass::Convert_Vector(const W3dVectorStruct & v,Vector3 * set)
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h
index bed1916507f..1169f3631ef 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h
@@ -21,8 +21,8 @@
 #pragma once
 
 //#include "../resource.h"       // main symbols
-#include "WWDownload/ftp.h"
-#include "WWDownload/downloaddefs.h"
+#include "ftp.h"
+#include "downloaddefs.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CDownload
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
index bfc3ee3f8b3..bc709153784 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
@@ -26,7 +26,7 @@
 #include <winsock.h>
 #include <Utility/stdio_adapter.h>
 
-#include "WWDownload/ftpdefs.h"
+#include "ftpdefs.h"
 
 // FTP server return codes.  See RFC 959
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h
index fa40554ea67..556cbafcc61 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h
@@ -20,11 +20,11 @@
 
 #include "always.h"
 
-#include <WWLib/win.h>
+#include "win.h"
 #include <imagehlp.h> // Must be included after Windows.h
 #include <set>
 #ifdef RTS_ENABLE_CRASHDUMP
-#include <WWLib/DbgHelpLoader_minidump.h>
+#include "DbgHelpLoader_minidump.h"
 #endif
 
 #include "mutex.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index ef4965eb60d..8fc30f2edcf 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -233,13 +233,17 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
 
 target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC})
 
+target_include_directories(g_ww3d2 PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
 target_compile_definitions(g_ww3d2 PRIVATE
     $<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
 )
 
 target_precompile_headers(g_ww3d2 PRIVATE
     [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
-    [["WW3D2/dx8wrapper.h"]]
+    [["dx8wrapper.h"]]
     [["WWLib/always.h"]]
     [["WWLib/STLUtils.h"]]
     [["WWLib/win.h"]]
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
index 27b835f0101..40790b0002c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
@@ -59,13 +59,13 @@
 
 
 #include "animobj.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "assetmgr.h"
-#include "WW3D2/hanim.h"
-#include "WW3D2/hcanim.h"
+#include "hanim.h"
+#include "hcanim.h"
 #include "ww3d.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/animatedsoundmgr.h"
+#include "animatedsoundmgr.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 3931fdef3b7..a9dac652860 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -87,35 +87,35 @@
 
 #include "htreemgr.h"
 #include "hanimmgr.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/font3d.h"
-#include "WW3D2/render2dsentence.h"		// for FontCharsClass
-#include "WW3D2/proto.h"
-#include "WW3D2/hanim.h"
-#include "WW3D2/hcanim.h"
-#include "WW3D2/htree.h"
-#include "WW3D2/collect.h"
+#include "texture.h"
+#include "font3d.h"
+#include "render2dsentence.h"		// for FontCharsClass
+#include "proto.h"
+#include "hanim.h"
+#include "hcanim.h"
+#include "htree.h"
+#include "collect.h"
 #include "ww3d.h"
 #include "WWLib/ffactory.h"
 #include "boxrobj.h"
 #include "nullrobj.h"
-#include "WW3D2/distlod.h"
+#include "distlod.h"
 #include "hlod.h"
-#include "WW3D2/agg_def.h"
+#include "agg_def.h"
 #include "WWLib/wwstring.h"
 #include "WWDebug/wwmemlog.h"
 #include "dazzle.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/metalmap.h"
-#include "WW3D2/w3dexclusionlist.h"
+#include "dx8wrapper.h"
+#include "dx8renderer.h"
+#include "metalmap.h"
+#include "w3dexclusionlist.h"
 #include <WWLib/INI.h>
 #include <windows.h>
 #include <d3dx8core.h>
 #include "WWDebug/wwprofile.h"
-#include "WW3D2/assetstatus.h"
-#include "WW3D2/ringobj.h"
-#include "WW3D2/sphereobj.h"
+#include "assetstatus.h"
+#include "ringobj.h"
+#include "sphereobj.h"
 
 /*
 ** Static member variable which keeps track of the single instanced asset manager
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
index cfca344bb07..367dea479ee 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
@@ -89,20 +89,20 @@
 
 
 #include "boxrobj.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "WWDebug/wwdebug.h"
 #include "vertmaterial.h"
 #include "ww3d.h"
 #include "WWLib/chunkio.h"
 #include "rinfo.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/inttest.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8fvf.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/visrasterizer.h"
+#include "coltest.h"
+#include "inttest.h"
+#include "dx8wrapper.h"
+#include "dx8indexbuffer.h"
+#include "dx8vertexbuffer.h"
+#include "dx8fvf.h"
+#include "sortingrenderer.h"
+#include "visrasterizer.h"
 #include "meshgeometry.h"
 
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
index b66ebc26cda..8f838f954a9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
@@ -74,7 +74,7 @@
 #include "camera.h"
 #include "ww3d.h"
 #include "WWMath/matrix4.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 8115d654606..cd1416c0924 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -56,12 +56,12 @@
 #include "WWLib/WWFILE.h"
 #include "WWLib/inisup.h"
 #include "WWSaveLoad/persistfactory.h"
-#include "WW3D2/ww3dids.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/texture.h"
+#include "ww3dids.h"
+#include "dx8wrapper.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "sortingrenderer.h"
+#include "texture.h"
 #include "scene.h"
 #include "WWDebug/wwprofile.h"
 #include <limits.h>
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
index a21ce614457..8ecaa031565 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
@@ -21,10 +21,10 @@
 #include "ddsfile.h"
 #include "WWLib/ffactory.h"
 #include "WWLib/bufffile.h"
-#include "WW3D2/formconv.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/bitmaphandler.h"
-#include "WW3D2/colorspace.h"
+#include "formconv.h"
+#include "dx8wrapper.h"
+#include "bitmaphandler.h"
+#include "colorspace.h"
 #include <ddraw.h>
 
 // ----------------------------------------------------------------------------
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
index 79abb668959..3b9c1d07f8d 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
@@ -52,17 +52,17 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "decalmsh.h"
-#include "WW3D2/decalsys.h"
+#include "decalsys.h"
 #include "rinfo.h"
 #include "mesh.h"
 #include "meshmdl.h"
 #include "WWMath/plane.h"
-#include "WW3D2/statistics.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8indexbuffer.h"
+#include "statistics.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
 #include "WWLib/simplevec.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8wrapper.h"
+#include "texture.h"
+#include "dx8wrapper.h"
 
 #define DISABLE_CLIPPING	0
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
index 039d80db672..3876d84ca7c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
@@ -47,14 +47,14 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hanimmgr.h"
-#include "WW3D2/hanim.h"
+#include "hanim.h"
 #include "hrawanim.h"
-#include "WW3D2/hcanim.h"
+#include "hcanim.h"
 #include "hmorphanim.h"
 #include "WWLib/chunkio.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/w3dexclusionlist.h"
-#include "WW3D2/animatedsoundmgr.h"
+#include "w3dexclusionlist.h"
+#include "animatedsoundmgr.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index 9dce50fbc31..00182a473f8 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -128,10 +128,10 @@
 
 #include "hlod.h"
 #include "assetmgr.h"
-#include "WW3D2/hmdldef.h"
-#include "WW3D2/w3derr.h"
+#include "hmdldef.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "rinfo.h"
 #include <WWLib/win.h>
 #include "WWMath/sphere.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
index 11e86d2ff94..c0e82f399d5 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
@@ -40,7 +40,7 @@
 #include "w3d_file.h"
 #include "WWLib/chunkio.h"
 #include "assetmgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "WWLib/wwstring.h"
 #include "WWLib/textfile.h"
 #include "WWLib/simplevec.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
index 4e2bbe6e754..06524ad697a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
@@ -54,7 +54,7 @@
 #include "motchan.h"
 #include "WWLib/chunkio.h"
 #include "assetmgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 
 /***********************************************************************************************
  * NodeMotionStruct::NodeMotionStruct -- constructor                                           *
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
index 3e41c3bd2ad..bd1aad00f70 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
@@ -45,10 +45,10 @@
 
 
 #include "htreemgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "WWLib/chunkio.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/w3dexclusionlist.h"
+#include "w3dexclusionlist.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
index ba9b6142001..4018f2ad4d2 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
@@ -58,15 +58,15 @@
 
 #include "light.h"
 #include "ww3d.h"
-#include "WW3D2/ww3dids.h"
+#include "ww3dids.h"
 #include "w3d_file.h"
-#include "WW3D2/w3d_util.h"
-#include "WW3D2/w3derr.h"
+#include "w3d_util.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
 #include "rinfo.h"
 #include "scene.h"
 #include "WWSaveLoad/persistfactory.h"
-#include "WW3D2/statistics.h"
+#include "statistics.h"
 
 
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
index c1c0d4ba9ca..b60e78bc4c6 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
@@ -39,12 +39,12 @@
 #include "ww3d.h"
 #include "WWLib/INI.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "meshmatdesc.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/rendobj.h"
+#include "matinfo.h"
+#include "rendobj.h"
 #include "mesh.h"
 
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
index 8aaf1b78125..2b8ad39034c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
@@ -44,7 +44,7 @@
 
 
 #include "matrixmapper.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
index 6b4ed3c59c2..e73dec6e546 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
@@ -90,32 +90,32 @@
 #include <assert.h>
 #include "w3d_file.h"
 #include "assetmgr.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWDebug/wwdebug.h"
 #include "vertmaterial.h"
 #include "shader.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/htree.h"
+#include "matinfo.h"
+#include "htree.h"
 #include "meshbuild.h"
 #include "WWMath/tri.h"
 #include "WWMath/aaplane.h"
-#include "WW3D2/aabtree.h"
+#include "aabtree.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "meshmdl.h"
 #include "meshgeometry.h"
 #include "ww3d.h"
 #include "camera.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "rinfo.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/inttest.h"
+#include "coltest.h"
+#include "inttest.h"
 #include "decalmsh.h"
-#include "WW3D2/decalsys.h"
-#include "WW3D2/dx8polygonrenderer.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/visrasterizer.h"
+#include "decalsys.h"
+#include "dx8polygonrenderer.h"
+#include "dx8indexbuffer.h"
+#include "dx8renderer.h"
+#include "visrasterizer.h"
 #include "WWDebug/wwmemlog.h"
 #include <WWDebug/wwprofile.h>
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
index 4da62359afc..9d335b1bd6a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
@@ -86,7 +86,7 @@
 
 
 #include "meshgeometry.h"
-#include "WW3D2/aabtree.h"
+#include "aabtree.h"
 #include "WWLib/chunkio.h"
 #include "WWMath/aabox.h"
 #include "WWMath/obbox.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
index 8398fd11559..27e556bae5f 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
@@ -37,11 +37,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmatdesc.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "vertmaterial.h"
 #include "WWLib/realcrc.h"
-#include	"WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8caps.h"
+#include	"dx8wrapper.h"
+#include "dx8caps.h"
 
 
 /**************************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
index e111be52c8b..a4e927226eb 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
@@ -35,15 +35,15 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmdl.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/aabtree.h"
-#include "WW3D2/htree.h"
+#include "matinfo.h"
+#include "aabtree.h"
+#include "htree.h"
 #include "WWMath/vp.h"
-#include "WW3D2/visrasterizer.h"
-#include "WW3D2/dx8polygonrenderer.h"
-#include "WW3D2/bwrender.h"
+#include "visrasterizer.h"
+#include "dx8polygonrenderer.h"
+#include "bwrender.h"
 #include "camera.h"
-#include "WW3D2/dx8renderer.h"
+#include "dx8renderer.h"
 #include "WWLib/hashtemplate.h"
 
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 6931ed0e505..ed94f8508d1 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -76,19 +76,19 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmdl.h"
-#include "WW3D2/aabtree.h"
-#include "WW3D2/matinfo.h"
+#include "aabtree.h"
+#include "matinfo.h"
 #include "vertmaterial.h"
 #include "shader.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "w3d_file.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "assetmgr.h"
 #include "WWLib/simplevec.h"
 #include "WWLib/realcrc.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 #ifdef _UNIX
 #include "osdep/osdep.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
index a786bcbd143..bbcde0144d0 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
@@ -40,7 +40,7 @@
 #include "rinfo.h"
 #include "scene.h"
 #include "camera.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "WWMath/pot.h"
 #include "WWLib/bound.h"
 #include "WWLib/simplevec.h"
@@ -48,8 +48,8 @@
 #include "WWDebug/wwprofile.h"
 #include <limits.h>
 #include "WWMath/vp.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8wrapper.h"
+#include "texture.h"
+#include "dx8wrapper.h"
 #include "WWMath/vector3.h"
 
 // A random permutation of the numbers 0 to 15 - used for LOD particle decimation.
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
index 6d32d14b4ee..9f644336998 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
@@ -39,9 +39,9 @@
 #include "ww3d.h"
 #include "assetmgr.h"
 #include "part_ldr.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "scene.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWDebug/wwprofile.h"
 #include <limits.h>
 #include <WWLib/gcd_lcm.h>
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
index b39a05becdc..6e36f9cfe00 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
@@ -35,11 +35,11 @@
 
 #include "part_ldr.h"
 #include "part_emt.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
 #include "WWLib/win.h"		// for lstrcpy, can this be improved?
 #include "assetmgr.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 
 #ifndef SAFE_DELETE
 #define SAFE_DELETE(pointer) { delete pointer; pointer = nullptr; }
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
index a36cf4a5901..34b430bacf2 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -35,18 +35,18 @@
 #include "render2d.h"
 #include "WWLib/mutex.h"
 #include "ww3d.h"
-#include "WW3D2/font3d.h"
+#include "font3d.h"
 #include "WWMath/rect.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWMath/matrix4.h"
 #include "WWMath/matrix3d.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/sortingrenderer.h"
+#include "dx8wrapper.h"
+#include "dx8indexbuffer.h"
+#include "dx8vertexbuffer.h"
+#include "sortingrenderer.h"
 #include "vertmaterial.h"
-#include "WW3D2/dx8fvf.h"
-#include "WW3D2/dx8caps.h"
+#include "dx8fvf.h"
+#include "dx8caps.h"
 #include "WWDebug/wwprofile.h"
 #include "WWDebug/wwmemlog.h"
 #include "assetmgr.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
index f24caee7a6e..09b57edd8d0 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
@@ -37,7 +37,7 @@
 
 #include "rinfo.h"
 #include "camera.h"
-#include "WW3D2/matpass.h"
+#include "matpass.h"
 
 
 /***********************************************************************************************
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
index 227344784ba..ebcb5a667a0 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
@@ -63,10 +63,10 @@
 #include "ww3d.h"
 #include "rinfo.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/coltest.h"
+#include "dx8renderer.h"
+#include "dx8wrapper.h"
+#include "sortingrenderer.h"
+#include "coltest.h"
 
 
 /*
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
index 7d94dbbea6d..b945cfc1708 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
@@ -43,8 +43,8 @@
 #include "shader.h"
 #include "w3d_file.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8caps.h"
+#include "dx8wrapper.h"
+#include "dx8caps.h"
 
 
 bool ShaderClass::ShaderDirty=true;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index a536fe41b05..b202a634b18 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -40,12 +40,12 @@
 #include "vertmaterial.h"
 #include "WWLib/realcrc.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWLib/INI.h"
 #include "WWLib/XSTRAW.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 static unsigned int unique=1;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
index c12469332d5..f0bfa5e6951 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -85,39 +85,39 @@
 #include "rinfo.h"
 #include "assetmgr.h"
 #include "boxrobj.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "camera.h"
 #include "scene.h"
 #include "WWLib/registry.h"
-#include "WW3D2/segline.h"
+#include "segline.h"
 #include "shader.h"
 #include "vertmaterial.h"
 #include "WWDebug/wwdebug.h"
 #include "WWDebug/wwprofile.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/shattersystem.h"
-#include "WW3D2/textureloader.h"
-#include "WW3D2/statistics.h"
-#include "WW3D2/pointgr.h"
+#include "shattersystem.h"
+#include "textureloader.h"
+#include "statistics.h"
+#include "pointgr.h"
 #include "WWLib/ffactory.h"
 #include "WWLib/INI.h"
 #include "dazzle.h"
 #include "meshmdl.h"
-#include "WW3D2/dx8renderer.h"
+#include "dx8renderer.h"
 #include "render2d.h"
 #include "WWLib/bound.h"
-#include "WW3D2/rddesc.h"
+#include "rddesc.h"
 #include "WWMath/Vector3i.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 #include "WWLib/TARGA.h"
-#include "WW3D2/sortingrenderer.h"
+#include "sortingrenderer.h"
 #include "WWLib/thread.h"
 #include "WWLib/cpudetect.h"
-#include "WW3D2/dx8texman.h"
-#include "WW3D2/formconv.h"
-#include "WW3D2/animatedsoundmgr.h"
-#include "WW3D2/static_sort_list.h"
-#include "WW3D2/framgrab.h"
+#include "dx8texman.h"
+#include "formconv.h"
+#include "animatedsoundmgr.h"
+#include "static_sort_list.h"
+#include "framgrab.h"
 #include "Lib/BaseType.h"
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index 52e3470e6fd..42bcf55d46f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -238,13 +238,17 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
 
 target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC})
 
+target_include_directories(z_ww3d2 PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
 target_compile_definitions(z_ww3d2 PRIVATE
     $<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
 )
 
 target_precompile_headers(z_ww3d2 PRIVATE
     [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
-    [["WW3D2/dx8wrapper.h"]]
+    [["dx8wrapper.h"]]
     [["WWLib/always.h"]]
     [["WWLib/STLUtils.h"]]
     [["WWLib/win.h"]]
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
index ed278d37817..32317e69ecd 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
@@ -59,13 +59,13 @@
 
 
 #include "animobj.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "assetmgr.h"
-#include "WW3D2/hanim.h"
-#include "WW3D2/hcanim.h"
+#include "hanim.h"
+#include "hcanim.h"
 #include "ww3d.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/animatedsoundmgr.h"
+#include "animatedsoundmgr.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 9ce8fb48662..ce6f67a0324 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -88,37 +88,37 @@
 
 #include "htreemgr.h"
 #include "hanimmgr.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/font3d.h"
-#include "WW3D2/render2dsentence.h"		// for FontCharsClass
-#include "WW3D2/proto.h"
-#include "WW3D2/hanim.h"
-#include "WW3D2/hcanim.h"
-#include "WW3D2/htree.h"
-#include "WW3D2/collect.h"
+#include "texture.h"
+#include "font3d.h"
+#include "render2dsentence.h"		// for FontCharsClass
+#include "proto.h"
+#include "hanim.h"
+#include "hcanim.h"
+#include "htree.h"
+#include "collect.h"
 #include "ww3d.h"
 #include "WWLib/ffactory.h"
 #include "boxrobj.h"
 #include "nullrobj.h"
-#include "WW3D2/distlod.h"
+#include "distlod.h"
 #include "hlod.h"
-#include "WW3D2/agg_def.h"
+#include "agg_def.h"
 #include "WWLib/wwstring.h"
 #include "WWDebug/wwmemlog.h"
 #include "dazzle.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/metalmap.h"
-#include "WW3D2/w3dexclusionlist.h"
+#include "dx8wrapper.h"
+#include "dx8renderer.h"
+#include "metalmap.h"
+#include "w3dexclusionlist.h"
 #include <WWLib/INI.h>
 #include <windows.h>
 #include <d3dx8core.h>
 #include "WWDebug/wwprofile.h"
-#include "WW3D2/assetstatus.h"
-#include "WW3D2/ringobj.h"
-#include "WW3D2/sphereobj.h"
+#include "assetstatus.h"
+#include "ringobj.h"
+#include "sphereobj.h"
 
-#include "WW3D2/shdlib.h"
+#include "shdlib.h"
 
 /*
 ** Static member variable which keeps track of the single instanced asset manager
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
index 2f5dc5f5e9d..1256e5d41eb 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
@@ -89,20 +89,20 @@
 
 
 #include "boxrobj.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "WWDebug/wwdebug.h"
 #include "vertmaterial.h"
 #include "ww3d.h"
 #include "WWLib/chunkio.h"
 #include "rinfo.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/inttest.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8fvf.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/visrasterizer.h"
+#include "coltest.h"
+#include "inttest.h"
+#include "dx8wrapper.h"
+#include "dx8indexbuffer.h"
+#include "dx8vertexbuffer.h"
+#include "dx8fvf.h"
+#include "sortingrenderer.h"
+#include "visrasterizer.h"
 #include "meshgeometry.h"
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
index a42e7e4fe43..90332efb9b4 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
@@ -74,7 +74,7 @@
 #include "camera.h"
 #include "ww3d.h"
 #include "WWMath/matrix4.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 27fc3cd0230..b242e9be09b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -56,15 +56,15 @@
 #include "WWLib/WWFILE.h"
 #include "WWLib/inisup.h"
 #include "WWSaveLoad/persistfactory.h"
-#include "WW3D2/ww3dids.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/texture.h"
+#include "ww3dids.h"
+#include "dx8wrapper.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "sortingrenderer.h"
+#include "texture.h"
 #include "scene.h"
 #include "WWDebug/wwprofile.h"
-#include "WW3D2/visrasterizer.h"
+#include "visrasterizer.h"
 #include <limits.h>
 #include <WWDebug/wwprofile.h>
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
index 0fa44e57580..f625baee325 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
@@ -21,10 +21,10 @@
 #include "ddsfile.h"
 #include "WWLib/ffactory.h"
 #include "WWLib/bufffile.h"
-#include "WW3D2/formconv.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/bitmaphandler.h"
-#include "WW3D2/colorspace.h"
+#include "formconv.h"
+#include "dx8wrapper.h"
+#include "bitmaphandler.h"
+#include "colorspace.h"
 #include <ddraw.h>
 
 // ----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
index 4448ba801db..040b3dc230f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
@@ -52,18 +52,18 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "decalmsh.h"
-#include "WW3D2/decalsys.h"
+#include "decalsys.h"
 #include "rinfo.h"
 #include "mesh.h"
 #include "meshmdl.h"
 #include "WWMath/plane.h"
-#include "WW3D2/statistics.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/dx8indexbuffer.h"
+#include "statistics.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
 #include "WWLib/simplevec.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8caps.h"
+#include "texture.h"
+#include "dx8wrapper.h"
+#include "dx8caps.h"
 
 #define DISABLE_CLIPPING	0
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
index a43a1c5e971..60e7e7908c2 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
@@ -47,14 +47,14 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hanimmgr.h"
-#include "WW3D2/hanim.h"
+#include "hanim.h"
 #include "hrawanim.h"
-#include "WW3D2/hcanim.h"
+#include "hcanim.h"
 #include "hmorphanim.h"
 #include "WWLib/chunkio.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/w3dexclusionlist.h"
-#include "WW3D2/animatedsoundmgr.h"
+#include "w3dexclusionlist.h"
+#include "animatedsoundmgr.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index 4c895325d13..0db93d24ad5 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -128,10 +128,10 @@
 
 #include "hlod.h"
 #include "assetmgr.h"
-#include "WW3D2/hmdldef.h"
-#include "WW3D2/w3derr.h"
+#include "hmdldef.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "rinfo.h"
 #include <WWLib/win.h>
 #include "WWMath/sphere.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
index 9460ded55ae..d1e346c51ec 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
@@ -40,7 +40,7 @@
 #include "w3d_file.h"
 #include "WWLib/chunkio.h"
 #include "assetmgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "WWLib/wwstring.h"
 #include "WWLib/textfile.h"
 #include "WWLib/simplevec.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
index 499285d8f13..8b0406e8869 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
@@ -54,7 +54,7 @@
 #include "motchan.h"
 #include "WWLib/chunkio.h"
 #include "assetmgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 
 /***********************************************************************************************
  * NodeMotionStruct::NodeMotionStruct -- constructor                                           *
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
index 4464df9d312..db7c3a85413 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
@@ -45,10 +45,10 @@
 
 
 #include "htreemgr.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "WWLib/chunkio.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/w3dexclusionlist.h"
+#include "w3dexclusionlist.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
index 7b322bf642b..b2c9e5793fa 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
@@ -58,15 +58,15 @@
 
 #include "light.h"
 #include "ww3d.h"
-#include "WW3D2/ww3dids.h"
+#include "ww3dids.h"
 #include "w3d_file.h"
-#include "WW3D2/w3d_util.h"
-#include "WW3D2/w3derr.h"
+#include "w3d_util.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
 #include "rinfo.h"
 #include "scene.h"
 #include "WWSaveLoad/persistfactory.h"
-#include "WW3D2/statistics.h"
+#include "statistics.h"
 
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
index b95d49611e9..9bd45bfc659 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
@@ -41,7 +41,7 @@
 #include "WWMath/matrix3d.h"
 #include "camera.h"
 #include "light.h"
-#include "WW3D2/colorspace.h"
+#include "colorspace.h"
 
 /*
 ** Constants
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
index e61142bc226..797b36fbcb9 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
@@ -39,15 +39,15 @@
 
 #include "WWLib/sharebuf.h"
 #include "linegrp.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "vertmaterial.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 #include "WWMath/wwmath.h"
 #include "rinfo.h"
 #include "camera.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/sortingrenderer.h"
+#include "dx8indexbuffer.h"
+#include "dx8vertexbuffer.h"
+#include "sortingrenderer.h"
 
 // Line groups are a rendering primitive similar to point groups
 // They are tetrahedra which are aligned with the view plane with their centers
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
index b08d50c2a89..21d44498110 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
@@ -39,12 +39,12 @@
 #include "ww3d.h"
 #include "WWLib/INI.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "meshmatdesc.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/rendobj.h"
+#include "matinfo.h"
+#include "rendobj.h"
 #include "mesh.h"
 #include <WWLib/RANDOM.h>
 #include <WWLib/bound.h>
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
index 7264a7dd3c6..e3be6a87520 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
@@ -51,7 +51,7 @@
 
 
 #include "matrixmapper.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
index 0da89d80964..199f5010496 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
@@ -90,34 +90,34 @@
 #include <assert.h>
 #include "w3d_file.h"
 #include "assetmgr.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWDebug/wwdebug.h"
 #include "vertmaterial.h"
 #include "shader.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/htree.h"
+#include "matinfo.h"
+#include "htree.h"
 #include "meshbuild.h"
 #include "WWMath/tri.h"
 #include "WWMath/aaplane.h"
-#include "WW3D2/aabtree.h"
+#include "aabtree.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "meshmdl.h"
 #include "meshgeometry.h"
 #include "ww3d.h"
 #include "camera.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "rinfo.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/inttest.h"
+#include "coltest.h"
+#include "inttest.h"
 #include "decalmsh.h"
-#include "WW3D2/decalsys.h"
-#include "WW3D2/dx8polygonrenderer.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/visrasterizer.h"
+#include "decalsys.h"
+#include "dx8polygonrenderer.h"
+#include "dx8indexbuffer.h"
+#include "dx8renderer.h"
+#include "visrasterizer.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/dx8rendererdebugger.h"
+#include "dx8rendererdebugger.h"
 #include <WWDebug/wwprofile.h>
 
 static unsigned MeshDebugIdCount;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
index e54850fda5a..6e05a70c3f7 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
@@ -86,7 +86,7 @@
 
 
 #include "meshgeometry.h"
-#include "WW3D2/aabtree.h"
+#include "aabtree.h"
 #include "WWLib/chunkio.h"
 #include "WWMath/aabox.h"
 #include "WWMath/obbox.h"
@@ -96,7 +96,7 @@
 #include "WWDebug/wwmemlog.h"
 #include "w3d_file.h"
 #include "WWMath/vp.h"
-#include "WW3D2/htree.h"
+#include "htree.h"
 #include "WWMath/matrix4.h"
 #include "rinfo.h"
 #include "camera.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
index 5fe1781ecf0..982afc7549e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
@@ -37,11 +37,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmatdesc.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "vertmaterial.h"
 #include "WWLib/realcrc.h"
-#include	"WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8caps.h"
+#include	"dx8wrapper.h"
+#include "dx8caps.h"
 #include "meshmdl.h"
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
index 3a1e60c3c6e..5ceea410902 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
@@ -38,15 +38,15 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmdl.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/aabtree.h"
-#include "WW3D2/htree.h"
+#include "matinfo.h"
+#include "aabtree.h"
+#include "htree.h"
 #include "WWMath/vp.h"
-#include "WW3D2/visrasterizer.h"
-#include "WW3D2/dx8polygonrenderer.h"
-#include "WW3D2/bwrender.h"
+#include "visrasterizer.h"
+#include "dx8polygonrenderer.h"
+#include "bwrender.h"
 #include "camera.h"
-#include "WW3D2/dx8renderer.h"
+#include "dx8renderer.h"
 #include "WWLib/hashtemplate.h"
 
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 42a9abf3052..7cb67c9ad1e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -76,19 +76,19 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "meshmdl.h"
-#include "WW3D2/aabtree.h"
-#include "WW3D2/matinfo.h"
+#include "aabtree.h"
+#include "matinfo.h"
 #include "vertmaterial.h"
 #include "shader.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "w3d_file.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "assetmgr.h"
 #include "WWLib/simplevec.h"
 #include "WWLib/realcrc.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 #ifdef _UNIX
 #include "osdep/osdep.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
index 29f037e0e16..2d9b057ccb2 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
@@ -40,7 +40,7 @@
 #include "rinfo.h"
 #include "scene.h"
 #include "camera.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "WWMath/pot.h"
 #include "WWLib/bound.h"
 #include "WWLib/simplevec.h"
@@ -48,8 +48,8 @@
 #include "WWDebug/wwprofile.h"
 #include <limits.h>
 #include "WWMath/vp.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8wrapper.h"
+#include "texture.h"
+#include "dx8wrapper.h"
 #include "WWMath/vector3.h"
 
 // A random permutation of the numbers 0 to 15 - used for LOD particle decimation.
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
index ca8d9045bcc..bdab80fac63 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
@@ -42,9 +42,9 @@
 #include "ww3d.h"
 #include "assetmgr.h"
 #include "part_ldr.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "scene.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWDebug/wwprofile.h"
 #include <limits.h>
 #include <WWLib/gcd_lcm.h>
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
index 4b847fd6e2e..eae230609f1 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
@@ -35,11 +35,11 @@
 
 #include "part_ldr.h"
 #include "part_emt.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWLib/chunkio.h"
 #include "WWLib/win.h"		// for lstrcpy, can this be improved?
 #include "assetmgr.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 
 #ifndef SAFE_DELETE
 #define SAFE_DELETE(pointer) { delete pointer; pointer = nullptr; }
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
index 36592e83276..e8ff2abe59e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -42,18 +42,18 @@
 #include "render2d.h"
 #include "WWLib/mutex.h"
 #include "ww3d.h"
-#include "WW3D2/font3d.h"
+#include "font3d.h"
 #include "WWMath/rect.h"
-#include "WW3D2/texture.h"
+#include "texture.h"
 #include "WWMath/matrix4.h"
 #include "WWMath/matrix3d.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8indexbuffer.h"
-#include "WW3D2/dx8vertexbuffer.h"
-#include "WW3D2/sortingrenderer.h"
+#include "dx8wrapper.h"
+#include "dx8indexbuffer.h"
+#include "dx8vertexbuffer.h"
+#include "sortingrenderer.h"
 #include "vertmaterial.h"
-#include "WW3D2/dx8fvf.h"
-#include "WW3D2/dx8caps.h"
+#include "dx8fvf.h"
+#include "dx8caps.h"
 #include "WWDebug/wwprofile.h"
 #include "WWDebug/wwmemlog.h"
 #include "assetmgr.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
index dc6c07c3887..21e710c59d9 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
@@ -40,7 +40,7 @@
 
 #include "rinfo.h"
 #include "camera.h"
-#include "WW3D2/matpass.h"
+#include "matpass.h"
 
 
 /***********************************************************************************************
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
index f76899d71ce..6967adc959e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
@@ -67,10 +67,10 @@
 #include "ww3d.h"
 #include "rinfo.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/sortingrenderer.h"
-#include "WW3D2/coltest.h"
+#include "dx8renderer.h"
+#include "dx8wrapper.h"
+#include "sortingrenderer.h"
+#include "coltest.h"
 
 
 /*
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
index ec878aca073..c53cdb44783 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
@@ -43,8 +43,8 @@
 #include "shader.h"
 #include "w3d_file.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8caps.h"
+#include "dx8wrapper.h"
+#include "dx8caps.h"
 
 
 bool ShaderClass::ShaderDirty=true;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index 4467e88bb8f..d5182c0a772 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -40,12 +40,12 @@
 #include "vertmaterial.h"
 #include "WWLib/realcrc.h"
 #include "WWDebug/wwdebug.h"
-#include "WW3D2/w3d_util.h"
+#include "w3d_util.h"
 #include "WWLib/chunkio.h"
-#include "WW3D2/w3derr.h"
+#include "w3derr.h"
 #include "WWLib/INI.h"
 #include "WWLib/XSTRAW.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 
 
 static unsigned int unique=1;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
index 5f1c1ac6692..226c8a63c98 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -85,40 +85,40 @@
 #include "rinfo.h"
 #include "assetmgr.h"
 #include "boxrobj.h"
-#include "WW3D2/predlod.h"
+#include "predlod.h"
 #include "camera.h"
 #include "scene.h"
 #include "WWLib/registry.h"
-#include "WW3D2/segline.h"
+#include "segline.h"
 #include "shader.h"
 #include "vertmaterial.h"
 #include "WWDebug/wwdebug.h"
 #include "WWDebug/wwprofile.h"
 #include "WWDebug/wwmemlog.h"
-#include "WW3D2/shattersystem.h"
-#include "WW3D2/textureloader.h"
-#include "WW3D2/statistics.h"
-#include "WW3D2/pointgr.h"
+#include "shattersystem.h"
+#include "textureloader.h"
+#include "statistics.h"
+#include "pointgr.h"
 #include "WWLib/ffactory.h"
 #include "WWLib/INI.h"
 #include "dazzle.h"
 #include "meshmdl.h"
-#include "WW3D2/dx8renderer.h"
+#include "dx8renderer.h"
 #include "render2d.h"
 #include "WWLib/bound.h"
-#include "WW3D2/rddesc.h"
+#include "rddesc.h"
 #include "WWMath/Vector3i.h"
-#include "WW3D2/dx8wrapper.h"
+#include "dx8wrapper.h"
 #include "WWLib/TARGA.h"
-#include "WW3D2/sortingrenderer.h"
+#include "sortingrenderer.h"
 #include "WWLib/thread.h"
 #include "WWLib/cpudetect.h"
-#include "WW3D2/dx8texman.h"
-#include "WW3D2/formconv.h"
-#include "WW3D2/animatedsoundmgr.h"
-#include "WW3D2/static_sort_list.h"
-#include "WW3D2/shdlib.h"
-#include "WW3D2/framgrab.h"
+#include "dx8texman.h"
+#include "formconv.h"
+#include "animatedsoundmgr.h"
+#include "static_sort_list.h"
+#include "shdlib.h"
+#include "framgrab.h"
 #include "Lib/BaseType.h"