8 files changed, 29 insertions, 23 deletions
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"