14 files changed, 14 insertions, 32 deletions
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 9e0fa24b9..d8525a285 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -21,8 +21,6 @@
 
 #include "resources/ambientlayer.h"
 
-#include "resources/map/map.h"
-
 #include "render/graphics.h"
 
 #include "resources/image.h"
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index af60ce53d..f13055b49 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -25,7 +25,7 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "resources/map/blocktype.h"
+#include "resources/map/blockmask.h"
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 0fe02a99f..ec68e5731 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -27,7 +27,7 @@
 #include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
 
-#include "resources/map/blocktype.h"
+#include "resources/map/blockmask.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/map/location.h b/src/resources/map/location.h
index 6718f5c24..7c1995dba 100644
--- a/src/resources/map/location.h
+++ b/src/resources/map/location.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_MAP_LOCATION
-#define RESOURCES_MAP_LOCATION
+#ifndef RESOURCES_MAP_LOCATION_H
+#define RESOURCES_MAP_LOCATION_H
 
 #include "resources/map/metatile.h"
 
@@ -51,4 +51,4 @@ struct Location final
     MetaTile *tile;
 };
 
-#endif  // RESOURCES_MAP_LOCATION
+#endif  // RESOURCES_MAP_LOCATION_H
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 65d1dda3e..6e7a7cec6 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -27,7 +27,6 @@
 #include "render/graphics.h"
 #include "notifications.h"
 #include "notifymanager.h"
-#include "simpleanimation.h"
 
 #include "resources/map/mapheights.h"
 #include "resources/map/maplayer.h"
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 76b55f988..095f97bdf 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -29,7 +29,6 @@
 
 #include "resources/map/blockmask.h"
 #include "resources/map/blocktype.h"
-#include "resources/map/metatile.h"
 #include "resources/map/properties.h"
 
 #include "listeners/configlistener.h"
@@ -39,21 +38,20 @@
 #include <string>
 #include <vector>
 
-class Animation;
 class AmbientLayer;
-class Image;
 class MapHeights;
 class MapItem;
 class MapLayer;
 class ObjectsLayer;
 class Particle;
 class Resource;
-class SimpleAnimation;
 class SpecialLayer;
 class Tileset;
 class TileAnimation;
 class WalkLayer;
 
+struct MetaTile;
+
 typedef std::vector<Tileset*> Tilesets;
 typedef std::vector<MapLayer*> Layers;
 typedef Layers::const_iterator LayersCIter;
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index b5de484e1..97d3a8020 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -34,18 +34,12 @@
 #include "render/graphics.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/map/mapitem.h"
-#include "resources/map/mapobjectlist.h"
 #include "resources/map/maprowvertexes.h"
 #include "resources/map/maptype.h"
 #include "resources/map/speciallayer.h"
 
-#include "gui/font.h"
-#include "gui/gui.h"
-
-#include "utils/delete2.h"
 #include "utils/dtor.h"
 
 #include "debug.h"
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 3656194b6..fc1fe611d 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -23,21 +23,16 @@
 #ifndef RESOURCES_MAP_MAPLAYER_H
 #define RESOURCES_MAP_MAPLAYER_H
 
-#include "position.h"
 #include "main.h"
 
 #include "listeners/configlistener.h"
 
-#include "resources/map/mapobject.h"
-
 #include "being/actor.h"
 
 #include <string>
 #include <vector>
 
 class Image;
-class ImageVertexes;
-class MapObjectList;
 class MapRowVertexes;
 class SpecialLayer;
 
diff --git a/src/resources/map/maprowvertexes.h b/src/resources/map/maprowvertexes.h
index d00ec07fd..39c72dfdc 100644
--- a/src/resources/map/maprowvertexes.h
+++ b/src/resources/map/maprowvertexes.h
@@ -23,12 +23,12 @@
 
 #include "utils/dtor.h"
 
+#include "graphicsvertexes.h"
+
 #include <vector>
 
 #include "localconsts.h"
 
-class ImageVertexes;
-
 typedef std::vector<ImageVertexes*> MapRowImages;
 
 class MapRowVertexes final
diff --git a/src/resources/map/maptype.h b/src/resources/map/maptype.h
index edfbfeacc..9580cdd1f 100644
--- a/src/resources/map/maptype.h
+++ b/src/resources/map/maptype.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_MAP_TYPE_H
-#define RESOURCES_MAP_TYPE_H
+#ifndef RESOURCES_MAP_MAPTYPE_H
+#define RESOURCES_MAP_MAPTYPE_H
 
 namespace MapType
 {
@@ -36,4 +36,4 @@ namespace MapType
     };
 }
 
-#endif  // RESOURCES_MAP_TYPE_H
+#endif  // RESOURCES_MAP_MAPTYPE_H
diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp
index 284069589..1c4662797 100644
--- a/src/resources/map/speciallayer.cpp
+++ b/src/resources/map/speciallayer.cpp
@@ -22,7 +22,6 @@
 
 #include "resources/map/mapconsts.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/resources/map/tileanimation.cpp b/src/resources/map/tileanimation.cpp
index 08a2c047c..6dfe6f0be 100644
--- a/src/resources/map/tileanimation.cpp
+++ b/src/resources/map/tileanimation.cpp
@@ -24,8 +24,6 @@
 
 #include "simpleanimation.h"
 
-#include "resources/image.h"
-
 #include "resources/map/maplayer.h"
 
 #include "utils/delete2.h"
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 54f80fe79..c1fbf038a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -30,6 +30,7 @@
 #include "resources/map/blocktype.h"
 #include "resources/map/map.h"
 #include "resources/map/mapconsts.h"
+#include "resources/map/mapheights.h"
 #include "resources/map/tileset.h"
 
 #include "resources/animation.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index fac78de18..10e7d8014 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -25,12 +25,12 @@
 
 #include "utils/xml.h"
 
-#include "resources/map/mapheights.h"
 #include "resources/map/maplayer.h"
 
 #include <string>
 
 class Map;
+class MapHeights;
 class MapLayer;
 class Properties;
 class Tileset;