remove unused includes from widget files.

104 files changed, 86 insertions, 286 deletions

diff --git a/src/being/being.cpp b/src/being/being.cpp
index f3c637e34..1b3d8f15e 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -26,6 +26,7 @@
 #include "animatedsprite.h"
 #include "beingequipbackend.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "party.h"
@@ -59,6 +60,7 @@
 #include "resources/resourcemanager.h"
 
 #include "gui/widgets/langtab.h"
+#include "gui/widgets/skilldata.h"
 #include "gui/widgets/skillinfo.h"
 
 #include "utils/gettext.h"
diff --git a/src/client.cpp b/src/client.cpp
index cb0b6b982..1afd8f477 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -70,6 +70,7 @@
 #include "gui/updaterwindow.h"
 #include "gui/worldselectdialog.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/desktop.h"
 
 #include "net/gamehandler.h"
diff --git a/src/dragdrop.h b/src/dragdrop.h
index fcf8893e0..3d3a4eba3 100644
--- a/src/dragdrop.h
+++ b/src/dragdrop.h
@@ -24,6 +24,7 @@
 #include "item.h"
 #include "textcommand.h"
 
+#include "gui/widgets/skilldata.h"
 #include "gui/widgets/skillinfo.h"
 
 #include "resources/image.h"
diff --git a/src/game.cpp b/src/game.cpp
index fc009834c..671a8d578 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -29,6 +29,7 @@
 #include "animatedsprite.h"
 #include "client.h"
 #include "commandhandler.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "emoteshortcut.h"
 #include "guildmanager.h"
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 310123c16..ec157debc 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -30,6 +30,7 @@
 #include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index d3a5af07a..68ecfdfd3 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -28,6 +28,7 @@
 #include "gui/sdlfont.h"
 #include "gui/setup.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 5b76faa98..848c1e88f 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -29,6 +29,7 @@
 
 #include "utils/gettext.h"
 
+#include "resources/image.h"
 #include "resources/imageset.h"
 
 #include "debug.h"
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index fb5430e43..4c89efff5 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/equipmentwindow.h"
 
+#include "configuration.h"
 #include "dragdrop.h"
 #include "graphicsvertexes.h"
 #include "inventory.h"
@@ -35,6 +36,7 @@
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/playerbox.h"
 
 #include "net/inventoryhandler.h"
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index 153a98430..2f6eb5366 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -29,6 +29,7 @@
 #include "gui/sdlfont.h"
 #include "gui/setup.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e3bbf453e..ec26e1b9e 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -41,6 +41,7 @@
 #include "gui/tradewindow.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 74076dd5f..534564d36 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -24,6 +24,7 @@
 #include "gui/itempopup.h"
 
 #include "client.h"
+#include "configuration.h"
 #include "item.h"
 #include "units.h"
 
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 09fb85f19..ba87b4984 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -23,6 +23,7 @@
 #include "gui/ministatuswindow.h"
 
 #include "animatedsprite.h"
+#include "configuration.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 5a370a4ef..ed770047f 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -24,6 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "commandhandler.h"
+#include "configuration.h"
 #include "dropshortcut.h"
 #include "game.h"
 #include "guild.h"
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index 7095f4b4f..de1f6191d 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -23,6 +23,8 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 static const int sizeListSize = 4;
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index d88d7a4f7..53aa18ece 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -27,6 +27,7 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shortcutcontainer.h"
+#include "gui/widgets/tab.h"
 
 #include "debug.h"
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 78d15f273..92c2ecace 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -22,9 +22,34 @@
 
 #include "gui/skilldialog.h"
 
+#include "configuration.h"
 #include "dragdrop.h"
+#include "effectmanager.h"
+#include "itemshortcut.h"
 
+#include "being/localplayer.h"
+
+#include "gui/setup.h"
+#include "gui/shortcutwindow.h"
+#include "gui/textpopup.h"
+#include "gui/viewport.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 #include "gui/widgets/skillmodel.h"
+#include "gui/widgets/tab.h"
+#include "gui/widgets/tabbedarea.h"
+
+#include "net/net.h"
+#include "net/playerhandler.h"
+#include "net/skillhandler.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+
+#include <guichan/font.hpp>
 
 #include "debug.h"
 
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index aa03fa100..ffbbd498c 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -22,6 +22,7 @@
 #include "gui/socialwindow.h"
 
 #include "actorspritemanager.h"
