14 files changed, 3 insertions, 44 deletions
diff --git a/src/being/actor.cpp b/src/being/actor.cpp
index 0efed5d18..f32105682 100644
--- a/src/being/actor.cpp
+++ b/src/being/actor.cpp
@@ -23,9 +23,6 @@
 
 #include "map.h"
 
-#include "resources/image.h"
-#include "resources/resourcemanager.h"
-
 #include "debug.h"
 
 Actor::Actor():
diff --git a/src/being/actor.h b/src/being/actor.h
index 326b9f40c..9467c87eb 100644
--- a/src/being/actor.h
+++ b/src/being/actor.h
@@ -30,7 +30,6 @@
 
 class Actor;
 class Graphics;
-class Image;
 class Map;
 
 typedef std::list<Actor*> Actors;
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 9c5ff6def..3feaa4d8b 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -23,10 +23,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "effectmanager.h"
 #include "imagesprite.h"
-#include "simpleanimation.h"
-#include "soundmanager.h"
 #include "statuseffect.h"
 
 #include "being/actorspritelistener.h"
@@ -34,9 +31,6 @@
 
 #include "gui/theme.h"
 
-#include "net/net.h"
-
-#include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/checkutils.h"
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index debdc69d1..11f427669 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -30,8 +30,6 @@
 
 #include "particle/particlecontainer.h"
 
-#include <SDL_types.h>
-
 #include <set>
 #include <list>
 
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 9e2bd8f99..f3c637e34 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -29,7 +29,6 @@
 #include "effectmanager.h"
 #include "guild.h"
 #include "party.h"
-#include "soundconsts.h"
 #include "soundmanager.h"
 #include "text.h"
 
@@ -46,13 +45,13 @@
 
 #include "net/charserverhandler.h"
 #include "net/gamehandler.h"
-#include "net/inventoryhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
 #include "net/playerhandler.h"
 
 #include "resources/avatardb.h"
 #include "resources/emotedb.h"
+#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 #include "resources/monsterdb.h"
 #include "resources/npcdb.h"
@@ -64,8 +63,6 @@
 
 #include "utils/gettext.h"
 
-#include <cmath>
-
 #include "debug.h"
 
 const unsigned int CACHE_SIZE = 50;
diff --git a/src/being/being.h b/src/being/being.h
index 7033f3981..ff40186bc 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -29,10 +29,7 @@
 
 #include <guichan/color.hpp>
 
-#include <SDL_types.h>
-
 #include <map>
-#include <set>
 
 #include "localconsts.h"
 
@@ -48,19 +45,14 @@ static const int DEFAULT_BEING_HEIGHT = 32;
 
 class AnimatedSprite;
 class BeingCacheEntry;
-class Being;
 class FlashText;
 class Guild;
-class Inventory;
 class ItemInfo;
-class Item;
 class Particle;
 class Party;
 class SpeechBubble;
 class Text;
 
-struct Position;
-
 extern volatile int cur_time;
 
 enum Gender
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 914afd1fe..9bf691d9a 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -40,8 +40,6 @@
 #include "utils/dtor.h"
 #include "utils/sdlcheckutils.h"
 
-#include <SDL.h>
-
 #include "debug.h"
 
 static const int BUFFER_WIDTH = 100;
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 6a0aa1b19..2179dc318 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -26,12 +26,10 @@
 #include "client.h"
 #include "configuration.h"
 #include "dropshortcut.h"
-#include "effectmanager.h"
 #include "guild.h"
 #include "item.h"
 #include "maplayer.h"
 #include "party.h"
-#include "simpleanimation.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
@@ -59,21 +57,13 @@
 #include "gui/widgets/gmtab.h"
 #include "gui/widgets/whispertab.h"
 
-#include "render/graphics.h"
-
 #include "net/beinghandler.h"
 #include "net/chathandler.h"
-#include "net/guildhandler.h"
 #include "net/inventoryhandler.h"
 #include "net/net.h"
-#include "net/partyhandler.h"
 #include "net/playerhandler.h"
-#include "net/skillhandler.h"
-#include "net/tradehandler.h"
 
-#include "resources/imageset.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 4f57df0d7..5e0cf9ea6 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -32,15 +32,12 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include <memory>
 #include <vector>
 
 #include "localconsts.h"
 
 class ChatTab;
 class FloorItem;
-class ImageSet;
-class Item;
 class Map;
 class OkDialog;
 
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 9abd617a5..cd329e66e 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -25,8 +25,6 @@
 #include "configuration.h"
 #include "depricatedevent.h"
 #include "inventory.h"
-#include "depricatedlistener.h"
-#include "logger.h"
 
 #include "gui/inventorywindow.h"
 #include "gui/npcdialog.h"
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 37aa9736c..a0b10d4fe 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -59,7 +59,6 @@ struct PlayerInfoBackend final
     IntMap mSkills;
 };
 
-class Equipment;
 class Inventory;
 class Item;
 
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index cdd9ca4bc..3ae58a411 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -27,8 +27,6 @@
 
 #include "being/localplayer.h"
 
-#include "render/graphics.h"
-
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
diff --git a/src/map.h b/src/map.h
index 41fc28185..0917deee2 100644
--- a/src/map.h
+++ b/src/map.h
@@ -36,6 +36,7 @@
 
 class Animation;
 class AmbientLayer;
+class Image;
 class MapLayer;
 class Particle;
 class Resource;
diff --git a/src/maplayer.h b/src/maplayer.h
index 9c5a70cd2..a994ab4bc 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -32,6 +32,7 @@
 #include <string>
 #include <vector>
 
+class Image;
 class MapItem;
 class SpecialLayer;
 class ImageVertexes;