Moved basic widgets into the gui/widgets directory

In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.

155 files changed, 712 insertions, 669 deletions

diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 37301c86..80a34848 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -19,14 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "buddywindow.h"
-#include "chat.h"
-#include "icon.h"
+#include "gui/buddywindow.h"
 
-#include "widgets/avatar.h"
+#include "gui/chat.h"
 
-#include "../resources/resourcemanager.h"
-#include "../utils/gettext.h"
+#include "gui/widgets/avatar.h"
+#include "gui/widgets/icon.h"
+
+#include "resources/resourcemanager.h"
+#include "utils/gettext.h"
 
 extern ChatWindow *chatWindow;
 
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index aa654477..fdcfb36b 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.h
@@ -22,11 +22,11 @@
 #ifndef BUDDYWINDOW_H
 #define BUDDYWINDOW_H
 
+#include "gui/widgets/window.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/actionevent.hpp>
 
-#include "window.h"
-
 class Avatar;
 
 /**
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index aec9e576..ea4bb49b 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/buy.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/scrollarea.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/slider.h"
+
 #include "gui/shop.h"
 #include "gui/shoplistbox.h"
-#include "gui/slider.h"
-
-#include "gui/widgets/layout.h"
 
 #include "npc.h"
 #include "shopitem.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 1e022652..52d02d7b 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -22,12 +22,12 @@
 #ifndef BUY_H
 #define BUY_H
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include "guichanfwd.h"
 
-#include "../guichanfwd.h"
+#include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
 
 class ShopItems;
 class ShopListBox;
@@ -108,6 +108,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
          * Closes the Buy Window, as well as resetting the current npc.
          */
         void close();
+
     private:
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 16d9d2ee..e56b16b1 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -23,7 +23,7 @@
 
 #include "npc.h"
 
-#include "gui/button.h"
+#include "gui/widgets/button.h"
 
 #include "net/net.h"
 #include "net/npchandler.h"
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index ff956e09..ab6d0c92 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -22,9 +22,9 @@
 #ifndef BUYSELL_H
 #define BUYSELL_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 /**
  * A dialog to choose between buying or selling at a shop.
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index daa66324..0955ffca 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -19,18 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "changeemaildialog.h"
+#include "gui/changeemaildialog.h"
 
 #include "main.h"
 #include "log.h"
 #include "logindata.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
 #include "gui/register.h"
-#include "gui/textfield.h"
 #include "gui/ok_dialog.h"
 
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/textfield.h"
+
 #include "utils/gettext.h"
 #include "utils/strprintf.h"
 
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 614f2401..486d8b03 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -22,7 +22,7 @@
 #ifndef GUI_CHANGEEMAIL_H
 #define GUI_CHANGEEMAIL_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 7af1371b..403d9afc 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -25,12 +25,13 @@
 #include "log.h"
 #include "logindata.h"
 
-#include "gui/button.h"
 #include "gui/register.h"
-#include "gui/passwordfield.h"
-#include "gui/textfield.h"
 #include "gui/ok_dialog.h"
-#include "gui/label.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/passwordfield.h"
+#include "gui/widgets/textfield.h"
+#include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
 #include "utils/strprintf.h"
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index ba9f6ede..18c13606 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -22,7 +22,7 @@
 #ifndef CHANGEPASSWORDDIALOG_H
 #define CHANGEPASSWORDDIALOG_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index ca8ba2e0..ddcc62a5 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -21,17 +21,14 @@
 
 #include "gui/char_select.h"
 
-#include "gui/button.h"
 #include "gui/charcreatedialog.h"
 #include "gui/confirm_dialog.h"
-#include "gui/label.h"
 #include "gui/ok_dialog.h"
 #include "gui/playerbox.h"
-#include "gui/textfield.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "gui/radiobutton.h"
-#include "gui/slider.h"
+#include "gui/widgets/radiobutton.h"
+#include "gui/widgets/slider.h"
 
 #include "gui/unregisterdialog.h"
 #include "gui/changepassworddialog.h"
@@ -42,7 +39,10 @@
 #include "net/tmwserv/accountserver/account.h"
 #endif
 
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/textfield.h"
 
 #include "game.h"
 #include "localplayer.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 171c49f6..75a98465 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -22,13 +22,13 @@
 #ifndef CHAR_SELECT_H
 #define CHAR_SELECT_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include "being.h"
+#include "guichanfwd.h"
+#include "lockedarray.h"
 
-#include "../being.h"
-#include "../guichanfwd.h"
-#include "../lockedarray.h"
+#include <guichan/actionlistener.hpp>
 
 #ifdef TMWSERV_SUPPORT
 #include "../logindata.h"
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 5cfcef4d..48f8dedc 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -19,17 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "char_server.h"
-#include "listbox.h"
-#include "scrollarea.h"
+#include "gui/char_server.h"
 
-#include "../logindata.h"
-#include "../main.h"
-#include "../serverinfo.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include "logindata.h"
+#include "main.h"
+#include "serverinfo.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 extern SERVER_INFO **server_info;
 
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 49a5b47b..b80ad286 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -22,11 +22,11 @@
 #ifndef _CHAR_SEL_SERVER_H
 #define _CHAR_SEL_SERVER_H
 
+#include "gui/widgets/window.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
 
-#include "window.h"
-
 class LoginData;
 class ServerListModel;
 
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index f174ceb5..b9dc54a8 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -21,16 +21,16 @@
 
 #include "gui/charcreatedialog.h"
 
-#include "gui/button.h"
 #include "gui/char_select.h"
 #include "gui/confirm_dialog.h"
-#include "gui/label.h"
 #include "gui/ok_dialog.h"
 #include "gui/playerbox.h"
-#include "gui/textfield.h"
 
-#include "gui/radiobutton.h"
-#include "gui/slider.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/radiobutton.h"
+#include "gui/widgets/slider.h"
+#include "gui/widgets/textfield.h"
 
 #include "gui/widgets/layout.h"
 
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index e0a63eb7..8897b5f7 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -26,7 +26,7 @@
 #include "guichanfwd.h"
 #include "lockedarray.h"
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 014ac8b5..17b1a3dc 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -24,10 +24,10 @@
 #include "gui/chatinput.h"
 #include "gui/itemlinkhandler.h"
 #include "gui/recorder.h"
-#include "gui/scrollarea.h"
 #include "gui/sdlinput.h"
 
 #include "gui/widgets/chattab.h"
+#include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/whispertab.h"
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 3cf2a738..085833eb 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -22,17 +22,17 @@
 #ifndef CHAT_H
 #define CHAT_H
 
-#include "window.h"
-
-#include <list>
-#include <string>
-#include <map>
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include <list>
+#include <string>
+#include <map>
+
 class BrowserBox;
 class Channel;
 class ChatTab;
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 3bc16928..c76802bc 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -22,9 +22,7 @@
 #ifndef CHATINPUT_H
 #define CHATINPUT_H
 
-#include <guichan/focuslistener.hpp>
-
-#include "textfield.h"
+#include "gui/widgets/textfield.h"
 
 #include <guichan/focuslistener.hpp>
 
