3 files changed, 8 insertions, 9 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 2bf88ed68..25a036bb4 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -35,7 +35,7 @@
 
 #include "net/ea/guildhandler.h"
 
-#include "net/ea/gui/guildtab.h"
+#include "gui/widgets/tabs/chat/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/eathena/adminhandler.h"
@@ -379,7 +379,7 @@ void GeneralHandler::gameEnded() const
         socialWindow->removeTab(Ea::taParty);
     }
 
-    delete2(Ea::guildTab);
+    delete2(guildTab);
     delete2(Ea::partyTab);
 }
 
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index a1ea449c5..f64569d10 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -30,7 +30,7 @@
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/socialwindow.h"
 
-#include "net/ea/gui/guildtab.h"
+#include "gui/widgets/tabs/chat/guildtab.h"
 
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
@@ -372,11 +372,11 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const
     g->setEmblemId(emblem);
     if (!Ea::taGuild)
         Ea::taGuild = g;
-    if (!Ea::guildTab && chatWindow)
+    if (!guildTab && chatWindow)
     {
-        Ea::guildTab = new Ea::GuildTab(chatWindow);
+        guildTab = new GuildTab(chatWindow);
         if (config.getBoolValue("showChatHistory"))
-            Ea::guildTab->loadFromLogFile("#Guild");
+            guildTab->loadFromLogFile("#Guild");
         if (localPlayer)
             localPlayer->addGuild(Ea::taGuild);
         memberList(guildId);
@@ -406,8 +406,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const
             m->setOnline(online);
             if (online)
                 m->setGender(gender);
-            if (Ea::guildTab)
-                Ea::guildTab->showOnline(m->getName(), online);
+            if (guildTab)
+                guildTab->showOnline(m->getName(), online);
             if (socialWindow)
                 socialWindow->updateGuildCounter();
         }
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index af070a3e3..8b19ea51d 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -85,7 +85,6 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
         void processGuildExpulsionList(Net::MessageIn &msg) const;
 };
 
-//    extern Ea::GuildTab *guildTab;
 }  // namespace EAthena
 
 namespace Ea