Reduce irrlicht_extrabloated.h includes in header files

irr/include/IGUIButton.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "IGUIElement.h"
+#include "SColor.h"
 
 namespace irr
 {

irr/include/IGUIElement.h

@@ -10,7 +10,6 @@
 #include "IEventReceiver.h"
 #include "EGUIElementTypes.h"
 #include "EGUIAlignment.h"
-#include "IGUIEnvironment.h"
 #include <cassert>
 #include <list>
 #include <vector>
@@ -19,6 +18,8 @@ namespace irr
 {
 namespace gui
 {
+class IGUIEnvironment;
+
 //! Base class of all GUI elements.
 class IGUIElement : virtual public IReferenceCounted, public IEventReceiver
 {

irr/include/IGUIImage.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "IGUIElement.h"
+#include "SColor.h"
 
 namespace irr
 {

src/activeobjectmgr.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include "debug.h"
 #include "util/container.h"
 #include "irrlichttypes.h"
 #include "util/basic_macros.h"

src/chat_interface.h

@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "util/container.h"
-#include <string>
-#include <queue>
 #include "irrlichttypes.h"
+#include "util/container.h" // MutexedQueue
+#include <string>
 
 enum ChatEventType {
 	CET_CHAT,

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;

src/content/content.h

@@ -3,9 +3,8 @@
 // Copyright (C) 2018 rubenwardy <rw@rubenwardy.com>
 
 #pragma once
-#include "config.h"
-#include "convert_json.h"
 #include "irrlichttypes.h"
+#include <string>
 
 enum class ContentType
 {

src/debug.h

@@ -6,8 +6,7 @@
 
 #include <exception>
 #include <cassert>
-#include "gettime.h"
-#include "log.h"
+#include "log.h" // unused. for convenience.
 
 #ifdef _MSC_VER
 	#define FUNCTION_NAME __FUNCTION__

src/emerge.h

@@ -8,7 +8,6 @@
 #include <mutex>
 #include "network/networkprotocol.h"
 #include "irr_v3d.h"
-#include "util/container.h"
 #include "util/metricsbackend.h"
 #include "mapgen/mapgen.h" // for MapgenParams
 #include "map.h"

src/gui/mainmenumanager.h

@@ -11,6 +11,12 @@
 #include <cassert>
 #include <list>
 
+#include "IGUIEnvironment.h"
+
+namespace irr::gui {
+	class IGUIStaticText;
+}
+
 class IGameCallback
 {
 public:

src/gui/modalMenu.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include "IGUIElement.h"
+#include "irrlichttypes_bloated.h"
 #include "irr_ptr.h"
+
 #include "util/string.h"
 #ifdef __ANDROID__
 	#include <porting_android.h>

src/gui/touchscreeneditor.h

@@ -13,6 +13,7 @@
 class ISimpleTextureSource;
 namespace irr::gui
 {
+	class IGUIButton;
 	class IGUIImage;
 }
 

src/network/serverpackethandler.cpp

@@ -18,6 +18,7 @@
 #include "version.h"
 #include "irrlicht_changes/printing.h"
 #include "network/connection.h"
+#include "network/networkpacket.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
 #include "server/player_sao.h"

src/objdef.cpp

@@ -6,6 +6,9 @@
 #include "util/numeric.h"
 #include "log.h"
 #include "gamedef.h"
+#include "porting.h" // strcasecmp
+
+#include <cassert>
 
 ObjDefManager::ObjDefManager(IGameDef *gamedef, ObjDefType type)
 {

src/objdef.h

@@ -4,8 +4,9 @@
 
 #pragma once
 
-#include "util/basic_macros.h"
-#include "porting.h"
+#include "util/basic_macros.h" // DISABLE_CLASS_COPY
+#include "irrlichttypes.h"
+#include <string>
 #include <vector>
 
 class IGameDef;

src/reflowscan.h

@@ -5,7 +5,8 @@
 #pragma once
 
 #include "util/container.h"
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
+#include "irr_v3d.h"
 
 class NodeDefManager;
 class Map;

src/server.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 #include "irr_v2d.h"
 #include "network/connection.h"
+#include "network/networkpacket.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
 #include "server/ban.h"

src/server/clientiface.cpp

@@ -6,6 +6,7 @@
 #include "clientiface.h"
 #include "debug.h"
 #include "network/connection.h"
+#include "network/networkpacket.h"
 #include "network/serveropcodes.h"
 #include "remoteplayer.h"
 #include "serialization.h" // SER_FMT_VER_INVALID

src/server/clientiface.h

@@ -6,25 +6,25 @@
 
 #include "irr_v3d.h"                   // for irrlicht datatypes
 
-#include "constants.h"
-#include "network/networkpacket.h"
-#include "network/networkprotocol.h"
 #include "network/address.h"
+#include "network/networkprotocol.h" // session_t
 #include "porting.h"
 #include "threading/mutex_auto_lock.h"
 #include "clientdynamicinfo.h"
 
 #include <list>
-#include <vector>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
 #include <memory>
 #include <mutex>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
-class MapBlock;
-class ServerEnvironment;
 class EmergeManager;
+class MapBlock;
+class NetworkPacket;
+class ServerEnvironment;
 
 /*
  * State Transitions

src/servermap.h

@@ -8,8 +8,8 @@
 #include <memory>
 
 #include "map.h"
-#include "util/container.h"
-#include "util/metricsbackend.h"
+#include "util/container.h" // UniqueQueue
+#include "util/metricsbackend.h" // ptr typedefs
 #include "map_settings_manager.h"
 
 class Settings;

src/unittest/test.h

@@ -9,7 +9,7 @@
 #include <sstream>
 #include <vector>
 
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes_bloated.h"
 #include "porting.h"
 #include "filesys.h"
 #include "mapnode.h"

src/unittest/test_compression.cpp

@@ -6,7 +6,6 @@
 
 #include <sstream>
 
-#include "irrlichttypes_extrabloated.h"
 #include "log.h"
 #include "serialization.h"
 #include "nodedef.h"