57 files changed, 74 insertions, 68 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 6771e7e3e..0d81e4314 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -57,11 +57,11 @@
 #include "gui/viewport.h"
 
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
-#include "gui/widgets/whispertab.h"
+#include "gui/widgets/tabs/whispertab.h"
 
 #include "net/adminhandler.h"
 #include "net/beinghandler.h"
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index dae7d83d9..f566d6db0 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -22,7 +22,7 @@
 #define GUI_WIDGETS_SETUPITEM_H
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index a08b8430e..44b2ea8d8 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tab.h"
+#include "gui/widgets/tabs/tab.h"
 
 #include <guichan/widgets/container.hpp>
 
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/tabs/battletab.cpp
index 3f97af5b9..fa7e252f0 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/tabs/battletab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/battletab.h"
+#include "gui/widgets/tabs/battletab.h"
 
 #include "chatlogger.h"
 #include "configuration.h"
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/tabs/battletab.h
index 35a0f1b66..b4aa1d1df 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/tabs/battletab.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_BATTLETAB_H
 #define GUI_WIDGETS_BATTLETAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 /**
  * A tab for a party chat channel.
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index e863643d3..2c0628581 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 #include "chatlogger.h"
 #include "client.h"
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/tabs/chattab.h
index 07192ab6b..e7744a8c1 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -26,7 +26,7 @@
 #include "gui/windows/chatwindow.h"
 
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/tab.h"
+#include "gui/widgets/tabs/tab.h"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/gmtab.cpp b/src/gui/widgets/tabs/gmtab.cpp
index c8bf8ac98..25ec67f19 100644
--- a/src/gui/widgets/gmtab.cpp
+++ b/src/gui/widgets/tabs/gmtab.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/gmtab.h"
+#include "gui/widgets/tabs/gmtab.h"
 
 #include "chatlogger.h"
 
diff --git a/src/gui/widgets/gmtab.h b/src/gui/widgets/tabs/gmtab.h
index 53e4e9644..28ccabe8a 100644
--- a/src/gui/widgets/gmtab.h
+++ b/src/gui/widgets/tabs/gmtab.h
@@ -21,7 +21,7 @@
 #ifndef GUI_WIDGETS_GMTAB_H
 #define GUI_WIDGETS_GMTAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 /**
  * A tab for whispers from a single player.
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/tabs/guildchattab.cpp
index 99723e7e4..4188a8843 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/tabs/guildchattab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/guildchattab.h"
+#include "gui/widgets/tabs/guildchattab.h"
 
 #include "chatlogger.h"
 #include "configuration.h"
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h
index e60970b50..f7aebcf55 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/tabs/guildchattab.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_GUILDCHATTAB_H
 #define GUI_WIDGETS_GUILDCHATTAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 /**
  * A tab for a guild chat channel.
diff --git a/src/gui/widgets/langtab.cpp b/src/gui/widgets/tabs/langtab.cpp
index 1ee4eef75..7bea453c7 100644
--- a/src/gui/widgets/langtab.cpp
+++ b/src/gui/widgets/tabs/langtab.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/langtab.h"
+#include "gui/widgets/tabs/langtab.h"
 
 #include "chatlogger.h"
 
