11 files changed, 26 insertions, 16 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 4661cd5b8..e52945a98 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -25,7 +25,8 @@
 #include "actorspritemanager.h"
 #include "game.h"
 #include "notifymanager.h"
-#include "playerrelations.h"
+
+#include "being/playerrelations.h"
 
 #include "net/chathandler.h"
 
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 68c3f1a02..bc4d6d442 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -24,13 +24,14 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "party.h"
-#include "playerrelations.h"
-#include "configuration.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 0b1c4ad06..8b44ac409 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "inventory.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index eae8e7ffc..ebcc900de 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -25,8 +25,9 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "localplayer.h"
-#include "playerrelations.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelations.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 4b9bcb80f..9f501a4e0 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/network.h"
diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp
index f946e1f8e..542a9327b 100644
--- a/src/net/eathena/gui/guildtab.cpp
+++ b/src/net/eathena/gui/guildtab.cpp
@@ -24,7 +24,8 @@
 
 #include "chatlogger.h"
 #include "guild.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/net.h"
 #include "net/guildhandler.h"
diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp
index 157869a96..420e19fea 100644
--- a/src/net/eathena/gui/partytab.cpp
+++ b/src/net/eathena/gui/partytab.cpp
@@ -23,9 +23,10 @@
 #include "net/eathena/gui/partytab.h"
 
 #include "chatlogger.h"
-#include "localplayer.h"
 #include "party.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 5deb326fa..22d6bc360 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -22,8 +22,9 @@
 #include "net/eathena/guildhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "net/eathena/messagein.h"
 #include "net/eathena/protocol.h"
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 2543c3b41..ea480103e 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/eathena/npchandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 26e5ed981..e00fd4119 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -22,9 +22,10 @@
 #include "net/eathena/partyhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/eathena/protocol.h"
 
 #include "net/eathena/gui/partytab.h"
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index df0364af5..3698153da 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -23,7 +23,8 @@
 #include "net/eathena/tradehandler.h"
 
 #include "item.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "net/eathena/protocol.h"