remove unused includes from gui files.

120 files changed, 46 insertions, 378 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 87f6642a9..d0fdfeddb 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -62,6 +62,7 @@
 
 #include "render/graphics.h"
 
+#include "net/net.h"
 #include "net/playerhandler.h"
 
 #include "utils/gettext.h"
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index cd329e66e..5b94c0018 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -33,6 +33,7 @@
 #include "resources/iteminfo.h"
 
 #include "net/inventoryhandler.h"
+#include "net/net.h"
 #include "net/playerhandler.h"
 
 #include "debug.h"
diff --git a/src/game.cpp b/src/game.cpp
index ffcdeb934..fc009834c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -85,6 +85,7 @@
 
 #include "net/generalhandler.h"
 #include "net/gamehandler.h"
+#include "net/net.h"
 #include "net/packetcounters.h"
 
 #include "resources/imagewriter.h"
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 2297ec9d9..310123c16 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -21,8 +21,6 @@
 
 #include "gui/beingpopup.h"
 
-#include "units.h"
-
 #include "being/being.h"
 #include "being/playerrelations.h"
 
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index b378a22ba..2ce3a192b 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -22,19 +22,9 @@
 
 #include "gui/botcheckerwindow.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
-#include <vector>
-#include <algorithm>
-
-#include "gui/chatwindow.h"
-
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/guitable.h"
 
 #include "actorspritemanager.h"
@@ -44,6 +34,8 @@
 
 #include "utils/gettext.h"
 
