17 files changed, 37 insertions, 21 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 1bb3ca235..aacb3aabe 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,9 +24,10 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "guild.h"
-#include "localplayer.h"
 #include "maplayer.h"
 
+#include "being/localplayer.h"
+
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index 5cc770478..440977c37 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -24,9 +24,10 @@
 
 #include "chatlogger.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "main.h"
 
+#include "being/localplayer.h"
+
 #include "net/net.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 1cb2e9d82..fba603ee6 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -27,10 +27,11 @@
 #include "client.h"
 #include "commandhandler.h"
 #include "configuration.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "gui/helpwindow.h"
 
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 96d068ade..89fcf1ecd 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -25,8 +25,9 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "dropshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index d72f5379d..0bdb0aa31 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -28,7 +28,8 @@
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/widgets/gmtab.cpp b/src/gui/widgets/gmtab.cpp
index 854a67692..ee9d7caa1 100644
--- a/src/gui/widgets/gmtab.cpp
+++ b/src/gui/widgets/gmtab.cpp
@@ -22,7 +22,8 @@
 
 #include "chatlogger.h"
 #include "commands.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 3e09156fd..6394ac3ad 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -26,10 +26,11 @@
 #include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "localplayer.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "being/localplayer.h"
+
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f3fb21336..99aedabcd 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -27,7 +27,8 @@
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "playerinfo.h"
+
+#include "being/playerinfo.h"
 
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 40eaefcf9..0466706df 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -29,8 +29,9 @@
 #include "item.h"
 #include "itemshortcut.h"
 #include "spellshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 6a5c815d4..31ee7c123 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -23,10 +23,11 @@
 #include "gui/widgets/playerbox.h"
 
 #include "animatedsprite.h"
-#include "being.h"
 #include "client.h"
 #include "configuration.h"
 
+#include "being/being.h"
+
 #include "resources/image.h"
 
 #include "utils/dtor.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index b7e0ad120..2a98b4441 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -24,9 +24,10 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "playerinfo.h"
 #include "shopitem.h"
 
+#include "being/playerinfo.h"
+
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index 809e34b0d..2f0dcb5b5 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/widgets/skillinfo.h"
 
-#include "playerinfo.h"
+#include "being/playerinfo.h"
 
 #include "gui/widgets/skillmodel.h"
 
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp
index 1792c41fd..c4a298640 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/widgets/skillmodel.cpp
@@ -25,8 +25,9 @@
 #include "configuration.h"
 #include "effectmanager.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/setup.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index da5779672..8e6debb7e 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -26,8 +26,9 @@
 #include "configuration.h"
 #include "effectmanager.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
-#include "playerinfo.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "gui/setup.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 0ffb25b1d..433001f3b 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -25,9 +25,10 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "itemshortcut.h"
-#include "localplayer.h"
 #include "spellshortcut.h"
 
+#include "being/localplayer.h"
+
 #include "input/keyboardconfig.h"
 
 #include "gui/inventorywindow.h"
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index e2ef34536..61becb7da 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -23,7 +23,8 @@
 #include "gui/widgets/tradetab.h"
 
 #include "chatlogger.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/net.h"
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index dbca226a8..b836ee729 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -24,7 +24,8 @@
 
 #include "chatlogger.h"
 #include "commands.h"
-#include "localplayer.h"
+
+#include "being/localplayer.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"