+#include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "maplayer.h"
@@ -39,6 +40,7 @@
 #include "gui/textdialog.h"
 #include "gui/whoisonline.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 926dd3d9b..49f16a944 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -31,6 +31,8 @@
 
 #include "input/inputmanager.h"
 
+#include "utils/stringutils.h"
+
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index ac3721a76..1740f8613 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -36,6 +36,7 @@
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/progressbar.h"
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index 7684a7510..5834dcc60 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -37,6 +37,7 @@
 #include "gui/sdlfont.h"
 #include "gui/setup.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 7b6b0d611..8b65928a8 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,7 +24,6 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "guild.h"
 #include "maplayer.h"
 
 #include "being/localplayer.h"
@@ -35,7 +34,6 @@
 #include "gui/viewport.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 12862942a..5d7d5c3ac 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -28,9 +28,7 @@
 
 #include "gui/widgets/listbox.h"
 
-#include <map>
 #include <string>
-#include <vector>
 
 class Image;
 
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index 440977c37..28081aed4 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -24,16 +24,7 @@
 
 #include "chatlogger.h"
 #include "configuration.h"
-#include "main.h"
 
-#include "being/localplayer.h"
-
-#include "net/net.h"
-
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index bcc487177..91d8233ed 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -35,7 +35,6 @@
 #include "localconsts.h"
 
 class Image;
-class Resource;
 class LinkHandler;
 
 struct BrowserLink final
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 37213369d..73aa63d34 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/button.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "graphicsvertexes.h"
 
 #include "input/keydata.h"
@@ -31,9 +30,6 @@
 
 #include "resources/imageset.h"
 
-#include "utils/dtor.h"
-
-#include <guichan/exception.hpp>
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 4d581f80d..1d605469e 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -26,7 +26,6 @@
 #include "gui/widgets/widget2.h"
 
 #include <guichan/widgets/button.hpp>
-#include <guichan/mouseevent.hpp>
 #include <guichan/widgetlistener.hpp>
 
 #include "localconsts.h"
@@ -34,7 +33,6 @@
 class Image;
 class ImageCollection;
 class ImageSet;
-class ImageRect;
 class Skin;
 
 const std::string BUTTON_PLAY = "buttonplay.png";
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index fd33709d4..e8a0be29d 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -33,10 +33,8 @@
 
 #include "localconsts.h"
 
-class Button;
 class CharSelectDialog;
 class Label;
-class PlayerBox;
 class TextPopup;
 
 class CharacterDisplay final : public Container,
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index 13e27c5d2..835ef7fb0 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -25,8 +25,6 @@
 
 #include "localconsts.h"
 
