Remove useless includes.

94 files changed, 27 insertions, 251 deletions

diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index ad019e9a6..89bc1e084 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -34,7 +34,6 @@
 #include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 2d13837c6..2cb24bb13 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -23,13 +23,13 @@
 #include "gui/buydialog.h"
 
 #include "keyboardconfig.h"
+#include "logger.h"
 #include "shopitem.h"
 #include "units.h"
 
 #include "gui/setup.h"
 #include "gui/tradewindow.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
@@ -38,9 +38,6 @@
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
 
-#include "shopitem.h"
-#include "units.h"
-
 #include "net/buysellhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
@@ -48,7 +45,6 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp
index 1afcf96a1..cdcf90be9 100644
--- a/src/gui/buyselldialog.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -24,8 +24,6 @@
 
 #include "gui/setup.h"
 
-#include "gui/widgets/button.h"
-
 #include "net/buysellhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 00ac3ab69..5751efba4 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -30,7 +30,6 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/passwordfield.h"
-#include "gui/widgets/textfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 
@@ -39,7 +38,6 @@
 #include "net/net.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index e90a12a0d..ba2e06661 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -22,15 +22,11 @@
 
 #include "gui/charcreatedialog.h"
 
-#include "client.h"
-#include "game.h"
 #include "keydata.h"
 #include "keyevent.h"
-#include "localplayer.h"
 #include "main.h"
 #include "units.h"
 
-#include "gui/charselectdialog.h"
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
 
@@ -42,7 +38,6 @@
 #include "gui/widgets/slider.h"
 #include "gui/widgets/textfield.h"
 
-#include "net/charhandler.h"
 #include "net/messageout.h"
 #include "net/net.h"
 
@@ -52,12 +47,13 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
 #include "debug.h"
 
