12 files changed, 27 insertions, 17 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index c156b9f51..1c48284b7 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/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/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index dea944932..678be6cc4 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/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/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 8bb426bef..46a95b44d 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/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/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 8c455a186..aeea1b58e 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/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/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index b066db36b..57771559d 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "game.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/network.h"
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 08a42eadc..cc907295f 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/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/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index 348e5cbfb..e0c28ab4a 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -23,9 +23,10 @@
 #include "net/tmwa/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/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 6761105e1..73b82bfbc 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -22,8 +22,9 @@
 #include "net/tmwa/guildhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index e22036619..2f4fc2e70 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/tmwa/npchandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 39a580ebf..1b29cde46 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,9 +22,10 @@
 #include "net/tmwa/partyhandler.h"
 
 #include "actorspritemanager.h"
-#include "localplayer.h"
 #include "notifymanager.h"
 
+#include "being/localplayer.h"
+
 #include "net/tmwa/protocol.h"
 
 #include "net/tmwa/gui/partytab.h"
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 378f53f97..9a5f52330 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -20,7 +20,7 @@
 
 #include "net/tmwa/questhandler.h"
 
-#include "localplayer.h"
+#include "being/localplayer.h"
 
 #include "gui/skilldialog.h"
 #include "gui/questswindow.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 33c08382e..3d49a63d0 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -23,7 +23,8 @@
 #include "net/tmwa/tradehandler.h"
 
 #include "item.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "net/tmwa/protocol.h"