-class CharacterViewBase;
-
 class CharacterViewSmall final : public CharacterViewBase
 {
     public:
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index fba603ee6..f7dd927d2 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/chattab.h"
 
-#include "actorspritemanager.h"
 #include "chatlogger.h"
 #include "client.h"
 #include "commandhandler.h"
@@ -37,7 +36,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/tabbedarea.h"
-#include "gui/widgets/tradetab.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 5548390bc..52230a6d0 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -23,14 +23,12 @@
 #include "gui/widgets/checkbox.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
 #include "resources/image.h"
 
-#include <guichan/actionlistener.hpp>
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 211230250..d470ac425 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -29,7 +29,6 @@
 
 #include "localconsts.h"
 
-class Image;
 class Skin;
 
 /**
diff --git a/src/gui/widgets/colormodel.cpp b/src/gui/widgets/colormodel.cpp
index 794dfc08e..4a3f15d11 100644
--- a/src/gui/widgets/colormodel.cpp
+++ b/src/gui/widgets/colormodel.cpp
@@ -24,8 +24,6 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 ColorModel::ColorModel() :
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
index 0035da5e6..64310958d 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/widgets/colormodel.h
@@ -23,8 +23,6 @@
 
 #include "utils/stringvector.h"
 
-#include "resources/image.h"
-
 #include <guichan/color.hpp>
 #include <guichan/listmodel.hpp>
 
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 3673f9e9f..fb75cf3da 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/colormodel.h"
 
-#include "resources/resourcemanager.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index c86ee5a07..1d9faa56d 100644
--- a/src/gui/widgets/colorpage.h
+++ b/src/gui/widgets/colorpage.h
@@ -21,12 +21,8 @@
 #ifndef GUI_WIDGETS_COLORPAGE_H
 #define GUI_WIDGETS_COLORPAGE_H
 
-#include "gui/widgets/widget2.h"
-
 #include "gui/widgets/listbox.h"
 
-#include <guichan/widget.hpp>
-
 #include "localconsts.h"
 
 class ColorPage final : public ListBox
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 8c1a0fec6..27a20a7e2 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -25,7 +25,6 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widget.hpp>
 #include <guichan/widgets/container.hpp>
 
 #if !defined USE_INTERNALGUICHAN
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 8eac7bf79..76ae575de 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -23,23 +23,15 @@
 #include "gui/widgets/dropdown.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/sdlinput.h"
-#include "gui/viewport.h"
-
 #include "gui/widgets/extendedlistmodel.h"
-#include "gui/widgets/listbox.h"
 #include "gui/widgets/popuplist.h"
-#include "gui/widgets/scrollarea.h"
 
 #include "resources/image.h"
 
-#include "utils/dtor.h"
-
 #include <guichan/font.hpp>
 
 #include <algorithm>
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 01e1ec78c..dc9c169d2 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -27,13 +27,11 @@
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/basiccontainer.hpp>
-#include <guichan/focushandler.hpp>
 #include <guichan/focuslistener.hpp>
 #include <guichan/keylistener.hpp>
 #include <guichan/listmodel.hpp>
 #include <guichan/mouselistener.hpp>
 #include <guichan/selectionlistener.hpp>
-#include <guichan/widgets/scrollarea.hpp>
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 89fcf1ecd..5f1364fc7 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -26,17 +26,13 @@
 #include "dragdrop.h"
 #include "dropshortcut.h"
 
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "input/keyboardconfig.h"
-
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index f8ba7fe07..55684a4f5 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -23,12 +23,8 @@
 #ifndef GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
 #define GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
-
 #include "gui/widgets/shortcutcontainer.h"
 
-class Image;
-class Item;
 class ItemPopup;
 
 /**
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 0bdb0aa31..50b18beb1 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -23,24 +23,15 @@
 
 #include "animatedsprite.h"
 #include "client.h"
-#include "configuration.h"
 #include "emoteshortcut.h"
-#include "inventory.h"
-#include "item.h"
-#include "itemshortcut.h"
-
-#include "being/localplayer.h"
 
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
 
-#include "utils/dtor.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 49ddf90e1..87ea04bc4 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -28,8 +28,6 @@
 
 #include <vector>
 
-class AnimatedSprite;
-class Image;
 class TextPopup;
 
 /**
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 69c7e4d54..4cf3153b1 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -20,19 +20,10 @@
 
 #include "gui/widgets/extendedlistbox.h"
 
-#include "client.h"
-#include "configuration.h"
-
-#include "input/keyevent.h"
-
-#include "gui/sdlinput.h"
-
 #include "gui/widgets/extendedlistmodel.h"
 
-#include <guichan/focushandler.hpp>
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp
index 9eca8ffa6..38acf55f7 100644
--- a/src/gui/widgets/extendednamesmodel.cpp
+++ b/src/gui/widgets/extendednamesmodel.cpp
@@ -20,10 +20,6 @@
 
 #include "gui/widgets/extendednamesmodel.h"
 
-#include "utils/gettext.h"
-
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 ExtendedNamesModel::ExtendedNamesModel() :
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index 3c08ef948..77dca565d 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/extendedlistmodel.h"
 
-#include "resources/image.h"
-
 class ExtendedNamesModel : public ExtendedListModel
 {
     public:
diff --git a/src/gui/widgets/gmtab.cpp b/src/gui/widgets/gmtab.cpp
index ee9d7caa1..71d59d44a 100644
--- a/src/gui/widgets/gmtab.cpp
+++ b/src/gui/widgets/gmtab.cpp
@@ -21,12 +21,6 @@
 #include "gui/widgets/gmtab.h"
 
 #include "chatlogger.h"
-#include "commands.h"
-
-#include "being/localplayer.h"
-
-#include "net/chathandler.h"
-#include "net/net.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 6394ac3ad..4e18eb16a 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -24,16 +24,10 @@
 
 #include "chatlogger.h"
 #include "configuration.h"
-#include "guild.h"
 #include "guildmanager.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
-#include "being/localplayer.h"
-
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 68068acf7..f186a8604 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -23,12 +23,9 @@
 #include "gui/widgets/guitable.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keyevent.h"
 
-#include "gui/sdlinput.h"
-
 #include "utils/dtor.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index e2b1e5f03..a56023dc5 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -25,8 +25,6 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/sdlinput.h"
-
 #include "utils/stringutils.h"
 #include "debug.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 5ed03c516..a69716f75 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/itemcontainer.h"
 
 #include "dragdrop.h"
-#include "dropshortcut.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
@@ -33,10 +32,8 @@
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/itempopup.h"
-#include "gui/outfitwindow.h"
 #include "gui/shopwindow.h"
 #include "gui/shortcutwindow.h"
-#include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
 #include "net/net.h"
@@ -48,11 +45,11 @@
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
-#include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include "debug.h"
+#include <algorithm>
 
+#include "debug.h"
 
 namespace
 {
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index d17261c1c..1d6df41e6 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -31,7 +31,6 @@
 #include <guichan/widgetlistener.hpp>
 
 #include <list>
-#include <algorithm>
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 188bfa931..0a2e61e25 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/itemlinkhandler.h"
 
-#include "item.h"
-
 #include "gui/confirmdialog.h"
 #include "gui/helpwindow.h"
 #include "gui/itempopup.h"
@@ -31,8 +29,10 @@
 
 #include "utils/gettext.h"
 #include "utils/process.h"
+#include "utils/stringutils.h"
+
+#include "resources/itemdb.h"
 
-#include <sstream>
 #include <string>
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 0466706df..554be07c1 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -23,18 +23,15 @@
 #include "gui/widgets/itemshortcutcontainer.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "dragdrop.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
-#include "input/keyboardconfig.h"
 
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index e5e9911a4..99abc1b19 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -25,10 +25,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include <guichan/mouselistener.hpp>
-
-class Image;
-class Item;
 class ItemPopup;
 class SpellPopup;
 
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 29b7b0e48..daed87088 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -23,17 +23,14 @@
 #include "gui/widgets/listbox.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keyevent.h"
 
 #include "gui/gui.h"
-#include "gui/sdlinput.h"
 
 #include <guichan/focushandler.hpp>
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index ef662e3ac..fe6fb8ba6 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -29,7 +29,6 @@
 
 #include "localconsts.h"
 
-class SelectionListener;
 class Skin;
 
 /**
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp
index 0dc06b05c..a44caf11c 100644
--- a/src/gui/widgets/namesmodel.cpp
+++ b/src/gui/widgets/namesmodel.cpp
@@ -20,13 +20,8 @@
 
 #include "gui/widgets/namesmodel.h"
 
-#include "logger.h"
-
 #include "utils/gettext.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/font.hpp>
-
 #include "debug.h"
 
 NamesModel::NamesModel() :
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 31ee7c123..ff865bdbe 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -22,16 +22,12 @@
 
 #include "gui/widgets/playerbox.h"
 
-#include "animatedsprite.h"
 #include "client.h"
-#include "configuration.h"
 
 #include "being/being.h"
 
 #include "resources/image.h"
 
-#include "utils/dtor.h"
-
 #include "debug.h"
 
 PlayerBox::PlayerBox(Being *const being, const std::string &skin,
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index eeb179625..1f627a7a0 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -30,7 +30,6 @@
 #include "localconsts.h"
 
 class Being;
-class ImageRect;
 class Skin;
 
 /**
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index e71e65c14..774640fc3 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -27,8 +27,6 @@
 
 #include "gui/viewport.h"
 
-#include "gui/widgets/window.h"
-
 #include <guichan/exception.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index c5f8bd3c1..b305ed0c2 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -24,7 +24,6 @@
 #ifndef GUI_WIDGETS_POPUP_H
 #define GUI_WIDGETS_POPUP_H
 
-#include "configuration.h"
 #include "gui/widgets/container.h"
 
 #include <guichan/mouselistener.hpp>
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index fea5225d7..452dfe1b4 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -26,8 +26,6 @@
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "utils/gettext.h"
-
 #include "debug.h"
 
 PopupList::PopupList(DropDown *const widget,
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index f3786c192..9f84b454a 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -21,10 +21,8 @@
 #ifndef GUI_WIDGETS_POPUPLIST_H
 #define GUI_WIDGETS_POPUPLIST_H
 
-#include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
-#include <guichan/actionlistener.hpp>
 #include <guichan/focuslistener.hpp>
 #include <guichan/listmodel.hpp>
 
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 2c3b13354..b5af0360d 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -23,14 +23,11 @@
 #include "gui/widgets/progressbar.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "graphicsvertexes.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
-#include "utils/dtor.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 1807324ed..4d30c015d 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -34,7 +34,6 @@
 
 class Graphics;
 class ImageCollection;
-class ImageRect;
 class Skin;
 
 /**
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index c33fa6bfe..4d39becf1 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -25,7 +25,6 @@
 
 #include "resources/animation.h"
 #include "resources/imageset.h"
-#include "resources/resourcemanager.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 8f595e6c3..fe0195680 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/radiobutton.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keydata.h"
 #include "input/keyevent.h"
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 02015bb14..72ffc3c14 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -29,7 +29,6 @@
 
 #include "localconsts.h"
 
-class Image;
 class Skin;
 
 /**
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 03466b90e..56fdd299b 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -23,11 +23,8 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "graphicsvertexes.h"
 
-#include "utils/dtor.h"
-
 #include "debug.h"
 
 int ScrollArea::instances = 0;
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 75e59e2d2..4c4b3f4a9 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -32,7 +32,6 @@
 
 class Image;
 class ImageCollection;
-class ImageRect;
 
 /**
  * A scroll area.
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index b681824c8..011f26b83 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -33,12 +33,10 @@
 #include "gui/widgets/horizontcontainer.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/slider.h"
 #include "gui/widgets/sliderlist.h"
 #include "gui/widgets/vertcontainer.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
 
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 97c6006ce..476a31ae4 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -21,20 +21,16 @@
 #ifndef GUI_WIDGETS_SETUPITEM_H
 #define GUI_WIDGETS_SETUPITEM_H
 
-#include "gui/widgets/tabbedarea.h"
-
+#include "gui/widgets/button.h"
 #include "gui/widgets/setuptabscroll.h"
-#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/widget.hpp>
 
 #include <list>
 #include <vector>
 
 class CheckBox;
 class Configuration;
-class ContainerPlacer;
 class DropDown;
 class EditDialog;
 class HorizontContainer;
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index f407cce3b..f36d6d54e 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -20,7 +20,6 @@
 
 #include "gui/widgets/setuptabscroll.h"
 
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
 #include "gui/widgets/vertcontainer.h"
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 2d0b9c1d5..739ed07e7 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -20,11 +20,15 @@
 
 #include "gui/widgets/setuptouchitem.h"
 
+#include "gui/setupactiondata.h"
+
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/vertcontainer.h"
 
+#include <algorithm>
+
 #include "debug.h"
 
 static class SortTouchActionFunctor final
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 8910f1023..b5f921fb8 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -21,13 +21,9 @@
 #ifndef GUI_WIDGETS_SETUPTOUCHITEM_H
 #define GUI_WIDGETS_SETUPTOUCHITEM_H
 
-#include "gui/setupactiondata.h"
-
 #include "gui/widgets/namesmodel.h"
 #include "gui/widgets/setupitem.h"
 
-#include <algorithm>
-
 class TouchActionsModel final : public NamesModel
 {
     public:
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 2a98b4441..cd83d23db 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/shoplistbox.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "shopitem.h"
 
 #include "being/playerinfo.h"
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 9c651fce1..d7d9eae41 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -22,11 +22,8 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "configuration.h"
 #include "graphicsvertexes.h"
 
-#include "resources/image.h"
-
 #include "debug.h"
 
 float ShortcutContainer::mAlpha = 1.0;
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 7be34b174..2f6a48bc4 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SHORTCUTCONTAINER_H
 #define GUI_WIDGETS_SHORTCUTCONTAINER_H
 
-#include "gui/widgets/tab.h"
+#include "gui/widgets/widget2.h"
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index 77a1465b1..66c662a21 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -24,6 +24,9 @@
 
 #include "configuration.h"
 
+#include "gui/theme.h"
+
+#include "resources/image.h"
 #include "resources/resourcemanager.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
index bef377e9e..3830ed764 100644
--- a/src/gui/widgets/skilldata.h
+++ b/src/gui/widgets/skilldata.h
@@ -23,11 +23,10 @@
 #ifndef GUI_WIDGETS_SKILLDATA_H
 #define GUI_WIDGETS_SKILLDATA_H
 
-#include "gui/theme.h"
-
-#include "resources/image.h"
 #include "resources/soundinfo.h"
 
+class Image;
+
 struct SkillData final
 {
     std::string name;
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 2f0dcb5b5..e49486329 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -24,8 +24,14 @@
 
 #include "being/playerinfo.h"
 
+#include "gui/theme.h"
+
+#include "gui/widgets/skilldata.h"
 #include "gui/widgets/skillmodel.h"
 
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 SkillInfo::SkillInfo() :
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index 343d74781..69a63dbba 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -23,10 +23,15 @@
 #ifndef GUI_WIDGETS_SKILLINFO_H
 #define GUI_WIDGETS_SKILLINFO_H
 
-#include "gui/widgets/skilldata.h"
+#include <guichan/color.hpp>
 
+#include <vector>
 #include <map>
 
+#include "localconsts.h"
+
+struct SkillData;
+
 class SkillModel;
 
 typedef std::map<int, SkillData*> SkillDataMap;
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp
index c4a298640..c4d79e450 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/widgets/skillmodel.cpp
@@ -22,38 +22,8 @@
 
 #include "gui/widgets/skillmodel.h"
 
-#include "configuration.h"
-#include "effectmanager.h"
-#include "itemshortcut.h"
+#include "gui/widgets/skilldata.h"
 
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-
-#include "gui/setup.h"
-#include "gui/shortcutwindow.h"
-#include "gui/textpopup.h"
-#include "gui/viewport.h"
-
-#include "gui/widgets/label.h"
-#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/listbox.h"
-#include "gui/widgets/progressbar.h"
-#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tab.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/skillhandler.h"
-
-#include "resources/image.h"
-#include "resources/resourcemanager.h"
-
-#include "utils/dtor.h"
-#include "utils/gettext.h"
-
-#include <guichan/font.hpp>
-
-#include <set>
 #include <string>
 
 #include "debug.h"
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index 8e6debb7e..89f36b72f 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -23,45 +23,13 @@
 #ifndef GUI_WIDGETS_SKILLMODEL_H
 #define GUI_WIDGETS_SKILLMODEL_H
 
-#include "configuration.h"
-#include "effectmanager.h"
-#include "itemshortcut.h"
-
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-
-#include "gui/setup.h"
-#include "gui/shortcutwindow.h"
-#include "gui/textpopup.h"
-#include "gui/viewport.h"
-
-#include "gui/widgets/label.h"
-#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/listbox.h"
-#include "gui/widgets/progressbar.h"
-#include "gui/widgets/scrollarea.h"
 #include "gui/widgets/skillinfo.h"
-#include "gui/widgets/tab.h"
-
-#include "net/net.h"
-#include "net/playerhandler.h"
-#include "net/skillhandler.h"
+#include <guichan/listmodel.hpp>
 
-#include "resources/image.h"
-#include "resources/resourcemanager.h"
-
-#include "utils/dtor.h"
-#include "utils/gettext.h"
-
-#include <guichan/font.hpp>
-
-#include <set>
 #include <string>
 
 #include "localconsts.h"
 
-struct SkillInfo;
-
 class SkillModel final : public gcn::ListModel
 {
     public:
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index b8988964e..8457200a7 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/slider.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "input/keyevent.h"
 
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index cd5cacd35..2dbafa280 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -29,9 +29,6 @@
 
 #include "localconsts.h"
 
-class Image;
-class ImageRect;
-
 /**
  * Slider widget. Same as the Guichan slider but with custom look.
  *
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index ab12ef908..3356e8f27 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -20,16 +20,11 @@
 
 #include "gui/widgets/sliderlist.h"
 
-#include "client.h"
-
 #include "gui/gui.h"
-#include "gui/sdlfont.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 
-#include "utils/dtor.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 433001f3b..4319bd145 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,21 +27,12 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "being/localplayer.h"
-
-#include "input/keyboardconfig.h"
-
 #include "gui/inventorywindow.h"
-#include "gui/okdialog.h"
 #include "gui/shortcutwindow.h"
 #include "gui/spellpopup.h"
 #include "gui/viewport.h"
-#include "gui/textcommandeditor.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
-
-#include "utils/gettext.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 0a9eacf83..a4dbeb96e 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -23,13 +23,9 @@
 #ifndef GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H
 #define GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
-
 #include "gui/widgets/shortcutcontainer.h"
 
-class Image;
 class SpellPopup;
-class TextCommand;
 
 /**
  * An item shortcut container. Used to quickly use items.
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 643a5ff92..8c974cf97 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -23,14 +23,11 @@
 #include "gui/widgets/tab.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "graphicsvertexes.h"
 
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
-#include "utils/dtor.h"
-
 #include "debug.h"
 
 int Tab::mInstances = 0;
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 690db9072..ca94cc8c8 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -32,11 +32,9 @@
 #include "localconsts.h"
 
 class ImageCollection;
-class ImageRect;
 class Label;
 class Skin;
 class TabbedArea;
-class Theme;
 
 /**
  * A tab, the same as the Guichan tab in 0.8, but extended
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index d9b75dc11..acb638889 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -25,6 +25,7 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tab.h"
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 5a97de6a6..034257e8f 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -26,12 +26,12 @@
 #include "gui/widgets/widget2.h"
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/widget.hpp>
+#include <guichan/keylistener.hpp>
+#include <guichan/mouselistener.hpp>
 #include <guichan/widgetlistener.hpp>
 #include <guichan/widgets/container.hpp>
 
-#include "gui/widgets/button.h"
-
+class Button;
 class Image;
 class Tab;
 
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index f0d3c1243..d0d0ae4b8 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -21,7 +21,6 @@
 #include "gui/widgets/tabstrip.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/tab.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index a61dab42b..ed812bc9f 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -23,7 +23,6 @@
 
 #include "gui/widgets/widgetgroup.h"
 
-#include <guichan/actionevent.hpp>
 #include <guichan/widget.hpp>
 
 class TabStrip final : public WidgetGroup
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index aac233d24..17b16f355 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -23,19 +23,15 @@
 #include "gui/widgets/textfield.h"
 
 #include "client.h"
-#include "configuration.h"
 
-#include "input/inputmanager.h"
 #include "input/keyevent.h"
 
 #include "gui/popupmenu.h"
-#include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
 
 #include "utils/copynpaste.h"
-#include "utils/dtor.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index f16025c4b..1261e256d 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -30,9 +30,7 @@
 
 #include "localconsts.h"
 
-class ImageRect;
 class PopupMenu;
-class TextField;
 
 /**
  * A text field.
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index e788f1f4c..f78c48894 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/textpreview.h"
 
 #include "client.h"
-#include "configuration.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 675d0fd73..744347df5 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/color.hpp>
-#include <guichan/font.hpp>
 #include <guichan/widget.hpp>
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index 61becb7da..fbb36f94a 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -24,14 +24,6 @@
 
 #include "chatlogger.h"
 
-#include "being/localplayer.h"
-
-#include "net/net.h"
-
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 89f961b00..a28bd4a2e 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/chattab.h"
 
-class Channel;
-
 /**
  * A tab for whispers from a single player.
  */
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index d1387aca8..46cc2d831 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -37,7 +37,6 @@ class ContainerPlacer;
 class ImageCollection;
 class Layout;
 class LayoutCell;
-class ResizeGrip;
 class Skin;
 class WindowContainer;
 
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 98ba3228e..39674e860 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/windowmenu.h"
 
+#include "configuration.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/skilldialog.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index b0d2f1f95..bca770e70 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,6 +22,7 @@
 
 #include "net/ea/playerhandler.h"
 
+#include "configuration.h"
 #include "game.h"
 #include "party.h"
 #include "notifications.h"