Clean up header includes (#16674)

src/chat.cpp

@@ -5,10 +5,7 @@
 #include "chat.h"
 
 #include <algorithm>
-#include <cctype>
-#include <sstream>
 
-#include "config.h"
 #include "debug.h"
 #include "settings.h"
 #include "util/strfnd.h"

src/chat.h

@@ -7,7 +7,6 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <list>
 #include <optional>
 
 #include "irrlichttypes.h"

src/client/camera.cpp

@@ -3,10 +3,7 @@
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include "camera.h"
-#include "debug.h"
 #include "client.h"
-#include "config.h"
-#include "map.h"
 #include "clientmap.h"     // MapDrawControl
 #include "localplayer.h"
 #include "player.h"

src/client/camera.h

@@ -6,6 +6,7 @@
 
 #include "irrlichttypes.h"
 #include "inventory.h" // ItemStack
+#include "util/basic_macros.h"
 #include "util/numeric.h"
 #include <plane3d.h>
 #include <array>

src/client/client.cpp

@@ -51,6 +51,7 @@
 // Network
 #include "network/clientopcodes.h"
 #include "network/connection.h"
+#include "network/networkexceptions.h"
 #include "network/networkpacket.h"
 #include "serialization.h"
 

src/client/clientenvironment.cpp

@@ -18,10 +18,8 @@
 #include "raycast.h"
 #include "voxelalgorithms.h"
 #include "settings.h"
-#include "shader.h"
 #include "content_cao.h"
 #include "porting.h"
-#include <algorithm>
 #include "client/renderingengine.h"
 
 /*

src/client/clientevent.h

@@ -6,7 +6,7 @@
 
 #include <string>
 #include "irrlichttypes.h"
-#include "client/hud.h" // HudElementStat
+#include "../hud.h" // HudElementStat
 
 struct ParticleParameters;
 struct ParticleSpawnerParameters;

src/client/clientlauncher.cpp

@@ -19,6 +19,7 @@
 #include "version.h"
 #include "renderingengine.h"
 #include "settings.h"
+#include "util/numeric.h"
 #include "util/tracy_wrapper.h"
 #include <IGUISpriteBank.h>
 #include <ICameraSceneNode.h>

src/client/clientmap.h

@@ -7,7 +7,6 @@
 #include "irrlichttypes_bloated.h"
 #include "map.h"
 #include <ISceneNode.h>
-#include <set>
 #include <map>
 #include <functional>
 

src/client/clientobject.cpp

@@ -4,7 +4,6 @@
 
 #include "clientobject.h"
 #include "debug.h"
-#include "porting.h"
 
 /*
 	ClientActiveObject

src/client/clouds.cpp

@@ -6,7 +6,7 @@
 #include "client/shader.h"
 #include "clouds.h"
 #include "constants.h"
-#include "debug.h"
+#include "util/numeric.h"
 #include "irrlicht_changes/printing.h"
 #include "noise.h"
 #include "profiler.h"

src/client/clouds.h

@@ -8,7 +8,6 @@
 #include "constants.h"
 #include "irr_ptr.h"
 #include "skyparams.h"
-#include <iostream>
 #include <ISceneNode.h>
 #include <SMaterial.h>
 #include <CMeshBuffer.h>

src/client/filecache.cpp

@@ -10,7 +10,6 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-#include <cstdlib>
 
 void FileCache::createDir()
 {

src/client/game.cpp

@@ -29,6 +29,7 @@
 #include "gui/profilergraph.h"
 #include "localplayer.h"
 #include "minimap.h"
+#include "network/networkexceptions.h"
 #include "nodedef.h"         // Needed for determining pointing to nodes
 #include "nodemetadata.h"
 #include "particles.h"

src/client/imagesource.cpp

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

src/client/inputhandler.h

@@ -8,7 +8,6 @@
 #include "irr_v2d.h"
 #include "joystick_controller.h"
 #include <array>
-#include <list>
 #include <set>
 #include <unordered_map>
 #include "keycode.h"

src/client/item_visuals_manager.cpp

@@ -4,7 +4,7 @@
 
 #include "item_visuals_manager.h"
 
-#include "mesh.h"
+#include "wieldmesh.h"
 #include "client.h"
 #include "texturesource.h"
 #include "itemdef.h"

src/client/item_visuals_manager.h

@@ -5,16 +5,16 @@
 #pragma once
 
 #include <string>
-#include <map>
 #include <thread>
 #include <unordered_map>
-#include "wieldmesh.h" // ItemMesh
-#include "util/basic_macros.h"
+#include <vector>
 
+struct AnimationInfo;
 class Client;
 struct ItemStack;
+struct ItemMesh;
+namespace video { class ITexture; class SColor; }
 typedef std::vector<video::SColor> Palette; // copied from src/client/texturesource.h
-namespace video { class ITexture; }
 
 // Caches data needed to draw an itemstack
 

src/client/joystick_controller.cpp

@@ -5,7 +5,6 @@
 #include "joystick_controller.h"
 #include "keys.h"
 #include "settings.h"
-#include "gettime.h"
 #include "porting.h"
 #include "util/string.h"
 #include "util/numeric.h"

src/client/keycode.cpp

@@ -5,11 +5,8 @@
 #include "keycode.h"
 #include "settings.h"
 #include "log.h"
-#include "debug.h"
 #include "renderingengine.h"
-#include "util/hex.h"
 #include "util/string.h"
-#include "util/basic_macros.h"
 #include <unordered_map>
 #include <vector>
 

src/client/keys.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <list>
-
 class KeyType
 {
 public:

src/client/mapblock_mesh.cpp

@@ -7,6 +7,7 @@
 #include "client.h"
 #include "mapblock.h"
 #include "node_visuals.h"
+#include "porting.h"
 #include "shader.h"
 #include "mesh.h"
 #include "minimap.h"

src/client/mapblock_mesh.h

@@ -12,9 +12,7 @@
 #include "util/numeric.h"
 #include "client/tile.h"
 #include "voxel.h"
-#include <array>
 #include <map>
-#include <unordered_map>
 
 namespace video {
 	class IVideoDriver;

src/client/mesh.h

@@ -5,8 +5,6 @@
 #pragma once
 
 #include "irrlichttypes_bloated.h"
-#include "SColor.h"
-#include "SMaterialLayer.h"
 
 namespace scene {
 	class IAnimatedMesh;
@@ -15,6 +13,11 @@ namespace scene {
 	struct SMesh;
 }
 
+namespace video {
+	class SMaterialLayer;
+	class SColor;
+}
+
 
 /*!
  * Applies shading to a color based on the surface's

src/client/mesh_generator_thread.cpp

@@ -7,6 +7,7 @@
 #include "profiler.h"
 #include "client.h"
 #include "mapblock.h"
+#include "mapblock_mesh.h"
 #include "map.h"
 #include "util/directiontables.h"
 #include "porting.h"

src/client/mesh_generator_thread.h

@@ -6,16 +6,18 @@
 
 #include <ctime>
 #include <mutex>
-#include <unordered_map>
 #include <unordered_set>
-#include "mapblock_mesh.h"
+#include "irrlichttypes_bloated.h"
 #include "threading/mutex_auto_lock.h"
 #include "util/thread.h"
 #include <vector>
 #include <memory>
-#include <unordered_map>
 
+class Map;
 class MapBlock;
+class MapBlockMesh;
+class MeshMakeData;
+class Client;
 
 struct QueuedMeshUpdate
 {

src/client/meshgen/collector.cpp

@@ -4,8 +4,6 @@
 
 #include "collector.h"
 #include <stdexcept>
-#include "log.h"
-#include "client/mesh.h"
 
 void MeshCollector::append(const TileSpec &tile, const video::S3DVertex *vertices,
 		u32 numVertices, const u16 *indices, u32 numIndices)

src/client/minimap.h

@@ -9,6 +9,7 @@
 #include "rect.h"
 #include "CMeshBuffer.h"
 
+#include "constants.h"
 #include "../hud.h"
 #include "mapnode.h"
 #include "util/thread.h"

src/client/particles.h

@@ -15,6 +15,7 @@
 #include <vector>
 #include <unordered_map>
 #include "../particles.h"
+#include "util/numeric.h"
 
 namespace video {
 	class ITexture;

src/client/render/anaglyph.cpp

@@ -5,6 +5,8 @@
 
 #include "anaglyph.h"
 #include "client/camera.h"
+#include "stereo.h"
+#include "plain.h"
 #include <IrrlichtDevice.h>
 #include <ISceneManager.h>
 

src/client/render/anaglyph.h

@@ -4,7 +4,6 @@
 // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
 
 #pragma once
-#include "stereo.h"
 #include "pipeline.h"
 
 /**

src/client/render/core.cpp

@@ -4,9 +4,9 @@
 // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
 
 #include "core.h"
-#include "plain.h"
+
+#include "pipeline.h"
 #include "client/shadows/dynamicshadowsrender.h"
-#include "settings.h"
 
 RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud,
 		std::unique_ptr<ShadowRenderer> _shadow_renderer,

src/client/render/factory.cpp

@@ -9,7 +9,6 @@
 #include "plain.h"
 #include "anaglyph.h"
 #include "sidebyside.h"
-#include "secondstage.h"
 #include "client/shadows/dynamicshadowsrender.h"
 
 #include <memory>

src/client/render/secondstage.cpp

@@ -7,9 +7,8 @@
 #include "secondstage.h"
 #include "client/client.h"
 #include "client/shader.h"
-#include "client/tile.h"
 #include "settings.h"
-#include "mt_opengl.h"
+#include "plain.h"
 #include <ISceneManager.h>
 
 PostProcessingStep::PostProcessingStep(u32 _shader_id, const std::vector<u8> &_texture_map) :

src/client/render/secondstage.h

@@ -4,7 +4,6 @@
 // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
 
 #pragma once
-#include "stereo.h"
 #include "pipeline.h"
 
 /**

src/client/render/sidebyside.cpp

@@ -7,6 +7,7 @@
 #include "client/client.h"
 #include "client/hud.h"
 #include "client/camera.h"
+#include "plain.h"
 #include <ISceneManager.h>
 
 DrawImageStep::DrawImageStep(u8 texture_index, v2f _offset) :

src/client/render/stereo.h

@@ -4,8 +4,6 @@
 // Copyright (C) 2017 numzero, Lobachevskiy Vitaliy <numzer0@yandex.ru>
 
 #pragma once
-#include "core.h"
-#include "plain.h"
 #include "pipeline.h"
 
 

src/client/renderingengine.cpp

@@ -16,6 +16,7 @@
 #include "client/texturesource.h"
 #include "camera.h"
 #include "minimap.h"
+#include "porting.h"
 #include "clientmap.h"
 #include "renderingengine.h"
 #include "render/core.h"

src/client/shader.cpp

@@ -3,8 +3,6 @@
 // Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 // Copyright (C) 2013 Kahrl <kahrl@gmx.net>
 
-#include <fstream>
-#include <iterator>
 #include "shader.h"
 #include "irr_ptr.h"
 #include "debug.h"
@@ -20,9 +18,7 @@
 #include "client/renderingengine.h"
 #include "gettext.h"
 #include "log.h"
-#include "gamedef.h"
 #include "client/tile.h"
-#include "config.h"
 
 #include <mt_opengl.h>
 

src/client/shadows/dynamicshadows.h

@@ -6,7 +6,6 @@
 
 #include "irrlichttypes_bloated.h"
 #include <matrix4.h>
-#include "util/basic_macros.h"
 #include "constants.h"
 
 class Camera;

src/client/sky.cpp

@@ -6,10 +6,8 @@
 #include "sky.h"
 
 #include "camera.h"
-#include "client/mesh.h"
 #include "client/renderingengine.h"
 #include "client/texturesource.h"
-#include "client/tile.h"
 #include "noise.h" // easeCurve
 #include "player.h" // CameraMode
 #include "profiler.h"

src/client/sound/playing_sound.cpp

@@ -9,7 +9,6 @@
 #include "playing_sound.h"
 
 #include "al_extensions.h"
-#include "debug.h"
 #include "sound_constants.h"
 #include <cassert>
 #include <cmath>

src/client/sound/sound_manager.cpp

@@ -14,8 +14,6 @@
 #include "filesys.h"
 #include "porting.h"
 
-#include <limits>
-
 namespace sound {
 
 void OpenALSoundManager::stepStreams(f32 dtime)

src/client/texturesource.cpp

@@ -9,6 +9,7 @@
 #include "guiscalingfilter.h"
 #include "imagefilters.h"
 #include "imagesource.h"
+#include "porting.h"
 #include "renderingengine.h"
 #include "settings.h"
 #include "texturepaths.h"

src/content/content.cpp

@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2018 rubenwardy <rw@rubenwardy.com>
 
-#include <fstream>
 #include "content/content.h"
-#include "content/subgames.h"
-#include "content/mods.h"
 #include "filesys.h"
 #include "settings.h"
 

src/content/mod_configuration.cpp

@@ -5,10 +5,12 @@
 #include "mod_configuration.h"
 #include "log.h"
 #include "settings.h"
+#include "subgames.h"
 #include "filesys.h"
 #include "gettext.h"
 #include "exceptions.h"
 #include "util/numeric.h"
+#include <list>
 #include <optional>
 #include <algorithm>
 

src/content/mod_configuration.h

@@ -6,6 +6,7 @@
 
 #include "mods.h"
 
+struct SubgameSpec;
 
 /**
  * ModConfiguration is a subset of installed mods. This class

src/content/mods.cpp

@@ -10,10 +10,7 @@
 #include "database/database.h"
 #include "filesys.h"
 #include "log.h"
-#include "content/subgames.h"
 #include "settings.h"
-#include "porting.h"
-#include "convert_json.h"
 #include "script/common/c_internal.h"
 #include "exceptions.h"
 

src/content/mods.h

@@ -4,18 +4,11 @@
 
 #pragma once
 
-#include "irrlichttypes.h"
-#include <list>
-#include <set>
 #include <vector>
 #include <string>
 #include <map>
-#include "json-forwards.h"
 #include <unordered_set>
-#include "util/basic_macros.h"
-#include "config.h"
 #include "metadata.h"
-#include "subgames.h"
 
 class ModStorageDatabase;
 

src/content/subgames.cpp

@@ -4,12 +4,12 @@
 
 #include <common/c_internal.h>
 #include "content/subgames.h"
+#include "constants.h"
 #include "porting.h"
 #include "filesys.h"
 #include "settings.h"
 #include "log.h"
 #include "util/strfnd.h"
-#include "defaultsettings.h" // for set_default_settings
 #include "map_settings_manager.h"
 #include "util/string.h"
 #include "exceptions.h"

src/content_mapnode.cpp

@@ -8,7 +8,6 @@
 #include "mapnode.h"
 #include "nodedef.h"
 #include "nameidmapping.h"
-#include "util/string.h"
 
 /*
 	Legacy node content type IDs

src/content_nodemeta.cpp

@@ -8,7 +8,6 @@
 #include "inventory.h"
 #include "log.h"
 #include "debug.h"
-#include "serialization.h"
 #include "util/serialize.h"
 #include "util/string.h"
 #include "constants.h" // MAP_BLOCKSIZE

src/convert_json.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include "json-forwards.h"
 #include <ostream>
 
+namespace Json { class Value; }
+
 void fastWriteJson(const Json::Value &value, std::ostream &to);
 
 std::string fastWriteJson(const Json::Value &value);

src/craftdef.cpp

@@ -13,11 +13,9 @@
 #include "gamedef.h"
 #include "inventory.h"
 #include "itemdef.h"
-#include "util/serialize.h"
 #include "util/string.h"
 #include "util/numeric.h"
 #include "util/strfnd.h"
-#include "exceptions.h"
 
 inline bool isGroupRecipeStr(const std::string &rec_name)
 {

src/database/database-files.cpp

@@ -6,7 +6,8 @@
 #include "convert_json.h"
 #include "remoteplayer.h"
 #include "settings.h"
-#include "porting.h"
+#include "exceptions.h"
+#include "debug.h"
 #include "filesys.h"
 #include "server/player_sao.h"
 #include "util/string.h"

src/database/database-leveldb.cpp

@@ -8,6 +8,7 @@
 
 #include "database-leveldb.h"
 
+#include "debug.h"
 #include "log.h"
 #include "filesys.h"
 #include "exceptions.h"

src/database/database-postgresql.cpp

@@ -17,7 +17,6 @@
 
 #include "debug.h"
 #include "exceptions.h"
-#include "settings.h"
 #include "remoteplayer.h"
 #include "server/player_sao.h"
 #include <cstdlib>

src/database/database-postgresql.h

@@ -7,7 +7,6 @@
 #include <string>
 #include <libpq-fe.h>
 #include "database.h"
-#include "util/basic_macros.h"
 
 // Template class for PostgreSQL based data storage
 class Database_PostgreSQL : public Database

src/emerge.cpp

@@ -20,6 +20,7 @@
 #include "mapgen/mg_ore.h"
 #include "mapgen/mg_decoration.h"
 #include "mapgen/mg_schematic.h"
+#include "porting.h"
 #include "profiler.h"
 #include "scripting_server.h"
 #include "scripting_emerge.h"

src/environment.cpp

@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
-#include <fstream>
 #include "environment.h"
 #include "collision.h"
 #include "raycast.h"
-#include "scripting_server.h"
 #include "server.h"
 #include "settings.h"
 #include "daynightratio.h"

src/environment.h

@@ -14,9 +14,6 @@
 	- etc.
 */
 
-#include <list>
-#include <queue>
-#include <map>
 #include <atomic>
 #include <mutex>
 #include <optional>

src/face_position_cache.h

@@ -6,7 +6,6 @@
 
 #include "irr_v3d.h"
 
-#include <map>
 #include <vector>
 #include <unordered_map>
 #include <mutex>

src/gui/guiAnimatedImage.cpp

@@ -1,11 +1,7 @@
 #include "guiAnimatedImage.h"
 
 #include "client/guiscalingfilter.h"
-#include "log.h"
 #include "porting.h"
-#include "util/string.h"
-#include <string>
-#include <vector>
 #include <ITexture.h>
 
 GUIAnimatedImage::GUIAnimatedImage(gui::IGUIEnvironment *env, gui::IGUIElement *parent,

src/gui/guiButtonImage.cpp

@@ -5,7 +5,6 @@
 #include "guiButtonImage.h"
 
 #include "client/guiscalingfilter.h"
-#include "debug.h"
 #include "IGUIEnvironment.h"
 #include "IGUIImage.h"
 #include "IVideoDriver.h"

src/gui/guiButtonItemImage.h

@@ -5,8 +5,6 @@
 #pragma once
 
 #include "guiButton.h"
-#include "IGUIButton.h"
-
 
 class Client;
 class GUIItemImage;

src/gui/guiChatConsole.cpp

@@ -5,8 +5,6 @@
 #include "guiChatConsole.h"
 #include "chat.h"
 #include "client/client.h"
-#include "debug.h"
-#include "gettime.h"
 #include "client/keycode.h"
 #include "settings.h"
 #include "porting.h"

src/gui/guiEditBoxWithScrollbar.cpp

@@ -11,8 +11,6 @@
 #include "rect.h"
 
 #include "guiScrollBar.h"
-#include "porting.h"
-#include "Keycodes.h"
 
 using namespace gui;
 

src/gui/guiEngine.cpp

@@ -7,8 +7,6 @@
 #include "client/fontengine.h"
 #include "client/guiscalingfilter.h"
 #include "client/renderingengine.h"
-#include "client/shader.h"
-#include "client/tile.h"
 #include "clientdynamicinfo.h"
 #include "config.h"
 #include "content/content.h"
@@ -21,8 +19,6 @@
 #include "porting.h"
 #include "scripting_mainmenu.h"
 #include "settings.h"
-#include "sound.h"
-#include "version.h"
 #include <ICameraSceneNode.h>
 #include <IGUIStaticText.h>
 #include "client/imagefilters.h"

src/gui/guiFormSpecMenu.cpp

@@ -4,19 +4,15 @@
 
 
 #include <cstdlib>
-#include <cmath>
 #include <algorithm>
 #include <iterator>
 #include <limits>
-#include <sstream>
 #include "guiFormSpecMenu.h"
 #include "EGUIElementTypes.h"
-#include "constants.h"
 #include "itemdef.h"
 #include "gamedef.h"
 #include "client/keycode.h"
 #include "gui/guiTable.h"
-#include "util/strfnd.h"
 #include <IGUIButton.h>
 #include <IGUICheckBox.h>
 #include <IGUIComboBox.h>
@@ -29,17 +25,13 @@
 #include "client/joystick_controller.h"
 #include "log.h"
 #include "drawItemStack.h"
-#include "filesys.h"
-#include "gettime.h"
 #include "gettext.h"
-#include "scripting_server.h"
 #include "mainmenumanager.h"
 #include "porting.h"
 #include "settings.h"
 #include "client/client.h"
 #include "client/fontengine.h"
 #include "client/sound.h"
-#include "util/hex.h"
 #include "util/numeric.h"
 #include "util/string.h" // for parseColorString()
 #include "irrlicht_changes/static_text.h"

src/gui/guiFormSpecMenu.h

@@ -18,7 +18,6 @@
 #include "guiScrollBar.h"
 #include "guiTable.h"
 #include "util/string.h"
-#include "util/enriched_string.h"
 #include "StyleSpec.h"
 #include <ICursorControl.h> // gui::ECURSOR_ICON
 #include <IGUIStaticText.h>

src/gui/guiHyperText.cpp

@@ -10,7 +10,6 @@
 #include "client/client.h"
 #include "client/renderingengine.h"
 #include "client/texturesource.h"
-#include "hud.h"
 #include "inventory.h"
 #include "util/string.h"
 #include "irrlicht_changes/CGUITTFont.h"

src/gui/guiPasswordChange.cpp

@@ -26,7 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <IGUIFont.h>
 #include <IVideoDriver.h>
 
-#include "porting.h"
 #include "gettext.h"
 
 const int ID_oldPassword = 256;

src/gui/guiTable.cpp

@@ -4,22 +4,18 @@
 
 
 #include "guiTable.h"
-#include <queue>
 #include <sstream>
 #include <utility>
 #include <cstring>
 #include <IGUISkin.h>
 #include <IGUIFont.h>
 #include "client/renderingengine.h"
-#include "debug.h"
 #include "irrlicht_changes/CGUITTFont.h"
 #include "log.h"
 #include "client/texturesource.h"
-#include "gettime.h"
 #include "util/string.h"
 #include "util/numeric.h"
 #include "util/string.h" // for parseColorString()
-#include "settings.h" // for settings
 #include "porting.h" // for dpi
 #include "client/guiscalingfilter.h"
 

src/gui/guiVolumeChange.cpp

@@ -18,10 +18,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include "guiVolumeChange.h"
-#include "debug.h"
 #include "guiButton.h"
 #include "guiScrollBar.h"
-#include "serialization.h"
 #include <string>
 #include <IGUICheckBox.h>
 #include <IGUIButton.h>

src/gui/modalMenu.cpp

@@ -3,13 +3,11 @@
 // Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 // Copyright (C) 2018 stujones11, Stuart Jones <stujones111@gmail.com>
 
-#include <cstdlib>
 #include <IEventReceiver.h>
 #include <IGUIComboBox.h>
 #include <IGUIEditBox.h>
 #include "client/renderingengine.h"
 #include "modalMenu.h"
-#include "gettext.h"
 #include "gui/guiInventoryList.h"
 #include "porting.h"
 #include "settings.h"

src/gui/modalMenu.h

@@ -8,7 +8,6 @@
 #include "irrlichttypes_bloated.h"
 #include "irr_ptr.h"
 
-#include "util/string.h"
 #ifdef __ANDROID__
 	#include <porting_android.h>
 #endif

src/gui/touchcontrols.cpp

@@ -7,7 +7,6 @@
 #include "touchcontrols.h"
 #include "touchscreenlayout.h"
 
-#include "gettime.h"
 #include "irr_v2d.h"
 #include "log.h"
 #include "porting.h"
@@ -16,11 +15,9 @@
 #include "client/renderingengine.h"
 #include "client/texturesource.h"
 #include "util/enum_string.h"
-#include "util/numeric.h"
 #include "irr_gui_ptr.h"
 #include "IGUIImage.h"
 #include "IGUIStaticText.h"
-#include "IGUIFont.h"
 #include <IrrlichtDevice.h>
 #include <ISceneCollisionManager.h>
 #include <IGUIElement.h>

src/httpfetch.cpp

@@ -6,7 +6,6 @@
 #include "porting.h" // for sleep_ms(), get_sysinfo(), secure_rand_fill_buf()
 #include <list>
 #include <unordered_map>
-#include <cerrno>
 #include <mutex>
 #include "threading/event.h"
 #include "config.h"

src/httpfetch.h

@@ -6,7 +6,6 @@
 
 #include <vector>
 #include "util/string.h"
-#include "config.h"
 
 // These can be used in place of "caller" in to specify special handling.
 // Discard result (used as default value of "caller").

src/hud.cpp

@@ -3,7 +3,6 @@
 // Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include "hud.h"
-#include <cmath>
 
 const struct EnumString es_HudElementType[] =
 {

src/inventory.cpp

@@ -3,8 +3,6 @@
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include "inventory.h"
-#include "serialization.h"
-#include "debug.h"
 #include <algorithm>
 #include <sstream>
 #include "log.h"

src/inventory.h

@@ -7,6 +7,7 @@
 #include "irrlichttypes.h"
 #include "itemstackmetadata.h"
 #include <istream>
+#include <memory>
 #include <ostream>
 #include <string>
 #include <vector>

src/inventorymanager.cpp

@@ -8,11 +8,9 @@
 #include "serverenvironment.h"
 #include "scripting_server.h"
 #include "server/serveractiveobject.h"
-#include "settings.h"
 #include "craftdef.h"
 #include "rollback_interface.h"
 #include "util/strfnd.h"
-#include "util/basic_macros.h"
 #include "inventory.h"
 
 #define PLAYER_TO_SA(p)   p->getEnv()->getScriptIface()

src/irrlicht_changes/CGUITTFont.cpp

@@ -37,7 +37,6 @@
 #include "log.h"
 #include "filesys.h"
 #include "debug.h"
-#include "IFileSystem.h"
 #include "IGUIEnvironment.h"
 
 #include <cstdlib>

src/irrlicht_changes/static_text.cpp

@@ -12,7 +12,6 @@
 #include <SColor.h>
 
 #include "CGUITTFont.h"
-#include "util/string.h"
 
 
 namespace gui

src/irrlicht_changes/static_text.h

@@ -7,14 +7,10 @@
 #pragma once
 
 #include "IGUIStaticText.h"
-#include "irrArray.h"
-
-#include "log.h"
 
 #include <vector>
 
 #include "util/enriched_string.h"
-#include "config.h"
 #include <IGUIEnvironment.h>
 
 

src/itemdef.cpp

@@ -5,13 +5,11 @@
 
 #include "itemdef.h"
 
-#include "nodedef.h"
+#include "debug.h"
 #include "tool.h"
 #include "log.h"
 #include "settings.h"
 #include "util/serialize.h"
-#include "util/container.h"
-#include "util/thread.h"
 #include "util/pointedthing.h"
 #include <map>
 #include <set>

src/log.cpp

@@ -5,13 +5,9 @@
 #include "log_internal.h"
 
 #include "threading/mutex_auto_lock.h"
-#include "debug.h"
 #include "gettime.h"
 #include "porting.h"
-#include "settings.h"
-#include "config.h"
 #include "exceptions.h"
-#include "util/numeric.h"
 #include "filesys.h"
 
 #ifdef __ANDROID__

src/log_internal.h

@@ -4,16 +4,14 @@
 
 #include <atomic>
 #include <map>
-#include <queue>
+#include <vector>
 #include <string_view>
 #include <fstream>
 #include <thread>
 #include <mutex>
 #include "threading/mutex_auto_lock.h"
 #include "util/basic_macros.h"
-#include "util/stream.h"
 #include "irrlichttypes.h"
-#include "log.h"
 
 class ILogOutput;
 

src/main.cpp

@@ -3,12 +3,7 @@
 // Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 #include <map>
-#include <algorithm>
-
 #include "irrlichttypes_bloated.h"
-#include "irrlicht.h" // createDevice
-#include "irrlicht_changes/printing.h"
-#include "benchmark/benchmark.h"
 #include "chat_interface.h"
 #include "debug.h"
 #include "unittest/test.h"
@@ -32,15 +27,16 @@
 #include "servermap.h"
 #include "settings.h"
 #include "network/socket.h"
+#include "network/networkexceptions.h"
 #include "mapblock.h"
 #if USE_CURSES
 	#include "terminal_chat_console.h"
 #endif
 #if CHECK_CLIENT_BUILD()
-#include "gui/guiMainMenu.h"
 #include "client/clientlauncher.h"
-#include "gui/guiEngine.h"
-#include "gui/mainmenumanager.h"
+#endif
+#if BUILD_BENCHMARKS
+#include "benchmark/benchmark.h"
 #endif
 
 // for version information only

src/map.cpp

@@ -13,10 +13,9 @@
 #include "profiler.h"
 #include "nodedef.h"
 #include "gamedef.h"
-#include "util/directiontables.h"
 #include "rollback_interface.h"
 #include "environment.h"
-#include "irrlicht_changes/printing.h"
+#include <queue>
 
 /*
 	Map

src/map_settings_manager.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
-#include "debug.h"
 #include "filesys.h"
 #include "log.h"
 #include "mapgen/mapgen.h"

src/mapblock.cpp

@@ -7,11 +7,9 @@
 #include <memory>
 #include <sstream>
 #include "map.h"
-#include "light.h"
 #include "nodedef.h"
 #include "nodemetadata.h"
 #include "gamedef.h"
-#include "irrlicht_changes/printing.h"
 #include "log.h"
 #include "content_mapnode.h"  // For legacy name-id mapping
 #include "content_nodemeta.h" // For legacy deserialization

src/mapgen/cavegen.cpp

@@ -8,9 +8,6 @@
 #include <cmath>
 #include "map.h"
 #include "mapgen.h"
-#include "mapgen_v5.h"
-#include "mapgen_v6.h"
-#include "mapgen_v7.h"
 #include "mg_biome.h"
 #include "cavegen.h"
 

src/mapgen/dungeongen.cpp

@@ -8,7 +8,6 @@
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"

src/mapgen/mapgen.cpp

@@ -10,21 +10,16 @@
 #include "noise.h"
 #include "gamedef.h"
 #include "mg_biome.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"
 #include "emerge.h"
 #include "voxelalgorithms.h"
-#include "porting.h"
 #include "profiler.h"
 #include "settings.h"
 #include "treegen.h"
-#include "serialization.h"
-#include "util/serialize.h"
 #include "util/numeric.h"
 #include "util/directiontables.h"
-#include "filesys.h"
 #include "log.h"
 #include "mapgen_carpathian.h"
 #include "mapgen_flat.h"

src/mapgen/mapgen_carpathian.cpp

@@ -8,7 +8,6 @@
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"

src/mapgen/mapgen_flat.cpp

@@ -7,7 +7,6 @@
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"

src/mapgen/mapgen_fractal.cpp

@@ -8,7 +8,6 @@
 #include <cmath>
 #include "voxel.h"
 #include "noise.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"

src/mapgen/mapgen_v5.cpp

@@ -7,7 +7,6 @@
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
-#include "mapblock.h"
 #include "mapnode.h"
 #include "map.h"
 #include "nodedef.h"