Clean up header includes

irr/include/AnimatedMeshSceneNode.h

@@ -6,7 +6,6 @@
 
 #include "BoneSceneNode.h"
 #include "ISceneNode.h"
-#include "IAnimatedMesh.h"
 
 #include "SkinnedMesh.h"
 #include "Transform.h"
@@ -16,6 +15,9 @@
 namespace scene
 {
 
+class IAnimatedMesh;
+class ISceneManager;
+
 class AnimatedMeshSceneNode : public ISceneNode
 {
 public:

irr/include/IFileArchive.h

@@ -4,18 +4,14 @@
 
 #pragma once
 
-#include "IReadFile.h"
-#include "IFileList.h"
+#include "IReferenceCounted.h"
+#include "path.h"
 
 namespace io
 {
 
-//! FileSystemType: which filesystem should be used for e.g. browsing
-enum EFileSystemType
-{
-	FILESYSTEM_NATIVE = 0, // Native OS FileSystem
-	FILESYSTEM_VIRTUAL     // Virtual FileSystem
-};
+class IReadFile;
+class IFileList;
 
 //! Contains the different types of archives
 enum E_FILE_ARCHIVE_TYPE

irr/include/IFileSystem.h

@@ -5,15 +5,23 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "IFileArchive.h"
+#include "path.h"
 
 namespace io
 {
 
+class IArchiveLoader;
 class IReadFile;
 class IWriteFile;
 class IFileList;
 
+//! FileSystemType: which filesystem should be used for e.g. browsing
+enum EFileSystemType
+{
+	FILESYSTEM_NATIVE = 0, // Native OS FileSystem
+	FILESYSTEM_VIRTUAL     // Virtual FileSystem
+};
+
 //! The FileSystem manages files and archives and provides access to them.
 /** It manages where files are, so that modules which use the the IO do not
 need to know where every file is located. A file could be in a .zip-Archive or

irr/include/SkinnedMesh.h

@@ -5,9 +5,6 @@
 #pragma once
 
 #include "IAnimatedMesh.h"
-#include "ISceneManager.h"
-#include "CMeshBuffer.h"
-#include "SSkinMeshBuffer.h"
 #include "aabbox3d.h"
 #include "irrMath.h"
 #include "irrTypes.h"
@@ -17,6 +14,7 @@
 #include "vector3d.h"
 #include "Transform.h"
 
+#include <algorithm>
 #include <optional>
 #include <string>
 #include <variant>
@@ -28,6 +26,7 @@ namespace scene
 class AnimatedMeshSceneNode;
 class BoneSceneNode;
 class ISceneManager;
+struct SSkinMeshBuffer;
 
 class SkinnedMesh : public IAnimatedMesh
 {

irr/src/AnimatedMeshSceneNode.cpp

@@ -7,20 +7,16 @@
 #include "ISceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "S3DVertex.h"
 #include "Transform.h"
 #include "irrTypes.h"
 #include "matrix4.h"
 #include "os.h"
 #include "SkinnedMesh.h"
-#include "IDummyTransformationSceneNode.h"
 #include "BoneSceneNode.h"
-#include "IMaterialRenderer.h"
 #include "IMesh.h"
-#include "IMeshCache.h"
+#include "IMeshBuffer.h"
 #include "IAnimatedMesh.h"
-#include "IFileSystem.h"
-#include "quaternion.h"
+#include "SSkinMeshBuffer.h"
 #include <algorithm>
 #include <cstddef>
 #include <optional>

irr/src/CB3DMeshFileLoader.cpp

@@ -11,6 +11,7 @@
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
 #include "SkinnedMesh.h"
+#include "SSkinMeshBuffer.h"
 #include "coreutil.h"
 #include "os.h"
 

irr/src/CB3DMeshFileLoader.h

@@ -10,6 +10,7 @@
 
 #include "IMeshLoader.h"
 #include "ISceneManager.h"
+#include "S3DVertex.h"
 #include "SkinnedMesh.h"
 #include "SB3DStructs.h"
 #include "IReadFile.h"

irr/src/CGLTFMeshFileLoader.cpp

@@ -6,6 +6,7 @@
 #include "SMaterialLayer.h"
 #include "coreutil.h"
 #include "SkinnedMesh.h"
+#include "SSkinMeshBuffer.h"
 #include "IAnimatedMesh.h"
 #include "IReadFile.h"
 #include "irrTypes.h"

irr/src/CXMeshFileLoader.cpp

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CXMeshFileLoader.h"
+#include "SSkinMeshBuffer.h"
 #include "SkinnedMesh.h"
 #include "os.h"
 

irr/src/CXMeshFileLoader.h

@@ -5,7 +5,9 @@
 #pragma once
 
 #include "IMeshLoader.h"
+#include "irrArray.h"
 #include "irrString.h"
+#include "S3DVertex.h"
 #include "SkinnedMesh.h"
 
 namespace io

irr/src/CZipReader.h

@@ -7,11 +7,13 @@
 #include <vector>
 #include "IReadFile.h"
 #include "irrString.h"
+#include "IFileArchive.h"
 #include "IFileSystem.h"
 #include "CFileList.h"
 
 namespace io
 {
+
 // the fields crc-32, compressed size and uncompressed size are set to
 // zero in the local header
 static constexpr s16 ZIP_INFO_IN_DATA_DESCRIPTOR = 0x0008;

irr/src/OpenGL/Driver.cpp

@@ -22,6 +22,7 @@
 
 #include "EVertexAttributes.h"
 #include "CImage.h"
+#include "IReadFile.h"
 #include "matrix4.h"
 #include "os.h"
 

src/client/client.cpp

@@ -67,6 +67,7 @@
 
 #include <IAnimatedMesh.h>
 #include <IFileSystem.h>
+#include <IReadFile.h>
 #include <json/json.h>
 
 #include <iostream>

src/client/fontengine.h

@@ -7,7 +7,6 @@
 #include <map>
 #include <unordered_map>
 #include "irr_ptr.h"
-#include "irrlicht_changes/CGUITTFont.h"
 #include "util/basic_macros.h"
 #include "irrlichttypes.h"
 #include "irrString.h" // utf8_to_wide
@@ -18,6 +17,11 @@ namespace gui {
 	class IGUIFont;
 }
 
+// Luanti namespace
+namespace gui {
+	struct SGUITTFace;
+}
+
 #define FONT_SIZE_UNSPECIFIED 0xFFFFFFFF
 
 enum FontMode : u8 {

src/client/gameui.cpp

@@ -21,6 +21,7 @@
 #include "profiler.h"
 #include "renderingengine.h"
 #include "version.h"
+#include <IGUIFont.h>
 
 inline static const char *yawToDirectionString(int yaw)
 {

src/client/imagesource.cpp

@@ -6,6 +6,7 @@
 
 #include "exceptions.h"
 #include <IFileSystem.h>
+#include <IReadFile.h>
 #include "imagefilters.h"
 #include "renderingengine.h"
 #include "settings.h"

src/filesys.cpp

@@ -18,7 +18,9 @@
 #if CHECK_CLIENT_BUILD()
 #include "irr_ptr.h"
 #include <IFileArchive.h>
+#include <IFileList.h>
 #include <IFileSystem.h>
+#include <IReadFile.h>
 #endif
 
 #ifdef _WIN32

src/gui/guiButton.cpp

@@ -8,6 +8,7 @@
 #include "client/guiscalingfilter.h"
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
+#include "IGUISpriteBank.h"
 #include "IVideoDriver.h"
 #include "IGUIFont.h"
 #include "irrlicht_changes/static_text.h"

src/gui/guiButton.h

@@ -7,11 +7,13 @@
 #include <IGUIStaticText.h>
 #include "irrlicht_changes/static_text.h"
 #include "IGUIButton.h"
-#include "IGUISpriteBank.h"
 #include "ITexture.h"
 #include "SColor.h"
 #include "StyleSpec.h"
 
+namespace irr::gui {
+	class IGUISpriteBank;
+}
 
 class ISimpleTextureSource;
 

src/gui/guiChatConsole.cpp

@@ -16,6 +16,7 @@
 #include "util/string.h"
 #include "guiScrollBar.h"
 #include <IOSOperator.h>
+#include <IVideoDriver.h>
 #include <string>
 
 inline u32 clamp_u8(s32 value)

src/irrlicht_changes/CGUITTFont.cpp

@@ -35,7 +35,11 @@
 
 #include "log.h"
 #include "debug.h"
+#include "util/enriched_string.h"
+
 #include "IGUIEnvironment.h"
+#include "IImage.h"
+#include "IVideoDriver.h"
 
 #include <cstdlib>
 #include <iostream>
@@ -227,6 +231,18 @@ void SGUITTGlyph::unload()
 	source_rect = core::recti();
 }
 
+SGUITTGlyphPending::~SGUITTGlyphPending()
+{
+	if (surface)
+		surface->drop();
+}
+
+CGUITTGlyphPage::~CGUITTGlyphPage()
+{
+	if (texture)
+		driver->removeTexture(texture);
+}
+
 bool CGUITTGlyphPage::createPageTexture(const u8 pixel_mode,
 	const core::dimension2du texture_size)
 {

src/irrlicht_changes/CGUITTFont.h

@@ -37,13 +37,22 @@
 #include <freetype/freetype.h>
 
 #include "irr_ptr.h"
-#include "IGUIEnvironment.h"
 #include "IGUIFont.h"
-#include "IVideoDriver.h"
-#include "util/enriched_string.h"
+#include "irrArray.h"
+#include "path.h"
 #include "util/basic_macros.h"
 
-#include <map>
+namespace gui {
+	class IGUIEnvironment;
+}
+
+namespace video {
+	class IImage;
+	class ITexture;
+	class IVideoDriver;
+}
+
+class EnrichedString;
 
 namespace gui
 {
@@ -117,10 +126,7 @@ namespace gui
 		SGUITTGlyphPending(const SGUITTGlyph *glyph, video::IImage *surface) noexcept :
 			glyph(glyph), surface(surface)
 		{}
-		~SGUITTGlyphPending() {
-			if (surface)
-				surface->drop();
-		}
+		~SGUITTGlyphPending();
 
 		DISABLE_CLASS_COPY(SGUITTGlyphPending)
 
@@ -142,11 +148,7 @@ namespace gui
 				texture(0), available_slots(0), used_slots(0),
 				driver(Driver), name(texture_name)
 			{}
-			~CGUITTGlyphPage()
-			{
-				if (texture)
-					driver->removeTexture(texture);
-			}
+			~CGUITTGlyphPage();
 
 			//! Create the actual page texture,
 			bool createPageTexture(u8 pixel_mode, core::dimension2du texture_size);