Reduce irrlicht_extrabloated.h includes in header files

src/client/client.cpp

@@ -37,6 +37,7 @@
 #include "profiler.h"
 #include "shader.h"
 #include "gettext.h"
+#include "gettime.h"
 #include "clientdynamicinfo.h"
 #include "clientmap.h"
 #include "clientmedia.h"

src/client/content_cao.h

@@ -4,15 +4,23 @@
 
 #pragma once
 
-#include <map>
-#include "irrlichttypes_extrabloated.h"
-#include "clientobject.h"
+#include "EMaterialTypes.h"
+#include "IDummyTransformationSceneNode.h"
+#include "irrlichttypes.h"
+
 #include "object_properties.h"
-#include "itemgroup.h"
+#include "clientobject.h"
 #include "constants.h"
+#include "itemgroup.h"
 #include <cassert>
+#include <map>
 #include <memory>
 
+namespace irr::scene {
+	class IMeshSceneNode;
+	class IBillboardSceneNode;
+}
+
 class Camera;
 class Client;
 struct Nametag;

src/client/inputhandler.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "irrlichttypes.h"
+#include "irr_v2d.h"
 #include "joystick_controller.h"
 #include <list>
 #include "keycode.h"

src/client/joystick_controller.h

@@ -4,7 +4,9 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include <IEventReceiver.h>
+#include "irrlichttypes.h"
+
 #include "keys.h"
 #include <bitset>
 #include <vector>

src/client/mapblock_mesh.h

@@ -4,8 +4,11 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes.h"
 #include "irr_ptr.h"
+#include "IMesh.h"
+#include "SMeshBuffer.h"
+
 #include "util/numeric.h"
 #include "client/tile.h"
 #include "voxel.h"
@@ -13,6 +16,10 @@
 #include <map>
 #include <unordered_map>
 
+namespace irr::video {
+	class IVideoDriver;
+}
+
 class Client;
 class NodeDefManager;
 class IShaderSource;

src/client/mesh.cpp

@@ -3,7 +3,6 @@
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include "mesh.h"
-#include "S3DVertex.h"
 #include "debug.h"
 #include "log.h"
 #include <cmath>
@@ -11,6 +10,9 @@
 #include <IAnimatedMesh.h>
 #include <SAnimatedMesh.h>
 #include <IAnimatedMeshSceneNode.h>
+#include "S3DVertex.h"
+#include "SMesh.h"
+#include "SMeshBuffer.h"
 
 inline static void applyShadeFactor(video::SColor& color, float factor)
 {

src/client/mesh.h

@@ -4,10 +4,20 @@
 
 #pragma once
 
+#include "SColor.h"
 #include "SMaterialLayer.h"
-#include "irrlichttypes_extrabloated.h"
 #include "nodedef.h"
 
+namespace irr {
+	namespace scene {
+		class IAnimatedMesh;
+		class IMesh;
+		class IMeshBuffer;
+	}
+}
+
+using namespace irr;
+
 /*!
  * Applies shading to a color based on the surface's
  * normal vector.

src/client/minimap.h

@@ -4,18 +4,35 @@
 
 #pragma once
 
-#include "../hud.h"
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes.h"
 #include "irr_ptr.h"
+#include "rect.h"
+#include "SMeshBuffer.h"
+
+#include "../hud.h"
+#include "mapnode.h"
 #include "util/thread.h"
-#include "voxel.h"
 #include <map>
 #include <string>
 #include <vector>
 
+namespace irr {
+	namespace video {
+		class IVideoDriver;
+		class IImage;
+		class ITexture;
+	}
+
+	namespace scene {
+		class ISceneNode;
+	}
+}
+
 class Client;
+class NodeDefManager;
 class ITextureSource;
 class IShaderSource;
+class VoxelManipulator;
 
 #define MINIMAP_MAX_SX 512
 #define MINIMAP_MAX_SY 512

src/client/particles.cpp

@@ -22,6 +22,8 @@
 #include "settings.h"
 #include "profiler.h"
 
+#include "SMeshBuffer.h"
+
 using BlendMode = ParticleParamTypes::BlendMode;
 
 ClientParticleTexture::ClientParticleTexture(const ServerParticleTexture& p, ITextureSource *tsrc)

src/client/particles.h

@@ -4,12 +4,21 @@
 
 #pragma once
 
+#include "irrlichttypes_bloated.h"
+#include "irr_ptr.h"
+#include "ISceneNode.h"
+#include "S3DVertex.h"
+#include "SMeshBuffer.h"
+
+#include <mutex>
 #include <vector>
 #include <unordered_map>
-#include "irrlichttypes_extrabloated.h"
-#include "irr_ptr.h"
 #include "../particles.h"
 
+namespace irr::video {
+	class ITexture;
+}
+
 struct ClientEvent;
 class ParticleManager;
 class ClientEnvironment;