Removed unused includes.

8 files changed, 3 insertions, 355 deletions

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 8e2f3623b..6305be217 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -26,20 +26,15 @@
 #include "emoteshortcut.h"
 #include "game.h"
 #include "graphicsmanager.h"
-#include "guild.h"
 #include "itemshortcut.h"
-#include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
 #include "being/attributes.h"
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
-#include "being/playerrelations.h"
 
-#include "gui/chatconsts.h"
 #include "gui/dialogtype.h"
-#include "gui/dialogsmanager.h"
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
 #include "gui/sdlinput.h"
@@ -49,32 +44,18 @@
 
 #include "gui/windows/buydialog.h"
 #include "gui/windows/okdialog.h"
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
 #include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
 #include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
 #include "gui/windows/buyselldialog.h"
 #include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
 #include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
 #include "gui/windows/npcdialog.h"
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
 
 #include "gui/widgets/tabs/chattab.h"
-#include "gui/widgets/tabs/chattabtype.h"
 
 #include "render/graphics.h"
 #if defined USE_OPENGL
@@ -87,20 +68,15 @@
 #include "net/gamehandler.h"
 #include "net/ipc.h"
 #include "net/net.h"
-#include "net/uploadcharinfo.h"
-#include "net/partyhandler.h"
 #include "net/playerhandler.h"
+#include "net/uploadcharinfo.h"
 #include "net/tradehandler.h"
 
-#include "listeners/updatestatuslistener.h"
-
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
 #include "resources/db/itemdb.h"
 
-#include "resources/map/map.h"
-
 #include "utils/chatutils.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
@@ -114,7 +90,6 @@
 
 #include "debug.h"
 
-extern ShortcutWindow *spellShortcutWindow;
 extern std::string tradePartnerName;
 extern QuitDialog *quitDialog;
 extern int start_time;
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 0a83c4578..feab53e93 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -20,53 +20,15 @@
 
 #include "actions/chat.h"
 
-#include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
-#include "game.h"
 #include "guildmanager.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
 
 #include "gui/chatconsts.h"
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
+
 #include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
 
 #include "gui/widgets/tabs/chattab.h"
 #include "gui/widgets/tabs/chattabtype.h"
@@ -82,9 +44,6 @@
 
 #include "debug.h"
 
-extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
 extern unsigned int tmwServerVersion;
 
 namespace Actions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 78a0df060..daee32717 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -23,51 +23,17 @@
 #include "actormanager.h"
 #include "auctionmanager.h"
 #include "configuration.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
-#include "game.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
 #include "gui/chatconsts.h"
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
 
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
 #include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
+#include "gui/windows/socialwindow.h"
 #include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
 
 #include "gui/widgets/tabs/whispertab.h"
 
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
index 6aca5e7b2..28b51cfe2 100644
--- a/src/actions/move.cpp
+++ b/src/actions/move.cpp
@@ -20,72 +20,21 @@
 
 #include "actions/move.h"
 
-#include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
 #include "game.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
 
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
 #include "gui/windows/npcdialog.h"
 #include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
-
-#include "gui/widgets/tabs/chattab.h"
-
-#include "render/graphics.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
-#include "net/tradehandler.h"
-
-#include "listeners/updatestatuslistener.h"
-
-#include "resources/map/map.h"
-
-#include "utils/gettext.h"
 
 #include "debug.h"
 
-extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
-
 namespace Actions
 {
 
diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp
index d74cc916b..af69bb2b0 100644
--- a/src/actions/statusbar.cpp
+++ b/src/actions/statusbar.cpp
@@ -20,60 +20,18 @@
 
 #include "actions/statusbar.h"
 
-#include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
 #include "game.h"
-#include "itemshortcut.h"
 #include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
-
 #include "gui/widgets/tabs/chattab.h"
 
-#include "render/graphics.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
-
 #include "listeners/updatestatuslistener.h"
 
 #include "resources/map/map.h"
@@ -88,10 +46,6 @@
 
 #include "debug.h"
 
-extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
-
 namespace Actions
 {
 
diff --git a/src/actions/tabs.cpp b/src/actions/tabs.cpp
index ed7944274..7ede6e428 100644
--- a/src/actions/tabs.cpp
+++ b/src/actions/tabs.cpp
@@ -20,77 +20,14 @@
 
 #include "actions/tabs.h"
 
-#include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
-#include "game.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
-
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
-
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
 #include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
-
-#include "gui/widgets/tabs/chattab.h"
-
-#include "render/graphics.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
-
-#include "listeners/updatestatuslistener.h"
-
-#include "resources/map/map.h"
-
-#include "utils/gettext.h"
-
-#ifdef ANDROID
-#ifndef USE_SDL2
-#include <SDL_screenkeyboard.h>
-#endif
-#endif
 
 #include "debug.h"
 
 extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
 
 namespace Actions
 {
diff --git a/src/actions/target.cpp b/src/actions/target.cpp
index e183a6a2c..c5772c1b5 100644
--- a/src/actions/target.cpp
+++ b/src/actions/target.cpp
@@ -21,71 +21,13 @@
 #include "actions/target.h"
 
 #include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
-#include "game.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
 
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
-
-#include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
-#include "gui/popups/popupmenu.h"
-
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
-#include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
-#include "gui/windows/whoisonline.h"
-#include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/debugwindow.h"
-#include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/equipmentwindow.h"
-#include "gui/windows/helpwindow.h"
-#include "gui/windows/inventorywindow.h"
-#include "gui/windows/killstats.h"
-#include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
-#include "gui/windows/shortcutwindow.h"
-#include "gui/windows/updaterwindow.h"
-
-#include "gui/widgets/tabs/chattab.h"
-
-#include "render/graphics.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
-
-#include "listeners/updatestatuslistener.h"
-
-#include "resources/map/map.h"
-
-#include "utils/gettext.h"
 
 #include "debug.h"
 
-extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
-
 namespace Actions
 {
 
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index f2fcfa85a..4fcde2a52 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -20,37 +20,16 @@
 
 #include "actions/windows.h"
 
-#include "actormanager.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
-#include "game.h"
-#include "itemshortcut.h"
-#include "soundmanager.h"
-
 #include "actions/actiondef.h"
 
-#include "being/attributes.h"
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
-
 #include "gui/dialogsmanager.h"
-#include "gui/gui.h"
-#include "gui/popupmanager.h"
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
-#include "gui/popups/popupmenu.h"
 
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/statuswindow.h"
-#include "gui/windows/tradewindow.h"
 #include "gui/windows/questswindow.h"
-#include "gui/windows/quitdialog.h"
 #include "gui/windows/whoisonline.h"
 #include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/buyselldialog.h"
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/debugwindow.h"
 #include "gui/windows/didyouknowwindow.h"
@@ -59,7 +38,6 @@
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/killstats.h"
 #include "gui/windows/minimap.h"
-#include "gui/windows/npcdialog.h"
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/shopwindow.h"
@@ -69,21 +47,9 @@
 #include "gui/widgets/tabs/chattab.h"
 #include "gui/widgets/tabs/chattabtype.h"
 
-#include "render/graphics.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
-
-#include "listeners/updatestatuslistener.h"
-
-#include "resources/map/map.h"
-
 #include "debug.h"
 
 extern ShortcutWindow *spellShortcutWindow;
-extern std::string tradePartnerName;
-extern QuitDialog *quitDialog;
 
 namespace Actions
 {