@@ -34,9 +32,6 @@
 class ChatInput : public TextField, public gcn::FocusListener
 {
     public:
-        /**
-         * Constructor.
-         */
         ChatInput();
 
         /**
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index e1c32759..41bf44ad 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -19,15 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/font.hpp>
+#include "gui/confirm_dialog.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textbox.h"
 
-#include "button.h"
-#include "confirm_dialog.h"
-#include "gui.h"
-#include "scrollarea.h"
-#include "textbox.h"
+#include "gui/gui.h"
 
-#include "../utils/gettext.h"
+#include "utils/gettext.h"
+
+#include <guichan/font.hpp>
 
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 8d8c0436..821131c6 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -22,9 +22,9 @@
 #ifndef OPTION_DIALOG_H
 #define OPTION_DIALOG_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class ScrollArea;
 class TextBox;
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 5fb21ff2..66b9b7dd 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -19,15 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
 #include "connection.h"
-#include "label.h"
-#include "progressbar.h"
 
-#include "../main.h"
-#include "../log.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/progressbar.h"
 
-#include "../utils/gettext.h"
+#include "main.h"
+#include "log.h"
+
+#include "utils/gettext.h"
 
 ConnectionDialog::ConnectionDialog(int previousState):
     Window("Info"), mProgress(0), mPreviousState(previousState)
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 0e347266..ab586edd 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -22,9 +22,9 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class ProgressBar;
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index a98c9af4..db062059 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -19,18 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugwindow.h"
-#include "label.h"
-#include "viewport.h"
+#include "gui/debugwindow.h"
 
-#include "widgets/layout.h"
+#include "gui/viewport.h"
 
-#include "../engine.h"
-#include "../game.h"
-#include "../particle.h"
-#include "../map.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
 
-#include "../utils/stringutils.h"
+#include "engine.h"
+#include "game.h"
+#include "particle.h"
+#include "map.h"
+
+#include "utils/stringutils.h"
 
 DebugWindow::DebugWindow():
     Window("Debug")
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 8097132c..e30107f9 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -22,9 +22,7 @@
 #ifndef DEBUGWINDOW_H
 #define DEBUGWINDOW_H
 
-#include <guichan/actionlistener.hpp>
-
-#include "window.h"
+#include "gui/widgets/window.h"
 
 /**
  * The debug window.
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index d4b3cf2e..1d7c0102 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -19,18 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "gui.h"
-#include "emotewindow.h"
-#include "emotecontainer.h"
-#include "scrollarea.h"
+#include "gui/emotewindow.h"
 
-#include "widgets/layout.h"
+#include "gui/gui.h"
+#include "gui/emotecontainer.h"
 
-#include "../localplayer.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include "localplayer.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 EmoteWindow::EmoteWindow():
     Window(_("Emote"))
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index 8af24a7b..15d4b427 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -22,11 +22,11 @@
 #ifndef EMOTEWINDOW_H
 #define EMOTEWINDOW_H
 
+#include "gui/widgets/window.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include "window.h"
-
 class EmoteContainer;
 class TextBox;
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ef90e674..89be2c5e 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -19,30 +19,31 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define BOX_WIDTH 36
-#define BOX_HEIGHT 36
+#include "gui/widgets/button.h"
+
+#include "gui/equipmentwindow.h"
+#include "gui/itempopup.h"
+#include "gui/palette.h"
+#include "gui/playerbox.h"
+#include "gui/viewport.h"
+
+#include "equipment.h"
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+
+#include "resources/image.h"
+#include "resources/iteminfo.h"
+#include "resources/resourcemanager.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
 
-#include "button.h"
-#include "equipmentwindow.h"
-#include "itempopup.h"
-#include "palette.h"
-#include "playerbox.h"
-#include "viewport.h"
-
-#include "../equipment.h"
-#include "../graphics.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../localplayer.h"
-
-#include "../resources/image.h"
-#include "../resources/iteminfo.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+static const int BOX_WIDTH = 36;
+static const int BOX_HEIGHT = 36;
 
 // Positions of the boxes, 2nd dimension is X and Y respectively.
 static const int boxPosition[][2] = {
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 3e0afb48..f5f9ee98 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -22,9 +22,9 @@
 #ifndef EQUIPMENTWINDOW_H
 #define EQUIPMENTWINDOW_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class Equipment;
 class Image;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 87ce74fa..2c75a9f1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -19,29 +19,30 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "gui/gui.h"
+
+#include "gui/focushandler.h"
+#include "gui/palette.h"
+#include "gui/sdlinput.h"
+#include "gui/skin.h"
+#include "gui/truetypefont.h"
+#include "gui/viewport.h"
+
+#include "gui/widgets/window.h"
+#include "gui/widgets/windowcontainer.h"
+
+#include "configlistener.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "log.h"
+
+#include "resources/image.h"
+#include "resources/imageset.h"
+#include "resources/imageloader.h"
+#include "resources/resourcemanager.h"
+
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
-#include <guichan/imagefont.hpp>
-
-#include "focushandler.h"
-#include "gui.h"
-#include "palette.h"
-#include "sdlinput.h"
-#include "skin.h"
-#include "truetypefont.h"
-#include "viewport.h"
-#include "window.h"
-#include "windowcontainer.h"
-
-#include "../configlistener.h"
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../log.h"
-
-#include "../resources/image.h"
-#include "../resources/imageset.h"
-#include "../resources/imageloader.h"
-#include "../resources/resourcemanager.h"
 
 // Guichan stuff
 Gui *gui = 0;
diff --git a/src/gui/guildlistbox.cpp b/src/gui/guildlistbox.cpp
index a4d39741..89d311f1 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/guildlistbox.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "guildlistbox.h"
+#include "gui/guildlistbox.h"
 
-#include "../graphics.h"
+#include "graphics.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/guildlistbox.h b/src/gui/guildlistbox.h
index 8d6e74f1..d266fe46 100644
--- a/src/gui/guildlistbox.h
+++ b/src/gui/guildlistbox.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 
-#include "listbox.h"
+#include "gui/widgets/listbox.h"
 
 class Image;
 
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 0d48b4f3..91759687 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -22,22 +22,23 @@
 
 #include "gui/guildwindow.h"
 
-#include "gui/button.h"
 #include "gui/confirm_dialog.h"
 #include "gui/guildlistbox.h"
-#include "gui/scrollarea.h"
 #include "gui/textdialog.h"
-#include "gui/windowcontainer.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.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/tmwserv/chatserver/guild.h"
+
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
diff --git a/src/gui/guildwindow.h b/src/gui/guildwindow.h
index 88a084e9..3d7ac3ea 100644
--- a/src/gui/guildwindow.h
+++ b/src/gui/guildwindow.h
@@ -22,16 +22,16 @@
 #ifndef GUI_GUILDWINDOW_H
 #define GUI_GUILDWINDOW_H
 
-#include <iosfwd>
-#include <map>
-#include <vector>
+#include "gui/widgets/window.h"
+
+#include "guichanfwd.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/widgets/listbox.hpp>
 
-#include "window.h"
-
-#include "../guichanfwd.h"
+#include <iosfwd>
+#include <map>
+#include <vector>
 
 class LocalPlayer;
 class TextDialog;
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 4b4ba983..ddcf7b49 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -19,16 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "browserbox.h"
-#include "help.h"
-#include "scrollarea.h"
+#include "gui/help.h"
 
-#include "widgets/layout.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/browserbox.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "../resources/resourcemanager.h"
+#include "resources/resourcemanager.h"
 
-#include "../utils/gettext.h"
+#include "utils/gettext.h"
 
 HelpWindow::HelpWindow():
     Window(_("Help"))
diff --git a/src/gui/help.h b/src/gui/help.h
index 8764e733..070f129f 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -22,10 +22,10 @@
 #ifndef HELP_H
 #define HELP_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/linkhandler.h"
+#include "gui/widgets/window.h"
 
-#include "linkhandler.h"
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class BrowserBox;
 
@@ -59,7 +59,7 @@ class HelpWindow : public Window, public LinkHandler,
     private:
         void loadFile(const std::string &file);
 
-        BrowserBox* mBrowserBox;
+        BrowserBox *mBrowserBox;
         gcn::ScrollArea *mScrollArea;
 };
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 0b130581..cb26f36f 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -21,16 +21,16 @@
 
 #include "gui/inventorywindow.h"
 
-#include "gui/button.h"
 #include "gui/item_amount.h"
 #include "gui/itemcontainer.h"
-#include "gui/label.h"
-#include "gui/progressbar.h"
-#include "gui/scrollarea.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.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"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 6e19114c..93ffdc11 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -22,7 +22,7 @@
 #ifndef INVENTORYWINDOW_H
 #define INVENTORYWINDOW_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "inventory.h"
 
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index f539f8ab..d259481e 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -19,22 +19,23 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "item_amount.h"
-#include "label.h"
-#include "slider.h"
+#include "gui/item_amount.h"
+
 #ifdef EATHENA_SUPPORT
-#include "storagewindow.h"
+#include "gui/storagewindow.h"
 #endif
-#include "trade.h"
+#include "gui/trade.h"
 
-#include "widgets/layout.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/slider.h"
 
-#include "../item.h"
-#include "../localplayer.h"
+#include "item.h"
+#include "localplayer.h"
 
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
 
 ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
                                    int maxRange):
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 24c50290..84875685 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -22,9 +22,9 @@
 #ifndef ITEM_AMOUNT_WINDOW_H
 #define ITEM_AMOUNT_WINDOW_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class IntTextField;
 class Item;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 3098cc28..6226acab 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -24,8 +24,9 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
-#include "gui/scrollarea.h"
-#include "gui/textbox.h"
+
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textbox.h"
 
 #include "graphics.h"
 #include "units.h"
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 816e7ab2..8f110bc3 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -23,7 +23,7 @@
 #ifndef ITEMPOPUP_H
 #define ITEMPOPUP_H
 
-#include "popup.h"
+#include "gui/widgets/popup.h"
 
 class ItemInfo;
 class ScrollArea;
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index baa34b13..609d7c72 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -22,7 +22,7 @@
 #ifndef ITEMSHORTCUTWINDOW_H
 #define ITEMSHORTCUTWINDOW_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 class ItemShortcutContainer;
 class ScrollArea;
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index de328fcc..d9f31b95 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -19,25 +19,26 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "checkbox.h"
-#include "label.h"
-#include "listbox.h"
-#include "login.h"
-#include "ok_dialog.h"
-#include "passwordfield.h"
-#include "scrollarea.h"
-#include "textfield.h"
-
-#include "widgets/dropdown.h"
-#include "widgets/layout.h"
-
-#include "../main.h"
-#include "../logindata.h"
-#include "../configuration.h"
-
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include "gui/login.h"
+
+#include "gui/ok_dialog.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/dropdown.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/passwordfield.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textfield.h"
+
+#include "main.h"
+#include "logindata.h"
+#include "configuration.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 static const int MAX_SERVER_LIST_SIZE = 5;
 static const int LOGIN_DIALOG_WIDTH = 220;
diff --git a/src/gui/login.h b/src/gui/login.h
index 9a97cd4d..398fe725 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -22,8 +22,7 @@
 #ifndef LOGIN_H
 #define LOGIN_H
 
-#include <string>
-#include <vector>
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
@@ -31,7 +30,8 @@
 #include <guichan/listmodel.hpp>
 #endif
 
-#include "window.h"
+#include <string>
+#include <vector>
 
 class LoginData;
 #ifdef EATHENA_SUPPORT
diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index a24bfc05..c0b0519f 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "magic.h"
+#include "gui/magic.h"
 
-#include "gui/button.h"
+#include "gui/widgets/button.h"
 
 #include "localplayer.h"
 
diff --git a/src/gui/magic.h b/src/gui/magic.h
index 7f346f6a..734ad799 100644
--- a/src/gui/magic.h
+++ b/src/gui/magic.h
@@ -22,7 +22,7 @@
 #ifndef MAGIC_H
 #define MAGIC_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index e6ae2d3b..6ad57d61 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -19,17 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <string>
+#include "gui/menuwindow.h"
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/button.h"
+#include "gui/widgets/window.h"
 
-#include "button.h"
-#include "menuwindow.h"
-#include "window.h"
+#include "graphics.h"
 
-#include "../graphics.h"
+#include "utils/gettext.h"
 
-#include "../utils/gettext.h"
+#include <guichan/actionlistener.hpp>
+
+#include <string>
 
 extern Window *chatWindow;
 extern Window *equipmentWindow;
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index c3d5673e..c3190680 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -22,7 +22,7 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include "popup.h"
+#include "gui/widgets/popup.h"
 
 /**
  * The Button Menu.
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 3ce0aacd..c040f7ed 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -22,7 +22,7 @@
 #ifndef MINIMAP_H
 #define MINIMAP_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 class Image;
 
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 95577e69..9f74ad6e 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -19,17 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui.h"
-#include "ministatus.h"
-#include "progressbar.h"
-#include "status.h"
+#include "gui/ministatus.h"
 
-#include "../animatedsprite.h"
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../localplayer.h"
+#include "gui/gui.h"
+#include "gui/status.h"
 
-#include "../utils/stringutils.h"
+#include "gui/widgets/progressbar.h"
+
+#include "animatedsprite.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "localplayer.h"
+
+#include "utils/stringutils.h"
 
 MiniStatusWindow::MiniStatusWindow():
     Popup("MiniStatus")
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index fd5a4e53..96ac3d88 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -22,7 +22,7 @@
 #ifndef MINISTATUS_H
 #define MINISTATUS_H
 
-#include "popup.h"
+#include "gui/widgets/popup.h"
 
 #include <vector>
 
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 2d4a5891..770683eb 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -21,11 +21,10 @@
 
 #include "gui/npc_text.h"
 
-#include "gui/button.h"
-#include "gui/scrollarea.h"
-#include "gui/textbox.h"
-
+#include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textbox.h"
 
 #include "npc.h"
 
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 231ac684..ad32fdf4 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -22,13 +22,13 @@
 #ifndef NPC_TEXT_H
 #define NPC_TEXT_H
 
-#include <string>
+#include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "npc.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
-#include "../npc.h"
+#include <string>
 
 class TextBox;
 
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 7955214c..2a04acd2 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -21,10 +21,10 @@
 
 #include "gui/npcintegerdialog.h"
 
-#include "gui/button.h"
-#include "gui/inttextfield.h"
 #include "gui/npc_text.h"
 
+#include "gui/widgets/button.h"
+#include "gui/widgets/inttextfield.h"
 #include "gui/widgets/layout.h"
 
 #include "npc.h"
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index bb3a8e20..835372f7 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -22,9 +22,9 @@
 #ifndef GUI_NPCINTEGERDIALOG_H
 #define GUI_NPCINTEGERDIALOG_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class IntTextField;
 
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 5cd7dbab..97f9fdb7 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -21,12 +21,12 @@
 
 #include "gui/npclistdialog.h"
 
-#include "gui/button.h"
-#include "gui/listbox.h"
 #include "gui/npc_text.h"
-#include "gui/scrollarea.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 
 #include "npc.h"
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index fa297304..b0279e11 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -22,7 +22,7 @@
 #ifndef GUI_NPCLISTDIALOG_H
 #define GUI_NPCLISTDIALOG_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index f755c64b..20123745 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -21,13 +21,12 @@
 
 #include "gui/npcpostdialog.h"
 
-#include "gui/label.h"
-#include "gui/textbox.h"
-#include "gui/textfield.h"
-#include "gui/button.h"
-#include "gui/scrollarea.h"
-
+#include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/textbox.h"
+#include "gui/widgets/textfield.h"
+#include "gui/widgets/scrollarea.h"
 
 #include "npc.h"
 
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index b970f5cf..ea038aeb 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -22,9 +22,9 @@
 #ifndef GUI_NPCPOSTDIALOG_H
 #define GUI_NPCPOSTDIALOG_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class TextBox;
 class TextField;
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 7ce4060c..446078e8 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/npc_text.h"
-
-#include "gui/button.h"
 #include "gui/npcstringdialog.h"
-#include "gui/textfield.h"
 
+#include "gui/npc_text.h"
+
+#include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/textfield.h"
 
 #include "npc.h"
 
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 37d46cc0..e6bbd7ba 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -22,7 +22,7 @@
 #ifndef GUI_NPCSTRINGDIALOG_H
 #define GUI_NPCSTRINGDIALOG_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 24ffa80c..06217653 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -19,15 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/font.hpp>
+#include "gui/ok_dialog.h"
+
+#include "gui/gui.h"
 
-#include "button.h"
-#include "gui.h"
-#include "ok_dialog.h"
-#include "scrollarea.h"
-#include "textbox.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textbox.h"
 
-#include "../utils/gettext.h"
+#include "utils/gettext.h"
+
+#include <guichan/font.hpp>
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
                    Window *parent):
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 46dd4db0..30cfcdca 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -22,7 +22,7 @@
 #ifndef OK_DIALOG_H
 #define OK_DIALOG_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index 049030e5..b1967b0e 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.h
@@ -22,17 +22,17 @@
 #ifndef PARTYWINDOW_H
 #define PARTYWINDOW_H
 
-#include "window.h"
-#include "confirm_dialog.h"
+#include "gui/confirm_dialog.h"
 
 #include "gui/widgets/avatar.h"
-
-#include <string>
-#include <map>
+#include "gui/widgets/window.h"
 
 #include <guichan/actionevent.hpp>
 #include <guichan/actionlistener.hpp>
 
+#include <string>
+#include <map>
+
 /**
  * Party Member
  * Used for storing players in the party
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ac941db0..c016245b 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,11 +21,12 @@
 
 #include "gui/popupmenu.h"
 
-#include "gui/browserbox.h"
 #include "gui/chat.h"
 #include "gui/inventorywindow.h"
 #include "gui/item_amount.h"
 
+#include "gui/widgets/browserbox.h"
+
 #include "being.h"
 #include "beingmanager.h"
 #include "floor_item.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index d9fb4777..338f9044 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -22,8 +22,8 @@
 #ifndef POPUP_MENU_H
 #define POPUP_MENU_H
 
-#include "linkhandler.h"
-#include "window.h"
+#include "gui/linkhandler.h"
+#include "gui/widgets/window.h"
 
 class Being;
 class BrowserBox;
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 193f0e27..e506aea3 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -23,8 +23,8 @@
 
 #include "main.h"
 
-#include "gui/button.h"
-#include "gui/radiobutton.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/radiobutton.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 7f12c41c..252c283d 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -22,7 +22,7 @@
 #ifndef QUITDIALOG_H
 #define QUITDIALOG_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 #include "main.h"
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 4f919bef..3307d904 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -19,17 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <physfs.h>
+#include "gui/recorder.h"
+
+#include "gui/chat.h"
 
-#include "button.h"
-#include "chat.h"
-#include "recorder.h"
-#include "windowcontainer.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/chattab.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/windowcontainer.h"
 
-#include "widgets/chattab.h"
-#include "widgets/layout.h"
+#include "utils/stringutils.h"
 
-#include "../utils/stringutils.h"
+#include <physfs.h>
 
 Recorder::Recorder(ChatWindow *chat, const std::string &title,
                    const std::string &buttonTxt) :
diff --git a/src/gui/recorder.h b/src/gui/recorder.h
index 39d00c2c..4b2a7706 100644
--- a/src/gui/recorder.h
+++ b/src/gui/recorder.h
@@ -22,14 +22,14 @@
 #ifndef RECORD_H
 #define RECORD_H
 
-#include <fstream>
-#include <string>
+#include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "utils/gettext.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
-#include "../utils/gettext.h"
+#include <fstream>
+#include <string>
 
 class ChatWindow;
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 5fb8b579..6700bca6 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -19,26 +19,27 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../configuration.h"
-#include "../log.h"
-#include "../logindata.h"
-#include "../main.h"
+#include "gui/register.h"
 
-#include "button.h"
-#include "checkbox.h"
-#include "label.h"
-#include "login.h"
-#include "ok_dialog.h"
-#include "passwordfield.h"
-#include "radiobutton.h"
-#include "register.h"
-#include "textfield.h"
+#include "configuration.h"
+#include "log.h"
+#include "logindata.h"
+#include "main.h"
 
-#include "widgets/layout.h"
+#include "gui/login.h"
+#include "gui/ok_dialog.h"
 
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
-#include "../utils/stringutils.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/passwordfield.h"
+#include "gui/widgets/radiobutton.h"
+#include "gui/widgets/textfield.h"
+
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+#include "utils/stringutils.h"
 
 void WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
diff --git a/src/gui/register.h b/src/gui/register.h
index c37305e4..6839c805 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -22,12 +22,12 @@
 #ifndef REGISTER_H
 #define REGISTER_H
 
-#include <string>
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
-#include "window.h"
+#include <string>
 
 class LoginData;
 class OkDialog;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 2dfc66a7..c450cd2d 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -21,14 +21,14 @@
 
 #include "gui/sell.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/scrollarea.h"
 #include "gui/shop.h"
 #include "gui/shoplistbox.h"
-#include "gui/slider.h"
 
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/slider.h"
 
 #include "npc.h"
 #include "shopitem.h"
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 89ae06c4..547e297b 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -22,13 +22,13 @@
 #ifndef SELL_H
 #define SELL_H
 
+#include "gui/widgets/window.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
 #include <SDL_types.h>
 
-#include "window.h"
-
 class Item;
 class ShopItems;
 class ShopListBox;
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index fdf0296a..35bb2f50 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,15 +21,15 @@
 
 #include "gui/serverdialog.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/listbox.h"
 #include "gui/ok_dialog.h"
-#include "gui/scrollarea.h"
-#include "gui/textfield.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textfield.h"
 
 #include "configuration.h"
 #include "log.h"
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 9906e04a..0c75cede 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -22,7 +22,7 @@
 #ifndef SERVERDIALOG_H
 #define SERVERDIALOG_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 72dfbce5..7eb740b1 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -19,19 +19,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
 #include "setup.h"
-#include "setup_audio.h"
-#include "setup_colors.h"
-#include "setup_joystick.h"
-#include "setup_keyboard.h"
-#include "setup_players.h"
-#include "setup_video.h"
 
-#include "widgets/tabbedarea.h"
+#include "gui/setup_audio.h"
+#include "gui/setup_colors.h"
+#include "gui/setup_joystick.h"
+#include "gui/setup_keyboard.h"
+#include "gui/setup_players.h"
+#include "gui/setup_video.h"
 
-#include "../utils/dtor.h"
-#include "../utils/gettext.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/tabbedarea.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
 
 extern Window *chatWindow;
 extern Window *statusWindow;
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 4c387d34..0c97370f 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -22,13 +22,13 @@
 #ifndef SETUP_H
 #define SETUP_H
 
-#include <list>
+#include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichanfwd.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
-#include "../guichanfwd.h"
+#include <list>
 
 class SetupTab;
 
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 6b9c49f7..78817328 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -19,21 +19,22 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "checkbox.h"
-#include "label.h"
-#include "ok_dialog.h"
-#include "setup_audio.h"
-#include "slider.h"
+#include "gui/setup_audio.h"
 
-#include "widgets/layouthelper.h"
+#include "gui/ok_dialog.h"
 
-#include "../configuration.h"
-#include "../log.h"
-#include "../sound.h"
-#include "../map.h"
-#include "../engine.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/slider.h"
 
-#include "../utils/gettext.h"
+#include "configuration.h"
+#include "log.h"
+#include "sound.h"
+#include "map.h"
+#include "engine.h"
+
+#include "utils/gettext.h"
 
 Setup_Audio::Setup_Audio():
     mMusicVolume((int)config.getValue("musicVolume", 60)),
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 9e951895..b398a880 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -22,9 +22,11 @@
 #ifndef GUI_SETUP_AUDIO_H
 #define GUI_SETUP_AUDIO_H
 
-#include <guichan/actionlistener.hpp>
+#include "guichanfwd.h"
+
+#include "gui/setuptab.h"
 
-#include "setuptab.h"
+#include <guichan/actionlistener.hpp>
 
 class Setup_Audio : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 02955470..fec503ef 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -19,17 +19,18 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/browserbox.h"
+#include "gui/setup_colors.h"
+
 #include "gui/gui.h"
 #include "gui/itemlinkhandler.h"
-#include "gui/label.h"
-#include "gui/listbox.h"
 #include "gui/palette.h"
-#include "gui/scrollarea.h"
-#include "gui/setup_colors.h"
-#include "gui/slider.h"
 
+#include "gui/widgets/browserbox.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/slider.h"
 #include "gui/widgets/textpreview.h"
 
 #include "configuration.h"
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index b909b873..0aaf8b49 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -22,17 +22,17 @@
 #ifndef SETUP_COLORS_H
 #define SETUP_COLORS_H
 
-#include <string>
-
-#include <guichan/actionlistener.hpp>
-
 #include "gui/setuptab.h"
-#include "gui/textfield.h"
+
+#include "gui/widgets/textfield.h"
 
 #include "guichanfwd.h"
 
+#include <guichan/actionlistener.hpp>
+
+#include <string>
+
 class BrowserBox;
-class TextField;
 class TextPreview;
 
 class Setup_Colors : public SetupTab, public gcn::ActionListener,
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 59a882c7..4a78d1ef 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -19,17 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "checkbox.h"
-#include "label.h"
-#include "setup_joystick.h"
+#include "gui/setup_joystick.h"
 
-#include "widgets/layouthelper.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 "configuration.h"
+#include "joystick.h"
 
-#include "../utils/gettext.h"
+#include "utils/gettext.h"
 
 extern Joystick *joystick;
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index eba8a2cc..f3f19e16 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -22,9 +22,11 @@
 #ifndef GUI_SETUP_JOYSTICK_H
 #define GUI_SETUP_JOYSTICK_H
 
-#include <guichan/actionlistener.hpp>
+#include "guichanfwd.h"
+
+#include "gui/setuptab.h"
 
-#include "setuptab.h"
+#include <guichan/actionlistener.hpp>
 
 class Setup_Joystick : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 17d98dc1..8383af97 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -22,12 +22,12 @@
 
 #include "gui/setup_keyboard.h"
 
-#include "gui/button.h"
-#include "gui/listbox.h"
 #include "gui/ok_dialog.h"
-#include "gui/scrollarea.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 
 #include "keyboardconfig.h"
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 1451e71e..3f3ea446 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -19,25 +19,26 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <string>
-#include <vector>
+#include "gui/setup_players.h"
+
+#include "gui/ok_dialog.h"
+#include "gui/table.h"
 
-#include "button.h"
-#include "checkbox.h"
-#include "label.h"
-#include "listbox.h"
-#include "ok_dialog.h"
-#include "scrollarea.h"
-#include "setup_players.h"
-#include "table.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/dropdown.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "widgets/dropdown.h"
-#include "widgets/layouthelper.h"
+#include "configuration.h"
+#include "log.h"
 
-#include "../configuration.h"
-#include "../log.h"
+#include "utils/gettext.h"
 
-#include "../utils/gettext.h"
+#include <string>
+#include <vector>
 
 #define COLUMNS_NR 2 // name plus listbox
 #define NAME_COLUMN 0
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 72d81f71..491054c3 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -22,11 +22,13 @@
 #ifndef GUI_SETUP_PLAYERS_H
 #define GUI_SETUP_PLAYERS_H
 
-#include <guichan/actionlistener.hpp>
+#include "guichanfwd.h"
+
+#include "gui/setuptab.h"
 
-#include "setuptab.h"
+#include "player_relations.h"
 
-#include "../player_relations.h"
+#include <guichan/actionlistener.hpp>
 
 class GuiTable;
 class PlayerTableModel;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 07f073db..45ec29b9 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -19,33 +19,34 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <SDL.h>
-#include <string>
-#include <vector>
+#include "gui/setup_video.h"
+
+#include "gui/ok_dialog.h"
+
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/slider.h"
+#include "gui/widgets/textfield.h"
+
+#include "configuration.h"
+#include "graphics.h"
+#include "localplayer.h"
+#include "log.h"
+#include "main.h"
+#include "particle.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
-#include "checkbox.h"
-#include "label.h"
-#include "listbox.h"
-#include "ok_dialog.h"
-#include "scrollarea.h"
-#include "setup_video.h"
-#include "slider.h"
-#include "textfield.h"
-
-#include "widgets/layouthelper.h"
-
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../localplayer.h"
-#include "../log.h"
-#include "../main.h"
-#include "../particle.h"
-
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include <SDL.h>
+#include <string>
+#include <vector>
 
 extern Graphics *graphics;
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 62b46646..20944924 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -22,11 +22,13 @@
 #ifndef GUI_SETUP_VIDEO_H
 #define GUI_SETUP_VIDEO_H
 
+#include "guichanfwd.h"
+
+#include "gui/setuptab.h"
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
-#include "setuptab.h"
-
 class Setup_Video : public SetupTab, public gcn::ActionListener,
                     public gcn::KeyListener
 {
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index 3e0c51e2..c4f9f1dd 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -22,7 +22,7 @@
 #ifndef GUI_SETUPTAB_H
 #define GUI_SETUPTAB_H
 
-#include "gccontainer.h"
+#include "gui/widgets/gccontainer.h"
 
 class SetupTab : public GCContainer
 {
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 0b28b2f1..7b232ccb 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -22,7 +22,7 @@
 #ifndef SHOPLISTBOX_H
 #define SHOPLISTBOX_H
 
-#include "listbox.h"
+#include "gui/widgets/listbox.h"
 
 class ShopItems;
 
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index dcc7f72e..7d34296e 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -19,13 +19,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "scrollarea.h"
-#include "shortcutcontainer.h"
-#include "shortcutwindow.h"
+#include "gui/shortcutwindow.h"
 
-#include "widgets/layout.h"
+#include "gui/shortcutcontainer.h"
 
-#include "../configuration.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/scrollarea.h"
+
+#include "configuration.h"
 
 static const int SCROLL_PADDING = 0;
 
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index eae881ba..7aeb5571 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -22,7 +22,7 @@
 #ifndef SHORTCUTWINDOW_H
 #define SHORTCUTWINDOW_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 class ScrollArea;
 class ShortcutContainer;
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 39ccbb06..66ebc506 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -19,23 +19,24 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "button.h"
-#include "label.h"
-#include "listbox.h"
-#include "scrollarea.h"
-#include "skill.h"
-#include "table.h"
-#include "windowcontainer.h"
-
-#include "widgets/layout.h"
-
-#include "../localplayer.h"
-#include "../log.h"
-
-#include "../utils/dtor.h"
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
-#include "../utils/xml.h"
+#include "gui/skill.h"
+
+#include "gui/table.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/windowcontainer.h"
+
+#include "localplayer.h"
+#include "log.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+#include "utils/xml.h"
 
 static const char *SKILLS_FILE = _("skills.xml");
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 0d6336f3..0879f7e1 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -22,13 +22,14 @@
 #ifndef SKILL_H
 #define SKILL_H
 
-#include "gui/window.h"
-
-#include <vector>
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
-struct SKILL {
+#include <vector>
+
+struct SKILL
+{
     short id;      /**< Index into "skill_db" array */
     short lv, sp;
 };
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 3ae81e8b..5788aa99 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -21,16 +21,15 @@
 
 #include "gui/skilldialog.h"
 
