3 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 5470d7b2e..78f4fd475 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -25,9 +25,6 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "gamemodifiers.h"
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
 #include "item.h"
 #include "party.h"
 #include "spellmanager.h"
@@ -72,6 +69,10 @@
 #include "net/pethandler.h"
 #include "net/serverfeatures.h"
 
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
 #include "resources/chatobject.h"
 #include "resources/iteminfo.h"
 #include "resources/mapitemtype.h"
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index 07cb13d32..ccdf1bd43 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/tabs/chat/emulateguildtab.h"
 
 #include "configuration.h"
-#include "guildmanager.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
@@ -31,6 +30,8 @@
 
 #include "utils/gettext.h"
 
+#include "net/tmwa/guildmanager.h"
+
 #include "debug.h"
 
 EmulateGuildTab::EmulateGuildTab(const Widget2 *const widget) :
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index ffe9688c6..f8197466b 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -21,10 +21,6 @@
 
 #include "gui/windows/socialwindow.h"
 
-#ifdef TMWA_SUPPORT
-#include "guildmanager.h"
-#endif
-
 #include "enums/gui/dialogtype.h"
 
 #include "gui/windows/okdialog.h"
@@ -47,6 +43,10 @@
 
 #include "net/serverfeatures.h"
 
+#ifdef TMWA_SUPPORT
+#include "net/tmwa/guildmanager.h"
+#endif
+
 #include "debug.h"
 
 SocialWindow *socialWindow = nullptr;