From 6da3caf88a2f856e20fa1774d8dba0cc86b05140 Mon Sep 17 00:00:00 2001
From: marauder2k7 <ctrl-intelligence@live.co.uk>
Date: Thu, 12 Mar 2026 22:48:30 +0000
Subject: [PATCH] Fix include directives

includes now dont go into sub folders for the most part
---
 Engine/source/console/SimXMLDocument.cpp       |  2 +-
 Engine/source/gfx/bitmap/imageUtils.cpp        |  2 +-
 Engine/source/gfx/bitmap/loaders/bitmapPng.cpp |  4 ++--
 Engine/source/gfx/gFont.cpp                    |  2 +-
 Engine/source/persistence/taml/fsTinyXml.h     |  2 +-
 Engine/source/ts/tsCollision.cpp               | 10 +++++-----
 Engine/source/ts/tsMesh.cpp                    |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Engine/source/console/SimXMLDocument.cpp b/Engine/source/console/SimXMLDocument.cpp
index b565b1b31..6d40279ca 100644
--- a/Engine/source/console/SimXMLDocument.cpp
+++ b/Engine/source/console/SimXMLDocument.cpp
@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "tinyxml2/tinyxml2.h"
+#include "tinyxml2.h"
 
 //-----------------------------------------------------------------------------
 // Console implementation of STL map.
diff --git a/Engine/source/gfx/bitmap/imageUtils.cpp b/Engine/source/gfx/bitmap/imageUtils.cpp
index 3426eecd3..283b5c406 100644
--- a/Engine/source/gfx/bitmap/imageUtils.cpp
+++ b/Engine/source/gfx/bitmap/imageUtils.cpp
@@ -24,7 +24,7 @@
 #include "gfx/bitmap/imageUtils.h"
 #include "gfx/bitmap/ddsFile.h"
 #include "platform/threads/threadPool.h"
-#include "squish/squish.h"
+#include "squish.h"
 
 namespace ImageUtil
 {
diff --git a/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp b/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp
index 83b60edfb..bd1007127 100644
--- a/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp
+++ b/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp
@@ -32,8 +32,8 @@
 
 #define PNG_INTERNAL 1
 #include <time.h>
-#include "lpng/png.h"
-#include "zlib/zlib.h"
+#include "png.h"
+#include "zlib.h"
 
 #ifdef NULL
 #undef NULL
diff --git a/Engine/source/gfx/gFont.cpp b/Engine/source/gfx/gFont.cpp
index a4d349af1..e83976d1b 100644
--- a/Engine/source/gfx/gFont.cpp
+++ b/Engine/source/gfx/gFont.cpp
@@ -33,7 +33,7 @@
 #include "console/console.h"
 #include "console/engineAPI.h"
 #include "platform/threads/mutex.h"
-#include "zlib/zlib.h"
+#include "zlib.h"
 
 
 GFX_ImplementTextureProfile(GFXFontTextureProfile,
diff --git a/Engine/source/persistence/taml/fsTinyXml.h b/Engine/source/persistence/taml/fsTinyXml.h
index 8c99b0e5d..1ff3842bf 100644
--- a/Engine/source/persistence/taml/fsTinyXml.h
+++ b/Engine/source/persistence/taml/fsTinyXml.h
@@ -25,7 +25,7 @@
 
 
 #ifndef TINYXML_INCLUDED
-#include "tinyxml2/tinyxml2.h"
+#include "tinyxml2.h"
 #endif
 
 #include "platform/platform.h"
diff --git a/Engine/source/ts/tsCollision.cpp b/Engine/source/ts/tsCollision.cpp
index 04adffdf8..cab11d437 100644
--- a/Engine/source/ts/tsCollision.cpp
+++ b/Engine/source/ts/tsCollision.cpp
@@ -34,11 +34,11 @@
 #include "collision/vertexPolyList.h"
 #include "platform/profiler.h"
 
-#include "opcode/Opcode.h"
-#include "opcode/Ice/IceAABB.h"
-#include "opcode/Ice/IcePoint.h"
-#include "opcode/OPC_AABBTree.h"
-#include "opcode/OPC_AABBCollider.h"
+#include "Opcode.h"
+#include "Ice/IceAABB.h"
+#include "Ice/IcePoint.h"
+#include "OPC_AABBTree.h"
+#include "OPC_AABBCollider.h"
 
 static bool gOpcodeInitialized = false;
 
diff --git a/Engine/source/ts/tsMesh.cpp b/Engine/source/ts/tsMesh.cpp
index bce5422c0..55edafe44 100644
--- a/Engine/source/ts/tsMesh.cpp
+++ b/Engine/source/ts/tsMesh.cpp
@@ -52,7 +52,7 @@
 #include "gfx/util/triListOpt.h"
 #include "util/triRayCheck.h"
 
-#include "opcode/Opcode.h"
+#include "Opcode.h"
 
 GFXPrimitiveType drawTypes[] = { GFXTriangleList, GFXTriangleStrip };
 #define getDrawType(a) (drawTypes[a])