-#include "gui/button.h"
-#include "gui/gccontainer.h"
-#include "gui/icon.h"
-#include "gui/label.h"
-#include "gui/listbox.h"
-#include "gui/progressbar.h"
-#include "gui/scrollarea.h"
-#include "gui/windowcontainer.h"
-
+#include "gui/widgets/button.h"
+#include "gui/widgets/gccontainer.h"
+#include "gui/widgets/icon.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/progressbar.h"
+#include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
+#include "gui/widgets/windowcontainer.h"
 
 #include "localplayer.h"
 
@@ -38,8 +37,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/widgets/container.hpp>
-
 #include <string>
 #include <vector>
 
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index a913b9be..56192273 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -22,7 +22,7 @@
 #ifndef SKILL_H
 #define SKILL_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index b4f7ff3b..fb896ba2 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -20,10 +20,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/gui.h"
-#include "gui/scrollarea.h"
 #include "gui/speechbubble.h"
-#include "gui/textbox.h"
+
+#include "gui/gui.h"
+
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textbox.h"
 
 #include "graphics.h"
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 3eead884..3b97d3fe 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -23,8 +23,9 @@
 #ifndef SPEECHBUBBLE_H
 #define SPEECHBUBBLE_H
 
-#include "palette.h"
-#include "popup.h"
+#include "gui/palette.h"
+
+#include "gui/widgets/popup.h"
 
 class ScrollArea;
 class TextBox;
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index ad50c72f..7003e431 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -24,12 +24,11 @@
 #include "localplayer.h"
 #include "units.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/progressbar.h"
