Clean up header includes (#16674)

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>