5 files changed, 8 insertions, 3 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index e21cbe5d6..42623027d 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -25,7 +25,6 @@
 #include "localconsts.h"
 
 #include "resources/map/blocktype.h"
-#include "resources/map/map.h"
 #include "resources/map/mapconsts.h"
 
 #include "being/actor.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 4cd30f35f..db8d3eee3 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -66,6 +66,8 @@
 #include "resources/db/npcdb.h"
 #include "resources/db/petdb.h"
 
+#include "resources/map/map.h"
+
 #include "gui/widgets/skilldata.h"
 #include "gui/widgets/skillinfo.h"
 
diff --git a/src/being/being.h b/src/being/being.h
index a55c5858f..869cb374f 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -25,7 +25,9 @@
 
 #include "resources/beinginfo.h"
 
-#include "resources/map/blocktype.h"
+#include "position.h"
+
+#include "listeners/configlistener.h"
 
 #include "being/gender.h"
 
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index ca6514ace..320b57eca 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -69,8 +69,8 @@
 #include "resources/db/emotedb.h"
 #include "resources/db/weaponsdb.h"
 
+#include "resources/map/map.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 #include "resources/map/speciallayer.h"
 
 #include "listeners/updatestatuslistener.h"
diff --git a/src/being/playerignorestrategy.h b/src/being/playerignorestrategy.h
index 21e9fe3a5..4f3648897 100644
--- a/src/being/playerignorestrategy.h
+++ b/src/being/playerignorestrategy.h
@@ -27,6 +27,8 @@
 
 #include "localconsts.h"
 
+class Being;
+
 /**
  * Ignore strategy: describes how we should handle ignores.
  */