-#include "gui/windowcontainer.h"
-
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
+#include "gui/widgets/progressbar.h"
+#include "gui/widgets/windowcontainer.h"
 
 #include "net/net.h"
 #include "net/ea/playerhandler.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 1425fe12..403a7d59 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -22,9 +22,9 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include <guichan/actionlistener.hpp>
+#include "gui/widgets/window.h"
 
-#include "window.h"
+#include <guichan/actionlistener.hpp>
 
 class LocalPlayer;
 class ProgressBar;
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 492ccd50..c25420e9 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "statuswindow.h"
+#include "gui/statuswindow.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/progressbar.h"
-#include "gui/windowcontainer.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/progressbar.h"
+#include "gui/widgets/windowcontainer.h"
 
 #include "localplayer.h"
 
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index b28fa275..1e2a5097 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -22,7 +22,7 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 073b3ac8..076dfccf 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -19,35 +19,35 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <string>
+#include "gui/storagewindow.h"
+#include "gui/inventorywindow.h"
+#include "gui/item_amount.h"
+#include "gui/itemcontainer.h"
+#include "gui/viewport.h"
 
-#include <guichan/font.hpp>
-#include <guichan/mouseinput.hpp>
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/progressbar.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "button.h"
-#include "inventorywindow.h"
-#include "item_amount.h"
-#include "itemcontainer.h"
-#include "label.h"
-#include "progressbar.h"
-#include "scrollarea.h"
-#include "storagewindow.h"
-#include "viewport.h"
+#include "inventory.h"
+#include "item.h"
+#include "localplayer.h"
+#include "units.h"
 
