15 files changed, 34 insertions, 21 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 3dee60dfa..7c5c2598c 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -26,14 +26,15 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
+#include "configuration.h"
 #include "effectmanager.h"
 #include "game.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 "particle/particle.h"
 
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 6a68355dd..892422f76 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -26,9 +26,10 @@
 #include "client.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/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 8cb4b2951..f46a8dcb4 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -25,7 +25,7 @@
 
 #include "net/buysellhandler.h"
 
-#include "being.h"
+#include "being/being.h"
 
 #include "net/net.h"
 
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 72a1e49b7..c8259bc91 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -25,9 +25,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "notifymanager.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/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index df2c4ec47..1909cd6df 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/okdialog.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 802236212..615d0334b 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -25,10 +25,11 @@
 #include "chatlogger.h"
 #include "configuration.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 
 #include "net/ea/guildhandler.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index d21e82d20..c41fad098 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -24,11 +24,12 @@
 
 #include "chatlogger.h"
 #include "commandhandler.h"
-#include "localplayer.h"
 #include "party.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 #include "net/partyhandler.h"
 
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index e19b44592..4dc0f7f6e 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -23,9 +23,10 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/socialwindow.h"
 
 #include "debug.h"
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 65f0d87a0..d2bcd6a23 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -22,9 +22,10 @@
 
 #include "net/ea/inventoryhandler.h"
 
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/ministatuswindow.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index b21ba2fbc..7c3af78ec 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -26,7 +26,8 @@
 #include "equipment.h"
 #include "inventory.h"
 #include "localconsts.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "gui/inventorywindow.h"
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 7eee0d4e7..0a87bf370 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -23,9 +23,10 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/socialwindow.h"
 
 #include "debug.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 2d477ad4a..5106e0ecc 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -23,11 +23,12 @@
 #include "net/ea/playerhandler.h"
 
 #include "game.h"
-#include "localplayer.h"
 #include "party.h"
 #include "notifymanager.h"
 #include "units.h"
 
+#include "being/localplayer.h"
+
 #include "gui/ministatuswindow.h"
 #include "gui/okdialog.h"
 #include "gui/npcdialog.h"
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 68597dd85..e363385e1 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -23,9 +23,10 @@
 #include "net/ea/skillhandler.h"
 
 #include "logger.h"
-#include "localplayer.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/skilldialog.h"
 
diff --git a/src/net/ea/token.h b/src/net/ea/token.h
index c358ef8a7..0de35d379 100644
--- a/src/net/ea/token.h
+++ b/src/net/ea/token.h
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "being.h"
+#include "being/being.h"
 
 #ifndef NET_EA_TOKEN_H
 #define NET_EA_TOKEN_H
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 4fa92e7d8..d22bf71ea 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -26,8 +26,9 @@
 #include "item.h"
 #include "logger.h"
 #include "notifymanager.h"
-#include "playerinfo.h"
-#include "playerrelations.h"
+
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/tradewindow.h"