+#include <vector>
+
 #include "debug.h"
 
 const int COLUMNS_NR = 5;  // name plus listbox
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index 70304b25e..fbe53cf82 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -29,8 +29,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <vector>
-
 struct BOTCHK final
 {
     int16_t id;      /**< Index into "botchecker_db" array */
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 03d101c87..c370ecfd3 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -25,9 +25,9 @@
 #include "shopitem.h"
 #include "units.h"
 
-#include "gui/setup.h"
 #include "gui/tradewindow.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp
index 1c8c81b52..7a3b92064 100644
--- a/src/gui/buyselldialog.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -22,12 +22,12 @@
 
 #include "gui/buyselldialog.h"
 
-#include "gui/setup.h"
-
 #include "net/buysellhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
 
+#include "gui/widgets/button.h"
+
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 5271ec767..e61ac8bc5 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -29,7 +29,6 @@
 
 class Button;
 class LoginData;
-class OkDialog;
 class TextField;
 class WrongDataNoticeListener;
 
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index e67e9af68..fd70348a6 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -29,7 +29,6 @@
 
 class Button;
 class LoginData;
-class OkDialog;
 class TextField;
 class WrongDataNoticeListener;
 
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 86c1a0003..fbcabe3c3 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -23,23 +23,19 @@
 #include "gui/charcreatedialog.h"
 
 #include "main.h"
-#include "units.h"
 
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/radiobutton.h"
 #include "gui/widgets/slider.h"
 #include "gui/widgets/textfield.h"
 
-#include "net/messageout.h"
 #include "net/net.h"
 
 #include "resources/chardb.h"
@@ -49,8 +45,6 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 extern int serverVersion;
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 114481772..207ac557d 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -31,7 +31,6 @@
 #include <guichan/keylistener.hpp>
 
 class Label;
-class LocalPlayer;
 class PlayerBox;
 class RadioButton;
 class Slider;
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 806cd5b86..1f7248a18 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -38,7 +38,6 @@
 #include "gui/widgets/characterdisplay.h"
 #include "gui/widgets/characterviewnormal.h"
 #include "gui/widgets/characterviewsmall.h"
-#include "gui/widgets/container.h"
 #include "gui/widgets/layout.h"
 
 #include "net/logindata.h"
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 2a07da188..9556ba633 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -25,8 +25,6 @@
 
 #include "main.h"
 
-#include "being/being.h"
-
 #include "gui/widgets/window.h"
 
 #include "net/charserverhandler.h"
@@ -38,16 +36,9 @@ class Button;
 class CharacterDisplay;
 class CharacterViewBase;
 class Label;
-class LocalPlayer;
 class LoginData;
-class PlayerBox;
 class TextDialog;
 
-namespace Net
-{
-    class CharServerHandler;
-}
-
 /**
  * Character selection dialog.
  *
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index f5618a279..9797578ec 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -25,13 +25,11 @@
 #include "actorspritemanager.h"
 #include "client.h"
 #include "commandhandler.h"
-#include "commands.h"
 #include "configuration.h"
 #include "game.h"
 #include "guild.h"
 #include "party.h"
 #include "spellshortcut.h"
-#include "soundmanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -51,7 +49,6 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/langtab.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/tradetab.h"
@@ -67,7 +64,6 @@
 #include "resources/resourcemanager.h"
 
 #include <guichan/focushandler.hpp>
-#include <guichan/focuslistener.hpp>
 
 #include <sstream>
 
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 80b59b8d7..0bf195fc0 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -33,24 +33,17 @@
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
 
 #include <list>
 #include <map>
 #include <set>
 
-class BrowserBox;
 class ChatTab;
-class Channel;
 class ChatInput;
 class ColorListModel;
 class DropDown;
-class EmoteWindow;
-class ScrollArea;
 class TabbedArea;
 class ItemLinkHandler;
-class Tab;
 class WhisperTab;
 
 const int DEFAULT_CHAT_WINDOW_SCROLL = 7;
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index e9c8d1db7..08ef09d64 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -24,8 +24,6 @@
 
 #include "soundmanager.h"
 
-#include "gui/gui.h"
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 39d731bae..7d19da293 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -31,14 +31,11 @@
 #include "particle/particle.h"
 
 #include "gui/setup.h"
-#include "gui/setup_video.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/scrollarea.h"
 
 #include "resources/imagehelper.h"
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index cce158ca2..3a6fa7229 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -26,10 +26,7 @@
 #include "gui/widgets/container.h"
 #include "gui/widgets/window.h"
 
-class Container;
-class DebugWindow;
 class Label;
-class Tab;
 class TabbedArea;
 
 class DebugTab : public Container
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 4c8a96e51..d3a5af07a 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -33,10 +33,7 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "resources/resourcemanager.h"
-
 #include "utils/gettext.h"
-#include "utils/langs.h"
 #include "utils/process.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h
index 1e2f63662..49cb07a8b 100644
--- a/src/gui/didyouknowwindow.h
+++ b/src/gui/didyouknowwindow.h
@@ -31,7 +31,6 @@
 class Button;
 class BrowserBox;
 class CheckBox;
-class LinkHandler;
 class ScrollArea;
 
 /**
diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp
index 0926e45b5..fa6b1e123 100644
--- a/src/gui/editdialog.cpp
+++ b/src/gui/editdialog.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/editdialog.h"
 
-#include "gui/gui.h"
-
 #include "gui/widgets/button.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h
index bb5bf7e9e..6d3d191bc 100644
--- a/src/gui/editdialog.h
+++ b/src/gui/editdialog.h
@@ -32,8 +32,6 @@
 
 #define ACTION_EDIT_OK "edit ok"
 
-class TextField;
-
 /**
  * An 'Ok' button dialog.
  *
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp
index 516d30ffe..ff1d42eea 100644
--- a/src/gui/editserverdialog.cpp
+++ b/src/gui/editserverdialog.cpp
@@ -21,13 +21,10 @@
 
 #include "gui/editserverdialog.h"
 
-#include "configuration.h"
-
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
 #include "gui/okdialog.h"
-#include "gui/sdlinput.h"
 #include "gui/serverdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h
index a8503ac6a..531bb009a 100644
--- a/src/gui/editserverdialog.h
+++ b/src/gui/editserverdialog.h
@@ -23,11 +23,9 @@
 #define GUI_EDITSERVERDIALOG_H
 
 class Button;
-class Label;
 class TextField;
 class DropDown;
 class ServerDialog;
-class TypeListModel;
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 4371b41fc..5b76faa98 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -20,25 +20,17 @@
 
 #include "gui/emotewindow.h"
 
-#include "gui/chatwindow.h"
-#include "gui/gui.h"
-
 #include "gui/widgets/colormodel.h"
 #include "gui/widgets/colorpage.h"
 #include "gui/widgets/emotepage.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 
-#include "units.h"
-
 #include "utils/gettext.h"
 
 #include "resources/imageset.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 static const int fontSizeListSize = 2;
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index a9002117e..b65c0c13c 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/mouselistener.hpp>
-
 class ColorModel;
 class ColorPage;
 class EmotePage;
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index a277a7851..fb5430e43 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -41,7 +41,6 @@
 #include "net/net.h"
 
 #include "resources/imageset.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 522bfb2c3..2d2e2ca81 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -30,15 +30,12 @@
 
 #include "utils/xml.h"
 
-#include "resources/image.h"
-
 #include <guichan/actionlistener.hpp>
 
 #include <vector>
 
 class Being;
 class Button;
-class Inventory;
 class Image;
 class ImageSet;
 class Item;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0145332c8..2733f75fa 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -42,6 +42,7 @@
 #include "input/keyevent.h"
 #include "input/keyinput.h"
 
+#include "resources/cursor.h"
 #include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 3cdab558d..7742049e3 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -23,9 +23,6 @@
 #ifndef GUI_GUI_H
 #define GUI_GUI_H
 
-#include "resources/cursor.h"
-#include "resources/image.h"
-
 #include <guichan/color.hpp>
 #include <guichan/focuslistener.hpp>
 #include <guichan/gui.hpp>
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index f6064d58a..153a98430 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -36,7 +36,6 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
-#include "utils/langs.h"
 #include "utils/paths.h"
 #include "utils/process.h"
 
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index df3ac4c0f..1419e0a10 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -35,7 +35,6 @@
 
 class Button;
 class BrowserBox;
-class LinkHandler;
 class ScrollArea;
 
 typedef std::set<std::string> HelpNames;
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 29b6c58f3..e3bbf453e 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,6 +23,7 @@
 #include "gui/inventorywindow.h"
 
 #include "configuration.h"
+#include "item.h"
 #include "units.h"
 
 #include "being/playerinfo.h"
@@ -42,20 +43,20 @@
 
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemcontainer.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabstrip.h"
 #include "gui/widgets/textfield.h"
 
-#include "resources/iteminfo.h"
+#include "net/inventoryhandler.h"
+#include "net/net.h"
+
+#include "resources/itemdb.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include <guichan/font.hpp>
-#include <guichan/mouseinput.hpp>
 
 #include <string>
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 42227d022..eec3ba855 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -28,9 +28,6 @@
 
 #include "gui/widgets/window.h"
 
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 3d1cc1d7f..d0b313e26 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -28,13 +28,8 @@
 
 #include "resources/iteminfo.h"
 
-#include <guichan/mouselistener.hpp>
-
-class Button;
-class CheckBox;
 class Icon;
 class Label;
-class ScrollArea;
 class TextBox;
 
 /**
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 516d9b449..a8c82ec40 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -25,7 +25,6 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/chattab.h"
 
 #include "actorspritemanager.h"
 #include "game.h"
@@ -34,8 +33,7 @@
 #include "being/playerinfo.h"
 
 #include "utils/gettext.h"
-
-#include <math.h>
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 03975d0f4..3481dddc7 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -29,8 +29,6 @@
 #include "input/keyevent.h"
 
 #include "gui/confirmdialog.h"
-#include "gui/okdialog.h"
-#include "gui/sdlinput.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h
index f917d6b0e..fee0d4016 100644
--- a/src/gui/logindialog.h
+++ b/src/gui/logindialog.h
@@ -27,10 +27,8 @@
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
 
 #include <string>
-#include <vector>
 
 class Button;
 class CheckBox;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 79daa8bf4..7164aa070 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -40,8 +40,6 @@
 #include "utils/gettext.h"
 #include "utils/sdlcheckutils.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 bool Minimap::mShow = true;
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 43ace566c..09fb85f19 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -27,15 +27,11 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/chatwindow.h"
-#include "gui/gui.h"
 #include "gui/statuswindow.h"
 #include "gui/statuspopup.h"
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/chattab.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/progressbar.h"
 
 #include "net/net.h"
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index f651d8b8e..8a7466f4b 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -35,11 +35,10 @@
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
 #include "gui/sdlfont.h"
-#include "gui/setup.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/button.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/itemlinkhandler.h"
@@ -47,7 +46,6 @@
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textbox.h"
 
 #include "resources/avatardb.h"
 #include "resources/npcdb.h"
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 9e4de0907..d67407ac9 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -31,7 +31,6 @@
 #include "utils/stringvector.h"
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
 
 #include <list>
 
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index 348d57bb4..0bb08b3b1 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -25,8 +25,6 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
-#include "gui/gui.h"
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 7ad826307..504c8bf49 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -25,32 +25,28 @@
 #include "configuration.h"
 #include "dragdrop.h"
 #include "emoteshortcut.h"
-#include "equipment.h"
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
 
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
-#include "gui/chatwindow.h"
-#include "gui/inventorywindow.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
 
+#include "net/inventoryhandler.h"
+#include "net/net.h"
+
 #include <vector>
 
 #include "debug.h"
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 37d1b61a8..5f7d32e02 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -26,14 +26,12 @@
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/mouselistener.hpp>
 
 const unsigned int OUTFITS_COUNT = 100;
 const unsigned int OUTFIT_ITEM_COUNT = 16;
 
 class Button;
 class CheckBox;
-class Item;
 class Label;
 
 class OutfitWindow final : public Window,
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 1b25620a9..ada4f2e5b 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -23,14 +23,8 @@
 
 #include "gui/palette.h"
 
-#include "configuration.h"
 #include "client.h"
 
-#include "gui/gui.h"
-
-#include "utils/gettext.h"
-#include "utils/mathutils.h"
-
 #include <math.h>
 
 #include "debug.h"
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 93cad1559..4505454d8 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -25,7 +25,6 @@
 #define GUI_PALETTE_H
 
 #include "logger.h"
-#include "utils/stringutils.h"
 
 #include <guichan/color.hpp>
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 6b9de206b..5a370a4ef 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -29,7 +29,6 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "item.h"
-#include "itemshortcut.h"
 #include "maplayer.h"
 #include "party.h"
 #include "spellmanager.h"
@@ -40,7 +39,6 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/buydialog.h"
 #include "gui/chatwindow.h"
 #include "gui/equipmentwindow.h"
 #include "gui/inventorywindow.h"
@@ -48,7 +46,6 @@
 #include "gui/ministatuswindow.h"
 #include "gui/npcdialog.h"
 #include "gui/outfitwindow.h"
-#include "gui/selldialog.h"
 #include "gui/skilldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/textcommandeditor.h"
@@ -68,9 +65,10 @@
 #include "net/beinghandler.h"
 #include "net/buysellhandler.h"
 #include "net/guildhandler.h"
+#include "net/inventoryhandler.h"
+#include "net/net.h"
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
-#include "gui/shortcutwindow.h"
 #include "net/tradehandler.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 3f623280c..069fb466a 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -39,7 +39,6 @@ class Button;
 class ChatTab;
 class FloorItem;
 class Item;
-class ItemShortcut;
 class MapItem;
 class ScrollArea;
 class TextCommand;
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 896d66af3..3013da0ff 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -23,7 +23,6 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "effectmanager.h"
-#include "soundmanager.h"
 
 #include "being/localplayer.h"
 
@@ -32,20 +31,17 @@
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
-#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/layout.h"
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/extendednamesmodel.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "utils/translation/podict.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 enum QuestType
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index c6f59d92d..da67231d5 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -31,19 +31,14 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/chatwindow.h"
-#include "gui/npcdialog.h"
-#include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/checkbox.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/radiobutton.h"
 
 #include "net/charserverhandler.h"
 #include "net/gamehandler.h"
-#include "net/npchandler.h"
 #include "net/net.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp
index 22537ac7d..bafcad58a 100644
--- a/src/gui/registerdialog.cpp
+++ b/src/gui/registerdialog.cpp
@@ -23,16 +23,13 @@
 #include "gui/registerdialog.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/passwordfield.h"
diff --git a/src/gui/registerdialog.h b/src/gui/registerdialog.h
index dcdafe04e..0bc06b92d 100644
--- a/src/gui/registerdialog.h
+++ b/src/gui/registerdialog.h
@@ -28,11 +28,8 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
-#include <string>
-
 class Button;
 class LoginData;
-class OkDialog;
 class RadioButton;
 class TextField;
 
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index 29bf34769..8bab3e3f1 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -29,7 +29,6 @@
 
 #include <SDL_ttf.h>
 
-#include <list>
 #include <map>
 #include <string>
 
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index f37ae858e..f8c9b721c 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -58,12 +58,10 @@
 
 #include "gui/sdlinput.h"
 
-#include "logger.h"
 #include "mouseinput.h"
 #include "sdlshared.h"
 
 #include "input/inputmanager.h"
-#include "input/keydata.h"
 
 #ifdef USE_SDL2
 #include "gui/gui.h"
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 1674fcfd0..29f24784f 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -61,7 +61,7 @@
 
 #include "input/keyinput.h"
 
-#include <SDL.h>
+#include <SDL_events.h>
 
 #include <guichan/input.hpp>
 #include <guichan/keyinput.hpp>
@@ -69,7 +69,6 @@
 
 #include <queue>
 
-class KeyInput;
 class MouseInput;
 
 namespace Key
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index 97b0fbdc1..63a29d0b1 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -28,9 +28,9 @@
 #include "being/playerinfo.h"
 
 #include "gui/confirmdialog.h"
-#include "gui/setup.h"
 #include "gui/tradewindow.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 7a5cf65d1..c114253ba 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -28,8 +28,6 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include <SDL_types.h>
-
 class Button;
 class Item;
 class Label;
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index a1b743f3d..3257f2a63 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -33,27 +33,19 @@
 #include "gui/editserverdialog.h"
 #include "gui/gui.h"
 #include "gui/logindialog.h"
-#include "gui/okdialog.h"
 #include "gui/sdlfont.h"
-#include "gui/sdlinput.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textfield.h"
-
-#include "net/net.h"
 
 #include "utils/gettext.h"
 #include "utils/langs.h"
 
 #include <guichan/font.hpp>
 
-#include <cstdlib>
-#include <iostream>
 #include <string>
 
 #include "debug.h"
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index d884937b8..464947145 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -34,7 +34,6 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 #include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
 #include <string>
@@ -44,8 +43,6 @@ class Button;
 class Label;
 class ListBox;
 class ServerDialog;
-class TextField;
-class DropDown;
 
 /**
  * Server and Port List Model
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 435c4ba4e..f99ca862b 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -23,6 +23,7 @@
 #include "gui/setup_audio.h"
 
 #include "main.h"
+#include "map.h"
 
 #include "configuration.h"
 #include "soundmanager.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 26a4326d8..98cdc5470 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -23,8 +23,6 @@
 #ifndef GUI_SETUP_AUDIO_H
 #define GUI_SETUP_AUDIO_H
 
-#include "map.h"
-
 #include "gui/widgets/setupitem.h"
 
 class Setup_Audio final : public SetupTabScroll
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 3a81119ba..283ed8a95 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -23,21 +23,11 @@
 #include "gui/setup_chat.h"
 
 #include "gui/chatwindow.h"
-#include "gui/editdialog.h"
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
-#include "gui/widgets/checkbox.h"
-#include "gui/widgets/inttextfield.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
 
-#include "configuration.h"
-
-#include "being/localplayer.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index ac01f9e28..0a011082d 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -25,9 +25,6 @@
 
 #include "gui/widgets/setuptabscroll.h"
 
-class IntTextField;
-class EditDialog;
-
 class Setup_Chat final : public SetupTabScroll
 {
     public:
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 83020d1e1..f46b94499 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -21,14 +21,11 @@
 
 #include "gui/setup_colors.h"
 
-#include "configuration.h"
-
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 #include "gui/userpalette.h"
 
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/listbox.h"
@@ -38,6 +35,7 @@
 #include "gui/widgets/textpreview.h"
 
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include <string>
 #include <cmath>
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 3f644085e..0a395e6bb 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -32,7 +32,6 @@
 #include "gui/setupactiondata.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/checkbox.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
@@ -40,8 +39,6 @@
 
 #include <guichan/listmodel.hpp>
 
-#include <SDL_keyboard.h>
-
 #include "debug.h"
 
 static int selectedData = 0;
diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h
index 0e0420fc6..8241c88e9 100644
--- a/src/gui/setup_input.h
+++ b/src/gui/setup_input.h
@@ -29,7 +29,6 @@
 #include <string>
 
 class Button;
-class CheckBox;
 class ListBox;
 class KeyListModel;
 class ScrollArea;
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index b714ffaf3..e64d4f12e 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -35,8 +35,6 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/listmodel.hpp>
-
 #include "debug.h"
 
 extern Joystick *joystick;
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index ae6f6f6bb..74ff37d14 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -24,6 +24,7 @@
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
+#include "gui/widgets/setupitem.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "configuration.h"
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 06a512abb..22059480f 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -23,11 +23,9 @@
 #ifndef GUI_SETUP_OTHER_H
 #define GUI_SETUP_OTHER_H
 
-#include "gui/widgets/setupitem.h"
+#include "gui/widgets/setuptabscroll.h"
 
-class EditDialog;
 class NamesModel;
-class TextField;
 
 class Setup_Other final : public SetupTabScroll
 {
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index c53f2a970..079263a2d 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -22,23 +22,11 @@
 
 #include "gui/setup_perfomance.h"
 
-#include "gui/chatwindow.h"
-#include "gui/editdialog.h"
-
-#include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
-#include "gui/widgets/checkbox.h"
-#include "gui/widgets/inttextfield.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
 
-#include "configuration.h"
-
-#include "being/localplayer.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h
index f9777f1c1..4a2248d31 100644
--- a/src/gui/setup_perfomance.h
+++ b/src/gui/setup_perfomance.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/setuptabscroll.h"
 
-class EditDialog;
-class IntTextField;
 class NamesModel;
 
 class Setup_Perfomance final : public SetupTabScroll
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index c7c5e04cb..69a395b4c 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -22,22 +22,10 @@
 
 #include "gui/setup_players.h"
 
-#include "gui/chatwindow.h"
-#include "gui/editdialog.h"
-
-#include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
-#include "gui/widgets/checkbox.h"
-#include "gui/widgets/inttextfield.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
 
-#include "configuration.h"
-
-#include "being/localplayer.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index fdc2b7db5..1b6044f03 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -25,9 +25,6 @@
 
 #include "gui/widgets/setuptabscroll.h"
 
-class IntTextField;
-class EditDialog;
-
 class Setup_Players final : public SetupTabScroll
 {
     public:
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index af6e0420a..812b00159 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -23,13 +23,9 @@
 #include "gui/setup_relations.h"
 
 #include "actorspritemanager.h"
-#include "configuration.h"
 
 #include "being/localplayer.h"
 
-#include "gui/editdialog.h"
-#include "gui/okdialog.h"
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index 734b06943..dc387d5c1 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -30,7 +30,6 @@
 class Button;
 class CheckBox;
 class DropDown;
-class EditDialog;
 class GuiTable;
 class PlayerTableModel;
 class ScrollArea;
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index b7cd9bfa1..4715eacf0 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -23,11 +23,9 @@
 #include "gui/setup_theme.h"
 
 #include "gui/gui.h"
-#include "gui/editdialog.h"
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/extendedlistmodel.h"
 #include "gui/widgets/label.h"
@@ -36,8 +34,6 @@
 
 #include "configuration.h"
 
-#include "being/localplayer.h"
-
 #include "utils/gettext.h"
 
 #include "resources/resourcemanager.h"
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index 3470f1a2b..87c2fb4b2 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -27,7 +27,6 @@
 
 class Button;
 class DropDown;
-class EditDialog;
 class FontsModel;
 class FontSizeChoiceListModel;
 class Label;
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index 011a27016..7095f4b4f 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -23,8 +23,6 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "configuration.h"
-
 #include "debug.h"
 
 static const int sizeListSize = 4;
diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h
index 63ddb5dd2..b908ce19d 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/setup_touch.h
@@ -23,9 +23,6 @@
 
 #include "gui/widgets/setuptouchitem.h"
 
-class EditDialog;
-class TextField;
-
 class Setup_Touch final : public SetupTabScroll
 {
     public:
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 7b33fea22..b04bf7681 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -24,13 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "game.h"
 
 #include "graphicsmanager.h"
 
-#include "being/localplayer.h"
-
-#include "gui/gui.h"
 #include "gui/okdialog.h"
 #include "gui/textdialog.h"
 
@@ -41,23 +37,17 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/slider.h"
-#include "gui/widgets/sliderlist.h"
-#include "gui/widgets/textfield.h"
 #include "gui/widgets/dropdown.h"
 
 #include "render/rendererslistsdl.h"
-#include "resources/image.h"
 
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
 #include "test/testmain.h"
 
-#include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
-#include <SDL.h>
-
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index b7c54e2af..9a3121ed1 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -23,8 +23,6 @@
 #ifndef GUI_SETUP_VIDEO_H
 #define GUI_SETUP_VIDEO_H
 
-#include "being/being.h"
-
 #include "gui/widgets/setuptab.h"
 
 #include <guichan/keylistener.hpp>
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 237715141..e14dd9be9 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -25,9 +25,9 @@
 #include "gui/buydialog.h"
 #include "gui/itemamountwindow.h"
 #include "gui/selldialog.h"
-#include "gui/setup.h"
 #include "gui/tradewindow.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
@@ -35,8 +35,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
-#include "gui/widgets/slider.h"
-#include "gui/widgets/tradetab.h"
 
 #include "actorspritemanager.h"
 #include "auctionmanager.h"
@@ -48,7 +46,6 @@
 #include "shopitem.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
-#include "units.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -56,8 +53,6 @@
 
 #include "net/net.h"
 #include "net/chathandler.h"
-#include "net/npchandler.h"
-#include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 2645f6d20..4bcf139cb 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -32,7 +32,7 @@ class Button;
 class CheckBox;
 class Item;
 class Label;
-class ListBox;
+//class ListBox;
 class ScrollArea;
 class ShopItem;
 class ShopItems;
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 8bd64c9ff..d88d7a4f7 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/shortcutwindow.h"
 
-#include "configuration.h"
-
 #include "gui/setup.h"
 
 #include "gui/widgets/layout.h"
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 812521391..78d15f273 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -28,8 +28,6 @@
 
 #include "debug.h"
 
-class SkillEntry;
-
 class SkillListBox final : public ListBox
 {
     public:
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index c6d491056..9406293a4 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -32,7 +32,6 @@ const unsigned int SKILL_VAR_MIN_ID = 1000000;
 
 class Button;
 class Label;
-class ScrollArea;
 class SkillModel;
 class Tab;
 class TabbedArea;
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 72bd920d6..aa03fa100 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -30,7 +30,6 @@
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
-#include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
 #include "gui/confirmdialog.h"
@@ -42,9 +41,7 @@
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/chattab.h"
-#include "gui/widgets/container.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
 
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 66cb32741..31d1b676a 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -24,26 +24,21 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionevent.hpp>
 #include <guichan/actionlistener.hpp>
 
 #include <string>
 #include <map>
 
-class AttackTab;
 class Button;
 class ConfirmDialog;
 class CreatePopup;
 class Guild;
 class Label;
 class Map;
-class NavigateTab;
 class Party;
 class SocialTab;
-class Tab;
 class TabbedArea;
 class TextDialog;
-class PlayersTab;
 
 /**
  * Party window.
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index f80282959..8c1f279eb 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -28,12 +28,6 @@
 
 #include "gui/widgets/label.h"
 
-#include "units.h"
-
-#include "utils/gettext.h"
-
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 SpellPopup::SpellPopup():
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 35727f875..b7a1f83b3 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -28,10 +28,7 @@
 
 #include "textcommand.h"
 
-#include <guichan/mouselistener.hpp>
-
 class Label;
-class TextBox;
 
 /**
  * A popup that displays information about an item.
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 2e6569031..926dd3d9b 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -23,19 +23,13 @@
 
 #include "gui/statuspopup.h"
 
-#include "gui/gui.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/textbox.h"
-
-#include "units.h"
 
 #include "being/localplayer.h"
 
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index 69c6c7053..01f5c3fbe 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -28,12 +28,7 @@
 
 #include "gui/widgets/popup.h"
 
-#include "resources/iteminfo.h"
-
-#include <guichan/mouselistener.hpp>
-
 class Label;
-class TextBox;
 
 const int STATUSPOPUP_NUM_LABELS = 15;
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 585c950e6..ac3721a76 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -47,7 +47,6 @@
 #include "net/gamehandler.h"
 
 #include "utils/gettext.h"
-#include "utils/mathutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 9ba33c830..e947a09de 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -22,35 +22,23 @@
 
 #include "gui/textcommandeditor.h"
 
-#include "configuration.h"
-#include "item.h"
 #include "main.h"
 #include "spellmanager.h"
 
-#include "being/localplayer.h"
-
 #include "input/keyboardconfig.h"
 
-#include "gui/chatwindow.h"
-
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/radiobutton.h"
-#include "gui/widgets/guitable.h"
 
 #include "utils/gettext.h"
 
+#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
-#include <algorithm>
-
 #include "debug.h"
 
 class IconsModal final : public gcn::ListModel
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index a145bf62c..610b014d5 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/window.h"
 
-#include "textcommand.h"
-
 #include <guichan/actionlistener.hpp>
 
 class Button;
@@ -34,11 +32,9 @@ class DropDown;
 class IconsModal;
 class IntTextField;
 class Label;
-class ListModel;
 class MagicSchoolModel;
 class RadioButton;
 class TargetTypeModel;
-class TextBox;
 class TextCommand;
 class TextField;
 
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 7f4f4e123..4cb0d710d 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -23,14 +23,7 @@
 
 #include "gui/textpopup.h"
 
-#include "gui/gui.h"
-
 #include "gui/widgets/label.h"
-#include "gui/widgets/layouthelper.h"
-
-#include "units.h"
-
-#include "utils/gettext.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index ce6ae2a02..b165c2f25 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -26,10 +26,7 @@
 
 #include "gui/widgets/popup.h"
 
-#include <guichan/mouselistener.hpp>
-
 class Label;
-class TextBox;
 
 const int TEXTPOPUPCOUNT = 3;
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 6d052b2b8..21901e0a4 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -30,7 +30,6 @@
 
 #include "resources/dye.h"
 #include "resources/image.h"
-#include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 9fe49371a..3e1c525d7 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -31,6 +31,8 @@
 
 #include "gui/palette.h"
 
+#include "utils/stringvector.h"
+
 #include <map>
 
 #include "localconsts.h"
@@ -38,7 +40,6 @@
 class DyePalette;
 class Image;
 class ImageSet;
-class ProgressBar;
 
 const int THEME_PALETTES = 5;
 
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index e60472526..7684a7510 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -44,14 +44,13 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/layout.h"
 
+#include "net/net.h"
 #include "net/tradehandler.h"
 
 #include "utils/gettext.h"
 
 #include <guichan/font.hpp>
 
-#include <sstream>
-
 #include "debug.h"
 
 // TRANSLATORS: trade window button
diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h
index b6158d4d7..11d76eb36 100644
--- a/src/gui/tradewindow.h
+++ b/src/gui/tradewindow.h
@@ -35,7 +35,6 @@ class Inventory;
 class Item;
 class ItemContainer;
 class Label;
-class ScrollArea;
 class TextField;
 
 /**
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index bb727b9ce..a88ac7e16 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -28,7 +28,6 @@
 #include "gui/registerdialog.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/passwordfield.h"
 
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 6ae066ff5..de0da27bb 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -29,7 +29,6 @@
 
 class Button;
 class LoginData;
-class OkDialog;
 class TextField;
 class WrongDataNoticeListener;
 
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 5466c54d7..ad4b45ab1 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -28,8 +28,6 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/sdlinput.h"
-
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -46,7 +44,6 @@
 #include "utils/paths.h"
 #include "utils/process.h"
 
-#include <iostream>
 #include <fstream>
 
 #include <sys/stat.h>
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index c1f618962..13bbdced4 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -24,14 +24,9 @@
 #include "gui/userpalette.h"
 
 #include "configuration.h"
-#include "client.h"
-
-#include "gui/gui.h"
 
 #include "utils/gettext.h"
 
-#include <math.h>
-
 #include "debug.h"
 
 const std::string ColorTypeNames[] =
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 40f328a78..c477b2b3e 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -23,10 +23,9 @@
 #include "gui/viewport.h"
 
 #include "actorspritemanager.h"
-#include "client.h"
 #include "configuration.h"
 #include "game.h"
-#include "itemshortcut.h"
+#include "maplayer.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
@@ -34,25 +33,13 @@
 #include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
 #include "gui/beingpopup.h"
-#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/ministatuswindow.h"
 #include "gui/popupmenu.h"
-#include "gui/statuspopup.h"
 #include "gui/textpopup.h"
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
-#include "gui/widgets/progressbar.h"
-#include "gui/widgets/textfield.h"
-
-#include "net/net.h"
-
-#include "resources/resourcemanager.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 128689186..3d491e9c2 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -24,7 +24,6 @@
 #define GUI_VIEWPORT_H
 
 #include "configlistener.h"
-#include "maplayer.h"
 #include "position.h"
 
 #include "gui/widgets/windowcontainer.h"
@@ -35,17 +34,14 @@ class ActorSprite;
 class Button;
 class Being;
 class BeingPopup;
-class BrowserBox;
 class ChatTab;
 class FloorItem;
 class Graphics;
-class ImageSet;
 class Item;
-class ItemShortcut;
 class Map;
+class MapItem;
 class PopupMenu;
 class ProgressBar;
-class StatusPopup;
 class TextCommand;
 class TextField;
 class TextPopup;
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index d045b3876..7590db30b 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -25,13 +25,13 @@
 #include "guild.h"
 #include "party.h"
 
+#include "gui/chatwindow.h"
 #include "gui/socialwindow.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/chattab.h"
 
 #include "actorspritemanager.h"
 #include "client.h"
@@ -48,7 +48,6 @@
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
-#include <SDL.h>
 #include <SDL_thread.h>
 #include <vector>
 #include <algorithm>
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index f3d299f41..860eeacda 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -28,8 +28,6 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include "utils/mutex.h"
-
 #include <set>
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index 1c1fc222c..e2b1e5f03 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -27,6 +27,7 @@
 
 #include "gui/sdlinput.h"
 
+#include "utils/stringutils.h"
 #include "debug.h"
 
 IntTextField::IntTextField(const Widget2 *const widget, const int def,
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index fadd962c4..f11db3be3 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -34,6 +34,7 @@
 
 #include "gui/widgets/layout.h"
 
+#include "resources/cursor.h"
 #include "resources/image.h"
 
 #include <guichan/exception.hpp>
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index d12fc807d..98ba3228e 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -22,13 +22,8 @@
 
 #include "gui/windowmenu.h"
 
-#include "emoteshortcut.h"
-
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
-#include "gui/didyouknowwindow.h"
-#include "gui/helpwindow.h"
 #include "gui/skilldialog.h"
 #ifdef MANASERV_SUPPORT
 #include "gui/specialswindow.h"
@@ -36,9 +31,6 @@
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
-#include "net/net.h"
-#include "net/playerhandler.h"
-
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 8a9cf8ed2..d65bd3d34 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -27,14 +27,11 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/sdlinput.h"
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index bb3cd173b..ace7fd63c 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -29,13 +29,9 @@
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-
-#include <vector>
 
 class Button;
 class ListBox;
-class LoginData;
 class WorldListModel;
 
 /**
diff --git a/src/guild.cpp b/src/guild.cpp
index f02d57354..12fbe78a4 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -24,6 +24,8 @@
 
 #include "actorspritemanager.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 static class SortGuildFunctor final
diff --git a/src/logger.cpp b/src/logger.cpp
index d070e7a42..13ed54fee 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -23,6 +23,7 @@
 #include "logger.h"
 
 #include <iostream>
+#include <sstream>
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 7c3af78ec..eade97b6e 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -25,12 +25,14 @@
 
 #include "equipment.h"
 #include "inventory.h"
+#include "item.h"
 #include "localconsts.h"
 
 #include "being/playerinfo.h"
 
 #include "gui/inventorywindow.h"
 
+#include "net/inventoryhandler.h"
 #include "net/messagein.h"
 
 #include <vector>
diff --git a/src/party.cpp b/src/party.cpp
index c9e781b00..b6594672a 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -23,6 +23,8 @@
 
 #include "actorspritemanager.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 static class SortPartyFunctor final