-#include "widgets/layout.h"
+#include "net/net.h"
+#include "net/ea/inventoryhandler.h"
 
-#include "../inventory.h"
-#include "../item.h"
-#include "../localplayer.h"
-#include "../units.h"
+#include "resources/iteminfo.h"
 
-#include "../net/net.h"
-#include "../net/ea/inventoryhandler.h"
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
 
-#include "../resources/iteminfo.h"
+#include <guichan/font.hpp>
+#include <guichan/mouseinput.hpp>
 
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
+#include <string>
 
 StorageWindow::StorageWindow(int invSize):
     Window(_("Storage")),
diff --git a/src/gui/storagewindow.h b/src/gui/storagewindow.h
index a4db14bf..caf31b90 100644
--- a/src/gui/storagewindow.h
+++ b/src/gui/storagewindow.h
@@ -22,9 +22,9 @@
 #ifndef STORAGEWINDOW_H
 #define STORAGEWINDOW_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
-#include "../inventory.h"
+#include "inventory.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index a7f8def7..8430e974 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -21,9 +21,9 @@
 
 #include "gui/textdialog.h"
 
-#include "gui/button.h"
-#include "gui/label.h"
-#include "gui/textfield.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index 16a1e9d8..edfe85b6 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -22,7 +22,7 @@
 #ifndef GUI_GUILD_DIALOG_H
 #define GUI_GUILD_DIALOG_H
 