diff --git a/src/gui/widgets/langtab.h b/src/gui/widgets/tabs/langtab.h
index 0a0ff48c3..fa4e7c08c 100644
--- a/src/gui/widgets/langtab.h
+++ b/src/gui/widgets/tabs/langtab.h
@@ -21,7 +21,7 @@
 #ifndef GUI_WIDGETS_LANGTAB_H
 #define GUI_WIDGETS_LANGTAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 class LangTab final : public ChatTab
 {
diff --git a/src/gui/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index eb4240585..219cf30f2 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_audio.h"
+#include "gui/widgets/tabs/setup_audio.h"
 
 #include "main.h"
 #include "map.h"
diff --git a/src/gui/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index 98cdc5470..98cdc5470 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
diff --git a/src/gui/setup_chat.cpp b/src/gui/widgets/tabs/setup_chat.cpp
index 4874e4291..e5acd10e5 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/widgets/tabs/setup_chat.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_chat.h"
+#include "gui/widgets/tabs/setup_chat.h"
 
 #include "gui/windows/chatwindow.h"
 
diff --git a/src/gui/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index 0a011082d..108f67a7f 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/widgets/tabs/setup_chat.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_CHAT_H
 #define GUI_SETUP_CHAT_H
 
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 class Setup_Chat final : public SetupTabScroll
 {
diff --git a/src/gui/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 88b67223d..f5b834b6a 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_colors.h"
+#include "gui/widgets/tabs/setup_colors.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index 7fe58abb6..fcc6a378f 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -22,7 +22,7 @@
 #ifndef GUI_SETUP_COLORS_H
 #define GUI_SETUP_COLORS_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 #include <guichan/selectionlistener.hpp>
 
diff --git a/src/gui/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 423dce947..35fa4204a 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -21,7 +21,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_input.h"
+#include "gui/widgets/tabs/setup_input.h"
 
 #include "configuration.h"
 
diff --git a/src/gui/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 8241c88e9..03113913e 100644
--- a/src/gui/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -24,7 +24,7 @@
 #ifndef GUI_SETUP_INPUT_H
 #define GUI_SETUP_INPUT_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 #include <string>
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index e64d4f12e..15b6959a9 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_joystick.h"
+#include "gui/widgets/tabs/setup_joystick.h"
 
 #include "configuration.h"
 
diff --git a/src/gui/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index 3a54eb03d..3110da9b6 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_JOYSTICK_H
 #define GUI_SETUP_JOYSTICK_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 class Button;
 class CheckBox;
diff --git a/src/gui/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index a03ee9c74..ec4e2fe06 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_other.h"
+#include "gui/widgets/tabs/setup_other.h"
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
diff --git a/src/gui/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index 22059480f..10e83517b 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/widgets/tabs/setup_other.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_OTHER_H
 #define GUI_SETUP_OTHER_H
 
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 class NamesModel;
 
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp
index 72cd08507..25d91841e 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/widgets/tabs/setup_perfomance.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_perfomance.h"
+#include "gui/widgets/tabs/setup_perfomance.h"
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
diff --git a/src/gui/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h
index 4a2248d31..1695dec1f 100644
--- a/src/gui/setup_perfomance.h
+++ b/src/gui/widgets/tabs/setup_perfomance.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_PERFOMANCE_H
 #define GUI_SETUP_PERFOMANCE_H
 
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 class NamesModel;
 
diff --git a/src/gui/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp
index 928f9952d..68d1b2eb8 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/widgets/tabs/setup_players.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_players.h"
+#include "gui/widgets/tabs/setup_players.h"
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/setup_players.h b/src/gui/widgets/tabs/setup_players.h
index 1b6044f03..af0709c08 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/widgets/tabs/setup_players.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_PLAYERS_H
 #define GUI_SETUP_PLAYERS_H
 
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 class Setup_Players final : public SetupTabScroll
 {
diff --git a/src/gui/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index f675d1045..4e1bdb376 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_relations.h"
+#include "gui/widgets/tabs/setup_relations.h"
 
 #include "actorspritemanager.h"
 
diff --git a/src/gui/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index b1e1f8ab0..789dd5f3e 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -25,7 +25,7 @@
 
 #include "being/playerrelations.h"
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 class Button;
 class CheckBox;
diff --git a/src/gui/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 029bc07f1..dde3ad04e 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_theme.h"
+#include "gui/widgets/tabs/setup_theme.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 87c2fb4b2..96d07aa15 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_THEME_H
 #define GUI_SETUP_THEME_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 class Button;
 class DropDown;
diff --git a/src/gui/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index 1de4686df..e3081427d 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_touch.h"
+#include "gui/widgets/tabs/setup_touch.h"
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h
index b908ce19d..b908ce19d 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/widgets/tabs/setup_touch.h
diff --git a/src/gui/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 34e17a1c6..bd53763cc 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_video.h"
+#include "gui/widgets/tabs/setup_video.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/gui/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index 9a3121ed1..e8fb415c9 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -23,7 +23,7 @@
 #ifndef GUI_SETUP_VIDEO_H
 #define GUI_SETUP_VIDEO_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 #include <guichan/keylistener.hpp>
 
diff --git a/src/gui/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 32555b929..f19b3508f 100644
--- a/src/gui/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_visual.h"
+#include "gui/widgets/tabs/setup_visual.h"
 
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
diff --git a/src/gui/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index e1492d028..e1492d028 100644
--- a/src/gui/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/tabs/setuptab.cpp
index 68246cd0a..79df5e4bb 100644
--- a/src/gui/widgets/setuptab.cpp
+++ b/src/gui/widgets/tabs/setuptab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index ab866ba28..ab866ba28 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp
index f36d6d54e..48a27a550 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/tabs/setuptabscroll.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/setuptabscroll.h"
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/setupitem.h"
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 8854e173e..e7be18709 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -21,7 +21,7 @@
 #ifndef GUI_WIDGETS_SETUPTABSCROLL_H
 #define GUI_WIDGETS_SETUPTABSCROLL_H
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/tabs/setuptab.h"
 
 #include <map>
 #include <set>
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 8c974cf97..8c25e7b1d 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/tab.h"
+#include "gui/widgets/tabs/tab.h"
 
 #include "client.h"
 #include "graphicsvertexes.h"
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tabs/tab.h
index ecd0ae494..ecd0ae494 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tabs/tab.h
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tabs/tradetab.cpp
index c0a4d4d33..f9e1dc9e0 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tabs/tradetab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/tradetab.h"
+#include "gui/widgets/tabs/tradetab.h"
 
 #include "chatlogger.h"
 
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tabs/tradetab.h
index 6948a81ff..8c28704a4 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tabs/tradetab.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_TRADETAB_H
 #define GUI_WIDGETS_TRADETAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 /**
  * A tab for a party chat channel.
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp
index 01298880e..7ad14ac65 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/tabs/whispertab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/whispertab.h"
+#include "gui/widgets/tabs/whispertab.h"
 
 #include "chatlogger.h"
 #include "commands.h"
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/tabs/whispertab.h
index 599350c90..97e6427c2 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/tabs/whispertab.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_WHISPERTAB_H
 #define GUI_WIDGETS_WHISPERTAB_H
 
-#include "gui/widgets/chattab.h"
+#include "gui/widgets/tabs/chattab.h"
 
 /**
  * A tab for whispers from a single player.
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 61f42a824..47627e664 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -47,14 +47,16 @@
 #include "gui/windows/setup.h"
 #include "gui/windows/whoisonline.h"
 
-#include "gui/widgets/battletab.h"
+#include "gui/widgets/tabs/battletab.h"
+
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemlinkhandler.h"
-#include "gui/widgets/langtab.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
-#include "gui/widgets/tradetab.h"
-#include "gui/widgets/whispertab.h"
+
+#include "gui/widgets/tabs/langtab.h"
+#include "gui/widgets/tabs/tradetab.h"
+#include "gui/widgets/tabs/whispertab.h"
 
 #include "net/chathandler.h"
 #include "net/playerhandler.h"
diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp
index af42495a9..d1542d0bb 100644
--- a/src/gui/windows/npcpostdialog.cpp
+++ b/src/gui/windows/npcpostdialog.cpp
@@ -23,12 +23,13 @@
 #include "gui/windows/npcpostdialog.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 "gui/widgets/tabs/chattab.h"
+
 #include "net/net.h"
 #include "net/npchandler.h"
 
diff --git a/src/gui/windows/setup.cpp b/src/gui/windows/setup.cpp
index 00001424b..a7102204c 100644
--- a/src/gui/windows/setup.cpp
+++ b/src/gui/windows/setup.cpp
@@ -29,19 +29,19 @@
 
 #include "gui/windows/chatwindow.h"
 
-#include "gui/setup_audio.h"
-#include "gui/setup_chat.h"
-#include "gui/setup_colors.h"
-#include "gui/setup_joystick.h"
-#include "gui/setup_other.h"
-#include "gui/setup_theme.h"
-#include "gui/setup_input.h"
-#include "gui/setup_perfomance.h"
-#include "gui/setup_players.h"
-#include "gui/setup_relations.h"
-#include "gui/setup_touch.h"
-#include "gui/setup_video.h"
-#include "gui/setup_visual.h"
+#include "gui/widgets/tabs/setup_audio.h"
+#include "gui/widgets/tabs/setup_chat.h"
+#include "gui/widgets/tabs/setup_colors.h"
+#include "gui/widgets/tabs/setup_joystick.h"
+#include "gui/widgets/tabs/setup_other.h"
+#include "gui/widgets/tabs/setup_theme.h"
+#include "gui/widgets/tabs/setup_input.h"
+#include "gui/widgets/tabs/setup_perfomance.h"
+#include "gui/widgets/tabs/setup_players.h"
+#include "gui/widgets/tabs/setup_relations.h"
+#include "gui/widgets/tabs/setup_touch.h"
+#include "gui/widgets/tabs/setup_video.h"
+#include "gui/widgets/tabs/setup_visual.h"
 
 #include "gui/widgets/label.h"
 
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index a495d5750..7e6fbbb7c 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -28,7 +28,6 @@
 #include "gui/windows/tradewindow.h"
 
 #include "gui/widgets/button.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
@@ -36,6 +35,8 @@
 #include "gui/widgets/shopitems.h"
 #include "gui/widgets/shoplistbox.h"
 
+#include "gui/widgets/tabs/chattab.h"
+
 #include "actorspritemanager.h"
 #include "auctionmanager.h"
 #include "client.h"
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 1ae74efb3..b905d982d 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -27,7 +27,7 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shortcutcontainer.h"
-#include "gui/widgets/tab.h"
+#include "gui/widgets/tabs/tab.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 29232e240..2eb1bbdaa 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -41,7 +41,7 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/skillmodel.h"
-#include "gui/widgets/tab.h"
+#include "gui/widgets/tabs/tab.h"
 #include "gui/widgets/tabbedarea.h"
 
 #include "net/net.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 687b1af69..2779c497b 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -43,11 +43,12 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
-#include "gui/widgets/chattab.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "gui/widgets/tabs/chattab.h"
+
 #include "net/net.h"
 #include "net/guildhandler.h"
 #include "net/partyhandler.h"
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index bd3bf088f..3f0159340 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -39,13 +39,14 @@
 #include "gui/windows/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"
 #include "gui/widgets/layout.h"
 
+#include "gui/widgets/tabs/chattab.h"
+
 #include "net/net.h"
 #include "net/tradehandler.h"