6 files changed, 17 insertions, 7 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index a74f4f477..bbb016525 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -21,6 +21,7 @@
 
 #include "being/actorsprite.h"
 
+#include "animatedsprite.h"
 #include "configuration.h"
 #include "imagesprite.h"
 #include "statuseffect.h"
@@ -31,6 +32,8 @@
 
 #include "listeners/actorspritelistener.h"
 
+#include "particle/particle.h"
+
 #include "resources/resourcemanager.h"
 
 #include "utils/checkutils.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 1fcccb0cf..76af509d3 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -40,6 +40,7 @@
 #include "particle/particleinfo.h"
 
 #include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/popups/speechbubble.h"
 
diff --git a/src/being/being.h b/src/being/being.h
index c8da2d97c..afa023068 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -23,12 +23,10 @@
 #ifndef BEING_BEING_H
 #define BEING_BEING_H
 
-#include "equipment.h"
+//#include "equipment.h"
 
 #include "resources/beinginfo.h"
 
-#include "gui/base/color.hpp"
-
 #include <map>
 
 #include "localconsts.h"
@@ -45,6 +43,7 @@ static const int DEFAULT_BEING_HEIGHT = 32;
 
 class AnimatedSprite;
 class BeingCacheEntry;
+class Equipment;
 class FlashText;
 class Guild;
 class ItemInfo;
@@ -55,6 +54,11 @@ class Text;
 
 struct ParticleInfo;
 
+namespace gcn
+{
+    class Color;
+}
+
 extern volatile int cur_time;
 
 enum Gender
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 0e57eabfe..2a3c5fa2f 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -23,6 +23,7 @@
 #include "being/localplayer.h"
 
 #include "actormanager.h"
+#include "animatedsprite.h"
 #include "client.h"
 #include "configuration.h"
 #include "dropshortcut.h"
@@ -42,7 +43,6 @@
 
 #include "input/keyboardconfig.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
@@ -51,7 +51,6 @@
 #include "gui/windows/okdialog.h"
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/shopwindow.h"
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/updaterwindow.h"
 
@@ -85,6 +84,8 @@ typedef std::map<int, Guild*>::const_iterator GuildMapCIter;
 
 LocalPlayer *player_node = nullptr;
 
+class SkillDialog;
+
 extern std::list<BeingCacheEntry*> beingInfoCache;
 extern OkDialog *weightNotice;
 extern int weightNoticeTime;
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index a04c77e76..4404791ca 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -30,6 +30,8 @@
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
+#include "listeners/playerrelationslistener.h"
+
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index cddec5f10..3543d4221 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -25,14 +25,13 @@
 
 #include "utils/stringvector.h"
 
-#include "listeners/playerrelationslistener.h"
-
 #include <list>
 #include <map>
 
 #include "localconsts.h"
 
 class Being;
+class PlayerRelationsListener;
 
 struct PlayerRelation final
 {