-#include "window.h"
+#include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index f931b81b..95dffdcd 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -26,15 +26,15 @@
 #include "localplayer.h"
 #include "units.h"
 
-#include "gui/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/inventorywindow.h"
 #include "gui/item_amount.h"
 #include "gui/itemcontainer.h"
-#include "gui/label.h"
-#include "gui/scrollarea.h"
-#include "gui/textfield.h"
 
+#include "gui/widgets/button.h"
+#include "gui/widgets/chattab.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/textfield.h"
 #include "gui/widgets/layout.h"
 
 #include "net/net.h"
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 7f5f8a11..3493c4c6 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -22,14 +22,14 @@
 #ifndef TRADE_H
 #define TRADE_H
 
-#include <memory>
+#include "gui/widgets/window.h"
+
+#include "guichanfwd.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include "window.h"
-
-#include "../guichanfwd.h"
+#include <memory>
 
 class Inventory;
 class Item;
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index b67fb01e..b51d199e 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -25,13 +25,14 @@
 #include "log.h"
 #include "logindata.h"
 
-#include "gui/button.h"
-#include "gui/checkbox.h"
-#include "gui/label.h"
 #include "gui/ok_dialog.h"
-#include "gui/passwordfield.h"
 #include "gui/register.h"
-#include "gui/textfield.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/checkbox.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/passwordfield.h"
+#include "gui/widgets/textfield.h"
 
 #include "utils/gettext.h"
 #include "utils/strprintf.h"
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 5db57b1d..18dbef5d 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -22,12 +22,12 @@
 #ifndef UNREGISTERDIALOG_H
 #define UNREGISTERDIALOG_H
 
-#include <guichan/actionlistener.hpp>
-
-#include "gui/window.h"
+#include "gui/widgets/window.h"
 
 #include "guichanfwd.h"
 
