14 files changed, 33 insertions, 29 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 7702a5a9b..956f4d20b 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -39,11 +39,13 @@
 
 #include "input/keyboardconfig.h"
 
-#include "gui/botcheckerwindow.h"
-#include "gui/outfitwindow.h"
-#include "gui/socialwindow.h"
-#include "gui/killstats.h"
-#include "gui/questswindow.h"
+#include "gui/windows/socialwindow.h"
+#include "gui/windows/killstats.h"
+#include "gui/windows/questswindow.h"
+
+#include "gui/windows/botcheckerwindow.h"
+
+#include "gui/windows/outfitwindow.h"
 
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 601c3fbdf..15a4385dc 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -30,11 +30,12 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/buydialog.h"
-#include "gui/chatwindow.h"
-#include "gui/buyselldialog.h"
-#include "gui/selldialog.h"
-#include "gui/shopwindow.h"
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/buyselldialog.h"
+#include "gui/windows/selldialog.h"
+
+#include "gui/windows/buydialog.h"
+#include "gui/windows/shopwindow.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 7ff7e6eb8..4caa6ac3b 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -25,8 +25,8 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "gui/charcreatedialog.h"
-#include "gui/okdialog.h"
+#include "gui/windows/charcreatedialog.h"
+#include "gui/windows/okdialog.h"
 
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 403848a88..873e93aee 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -31,8 +31,8 @@
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
-#include "gui/chatwindow.h"
-#include "gui/shopwindow.h"
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/shopwindow.h"
 
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/gmtab.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 0f0192dfa..54371d247 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -29,7 +29,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/okdialog.h"
+#include "gui/windows/okdialog.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 47205f2f4..7e46438d2 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -28,7 +28,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/socialwindow.h"
+#include "gui/windows/socialwindow.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 69e1d7587..68bbe85b0 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -27,7 +27,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/ministatuswindow.h"
+#include "gui/windows/ministatuswindow.h"
 
 #include "net/ea/eaprotocol.h"
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 776443cf7..9f55a3603 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -30,7 +30,7 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/inventorywindow.h"
+#include "gui/windows/inventorywindow.h"
 
 #include "net/inventoryhandler.h"
 #include "net/messagein.h"
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 59d72dd78..d67f1d37a 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "gui/logindialog.h"
+#include "gui/windows/logindialog.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 654a783b3..b3af53e87 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/npchandler.h"
 
-#include "gui/npcdialog.h"
+#include "gui/windows/npcdialog.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index b7353be26..6b2462450 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -28,7 +28,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/socialwindow.h"
+#include "gui/windows/socialwindow.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 320727e01..03e62f45e 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -31,13 +31,14 @@
 
 #include "being/localplayer.h"
 
-#include "gui/ministatuswindow.h"
-#include "gui/okdialog.h"
-#include "gui/npcdialog.h"
-#include "gui/skilldialog.h"
-#include "gui/statuswindow.h"
 #include "gui/viewport.h"
 
+#include "gui/windows/ministatuswindow.h"
+#include "gui/windows/okdialog.h"
+#include "gui/windows/npcdialog.h"
+#include "gui/windows/skilldialog.h"
+#include "gui/windows/statuswindow.h"
+
 #include "resources/deaddb.h"
 
 #include "net/net.h"
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 47dc2c2d4..34848077a 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -29,7 +29,7 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/skilldialog.h"
+#include "gui/windows/skilldialog.h"
 
 #include "utils/stringutils.h"
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 3e1e5c5b3..abfb56559 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -31,8 +31,8 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "gui/confirmdialog.h"
-#include "gui/tradewindow.h"
+#include "gui/windows/confirmdialog.h"
+#include "gui/windows/tradewindow.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"