Cleanup GUI classes

Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.

98 files changed, 353 insertions, 331 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e84bfdba..1e9e5a05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,22 +77,35 @@ SET(SRCS
     gui/widgets/desktop.h
     gui/widgets/dropdown.cpp
     gui/widgets/dropdown.h
+    gui/widgets/emoteshortcutcontainer.cpp
+    gui/widgets/emoteshortcutcontainer.h
     gui/widgets/flowcontainer.cpp
     gui/widgets/flowcontainer.h
+    gui/widgets/guildlistbox.cpp
+    gui/widgets/guildlistbox.h
     gui/widgets/icon.cpp
     gui/widgets/icon.h
     gui/widgets/inttextfield.cpp
     gui/widgets/inttextfield.h
+    gui/widgets/itemcontainer.cpp
+    gui/widgets/itemcontainer.h
+    gui/widgets/itemlinkhandler.cpp
+    gui/widgets/itemlinkhandler.h
+    gui/widgets/itemshortcutcontainer.cpp
+    gui/widgets/itemshortcutcontainer.h
     gui/widgets/label.cpp
     gui/widgets/label.h
     gui/widgets/layout.cpp
     gui/widgets/layout.h
     gui/widgets/layouthelper.cpp
     gui/widgets/layouthelper.h
+    gui/widgets/linkhandler.h
     gui/widgets/listbox.cpp
     gui/widgets/listbox.h
     gui/widgets/passwordfield.cpp
     gui/widgets/passwordfield.h
+    gui/widgets/playerbox.cpp
+    gui/widgets/playerbox.h
     gui/widgets/popup.cpp
     gui/widgets/popup.h
     gui/widgets/progressbar.cpp
@@ -103,12 +116,24 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/scrollarea.cpp
     gui/widgets/scrollarea.h
+    gui/widgets/setuptab.cpp
+    gui/widgets/setuptab.h
+    gui/widgets/shopitems.cpp
+    gui/widgets/shopitems.h
+    gui/widgets/shoplistbox.cpp
+    gui/widgets/shoplistbox.h
+    gui/widgets/shortcutcontainer.cpp
+    gui/widgets/shortcutcontainer.h
     gui/widgets/slider.cpp
     gui/widgets/slider.h
     gui/widgets/tab.cpp
     gui/widgets/tab.h
     gui/widgets/tabbedarea.cpp
     gui/widgets/tabbedarea.h
+    gui/widgets/table.cpp
+    gui/widgets/table.h
+    gui/widgets/tablemodel.cpp
+    gui/widgets/tablemodel.h
     gui/widgets/textbox.cpp
     gui/widgets/textbox.h
     gui/widgets/textfield.cpp
@@ -145,33 +170,22 @@ SET(SRCS
     gui/debugwindow.h
     gui/emotepopup.cpp
     gui/emotepopup.h
-    gui/emoteshortcutcontainer.cpp
-    gui/emoteshortcutcontainer.h
     gui/equipmentwindow.cpp
     gui/equipmentwindow.h
     gui/focushandler.cpp
     gui/focushandler.h
     gui/gui.cpp
     gui/gui.h
-    gui/guildlistbox.cpp
-    gui/guildlistbox.h
     gui/guildwindow.cpp
     gui/guildwindow.h
     gui/help.cpp
     gui/help.h
     gui/inventorywindow.cpp
     gui/inventorywindow.h
-    gui/itemcontainer.cpp
-    gui/itemcontainer.h
-    gui/itemlinkhandler.cpp
-    gui/itemlinkhandler.h
     gui/itempopup.cpp
     gui/itempopup.h
-    gui/itemshortcutcontainer.cpp
-    gui/itemshortcutcontainer.h
     gui/itemamount.cpp
     gui/itemamount.h
-    gui/linkhandler.h
     gui/login.cpp
     gui/login.h
     gui/minimap.cpp
@@ -190,8 +204,6 @@ SET(SRCS
     gui/palette.h
     gui/partywindow.cpp
     gui/partywindow.h
-    gui/playerbox.cpp
-    gui/playerbox.h
     gui/popupmenu.cpp
     gui/popupmenu.h
     gui/quitdialog.cpp
@@ -220,14 +232,8 @@ SET(SRCS
     gui/setup_players.h
     gui/setup_video.cpp
     gui/setup_video.h
-    gui/setuptab.cpp
-    gui/setuptab.h
-    gui/shop.cpp
-    gui/shop.h
     gui/shoplistbox.cpp
     gui/shoplistbox.h
-    gui/shortcutcontainer.cpp
-    gui/shortcutcontainer.h
     gui/shortcutwindow.cpp
     gui/shortcutwindow.h
     gui/skilldialog.cpp
@@ -242,13 +248,8 @@ SET(SRCS
     gui/statuswindow.h
     gui/storagewindow.cpp
     gui/storagewindow.h
-    gui/table.cpp
-    gui/table.h
-    gui/tablemodel.cpp
-    gui/tablemodel.h
     gui/textdialog.cpp
     gui/textdialog.h
-    gui/textrenderer.h
     gui/trade.cpp
     gui/trade.h
     gui/truetypefont.cpp
@@ -441,6 +442,7 @@ SET(SRCS
     textmanager.h
     textparticle.cpp
     textparticle.h
+    textrenderer.h
     tileset.h
     units.cpp
     units.h
diff --git a/src/Makefile.am b/src/Makefile.am
index ec84f273..f84e7227 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,22 +23,35 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/widgets/desktop.h \
 	      gui/widgets/dropdown.cpp \
 	      gui/widgets/dropdown.h \
+	      gui/widgets/emoteshortcutcontainer.cpp \
+	      gui/widgets/emoteshortcutcontainer.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
+	      gui/widgets/guildlistbox.cpp \
+	      gui/widgets/guildlistbox.h \
 	      gui/widgets/icon.cpp \
 	      gui/widgets/icon.h \
 	      gui/widgets/inttextfield.cpp \
 	      gui/widgets/inttextfield.h \
+	      gui/widgets/itemcontainer.cpp \
+	      gui/widgets/itemcontainer.h \
+	      gui/widgets/itemlinkhandler.cpp \
+	      gui/widgets/itemlinkhandler.h \
+	      gui/widgets/itemshortcutcontainer.cpp \
+	      gui/widgets/itemshortcutcontainer.h \
 	      gui/widgets/label.cpp \
 	      gui/widgets/label.h \
 	      gui/widgets/layout.cpp \
 	      gui/widgets/layout.h \
 	      gui/widgets/layouthelper.cpp \
 	      gui/widgets/layouthelper.h \
+	      gui/widgets/linkhandler.h \
 	      gui/widgets/listbox.cpp \
 	      gui/widgets/listbox.h \
 	      gui/widgets/passwordfield.cpp \
 	      gui/widgets/passwordfield.h \
+	      gui/widgets/playerbox.cpp \
+	      gui/widgets/playerbox.h \
 	      gui/widgets/popup.cpp \
 	      gui/widgets/popup.h \
 	      gui/widgets/progressbar.cpp \
@@ -49,12 +62,24 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/widgets/scrollarea.cpp \
 	      gui/widgets/scrollarea.h \
+	      gui/widgets/setuptab.cpp \
+	      gui/widgets/setuptab.h \
+	      gui/widgets/shopitems.cpp \
+	      gui/widgets/shopitems.h \
+	      gui/widgets/shoplistbox.cpp \
+	      gui/widgets/shoplistbox.h \
+	      gui/widgets/shortcutcontainer.cpp \
+	      gui/widgets/shortcutcontainer.h \
 	      gui/widgets/slider.cpp \
 	      gui/widgets/slider.h \
 	      gui/widgets/tab.cpp \
 	      gui/widgets/tab.h \
 	      gui/widgets/tabbedarea.cpp \
 	      gui/widgets/tabbedarea.h \
+	      gui/widgets/table.cpp \
+	      gui/widgets/table.h \
+	      gui/widgets/tablemodel.cpp \
+	      gui/widgets/tablemodel.h \
 	      gui/widgets/textbox.cpp \
 	      gui/widgets/textbox.h \
 	      gui/widgets/textfield.cpp \
@@ -91,16 +116,12 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/debugwindow.h \
 	      gui/emotepopup.cpp \
 	      gui/emotepopup.h \
-	      gui/emoteshortcutcontainer.cpp \
-	      gui/emoteshortcutcontainer.h \
 	      gui/equipmentwindow.cpp \
 	      gui/equipmentwindow.h \
 	      gui/focushandler.cpp \
 	      gui/focushandler.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/guildlistbox.cpp \
-	      gui/guildlistbox.h \
 	      gui/guildwindow.cpp \
 	      gui/guildwindow.h \
 	      gui/help.cpp \
@@ -109,15 +130,8 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemamount.cpp \
 	      gui/itemamount.h \
-	      gui/itemcontainer.cpp \
-	      gui/itemcontainer.h \
-	      gui/itemlinkhandler.cpp \
-	      gui/itemlinkhandler.h \
 	      gui/itempopup.cpp \
 	      gui/itempopup.h \
-	      gui/itemshortcutcontainer.cpp \
-	      gui/itemshortcutcontainer.h \
-	      gui/linkhandler.h \
 	      gui/login.cpp \
 	      gui/login.h \
 	      gui/minimap.cpp \
@@ -136,8 +150,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/palette.h \
 	      gui/partywindow.cpp \
 	      gui/partywindow.h \
-	      gui/playerbox.cpp \
-	      gui/playerbox.h \
 	      gui/popupmenu.cpp \
 	      gui/popupmenu.h \
 	      gui/quitdialog.cpp \
@@ -166,14 +178,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/setup_players.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
-	      gui/setuptab.cpp \
-	      gui/setuptab.h \
-	      gui/shop.cpp \
-	      gui/shop.h \
-	      gui/shoplistbox.cpp \
-	      gui/shoplistbox.h \
-	      gui/shortcutcontainer.cpp \
-	      gui/shortcutcontainer.h \
 	      gui/shortcutwindow.cpp \
 	      gui/shortcutwindow.h \
 	      gui/skilldialog.cpp \
@@ -188,13 +192,8 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      gui/statuswindow.h \
 	      gui/storagewindow.cpp \
 	      gui/storagewindow.h \
-	      gui/table.cpp \
-	      gui/table.h \
-	      gui/tablemodel.cpp \
-	      gui/tablemodel.h \
 	      gui/textdialog.cpp \
 	      gui/textdialog.h \
-	      gui/textrenderer.h \
 	      gui/trade.cpp \
 	      gui/trade.h \
 	      gui/truetypefont.cpp \
@@ -387,6 +386,7 @@ mana_SOURCES = gui/widgets/avatar.cpp \
 	      textmanager.h \
 	      textparticle.cpp \
 	      textparticle.h \
+	      textrenderer.h \
 	      tileset.h \
 	      units.cpp \
 	      units.h \
diff --git a/src/game.cpp b/src/game.cpp
index c9686232..9cd91b04 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -42,18 +42,18 @@
 #include "sound.h"
 
 #include "gui/widgets/chattab.h"
+#include "gui/widgets/emoteshortcutcontainer.h"
+#include "gui/widgets/itemshortcutcontainer.h"
 #include "gui/buy.h"
 #include "gui/buysell.h"
 #include "gui/chat.h"
 #include "gui/confirmdialog.h"
 #include "gui/debugwindow.h"
-#include "gui/emoteshortcutcontainer.h"
 #include "gui/equipmentwindow.h"
 #include "gui/gui.h"
 #include "gui/help.h"
 #include "gui/inventorywindow.h"
 #include "gui/shortcutwindow.h"
-#include "gui/itemshortcutcontainer.h"
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
 #include "gui/npcdialog.h"
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index c6ae56ff..0519908a 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -21,14 +21,15 @@
 
 #include "gui/buy.h"
 
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/shopitems.h"
+#include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
-#include "gui/setup.h"
-#include "gui/shop.h"
-#include "gui/shoplistbox.h"
 
 #include "npc.h"
 #include "shopitem.h"
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index be6b75f1..0c6dc04c 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -23,9 +23,10 @@
 
 #include "npc.h"
 
-#include "gui/widgets/button.h"
 #include "gui/setup.h"
 
+#include "gui/widgets/button.h"
+
 #include "net/net.h"
 #include "net/npchandler.h"
 
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index bd2f095b..698fe58c 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -21,24 +21,23 @@
 
 #include "gui/charcreatedialog.h"
 
+#include "game.h"
+#include "localplayer.h"
+#include "main.h"
+#include "units.h"
+
 #include "gui/charselectdialog.h"
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
-#include "gui/playerbox.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/playerbox.h"
 #include "gui/widgets/radiobutton.h"
 #include "gui/widgets/slider.h"
 #include "gui/widgets/textfield.h"
 
-#include "gui/widgets/layout.h"
-
-#include "game.h"
-#include "localplayer.h"
-#include "main.h"
-#include "units.h"
-
 #include "net/charhandler.h"
 #include "net/messageout.h"
 #include "net/net.h"
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 04f2d2b6..e20ec849 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -21,26 +21,26 @@
 
 #include "gui/charselectdialog.h"
 
-#include "gui/widgets/button.h"
-#include "gui/widgets/container.h"
-#include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/textfield.h"
+#include "game.h"
+#include "localplayer.h"
+#include "main.h"
+#include "units.h"
 
 #include "gui/changeemaildialog.h"
 #include "gui/changepassworddialog.h"
 #include "gui/charcreatedialog.h"
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
-#include "gui/playerbox.h"
 #include "gui/sdlinput.h"
 #include "gui/unregisterdialog.h"
 
-#include "game.h"
-#include "localplayer.h"
-#include "main.h"
-#include "units.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/container.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/playerbox.h"
+#include "gui/widgets/textfield.h"
 
 #include "net/charhandler.h"
 #include "net/logindata.h"
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index d7b82de1..ada7ab16 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -21,22 +21,22 @@
 
 #include "chat.h"
 
-#include "gui/itemlinkhandler.h"
+#include "beingmanager.h"
+#include "configuration.h"
+#include "localplayer.h"
+
 #include "gui/recorder.h"
 #include "gui/setup.h"
 #include "gui/sdlinput.h"
 #include "gui/partywindow.h"
 
 #include "gui/widgets/chattab.h"
+#include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/whispertab.h"
 
-#include "beingmanager.h"
-#include "configuration.h"
-#include "localplayer.h"
-
 #include "net/chathandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index 19c32999..0a7da1f4 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -21,11 +21,11 @@
 
 #include "gui/confirmdialog.h"
 
+#include "gui/gui.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
-#include "gui/gui.h"
-
 #include "utils/gettext.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp
index 9e361173..3cc38131 100644
--- a/src/gui/connectiondialog.cpp
+++ b/src/gui/connectiondialog.cpp
@@ -21,13 +21,13 @@
 
 #include "connectiondialog.h"
 
+#include "main.h"
+#include "log.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/progressbar.h"
 
-#include "main.h"
-#include "log.h"
-
 #include "utils/gettext.h"
 
 ConnectionDialog::ConnectionDialog(State previousState):
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index c058605b..2b5616cb 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -21,6 +21,12 @@
 
 #include "gui/debugwindow.h"
 
+#include "engine.h"
+#include "game.h"
+#include "particle.h"
+#include "main.h"
+#include "map.h"
+
 #include "gui/setup.h"
 #include "gui/setup_video.h"
 #include "gui/viewport.h"
@@ -28,12 +34,6 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 
-#include "engine.h"
-#include "game.h"
-#include "particle.h"
-#include "main.h"
-#include "map.h"
-
 #include "resources/image.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 9944fa39..6ec708ff 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -21,18 +21,19 @@
 
 #include "gui/widgets/button.h"
 
+#include "equipment.h"
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+
 #include "gui/equipmentwindow.h"
 #include "gui/itempopup.h"
 #include "gui/palette.h"
-#include "gui/playerbox.h"
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
-#include "equipment.h"
-#include "graphics.h"
-#include "inventory.h"
-#include "item.h"
-#include "localplayer.h"
+#include "gui/widgets/playerbox.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 00f59cb6..7a39adb9 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -22,22 +22,22 @@
 
 #include "gui/guildwindow.h"
 
+#include "guild.h"
+#include "log.h"
+#include "localplayer.h"
+
 #include "gui/confirmdialog.h"
-#include "gui/guildlistbox.h"
 #include "gui/setup.h"
 #include "gui/textdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
+#include "gui/widgets/guildlistbox.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "guild.h"
-#include "log.h"
-#include "localplayer.h"
-
 #include "net/guildhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/help.h b/src/gui/help.h
index 070f129f..97079fa0 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -22,12 +22,13 @@
 #ifndef HELP_H
 #define HELP_H
 
-#include "gui/linkhandler.h"
+#include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
 class BrowserBox;
+class LinkHandler;
 
 /**
  * The help dialog.
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 6837aa38..80533025 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -21,23 +21,23 @@
 
 #include "gui/inventorywindow.h"
 
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "units.h"
+
 #include "gui/itemamount.h"
-#include "gui/itemcontainer.h"
 #include "gui/setup.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "inventory.h"
-#include "item.h"
-#include "localplayer.h"
-#include "units.h"
-
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index 4bc53892..275b0147 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -21,6 +21,9 @@
 
 #include "gui/itemamount.h"
 
+#include "item.h"
+#include "keyboardconfig.h"
+
 #include "gui/storagewindow.h"
 #include "gui/trade.h"
 #include "gui/itempopup.h"
@@ -32,9 +35,6 @@
 #include "gui/widgets/slider.h"
 #include "gui/widgets/icon.h"
 
-#include "item.h"
-#include "keyboardconfig.h"
-
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 39dc603a..aec09c10 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -22,14 +22,14 @@
 
 #include "gui/itempopup.h"
 
+#include "graphics.h"
+#include "units.h"
+
 #include "gui/gui.h"
 #include "gui/palette.h"
 
 #include "gui/widgets/textbox.h"
 
-#include "graphics.h"
-#include "units.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 396c5d1a..e5c5f758 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -21,6 +21,9 @@
 
 #include "gui/login.h"
 
+#include "main.h"
+#include "configuration.h"
+
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 
@@ -34,9 +37,6 @@
 
 #include "net/logindata.h"
 
-#include "main.h"
-#include "configuration.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 7083147a..c28f32db 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -21,16 +21,16 @@
 
 #include "gui/ministatus.h"
 
-#include "gui/gui.h"
-#include "gui/statuswindow.h"
-
-#include "gui/widgets/progressbar.h"
-
 #include "animatedsprite.h"
 #include "configuration.h"
 #include "graphics.h"
 #include "localplayer.h"
 
+#include "gui/gui.h"
+#include "gui/statuswindow.h"
+
+#include "gui/widgets/progressbar.h"
+
 #include "utils/stringutils.h"
 
 extern volatile int tick_time;
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 52c60c74..dead93b9 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -21,6 +21,10 @@
 
 #include "gui/npcdialog.h"
 
+#include "npc.h"
+
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/layout.h"
@@ -28,9 +32,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textbox.h"
 #include "gui/widgets/textfield.h"
-#include "gui/setup.h"
-
-#include "npc.h"
 
 #include "net/net.h"
 #include "net/npchandler.h"
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 32dbe22c..087c9498 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -21,6 +21,8 @@
 
 #include "gui/npcpostdialog.h"
 
+#include "npc.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
@@ -28,8 +30,6 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "npc.h"
-
 #include "net/net.h"
 #include "net/npchandler.h"
 
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index ba060504..727eee20 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -29,6 +29,8 @@
 #include "item.h"
 #include "log.h"
 
+#include "gui/chat.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/chattab.h"
@@ -36,7 +38,6 @@
 #include "gui/widgets/layout.h"
 
 #include "net/inventoryhandler.h"
-#include "gui/chat.h"
 #include "net/net.h"
 
 #include "resources/image.h"
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index da8189d6..f36577d4 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -21,12 +21,13 @@
 
 #include "gui/partywindow.h"
 
-#include "gui/widgets/chattab.h"
-#include "gui/setup.h"
-
 #include "beingmanager.h"
 #include "player.h"
 
+#include "gui/setup.h"
+
+#include "gui/widgets/chattab.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ffb7c028..e6cd3f5b 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,13 +21,6 @@
 
 #include "gui/popupmenu.h"
 
-#include "gui/chat.h"
-#include "gui/inventorywindow.h"
-#include "gui/storagewindow.h"
-#include "gui/itemamount.h"
-
-#include "gui/widgets/browserbox.h"
-
 #include "being.h"
 #include "beingmanager.h"
 #include "flooritem.h"
@@ -38,6 +31,13 @@
 #include "npc.h"
 #include "playerrelations.h"
 
+#include "gui/chat.h"
+#include "gui/inventorywindow.h"
+#include "gui/storagewindow.h"
+#include "gui/itemamount.h"
+
+#include "gui/widgets/browserbox.h"
+
 #include "net/adminhandler.h"
 #include "net/inventoryhandler.h"
 #include "net/net.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index cd5ddbed..3178ed55 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -22,7 +22,7 @@
 #ifndef POPUP_MENU_H
 #define POPUP_MENU_H
 
-#include "gui/linkhandler.h"
+#include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
 class Being;
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index d34af7ca..4f3780fc 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -23,12 +23,12 @@
 
 #include "main.h"
 
+#include "gui/sdlinput.h"
+
 #include "gui/widgets/layout.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/radiobutton.h"
 
-#include "gui/sdlinput.h"
-
 #include "net/charhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index b4013d2a..495a3ab3 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -21,6 +21,8 @@
 
 #include "gui/recorder.h"
 
+#include "main.h"
+
 #include "gui/chat.h"
 
 #include "gui/widgets/button.h"
@@ -28,8 +30,6 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "main.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 305eab97..cb503948 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -21,18 +21,19 @@
 
 #include "gui/sell.h"
 
+#include "npc.h"
+#include "shopitem.h"
+#include "units.h"
+
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/shopitems.h"
+#include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
-#include "gui/setup.h"
-#include "gui/shop.h"
-#include "gui/shoplistbox.h"
-
-#include "npc.h"
-#include "shopitem.h"
-#include "units.h"
 
 #include "net/net.h"
 #include "net/npchandler.h"
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 9dbc1025..40add9a6 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,6 +21,10 @@
 
 #include "gui/serverdialog.h"
 
+#include "configuration.h"
+#include "log.h"
+#include "main.h"
+
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 
@@ -31,10 +35,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
 
-#include "configuration.h"
-#include "log.h"
-#include "main.h"
-
 #include "net/net.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 5b1a86b9..d2f9add7 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -21,6 +21,10 @@
 
 #include "gui/setup_audio.h"
 
+#include "configuration.h"
+#include "log.h"
+#include "sound.h"
+
 #include "gui/okdialog.h"
 
 #include "gui/widgets/checkbox.h"
@@ -28,10 +32,6 @@
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/slider.h"
 
-#include "configuration.h"
-#include "log.h"
-#include "sound.h"
-
 #include "utils/gettext.h"
 
 Setup_Audio::Setup_Audio():
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 6cb3e1f3..6f9c249f 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -24,7 +24,7 @@
 
 #include "guichanfwd.h"
 
-#include "gui/setuptab.h"
+#include "gui/widgets/setuptab.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 7e8b8946..d9ba44e3 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -21,11 +21,13 @@
 
 #include "gui/setup_colors.h"
 
+#include "configuration.h"
+
 #include "gui/gui.h"
-#include "gui/itemlinkhandler.h"
 #include "gui/palette.h"
 
 #include "gui/widgets/browserbox.h"
+#include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/listbox.h"
@@ -34,8 +36,6 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/textpreview.h"
 
-#include "configuration.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index a7aaa5b7..867390b5 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -22,10 +22,10 @@
 #ifndef SETUP_COLORS_H
 #define SETUP_COLORS_H
 
-#include "gui/setuptab.h"
-
 #include "guichanfwd.h"
 
+#include "gui/widgets/setuptab.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index f050e334..35e86c0c 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/setup_joystick.h"
 
+#include "configuration.h"
+#include "joystick.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 
-#include "configuration.h"
-#include "joystick.h"
-
 #include "utils/gettext.h"
 
 extern Joystick *joystick;
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index f3f19e16..5b99edd0 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -24,7 +24,7 @@
 
 #include "guichanfwd.h"
 
-#include "gui/setuptab.h"
+#include "gui/widgets/setuptab.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 0f92d066..6bddbcdd 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/setup_keyboard.h"
 
+#include "keyboardconfig.h"
+
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
@@ -29,8 +31,6 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "keyboardconfig.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index cd1c57fb..a37b03b7 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -22,13 +22,13 @@
 #ifndef GUI_SETUP_KEYBOARD_H
 #define GUI_SETUP_KEYBOARD_H
 
-#include <string>
+#include "guichanfwd.h"
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/setuptab.h"
 
-#include "gui/setuptab.h"
+#include <guichan/actionlistener.hpp>
 
-#include "guichanfwd.h"
+#include <string>
 
 class Setup_Keyboard : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 6372d318..c09d38ef 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -21,8 +21,10 @@
 
 #include "gui/setup_players.h"
 
+#include "configuration.h"
+#include "log.h"
+
 #include "gui/okdialog.h"
-#include "gui/table.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
@@ -30,9 +32,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
-
-#include "configuration.h"
-#include "log.h"
+#include "gui/widgets/table.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 3096cab9..9be50733 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -23,11 +23,10 @@
 #define GUI_SETUP_PLAYERS_H
 
 #include "guichanfwd.h"
-
-#include "gui/setuptab.h"
-
 #include "playerrelations.h"
 
+#include "gui/widgets/setuptab.h"
+
 #include <guichan/actionlistener.hpp>
 
 class GuiTable;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index ec11709e..d9966db5 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -21,6 +21,14 @@
 
 #include "gui/setup_video.h"
 
+#include "configuration.h"
+#include "engine.h"
+#include "graphics.h"
+#include "localplayer.h"
+#include "log.h"
+#include "main.h"
+#include "particle.h"
+
 #include "gui/okdialog.h"
 
 #include "gui/widgets/checkbox.h"
@@ -32,14 +40,6 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/dropdown.h"
 
-#include "configuration.h"
-#include "engine.h"
-#include "graphics.h"
-#include "localplayer.h"
-#include "log.h"
-#include "main.h"
-#include "particle.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index b7d79f5c..23497c24 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -25,7 +25,7 @@
 #include "being.h"
 #include "guichanfwd.h"
 
-#include "gui/setuptab.h"
+#include "gui/widgets/setuptab.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 8e7e0bee..44feddfa 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -21,13 +21,13 @@
 
 #include "gui/shortcutwindow.h"
 
-#include "gui/shortcutcontainer.h"
+#include "configuration.h"
 
-#include "gui/widgets/layout.h"
-#include "gui/widgets/scrollarea.h"
 #include "gui/setup.h"
 
-#include "configuration.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/shortcutcontainer.h"
 
 static const int SCROLL_PADDING = 0;
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 6e7b3e70..2c013b55 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -21,6 +21,11 @@
 
 #include "gui/skilldialog.h"
 
+#include "localplayer.h"
+#include "log.h"
+
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
 #include "gui/widgets/icon.h"
@@ -33,10 +38,6 @@
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/vertcontainer.h"
 #include "gui/widgets/windowcontainer.h"
-#include "gui/setup.h"
-
-#include "localplayer.h"
-#include "log.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 35839b39..b9d7cedf 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -21,6 +21,11 @@
 
 #include "gui/specialswindow.h"
 
+#include "localplayer.h"
+#include "log.h"
+
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
 #include "gui/widgets/icon.h"
@@ -33,10 +38,6 @@
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/flowcontainer.h"
 #include "gui/widgets/windowcontainer.h"
-#include "gui/setup.h"
-
-#include "localplayer.h"
-#include "log.h"
 
 #include "net/net.h"
 #include "net/specialhandler.h"
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index c2703327..4f2df7e4 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -22,12 +22,12 @@
 
 #include "gui/speechbubble.h"
 
+#include "graphics.h"
+
 #include "gui/gui.h"
 
 #include "gui/widgets/textbox.h"
 
-#include "graphics.h"
-
 #include <guichan/font.hpp>
 #include <guichan/widgets/label.hpp>
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index cda83e82..5d464c6b 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -21,6 +21,12 @@
 
 #include "gui/statuswindow.h"
 
+#include "localplayer.h"
+#include "units.h"
+
+#include "gui/ministatus.h"
+#include "gui/setup.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
@@ -29,12 +35,6 @@
 #include "gui/widgets/vertcontainer.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "gui/ministatus.h"
-#include "gui/setup.h"
-
-#include "localplayer.h"
-#include "units.h"
-
 #include "net/net.h"
 #include "net/playerhandler.h"
 
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index e6583bad..b05c2104 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -21,23 +21,23 @@
 
 #include "gui/storagewindow.h"
 
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "units.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/itemamount.h"
-#include "gui/itemcontainer.h"
 #include "gui/setup.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "inventory.h"
-#include "item.h"
-#include "localplayer.h"
-#include "units.h"
-
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index b942b565..2a4934f3 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -28,11 +28,11 @@
 
 #include "gui/inventorywindow.h"
 #include "gui/itemamount.h"
-#include "gui/itemcontainer.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"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index e07adc9f..8c9f569e 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -22,6 +22,7 @@
 #include "gui/truetypefont.h"
 
 #include "graphics.h"
+
 #include "resources/image.h"
 
 #include <guichan/exception.hpp>
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 394db9cf..eea23be5 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -21,6 +21,12 @@
 
 #include "gui/updatewindow.h"
 
+#include "configuration.h"
+#include "log.h"
+#include "main.h"
+
+#include "gui/sdlinput.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -28,12 +34,6 @@
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "gui/sdlinput.h"
-
-#include "configuration.h"
-#include "log.h"
-#include "main.h"
-
 #include "net/download.h"
 
 #include "resources/resourcemanager.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e8a0e260..eb06ba0e 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -21,10 +21,6 @@
 
 #include "gui/viewport.h"
 
-#include "gui/gui.h"
-#include "gui/ministatus.h"
-#include "gui/popupmenu.h"
-
 #include "beingmanager.h"
 #include "configuration.h"
 #include "flooritemmanager.h"
@@ -37,6 +33,10 @@
 #include "npc.h"
 #include "textmanager.h"
 
+#include "gui/gui.h"
+#include "gui/ministatus.h"
+#include "gui/popupmenu.h"
+
 #include "resources/monsterinfo.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 5d8aea01..7bec47a2 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -24,6 +24,7 @@
 #include "localplayer.h"
 
 #include "gui/gui.h"
+
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index d189947d..610bc153 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -21,9 +21,10 @@
 
 #include "gui/widgets/browserbox.h"
 
-#include "gui/linkhandler.h"
 #include "gui/palette.h"
 
+#include "gui/widgets/linkhandler.h"
+
 #include <guichan/graphics.hpp>
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 9f44cdfc..3fd5fdf6 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/widgets/button.h"
 
-#include "gui/palette.h"
-
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/palette.h"
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 443fab3d..6a915e5b 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -25,11 +25,11 @@
 #include "configuration.h"
 #include "localplayer.h"
 
+#include "gui/recorder.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/scrollarea.h"
-
-#include "gui/itemlinkhandler.h"
-#include "gui/recorder.h"
+#include "gui/widgets/itemlinkhandler.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 9b4ab2f4..bff8d4d8 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/widgets/checkbox.h"
 
-#include "gui/palette.h"
-
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/palette.h"
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 int CheckBox::instances = 0;
 float CheckBox::mAlpha = 1.0;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 13ac866a..fb807f38 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -22,6 +22,7 @@
 #include "gui/widgets/desktop.h"
 
 #include "gui/palette.h"
+
 #include "gui/widgets/label.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index d5b324a6..9088bad9 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -21,18 +21,18 @@
 
 #include "gui/widgets/dropdown.h"
 
-#include "gui/widgets/listbox.h"
-#include "gui/widgets/scrollarea.h"
+#include "configuration.h"
+#include "graphics.h"
 
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
+#include "gui/skin.h"
 
-#include "configuration.h"
-#include "graphics.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index c087fc7e..5327caab 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -19,9 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/emoteshortcutcontainer.h"
-
-#include "gui/palette.h"
+#include "gui/widgets/emoteshortcutcontainer.h"
 
 #include "animatedsprite.h"
 #include "configuration.h"
@@ -34,6 +32,8 @@
 #include "localplayer.h"
 #include "log.h"
 
+#include "gui/palette.h"
+
 #include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 2997cb09..8860927e 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-#include "shortcutcontainer.h"
+#include "gui/widgets/shortcutcontainer.h"
 
 class AnimatedSprite;
 class Image;
diff --git a/src/gui/guildlistbox.cpp b/src/gui/widgets/guildlistbox.cpp
index 0081c78c..14a8f77f 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/widgets/guildlistbox.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/guildlistbox.h"
+#include "gui/widgets/guildlistbox.h"
 
 #include "graphics.h"
 
diff --git a/src/gui/guildlistbox.h b/src/gui/widgets/guildlistbox.h
index d266fe46..d266fe46 100644
--- a/src/gui/guildlistbox.h
+++ b/src/gui/widgets/guildlistbox.h
diff --git a/src/gui/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index ff431c31..67561e89 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -19,7 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/itemcontainer.h"
+#include "gui/widgets/itemcontainer.h"
+
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "itemshortcut.h"
+#include "log.h"
 
 #include "gui/chat.h"
 #include "gui/itempopup.h"
@@ -31,12 +37,6 @@
 #include "net/net.h"
 #include "net/inventoryhandler.h"
 
-#include "graphics.h"
-#include "inventory.h"
-#include "item.h"
-#include "itemshortcut.h"
-#include "log.h"
-
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 2cfd06b2..2cfd06b2 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 6476ce60..1a7011ab 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,12 +22,12 @@
 #include <sstream>
 #include <string>
 
-#include "itemlinkhandler.h"
-#include "itempopup.h"
-#include "viewport.h"
+#include "gui/widgets/itemlinkhandler.h"
+#include "gui/itempopup.h"
+#include "gui/viewport.h"
 
-#include "../resources/iteminfo.h"
-#include "../resources/itemdb.h"
+#include "resources/iteminfo.h"
+#include "resources/itemdb.h"
 
 ItemLinkHandler::ItemLinkHandler()
 {
diff --git a/src/gui/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index c04afa9e..af20b9ce 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -22,7 +22,7 @@
 #ifndef ITEM_LINK_HANDLER_H
 #define ITEM_LINK_HANDLER_H
 
-#include "linkhandler.h"
+#include "gui/widgets/linkhandler.h"
 
 class ItemPopup;
 
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index b0ab6ce0..489a85be 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -19,12 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/itemshortcutcontainer.h"
-
-#include "gui/inventorywindow.h"
-#include "gui/itempopup.h"
-#include "gui/palette.h"
-#include "gui/viewport.h"
+#include "gui/widgets/itemshortcutcontainer.h"
 
 #include "configuration.h"
 #include "graphics.h"
@@ -34,6 +29,11 @@
 #include "keyboardconfig.h"
 #include "localplayer.h"
 
+#include "gui/inventorywindow.h"
+#include "gui/itempopup.h"
+#include "gui/palette.h"
+#include "gui/viewport.h"
+
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 9d188bf0..03d57b8d 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -24,7 +24,7 @@
 
 #include <guichan/mouselistener.hpp>
 
-#include "shortcutcontainer.h"
+#include "gui/widgets/shortcutcontainer.h"
 
 class Image;
 class Item;
diff --git a/src/gui/linkhandler.h b/src/gui/widgets/linkhandler.h
index 30267f87..30267f87 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index aee0f8d3..baedf8e4 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -21,10 +21,10 @@
 
 #include "gui/widgets/listbox.h"
 
+#include "configuration.h"
+
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-
-#include "configuration.h"
 #include "gui/skin.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index c1d6f5e5..4c499c36 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -19,17 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "playerbox.h"
+#include "gui/widgets/playerbox.h"
 
-#include "../animatedsprite.h"
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../player.h"
+#include "animatedsprite.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "player.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
-#include "../utils/dtor.h"
+#include "utils/dtor.h"
 
 int PlayerBox::instances = 0;
 float PlayerBox::mAlpha = 1.0;
diff --git a/src/gui/playerbox.h b/src/gui/widgets/playerbox.h
index 7c08defd..7c08defd 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/widgets/playerbox.h
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 41d60ab6..d801bf32 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -22,14 +22,14 @@
 
 #include "gui/widgets/popup.h"
 
-#include "gui/widgets/windowcontainer.h"
-
-#include "gui/skin.h"
-
 #include "configuration.h"
 #include "graphics.h"
 #include "log.h"
 
+#include "gui/skin.h"
+
+#include "gui/widgets/windowcontainer.h"
+
 #include "resources/image.h"
 
 #include <guichan/exception.hpp>
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 0eda50a1..1b19ed7c 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -21,16 +21,16 @@
 
 #include "gui/widgets/progressbar.h"
 
-#include "gui/gui.h"
-#include "gui/palette.h"
-#include "gui/textrenderer.h"
-
 #include "configuration.h"
 #include "graphics.h"
+#include "textrenderer.h"
+
+#include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/skin.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index eed0ff33..5a2b5d61 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -24,9 +24,10 @@
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/setuptab.cpp b/src/gui/widgets/setuptab.cpp
index 917e15db..e585fa5d 100644
--- a/src/gui/setuptab.cpp
+++ b/src/gui/widgets/setuptab.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/setuptab.h"
+#include "gui/widgets/setuptab.h"
 
 SetupTab::SetupTab()
 {
diff --git a/src/gui/setuptab.h b/src/gui/widgets/setuptab.h
index f0af1ea9..f0af1ea9 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/widgets/setuptab.h
diff --git a/src/gui/shop.cpp b/src/gui/widgets/shopitems.cpp
index 513e50cc..f59df591 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/shop.h"
+#include "gui/widgets/shopitems.h"
 
 #include "shopitem.h"
 
diff --git a/src/gui/shop.h b/src/gui/widgets/shopitems.h
index 28f5d4b3..28f5d4b3 100644
--- a/src/gui/shop.h
+++ b/src/gui/widgets/shopitems.h
diff --git a/src/gui/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index fbdc22ce..4779b8c2 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -21,15 +21,17 @@
 
 #include "gui/widgets/shoplistbox.h"
 
+#include "configuration.h"
+#include "graphics.h"
+#include "shopitem.h"
+
 #include "gui/itempopup.h"
 #include "gui/palette.h"
-#include "gui/shop.h"
 #include "gui/viewport.h"
 
-#include "configuration.h"
-#include "graphics.h"
+#include "gui/widgets/shopitems.h"
+
 #include "resources/image.h"
-#include "shopitem.h"
 
 #include <guichan/font.hpp>
 #include <guichan/listmodel.hpp>
diff --git a/src/gui/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 99d3b9bd..99d3b9bd 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 228a484e..61524acc 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "shortcutcontainer.h"
+#include "gui/widgets/shortcutcontainer.h"
 
-#include "../configuration.h"
+#include "configuration.h"
 
-#include "../resources/image.h"
+#include "resources/image.h"
 
-#include "../utils/stringutils.h"
+#include "utils/stringutils.h"
 
 float ShortcutContainer::mAlpha = 1.0;
 
diff --git a/src/gui/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 906201be..906201be 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 66fe780d..693ac0f7 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -24,9 +24,10 @@
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip;
 Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip;
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index a49c4f12..9abe1f58 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -21,12 +21,12 @@
 
 #include "gui/widgets/tab.h"
 
-#include "gui/widgets/tabbedarea.h"
+#include "configuration.h"
+#include "graphics.h"
 
 #include "gui/palette.h"
 
-#include "configuration.h"
-#include "graphics.h"
+#include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index dd2e62dd..563d995f 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "gui/widgets/tabbedarea.h"
+
 #include "gui/widgets/tab.h"
 
 #include <guichan/widgets/container.hpp>
diff --git a/src/gui/table.cpp b/src/gui/widgets/table.cpp
index e2808992..f33d0abe 100644
--- a/src/gui/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -19,12 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/palette.h"
-#include "gui/table.h"
-#include "gui/sdlinput.h"
+#include "gui/widgets/table.h"
 
 #include "configuration.h"
 
+#include "gui/palette.h"
+#include "gui/sdlinput.h"
+
 #include "utils/dtor.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/table.h b/src/gui/widgets/table.h
index d1f445b3..d1f445b3 100644
--- a/src/gui/table.h
+++ b/src/gui/widgets/table.h
diff --git a/src/gui/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index 0d8a8e33..db06edec 100644
--- a/src/gui/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "tablemodel.h"
+#include "gui/widgets/tablemodel.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/tablemodel.h b/src/gui/widgets/tablemodel.h
index 129d2089..129d2089 100644
--- a/src/gui/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 0f0caa00..c0c42718 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -21,15 +21,15 @@
 
 #include "gui/widgets/textfield.h"
 
-#include "gui/palette.h"
-#include "gui/sdlinput.h"
-
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/palette.h"
+#include "gui/sdlinput.h"
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 0113c09f..ba2b557b 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -21,13 +21,13 @@
 
 #include "gui/widgets/textpreview.h"
 
+#include "configuration.h"
+#include "textrenderer.h"
+
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/textrenderer.h"
 #include "gui/truetypefont.h"
 
-#include "configuration.h"
-
 #include <typeinfo>
 
 float TextPreview::mAlpha = 1.0;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 8d7b442b..ada1e957 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -21,16 +21,16 @@
 
 #include "gui/widgets/window.h"
 
-#include "gui/widgets/layout.h"
-#include "gui/widgets/resizegrip.h"
-#include "gui/widgets/windowcontainer.h"
+#include "configuration.h"
+#include "log.h"
 
 #include "gui/gui.h"
 #include "gui/palette.h"
 #include "gui/skin.h"
 
-#include "configuration.h"
-#include "log.h"
+#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 8c0043eb..a25681f6 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/windowmenu.h"
 
+#include "graphics.h"
+
 #include "gui/emotepopup.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/window.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "graphics.h"
-
 #include "net/net.h"
 #include "net/playerhandler.h"
 
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 0a616f25..5ef59006 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -21,20 +21,20 @@
 
 #include "gui/worldselectdialog.h"
 
+#include "main.h"
+
+#include "gui/sdlinput.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "gui/sdlinput.h"
-
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
 #include "net/worldinfo.h"
 
-#include "main.h"
-
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/text.cpp b/src/text.cpp
index 2cd1e29a..1f03ebd2 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,12 +26,13 @@
 
 #include "configuration.h"
 #include "textmanager.h"
-#include "resources/resourcemanager.h"
-#include "resources/image.h"
+#include "textrenderer.h"
 
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/textrenderer.h"
+
+#include "resources/resourcemanager.h"
+#include "resources/image.h"
 
 int Text::mInstances = 0;
 ImageRect Text::mBubble;
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index c639b937..7433d6bc 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -19,11 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/color.hpp>
-
 #include "textparticle.h"
 
-#include "gui/textrenderer.h"
+#include "textrenderer.h"
+
+#include <guichan/color.hpp>
 
 TextParticle::TextParticle(Map *map, const std::string &text,
                            const gcn::Color *color,
diff --git a/src/gui/textrenderer.h b/src/textrenderer.h
index ad9fbbad..b750cb6b 100644
--- a/src/gui/textrenderer.h
+++ b/src/textrenderer.h
@@ -23,7 +23,8 @@
 #define TEXT_RENDERER_H
 
 #include "graphics.h"
-#include "palette.h"
+
+#include "gui/palette.h"
 
 /**
  * Class for text rendering. Used by the TextParticle, the Text and FlashText