+#include <guichan/actionlistener.hpp>
+
 class LoginData;
 class OkDialog;
 class WrongDataNoticeListener;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 8c903c28..f22c768a 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -19,30 +19,30 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iostream>
-#include <SDL.h>
-#include <SDL_thread.h>
-#include <zlib.h>
+#include "gui/updatewindow.h"
 
-#include <curl/curl.h>
+#include "gui/widgets/browserbox.h"
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/layout.h"
+#include "gui/widgets/progressbar.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "browserbox.h"
-#include "button.h"
-#include "label.h"
-#include "progressbar.h"
-#include "scrollarea.h"
-#include "updatewindow.h"
+#include "configuration.h"
+#include "log.h"
+#include "main.h"
 
-#include "widgets/layout.h"
+#include "resources/resourcemanager.h"
 
-#include "../configuration.h"
-#include "../log.h"
-#include "../main.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
-#include "../resources/resourcemanager.h"
+#include <iostream>
+#include <SDL.h>
+#include <SDL_thread.h>
+#include <zlib.h>
 
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include <curl/curl.h>
 
 /**
  * Calculates the Alder-32 checksum for the given file.
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index ace398b4..65a934dc 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -22,17 +22,15 @@
 #ifndef _UPDATERWINDOW_H
 #define _UPDATERWINDOW_H
 
+#include "gui/widgets/window.h"
+
+#include "utils/mutex.h"
+
 #include <guichan/actionlistener.hpp>
 
 #include <string>
 #include <vector>
 
-#include "window.h"
-
-#include "../utils/mutex.h"
-
-#include "../utils/mutex.h"
-
 class BrowserBox;
 class Button;
 class ProgressBar;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index c051e5a2..cff23862 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -22,12 +22,12 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
-#include <guichan/mouselistener.hpp>
+#include "gui/widgets/windowcontainer.h"
 
-#include "windowcontainer.h"
+#include "configlistener.h"
+#include "position.h"
 
-#include "../configlistener.h"
-#include "../position.h"
+#include <guichan/mouselistener.hpp>
 
 class Being;
 class FloorItem;
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index c9e8002e..55b1716a 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -21,8 +21,8 @@
 
 #include "gui/widgets/avatar.h"
 
-#include "gui/icon.h"
-#include "gui/label.h"
+#include "gui/widgets/icon.h"
+#include "gui/widgets/label.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/widgets/avatar.h b/src/gui/widgets/avatar.h
index 026a3581..d1380bfd 100644
--- a/src/gui/widgets/avatar.h
+++ b/src/gui/widgets/avatar.h
@@ -24,7 +24,7 @@
 
 #include "guichanfwd.h"
 
-#include "gui/gccontainer.h"
+#include "gui/widgets/gccontainer.h"
 
 #include <string>
 
diff --git a/src/gui/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 0240b67b..6b1cb434 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -19,14 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
+#include "gui/widgets/browserbox.h"
+
+#include "gui/linkhandler.h"
+#include "gui/palette.h"
+#include "gui/truetypefont.h"
 
 #include <guichan/graphics.hpp>
 
-#include "browserbox.h"
-#include "linkhandler.h"
-#include "palette.h"
-#include "truetypefont.h"
+#include <algorithm>
 
 BrowserBox::BrowserBox(unsigned int mode, bool opaque):
     gcn::Widget(),
diff --git a/src/gui/browserbox.h b/src/gui/widgets/browserbox.h
index 090c03e1..090c03e1 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/widgets/browserbox.h
diff --git a/src/gui/button.cpp b/src/gui/widgets/button.cpp
index a08d383b..71579bd4 100644
--- a/src/gui/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -19,19 +19,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/exception.hpp>
-#include <guichan/font.hpp>
+#include "gui/widgets/button.h"
+
+#include "gui/palette.h"
 
-#include "button.h"
-#include "palette.h"
+#include "configuration.h"
+#include "graphics.h"
 
-#include "../configuration.h"
-#include "../graphics.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"
+#include <guichan/exception.hpp>
+#include <guichan/font.hpp>
 
 int Button::mInstances = 0;
 float Button::mAlpha = 1.0;
diff --git a/src/gui/button.h b/src/gui/widgets/button.h
index eebf7931..eebf7931 100644
--- a/src/gui/button.h
+++ b/src/gui/widgets/button.h
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 2211eb36..26bc121a 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -19,16 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "chattab.h"
+#include "gui/widgets/chattab.h"
 
 #include "commandhandler.h"
 #include "configuration.h"
 #include "localplayer.h"
 
-#include "gui/browserbox.h"
+#include "gui/widgets/browserbox.h"
+#include "gui/widgets/scrollarea.h"
+
 #include "gui/itemlinkhandler.h"
 #include "gui/recorder.h"
-#include "gui/scrollarea.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/gui/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index c7bc8982..2e9a234b 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -19,14 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "checkbox.h"
-#include "palette.h"
+#include "gui/widgets/checkbox.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include "gui/palette.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "configuration.h"
+#include "graphics.h"
+
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 int CheckBox::instances = 0;
 float CheckBox::mAlpha = 1.0;
diff --git a/src/gui/checkbox.h b/src/gui/widgets/checkbox.h
index 303782b0..303782b0 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/widgets/checkbox.h
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 68c7e093..8dabc3f9 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -21,9 +21,10 @@
 
 #include "gui/widgets/dropdown.h"
 
-#include "gui/listbox.h"
+#include "gui/widgets/listbox.h"
+#include "gui/widgets/scrollarea.h"
+
 #include "gui/palette.h"
-#include "gui/scrollarea.h"
 
 #include "configuration.h"
 #include "graphics.h"
diff --git a/src/gui/gccontainer.cpp b/src/gui/widgets/gccontainer.cpp
index 8325ccd4..8325ccd4 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/widgets/gccontainer.cpp
diff --git a/src/gui/gccontainer.h b/src/gui/widgets/gccontainer.h
index da584a42..da584a42 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/widgets/gccontainer.h
diff --git a/src/gui/icon.cpp b/src/gui/widgets/icon.cpp
index c4f0ecc3..0e29f603 100644
--- a/src/gui/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "icon.h"
+#include "gui/widgets/icon.h"
 
-#include "../graphics.h"
+#include "graphics.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 Icon::Icon(const std::string &file)
     : mImage(0)
diff --git a/src/gui/icon.h b/src/gui/widgets/icon.h
index f8d77e0f..f8d77e0f 100644
--- a/src/gui/icon.h
+++ b/src/gui/widgets/icon.h
diff --git a/src/gui/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index d3fe448b..dee27e8e 100644
--- a/src/gui/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -19,10 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "inttextfield.h"
-#include "sdlinput.h"
+#include "gui/widgets/inttextfield.h"
 
-#include "../utils/stringutils.h"
+#include "gui/sdlinput.h"
+
+#include "utils/stringutils.h"
 
 IntTextField::IntTextField(int def):
     TextField(toString(def)),
diff --git a/src/gui/inttextfield.h b/src/gui/widgets/inttextfield.h
index ec768bea..ec768bea 100644
--- a/src/gui/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
diff --git a/src/gui/label.cpp b/src/gui/widgets/label.cpp
index d2fba12b..39fbf220 100644
--- a/src/gui/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -19,8 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "label.h"
-#include "palette.h"
+#include "gui/widgets/label.h"
+
+#include "gui/palette.h"
 
 Label::Label() :
     gcn::Label()
diff --git a/src/gui/label.h b/src/gui/widgets/label.h
index dcda8e9d..dcda8e9d 100644
--- a/src/gui/label.h
+++ b/src/gui/widgets/label.h
diff --git a/src/gui/listbox.cpp b/src/gui/widgets/listbox.cpp
index 70b4fc55..1271bf77 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -19,16 +19,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "gui/widgets/listbox.h"
+
+#include "gui/palette.h"
+
+#include "configuration.h"
+
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
-#include "listbox.h"
-#include "palette.h"
-
-#include "../configuration.h"
-
 float ListBox::mAlpha = 1.0;
 
 ListBox::ListBox(gcn::ListModel *listModel):
diff --git a/src/gui/listbox.h b/src/gui/widgets/listbox.h
index cfb58f15..cfb58f15 100644
--- a/src/gui/listbox.h
+++ b/src/gui/widgets/listbox.h
diff --git a/src/gui/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index fd8ebe22..fd8ebe22 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
diff --git a/src/gui/passwordfield.h b/src/gui/widgets/passwordfield.h
index 3b0b5dab..3b0b5dab 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
diff --git a/src/gui/popup.cpp b/src/gui/widgets/popup.cpp
index 46246639..9040d6b2 100644
--- a/src/gui/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -20,17 +20,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/exception.hpp>
+#include "gui/widgets/popup.h"
+
+#include "gui/widgets/windowcontainer.h"
 
-#include "skin.h"
-#include "popup.h"
-#include "windowcontainer.h"
+#include "gui/skin.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../log.h"
+#include "configuration.h"
+#include "graphics.h"
+#include "log.h"
 
-#include "../resources/image.h"
+#include "resources/image.h"
+
+#include <guichan/exception.hpp>
 
 Popup::Popup(const std::string &name, const std::string &skin):
     mPopupName(name),
diff --git a/src/gui/popup.h b/src/gui/widgets/popup.h
index 6fbe796c..71ce2d89 100644
--- a/src/gui/popup.h
+++ b/src/gui/widgets/popup.h
@@ -25,7 +25,7 @@
 
 #include <guichan/widgets/container.hpp>
 
-#include "../guichanfwd.h"
+#include "guichanfwd.h"
 
 class Skin;
 class SkinLoader;
diff --git a/src/gui/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index c160c159..0f278a67 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -19,18 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/font.hpp>
+#include "gui/widgets/progressbar.h"
+
+#include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/textrenderer.h"
 
-#include "gui.h"
-#include "palette.h"
-#include "progressbar.h"
-#include "textrenderer.h"
+#include "configuration.h"
+#include "graphics.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include <guichan/font.hpp>
 
 ImageRect ProgressBar::mBorder;
 int ProgressBar::mInstances = 0;
diff --git a/src/gui/progressbar.h b/src/gui/widgets/progressbar.h
index e75b1d44..e75b1d44 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/widgets/progressbar.h
diff --git a/src/gui/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index d563a2db..6f0ccdbd 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "radiobutton.h"
+#include "gui/widgets/radiobutton.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include "configuration.h"
+#include "graphics.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 int RadioButton::instances = 0;
 float RadioButton::mAlpha = 1.0;
diff --git a/src/gui/radiobutton.h b/src/gui/widgets/radiobutton.h
index 9aec3add..9aec3add 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
diff --git a/src/gui/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 2fa087c1..57995ba1 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -19,15 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "scrollarea.h"
+#include "gui/widgets/scrollarea.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include "configuration.h"
+#include "graphics.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 ScrollArea::instances = 0;
 float ScrollArea::mAlpha = 1.0;
diff --git a/src/gui/scrollarea.h b/src/gui/widgets/scrollarea.h
index e9aa5ed2..e9aa5ed2 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
diff --git a/src/gui/slider.cpp b/src/gui/widgets/slider.cpp
index f5b159f1..7cd0e54a 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "slider.h"
+#include "gui/widgets/slider.h"
 
-#include "../configuration.h"
-#include "../graphics.h"
+#include "configuration.h"
+#include "graphics.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip;
 Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip;
diff --git a/src/gui/slider.h b/src/gui/widgets/slider.h
index 56ea334a..56ea334a 100644
--- a/src/gui/slider.h
+++ b/src/gui/widgets/slider.h
diff --git a/src/gui/textbox.cpp b/src/gui/widgets/textbox.cpp
index 10f727e3..bf3692ec 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -19,12 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <sstream>
+#include "gui/widgets/textbox.h"
+
+#include "gui/palette.h"
 
 #include <guichan/font.hpp>
 
-#include "palette.h"
-#include "textbox.h"
+#include <sstream>
 
 TextBox::TextBox() :
         gcn::TextBox(), mTextColor(&guiPalette->getColor(Palette::TEXT))
diff --git a/src/gui/textbox.h b/src/gui/widgets/textbox.h
index 5884e11c..5884e11c 100644
--- a/src/gui/textbox.h
+++ b/src/gui/widgets/textbox.h
diff --git a/src/gui/textfield.cpp b/src/gui/widgets/textfield.cpp
index 48a00dcc..d830f8d4 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -19,19 +19,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/font.hpp>
+#include "gui/widgets/textfield.h"
+
+#include "gui/palette.h"
+#include "gui/sdlinput.h"
 
-#include "palette.h"
-#include "sdlinput.h"
-#include "textfield.h"
+#include "configuration.h"
+#include "graphics.h"
 
-#include "../configuration.h"
-#include "../graphics.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"
+#include <guichan/font.hpp>
 
 #undef DELETE //Win32 compatibility hack
 
diff --git a/src/gui/textfield.h b/src/gui/widgets/textfield.h
index 070d86ae..070d86ae 100644
--- a/src/gui/textfield.h
+++ b/src/gui/widgets/textfield.h
diff --git a/src/gui/window.cpp b/src/gui/widgets/window.cpp
index 1f9dab5b..0aadeb3e 100644
--- a/src/gui/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -19,21 +19,22 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/exception.hpp>
+#include "gui/widgets/window.h"
+
+#include "gui/widgets/layout.h"
+#include "gui/widgets/resizegrip.h"
+#include "gui/widgets/windowcontainer.h"
 
-#include "gui.h"
-#include "palette.h"
-#include "skin.h"
-#include "window.h"
-#include "windowcontainer.h"
+#include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/skin.h"
 
-#include "widgets/layout.h"
-#include "widgets/resizegrip.h"
+#include "configuration.h"
+#include "log.h"
 
-#include "../configuration.h"
-#include "../log.h"
+#include "resources/image.h"
 
-#include "../resources/image.h"
+#include <guichan/exception.hpp>
 
 int Window::instances = 0;
 int Window::mouseResize = 0;
diff --git a/src/gui/window.h b/src/gui/widgets/window.h
index 18a64532..f53bc483 100644
--- a/src/gui/window.h
+++ b/src/gui/widgets/window.h
@@ -22,13 +22,13 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
+#include "graphics.h"
+#include "guichanfwd.h"
+
 #include <guichan/widgetlistener.hpp>
 
 #include <guichan/widgets/window.hpp>
 
-#include "../graphics.h"
-#include "../guichanfwd.h"
-
 class ContainerPlacer;
 class Layout;
 class LayoutCell;
diff --git a/src/gui/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index eda739b9..d03e4fa4 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "windowcontainer.h"
+#include "gui/widgets/windowcontainer.h"
 
-#include "../utils/dtor.h"
+#include "utils/dtor.h"
 
 WindowContainer *windowContainer = NULL;
 
diff --git a/src/gui/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index bc918184..bc918184 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h