4 files changed, 16 insertions, 7 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 4938ea525..daef49b42 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -25,7 +25,6 @@
 #include "net/ea/eaprotocol.h"
 
 #include "actormanager.h"
-#include "client.h"
 #include "configuration.h"
 #include "effectmanager.h"
 #include "game.h"
@@ -39,13 +38,13 @@
 
 #include "input/keyboardconfig.h"
 
+#include "gui/windows/botcheckerwindow.h"
+#include "gui/windows/outfitwindow.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 "utils/timer.h"
 
 #include "resources/iteminfo.h"
 
@@ -53,6 +52,8 @@
 
 #include "debug.h"
 
+extern int serverVersion;
+
 namespace Ea
 {
 BeingHandler::BeingHandler(const bool enableSync) :
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 15a4385dc..581e706b3 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/ea/buysellhandler.h"
 
-#include "client.h"
 #include "configuration.h"
 #include "inventory.h"
 #include "notifications.h"
@@ -42,6 +41,8 @@
 
 #include "net/ea/eaprotocol.h"
 
+#include "utils/timer.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index ab0af709e..652776e28 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -23,7 +23,6 @@
 #include "net/eathena/beinghandler.h"
 
 #include "actormanager.h"
-#include "client.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "party.h"
@@ -44,9 +43,13 @@
 
 #include "resources/db/itemdb.h"
 
+#include "utils/stringutils.h"
+#include "utils/timer.h"
+
 #include "debug.h"
 
 extern Net::BeingHandler *beingHandler;
+extern int serverVersion;
 
 namespace EAthena
 {
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 8f91371b1..47d86a240 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -23,7 +23,6 @@
 #include "net/tmwa/beinghandler.h"
 
 #include "actormanager.h"
-#include "client.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "party.h"
@@ -38,10 +37,15 @@
 
 #include "resources/db/itemdb.h"
 
+#include "utils/stringutils.h"
+#include "utils/timer.h"
+
 #include "debug.h"
 
 extern Net::BeingHandler *beingHandler;
 
+extern int serverVersion;
+
 namespace TmwAthena
 {