+extern int serverVersion;
+
 static const Being::Action actions[] =
 {
     Being::STAND, Being::SIT, Being::MOVE, Being::ATTACK, Being::DEAD
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index b67a3971b..c0c1f113a 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -27,8 +27,6 @@
 
 #include "gui/charselectdialog.h"
 
-#include "gui/widgets/window.h"
-
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 1d82c09d6..146e4f290 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -23,12 +23,9 @@
 #include "gui/charselectdialog.h"
 
 #include "client.h"
-#include "game.h"
-#include "localplayer.h"
 #include "units.h"
 #include "keydata.h"
 #include "keyevent.h"
-#include "logger.h"
 
 #include "gui/changeemaildialog.h"
 #include "gui/changepassworddialog.h"
@@ -36,7 +33,6 @@
 #include "gui/confirmdialog.h"
 #include "gui/logindialog.h"
 #include "gui/okdialog.h"
-#include "gui/sdlinput.h"
 #include "gui/textdialog.h"
 #include "gui/unregisterdialog.h"
 
@@ -48,7 +44,6 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/textfield.h"
 
-#include "net/charhandler.h"
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/messageout.h"
@@ -57,7 +52,6 @@
 #include "resources/colordb.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/focushandler.hpp>
 #include <guichan/font.hpp>
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index cb3ed8da8..b0318a9aa 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -26,14 +26,13 @@
 #include "client.h"
 #include "commandhandler.h"
 #include "configuration.h"
+#include "game.h"
 #include "guild.h"
 #include "inputmanager.h"
-#include "keydata.h"
 #include "keyevent.h"
 #include "localplayer.h"
 #include "party.h"
 #include "playerinfo.h"
-#include "playerrelations.h"
 #include "spellshortcut.h"
 #include "sound.h"
 
@@ -45,12 +44,10 @@
 #include "gui/viewport.h"
 
 #include "gui/widgets/battletab.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/tradetab.h"
 #include "gui/widgets/whispertab.h"
@@ -60,9 +57,7 @@
 #include "net/net.h"
 
 #include "utils/copynpaste.h"
-#include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index e0ab7bc2d..ddc9574f2 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -27,10 +27,10 @@
 
 #include "configlistener.h"
 
-#include "gui/widgets/window.h"
-
 #include "utils/stringvector.h"
 
+#include "gui/widgets/window.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 6951d5b4f..a3b077648 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -26,7 +26,6 @@
 #include "game.h"
 #include "localplayer.h"
 #include "main.h"
-#include "map.h"
 #include "particle.h"
 
 #include "gui/setup.h"
@@ -38,15 +37,12 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tab.h"
-#include "gui/widgets/tabbedarea.h"
 
 #include "resources/imagehelper.h"
 
 #include "net/packetcounters.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 003395d3b..1c30b32ed 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -29,7 +29,6 @@
 #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/editdialog.cpp b/src/gui/editdialog.cpp
index 78ce2f8ba..96e6d21b2 100644
--- a/src/gui/editdialog.cpp
+++ b/src/gui/editdialog.cpp
@@ -25,7 +25,6 @@
 #include "gui/gui.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 2a61b9a0f..97ccc69f7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -23,8 +23,6 @@
 #include "gui/equipmentwindow.h"
 
 #include "being.h"
-#include "equipment.h"
-#include "graphics.h"
 #include "inventory.h"
 #include "item.h"
 #include "localplayer.h"
@@ -34,20 +32,16 @@
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/playerbox.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
-#include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fe6163877..3020168b7 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -32,13 +32,10 @@
 #include "gui/widgets/window.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "configlistener.h"
 #include "configuration.h"
-#include "graphics.h"
 #include "keydata.h"
 #include "keyevent.h"
 #include "keyinput.h"
-#include "logger.h"
 
 #include "resources/image.h"
 #include "resources/imageset.h"
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index 66e357d31..93413c4e8 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -29,7 +29,6 @@
 #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 16adbbb75..69bba3d93 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,10 +23,7 @@
 #include "gui/inventorywindow.h"
 
 #include "configuration.h"
-#include "inventory.h"
-#include "item.h"
 #include "inputmanager.h"
-#include "keydata.h"
 #include "keyevent.h"
 #include "playerinfo.h"
 #include "units.h"
@@ -36,14 +33,11 @@
 #include "gui/itemamountwindow.h"
 #include "gui/outfitwindow.h"
 #include "gui/setup.h"
-#include "gui/sdlinput.h"
 #include "gui/shopwindow.h"
 #include "gui/theme.h"
 #include "gui/tradewindow.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/container.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
@@ -53,14 +47,10 @@
 #include "gui/widgets/tabstrip.h"
 #include "gui/widgets/textfield.h"
 
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
 #include "resources/iteminfo.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index ef1aad258..a9498f1b9 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/itemamountwindow.h"
 
+#include "inventory.h"
 #include "item.h"
 #include "keyboardconfig.h"
 
@@ -40,8 +41,6 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
-#include "resources/itemdb.h"
-
 #include "utils/gettext.h"
 
 #include <math.h>
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index f9cbb92dd..fa65c7a42 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -37,7 +37,6 @@
 #include "gui/widgets/textbox.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 9de807c6c..564eba642 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -26,15 +26,13 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/chattab.h"
-#include "gui/chatwindow.h"
 
 #include "actorspritemanager.h"
-#include "depricatedevent.h"
+#include "game.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <math.h>
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 0ae29a730..804a46bad 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -36,7 +36,6 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/passwordfield.h"
-#include "gui/widgets/textfield.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
@@ -44,7 +43,6 @@
 
 #include "utils/gettext.h"
 #include "utils/paths.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 651d9a66c..c834bed64 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -23,15 +23,11 @@
 #include "gui/minimap.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
+#include "client.h"
 #include "configuration.h"
-#include "graphics.h"
 #include "localplayer.h"
-#include "logger.h"
-#include "map.h"
 #include "party.h"
 
-#include "gui/userpalette.h"
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index c32aaa742..e73cc5475 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -23,7 +23,6 @@
 #include "gui/ministatuswindow.h"
 
 #include "animatedsprite.h"
-#include "configuration.h"
 #include "graphics.h"
 #include "localplayer.h"
 #include "playerinfo.h"
@@ -46,7 +45,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 3c6262d03..b47e78626 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -32,7 +32,6 @@
 #include "gui/viewport.h"
 
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/itemlinkhandler.h"
@@ -41,7 +40,6 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textbox.h"
-#include "gui/widgets/textfield.h"
 
 #include "resources/resourcemanager.h"
 
@@ -49,7 +47,6 @@
 #include "net/npchandler.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 2c4e913f8..7ce62aa4e 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -25,13 +25,12 @@
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "equipment.h"
-#include "graphics.h"
+#include "game.h"
 #include "inputmanager.h"
 #include "inventory.h"
 #include "item.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/chatwindow.h"
@@ -45,14 +44,10 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <vector>
 
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 523497044..f0380153f 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -30,7 +30,6 @@
 
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
-#include "utils/stringutils.h"
 
 #include <math.h>
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 992ba8e14..379844983 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -24,6 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "dropshortcut.h"
+#include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "graphics.h"
@@ -72,6 +73,8 @@
 
 #include "debug.h"
 
+extern int serverVersion;
+
 std::string tradePartnerName("");
 
 PopupMenu::PopupMenu():
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 07abd3659..d9f039fa8 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -38,7 +38,6 @@
 #include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
 
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index c3368ca8a..64048dcc9 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -23,6 +23,7 @@
 #include "gui/quitdialog.h"
 
 #include "client.h"
+#include "game.h"
 #include "keydata.h"
 #include "keyevent.h"
 
diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp
index 988d4c718..cf86f973a 100644
--- a/src/gui/registerdialog.cpp
+++ b/src/gui/registerdialog.cpp
@@ -35,14 +35,12 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/radiobutton.h"
-#include "gui/widgets/textfield.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 19a912173..45119fcec 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -33,8 +33,6 @@
 #include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 
-#include "utils/stringutils.h"
-
 #include <guichan/exception.hpp>
 
 #include "debug.h"
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index eea0c86f1..41649a901 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -28,7 +28,6 @@
 #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"
@@ -43,7 +42,6 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 6e6f99841..1dad557b1 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -27,7 +27,6 @@
 #include "configuration.h"
 #include "keydata.h"
 #include "keyevent.h"
-#include "logger.h"
 #include "main.h"
 
 #include "gui/editserverdialog.h"
@@ -50,8 +49,6 @@
 
 #include "utils/gettext.h"
 #include "utils/langs.h"
-#include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 8fbe012e6..8c76d89d0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -40,9 +40,7 @@
 #include "gui/setup_video.h"
 #include "gui/setup_visual.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/tabbedarea.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index d6cc4f619..65bce0c14 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -23,8 +23,9 @@
 #ifndef GUI_SETUP_AUDIO_H
 #define GUI_SETUP_AUDIO_H
 
+#include "map.h"
+
 #include "gui/widgets/setupitem.h"
-#include "gui/widgets/setuptabscroll.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 9cd164839..ee6a85eaf 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -36,7 +36,6 @@
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 76ff9badc..f2412b3ff 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -39,7 +39,6 @@
 #include "gui/widgets/textpreview.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <string>
 #include <cmath>
diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h
index bed487b68..e0c14be7f 100644
--- a/src/gui/setup_input.h
+++ b/src/gui/setup_input.h
@@ -24,8 +24,6 @@
 #ifndef GUI_SETUP_INPUT_H
 #define GUI_SETUP_INPUT_H
 
-#include "keydata.h"
-
 #include "gui/widgets/setuptab.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index e011be983..e727f7f39 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -24,7 +24,6 @@
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/setupitem.h"
 
 #include "configuration.h"
 #include "logger.h"
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index ed29ed9cb..3b424479b 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -24,7 +24,6 @@
 #define GUI_Setup_Other_H
 
 #include "gui/widgets/setupitem.h"
-#include "gui/widgets/setuptabscroll.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index 1a0c892a9..d9c3e3fb1 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -36,7 +36,6 @@
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 45030087b..c0558f56f 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -25,7 +25,6 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/editdialog.h"
 #include "gui/okdialog.h"
@@ -37,7 +36,6 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/guitable.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index e9d392134..53ccf6eeb 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -33,11 +33,9 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
-#include "gui/widgets/textfield.h"
 
 #include "configuration.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 1e3f843aa..68e4c8e76 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/setup_video.h"
 
+#include "client.h"
 #include "configuration.h"
 #include "game.h"
 #include "graphics.h"
@@ -29,8 +30,6 @@
 #include "graphicsmanager.h"
 
 #include "localplayer.h"
-#include "logger.h"
-#include "main.h"
 
 #include "gui/gui.h"
 #include "gui/okdialog.h"
@@ -50,7 +49,6 @@
 #include "resources/image.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h
index 0451e93ac..14c11f3b2 100644
--- a/src/gui/setup_visual.h
+++ b/src/gui/setup_visual.h
@@ -23,7 +23,6 @@
 #define GUI_SETUP_VISUAL_H
 
 #include "gui/widgets/setupitem.h"
-#include "gui/widgets/setuptabscroll.h"
 
 class Setup_Visual : public SetupTabScroll
 {
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 89a457e88..2037cb789 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -28,7 +28,6 @@
 #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"
@@ -41,6 +40,7 @@
 
 #include "actorspritemanager.h"
 #include "auctionmanager.h"
+#include "client.h"
 #include "configuration.h"
 #include "confirmdialog.h"
 #include "inventory.h"
@@ -61,7 +61,6 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <sstream>
 
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 7c450855a..16e71e6b7 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -31,8 +31,6 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shortcutcontainer.h"
-#include "gui/widgets/tab.h"
-#include "gui/widgets/tabbedarea.h"
 
 #include "debug.h"
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 86a4df38b..723cdc5e1 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -24,7 +24,6 @@
 
 #include "itemshortcut.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "playerinfo.h"
 #include "configuration.h"
 
@@ -34,16 +33,12 @@
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/container.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 "gui/widgets/tabbedarea.h"
-#include "gui/widgets/windowcontainer.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
@@ -54,8 +49,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 22eb4024d..2c4f1316d 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -27,8 +27,6 @@
 #include "inputmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "logger.h"
-#include "map.h"
 #include "maplayer.h"
 #include "party.h"
 #include "playerrelations.h"
@@ -41,26 +39,19 @@
 #include "gui/textdialog.h"
 #include "gui/theme.h"
 
-#include "gui/widgets/avatarlistbox.h"
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/container.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tab.h"
-#include "gui/widgets/tabbedarea.h"
 
 #include "net/net.h"
 #include "net/guildhandler.h"
 #include "net/partyhandler.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index fd9f5ab5a..b9c6b2530 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -26,7 +26,6 @@
 #include "gui/setup.h"
 #include "gui/theme.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
@@ -35,7 +34,6 @@
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tab.h"
-#include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/flowcontainer.h"
 #include "gui/widgets/windowcontainer.h"
 
@@ -46,7 +44,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 #include "utils/xml.h"
 
 #include <string>
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index ff20603ce..6188b5c2d 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -23,11 +23,8 @@
 
 #include "gui/speechbubble.h"
 
-#include "graphics.h"
-
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
-#include "gui/theme.h"
 
 #include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index 969a92dc8..af7a2a619 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -29,13 +29,10 @@
 
 #include "gui/widgets/label.h"
 
-#include "textcommand.h"
-
 #include "graphics.h"
 #include "units.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index dae8b15fe..36917b250 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -37,8 +37,6 @@
 #include "units.h"
 #include "keyboardconfig.h"
 
-#include "utils/stringutils.h"
-
 #include <guichan/font.hpp>
 #include <guichan/widgets/label.hpp>
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index d64aa3ebf..88b48a472 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -24,7 +24,6 @@
 
 #include "chatwindow.h"
 #include "configuration.h"
-#include "depricatedevent.h"
 #include "equipment.h"
 #include "inventory.h"
 #include "item.h"
@@ -37,13 +36,11 @@
 #include "gui/theme.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"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/vertcontainer.h"
-#include "gui/widgets/windowcontainer.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
@@ -51,7 +48,6 @@
 
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 67e2be0c8..04dbffd51 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -37,7 +37,6 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/radiobutton.h"
 #include "gui/widgets/guitable.h"
-#include "gui/widgets/textfield.h"
 
 #include "configuration.h"
 #include "item.h"
@@ -47,9 +46,7 @@
 #include "spellmanager.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
-#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
 #include "debug.h"
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index d7d3d5eeb..b7f8a6ce3 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -27,7 +27,6 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/passwordfield.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index afece5319..b7967e32d 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -29,11 +29,9 @@
 
 #include "gui/widgets/label.h"
 
-#include "graphics.h"
 #include "units.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 44de72cdc..990f0d41a 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -26,7 +26,6 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "logger.h"
 
 #include "resources/dye.h"
 #include "resources/image.h"
@@ -34,8 +33,6 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
-#include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <physfs.h>
 
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 75446fdbd..a3b4f6800 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -30,8 +30,6 @@
 
 #include "gui/palette.h"
 
-#include "utils/stringvector.h"
-
 #include <map>
 
 #include "localconsts.h"
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index e2aa24321..5e1850daa 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -32,14 +32,12 @@
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/passwordfield.h"
-#include "gui/widgets/textfield.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 81fe7a9cd..7ca6d665c 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -26,8 +26,6 @@
 #include "configuration.h"
 #include "keydata.h"
 #include "keyevent.h"
-#include "logger.h"
-#include "main.h"
 
 #include "gui/sdlinput.h"
 
@@ -38,7 +36,6 @@
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "net/download.h"
 #include "net/logindata.h"
 
 #include "resources/resourcemanager.h"
@@ -47,8 +44,6 @@
 #include "utils/mkdir.h"
 #include "utils/paths.h"
 #include "utils/process.h"
-#include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 6103c8b86..382e0f355 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -22,16 +22,15 @@
 
 #include "gui/viewport.h"
 
-#include "actorsprite.h"
 #include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
+#include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
 #include "inputmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "map.h"
 #include "maplayer.h"
 #include "playerinfo.h"
 #include "textmanager.h"
@@ -52,8 +51,6 @@
 
 #include "resources/resourcemanager.h"
 
-#include "utils/stringutils.h"
-
 #include "debug.h"
 
 extern volatile int tick_time;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index fc3db142a..0d84837c8 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -23,8 +23,8 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
-#include "actorspritemanager.h"
 #include "configlistener.h"
+#include "maplayer.h"
 #include "position.h"
 
 #include "gui/widgets/windowcontainer.h"
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 911c26c3e..0747b4276 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -46,11 +46,8 @@
 #include "net/net.h"
 #include "net/playerhandler.h"
 
-#include "gui/chatwindow.h"
-
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 // Curl should be included after Guichan to avoid Windows redefinitions
 #include <curl/curl.h>
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index ad139159a..2a009bcc6 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -30,7 +30,6 @@
 
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
-#include "gui/palette.h"
 #include "gui/sdlfont.h"
 #include "gui/theme.h"
 #include "gui/viewport.h"
@@ -38,8 +37,6 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include "utils/stringutils.h"
-
 #include <guichan/font.hpp>
 
 #include "debug.h"
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 526db6ef5..b2b135a9c 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_GUILDLISTBOX_H
-#define GUI_GUILDLISTBOX_H
+#ifndef GUI_AVATARLISTBOX_H
+#define GUI_AVATARLISTBOX_H
 
 #include "avatar.h"
 
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index 5ac13c78e..3f313b0e1 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -25,7 +25,6 @@
 #include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "main.h"
 
 #include "gui/theme.h"
@@ -37,7 +36,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index ea5210eb8..df99905b7 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -27,8 +27,6 @@
 #include "graphics.h"
 #include "logger.h"
 
-#include "utils/stringutils.h"
-
 #include "gui/gui.h"
 #include "gui/palette.h"
 #include "gui/sdlfont.h"
@@ -37,7 +35,6 @@
 #include "gui/widgets/linkhandler.h"
 
 #include "resources/image.h"
-#include "resources/resource.h"
 #include "resources/resourcemanager.h"
 
 #include <guichan/graphics.hpp>
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 1dd4e1fc8..102fc9546 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -24,15 +24,14 @@
 
 #include "actorspritemanager.h"
 #include "chatlogger.h"
+#include "client.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "sound.h"
 
 #include "gui/helpwindow.h"
 
-#include "gui/widgets/browserbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/tradetab.h"
@@ -44,7 +43,6 @@
 #include "resources/itemdb.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <guichan/widgets/tabbedarea.hpp>
 
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 3d591cf3c..09f2b35ee 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -28,8 +28,6 @@
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tab.h"
 
-#include "utils/stringvector.h"
-
 #include "localconsts.h"
 
 class ScrollArea;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index a25a9ef7e..b6bd62fa7 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -36,8 +36,6 @@
 #include "resources/resourcemanager.h"
 #include "resources/wallpaper.h"
 
-#include "utils/stringutils.h"
-
 #include "debug.h"
 
 Desktop::Desktop() :
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index a471ab8ff..af95ffa82 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,21 +28,15 @@
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "configuration.h"
+#include "client.h"
 #include "dropshortcut.h"
-#include "graphics.h"
-#include "inventory.h"
-#include "item.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
 #include "resources/image.h"
-#include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
-#include "utils/stringutils.h"
-
 #include "debug.h"
 
 DropShortcutContainer::DropShortcutContainer():
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index a1b496dc5..cfbfad31d 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -22,6 +22,7 @@
 #include "gui/widgets/emoteshortcutcontainer.h"
 
 #include "animatedsprite.h"
+#include "client.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
@@ -31,14 +32,11 @@
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "logger.h"
 
-#include "gui/palette.h"
 #include "gui/textpopup.h"
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "resources/emotedb.h"
 #include "resources/image.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 61f516d21..8421c22df 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -23,7 +23,6 @@
 #include "client.h"
 #include "configuration.h"
 #include "keyevent.h"
-#include "keydata.h"
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
@@ -31,8 +30,6 @@
 
 #include "gui/widgets/extendedlistmodel.h"
 
-#include "resources/image.h"
-
 #include <guichan/focushandler.hpp>
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 9fed16e92..39887ef7e 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -34,9 +34,7 @@
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 910ee1910..63ea96db0 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -25,7 +25,6 @@
 #include "client.h"
 #include "configuration.h"
 #include "keyevent.h"
-#include "keydata.h"
 
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f16852673..bff17cfa2 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -27,7 +27,6 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "dropshortcut.h"
-#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
@@ -44,9 +43,6 @@
 #include "net/inventoryhandler.h"
 
 #include "resources/image.h"
-#include "resources/iteminfo.h"
-
-#include "utils/stringutils.h"
 
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 00f310c51..be2c02335 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -29,8 +29,6 @@
 
 #include "utils/process.h"
 
-#include "resources/itemdb.h"
-
 #include <sstream>
 #include <string>
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 50fc0de0f..2e4da8cbe 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/widgets/itemshortcutcontainer.h"
 
+#include "client.h"
 #include "configuration.h"
 #include "graphics.h"
 #include "inventory.h"
@@ -32,21 +33,15 @@
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
-#include "spellmanager.h"
-#include "textcommand.h"
 
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
-#include "gui/palette.h"
 #include "gui/skilldialog.h"
 #include "gui/spellpopup.h"
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
-#include "resources/iteminfo.h"
-
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 59e52b5ae..255a8090e 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -23,8 +23,6 @@
 #ifndef ITEMSHORTCUTCONTAINER_H
 #define ITEMSHORTCUTCONTAINER_H
 
-#include "spellmanager.h"
-
 #include "gui/widgets/shortcutcontainer.h"
 
 #include <guichan/mouselistener.hpp>
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 8e5bc0c78..46067df91 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -25,7 +25,6 @@
 #include "client.h"
 #include "configuration.h"
 #include "keyevent.h"
-#include "keydata.h"
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index b9f6657a9..51f057621 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -26,7 +26,6 @@
 #include "being.h"
 #include "client.h"
 #include "configuration.h"
-#include "graphics.h"
 
 #include "gui/theme.h"
 
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 34079afb2..228dcc040 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -23,7 +23,6 @@
 
 #include "gui/widgets/popup.h"
 
-#include "configuration.h"
 #include "graphics.h"
 #include "graphicsvertexes.h"
 #include "logger.h"
@@ -31,7 +30,6 @@
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/windowcontainer.h"
 #include "gui/widgets/window.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 0d0211bcc..10590d72d 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -29,9 +29,7 @@
 #include "textrenderer.h"
 
 #include "gui/gui.h"
-#include "gui/palette.h"
 #include "gui/sdlfont.h"
-#include "gui/theme.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index bbc809747..ca640421e 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -29,7 +29,6 @@
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/horizontcontainer.h"
@@ -38,8 +37,6 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/slider.h"
 #include "gui/widgets/sliderlist.h"
-#include "gui/widgets/tabbedarea.h"
-#include "gui/widgets/textfield.h"
 #include "gui/widgets/vertcontainer.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 6c8397bbb..10bdf4045 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -26,8 +26,6 @@
 
 #include "resources/image.h"
 
-#include "utils/stringutils.h"
-
 #include "debug.h"
 
 float ShortcutContainer::mAlpha = 1.0;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 630bd7e28..0a130f60e 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -26,7 +26,6 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "keyevent.h"
-#include "keydata.h"
 
 #include "gui/theme.h"
 
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 25dd3fb6d..a057eceb4 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -31,22 +31,16 @@
 #include "gui/textcommandeditor.h"
 #include "gui/theme.h"
 
-#include "configuration.h"
-#include "graphics.h"
-#include "inventory.h"
+#include "client.h"
 #include "spellshortcut.h"
 #include "itemshortcut.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "spellmanager.h"
-#include "logger.h"
 
 #include "resources/image.h"
-#include "textcommand.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 79c48beac..261cdf901 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -26,7 +26,6 @@
 #include "configuration.h"
 #include "graphics.h"
 #include "keyevent.h"
-#include "keydata.h"
 #include "logger.h"
 
 #include "gui/palette.h"
@@ -37,7 +36,6 @@
 
 #include "utils/copynpaste.h"
 #include "utils/dtor.h"
-#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 36533864e..0ec79a5c5 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -27,7 +27,6 @@
 #include "textrenderer.h"
 
 #include "gui/gui.h"
-#include "gui/palette.h"
 #include "gui/sdlfont.h"
 
 #include <typeinfo>
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index 5c893de1f..6416fcd8a 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -25,7 +25,6 @@
 #include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/theme.h"
 
@@ -36,7 +35,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 2b3b0436f..bb918e3b3 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -25,7 +25,6 @@
 #include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/theme.h"
 
@@ -33,7 +32,6 @@
 #include "net/net.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index c0c3ef94a..2350ed958 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -34,7 +34,6 @@
 
 #include "gui/widgets/layout.h"
 #include "gui/widgets/resizegrip.h"
-#include "gui/widgets/windowcontainer.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 5f48ff633..361b5287e 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -35,9 +35,6 @@
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/window.h"
-#include "gui/widgets/windowcontainer.h"
-
 #include "net/net.h"
 #include "net/playerhandler.h"
 
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index d5bb0ae40..d8b204140 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -36,10 +36,8 @@
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
-#include "net/worldinfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"