Fix code style

47 files changed, 69 insertions, 57 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7aab2541..280078a01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -806,7 +806,7 @@ SET(SRCS
     textmanager.h
     particle/textparticle.cpp
     particle/textparticle.h
-    tileset.h
+    resources/map/tileset.h
     touchactions.cpp
     touchactions.h
     touchmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 9193ad2d6..3ce90be29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -893,7 +893,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      textmanager.h \
 	      particle/textparticle.cpp \
 	      particle/textparticle.h \
-	      tileset.h \
+	      resources/map/tileset.h \
 	      touchactions.cpp \
 	      touchactions.h \
 	      touchmanager.cpp \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 444bf4134..e02014781 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -71,6 +71,8 @@
 
 #include "listeners/updatestatuslistener.h"
 
+#include "resources/map/map.h"
+
 #include "utils/gettext.h"
 
 #ifdef ANDROID
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.
  */
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 2e04ce014..3b5992883 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -34,6 +34,8 @@
 
 #include "resources/db/itemdb.h"
 
+#include "resources/map/map.h"
+
 #include "debug.h"
 
 extern int serverVersion;
diff --git a/src/game.cpp b/src/game.cpp
index c94dfd182..462479bea 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -98,6 +98,8 @@
 
 #include "resources/db/mapdb.h"
 
+#include "resources/map/map.h"
+
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/langs.h"
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 02feef997..f997c0549 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -76,8 +76,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/map/map.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 #include "resources/map/speciallayer.h"
 
 #include "utils/copynpaste.h"
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index 8904b6acc..6b9b917b7 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_STATUSPOPUP_H
-#define GUI_STATUSPOPUP_H
+#ifndef GUI_POPUPS_STATUSPOPUP_H
+#define GUI_POPUPS_STATUSPOPUP_H
 
 #include "input/keydata.h"
 
@@ -68,4 +68,4 @@ class StatusPopup final : public Popup
         Label *mLabels[STATUSPOPUP_NUM_LABELS];
 };
 
-#endif  // GUI_STATUSPOPUP_H
+#endif  // GUI_POPUPS_STATUSPOPUP_H
diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h
index e1dcb95b8..c36b94838 100644
--- a/src/gui/popups/textpopup.h
+++ b/src/gui/popups/textpopup.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_TEXTPOPUP_H
-#define GUI_TEXTPOPUP_H
+#ifndef GUI_POPUPS_TEXTPOPUP_H
+#define GUI_POPUPS_TEXTPOPUP_H
 
 #include "gui/widgets/popup.h"
 
@@ -78,4 +78,4 @@ class TextPopup final : public Popup
         Label *mText[TEXTPOPUPCOUNT];
 };
 
-#endif  // GUI_TEXTPOPUP_H
+#endif  // GUI_POPUPS_TEXTPOPUP_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ec9f5bac3..35805287b 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -28,8 +28,8 @@
 #include "sdlshared.h"
 #include "textmanager.h"
 
+#include "resources/map/map.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 #include "resources/map/maptype.h"
 #include "resources/map/speciallayer.h"
 
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 89fc382d6..2e8e27960 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -37,8 +37,8 @@
 
 #include "resources/image.h"
 
+#include "resources/map/map.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h
index 0c86b13b0..d4587665f 100644
--- a/src/gui/windows/botcheckerwindow.h
+++ b/src/gui/windows/botcheckerwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_BOTCHECKERWINDOW_H
-#define GUI_BOTCHECKERWINDOW_H
+#ifndef GUI_WINDOWS_BOTCHECKERWINDOW_H
+#define GUI_WINDOWS_BOTCHECKERWINDOW_H
 
 #include "listeners/configlistener.h"
 
@@ -91,4 +91,4 @@ class BotCheckerWindow final : public Window,
 
 extern BotCheckerWindow *botCheckerWindow;
 
-#endif  // GUI_BOTCHECKERWINDOW_H
+#endif  // GUI_WINDOWS_BOTCHECKERWINDOW_H
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 438103f0a..c29abf090 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -40,6 +40,8 @@
 
 #include "resources/imagehelper.h"
 
+#include "resources/map/map.h"
+
 #include "net/packetcounters.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 538d9a47d..84cbcd4bb 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -29,6 +29,7 @@
 
 #include "listeners/actionlistener.h"
 #include "listeners/attributelistener.h"
+#include "listeners/inventorylistener.h"
 #include "listeners/keylistener.h"
 #include "listeners/selectionlistener.h"
 
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index e9dd50d5d..0145d551f 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -34,6 +34,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "resources/map/map.h"
+
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 81d52387b..ffaba0c2f 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -39,6 +39,9 @@
 #include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/map/map.h"
+#include "resources/map/metatile.h"
+
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/sdlcheckutils.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 1a8f463e5..d54954e78 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -24,6 +24,7 @@
 
 #include "animatedsprite.h"
 #include "configuration.h"
+#include "inventory.h"
 
 #include "being/attributes.h"
 #include "being/localplayer.h"
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 7c16bb132..add4ea6b6 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -23,10 +23,9 @@
 #ifndef GUI_WINDOWS_MINISTATUSWINDOW_H
 #define GUI_WINDOWS_MINISTATUSWINDOW_H
 
-#include "inventory.h"
-
 #include "listeners/arrowslistener.h"
 #include "listeners/attributelistener.h"
+#include "listeners/inventorylistener.h"
 #include "listeners/statlistener.h"
 #include "listeners/updatestatuslistener.h"
 
@@ -36,6 +35,7 @@
 
 class AnimatedSprite;
 class Graphics;
+class Inventory;
 class ProgressBar;
 class StatusPopup;
 class TextPopup;
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index b57ed9bd7..fdaccc2d9 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -46,6 +46,8 @@
 
 #include "resources/beingcommon.h"
 
+#include "resources/map/map.h"
+
 #include "debug.h"
 
 enum QuestType
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index a1add2711..bc93bb2ae 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -42,6 +42,8 @@
 #include "net/gamehandler.h"
 #include "net/net.h"
 
+#include "resources/map/map.h"
+
 #include "utils/gettext.h"
 #include "utils/process.h"
 
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 1cfc313b5..dbba86562 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -27,8 +27,8 @@
 #include "guildmanager.h"
 #include "party.h"
 
+#include "resources/map/map.h"
 #include "resources/map/mapitem.h"
-#include "resources/map/maplayer.h"
 #include "resources/map/speciallayer.h"
 
 #include "being/localplayer.h"
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 18ef19409..4bb3f7892 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -30,6 +30,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "listeners/inventorylistener.h"
+
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/inventory.h b/src/inventory.h
index d9fd5dd1a..b1d359daf 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -25,14 +25,12 @@
 
 #include "being/gender.h"
 
-#include "listeners/inventorylistener.h"
-
 #include <list>
 #include <string>
 
 #include "localconsts.h"
 
-class Inventory;
+class InventoryListener;
 class Item;
 
 class Inventory final
diff --git a/src/listeners/errorlistener.h b/src/listeners/errorlistener.h
index 12b1c47bc..21b52572b 100644
--- a/src/listeners/errorlistener.h
+++ b/src/listeners/errorlistener.h
@@ -35,4 +35,4 @@ class ErrorListener final : public ActionListener
 
 extern ErrorListener errorListener;
 
-#endif  // LISTENERS_KEYLISTENER_H
+#endif  // LISTENERS_ERRORLISTENER_H
diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp
index ba4d5e989..2b6bf3703 100644
--- a/src/navigationmanager.cpp
+++ b/src/navigationmanager.cpp
@@ -21,6 +21,7 @@
 #include "navigationmanager.h"
 
 #include "resources/map/map.h"
+#include "resources/map/metatile.h"
 #include "resources/map/walklayer.h"
 
 static const int walkMask = (BlockMask::WALL | BlockMask::AIR
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index bc98b9be6..dd38dfdf7 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -50,6 +50,8 @@
 
 #include "resources/db/itemdb.h"
 
+#include "resources/map/map.h"
+
 #include "debug.h"
 
 extern int serverVersion;
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 1b324e376..b299edd5f 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -41,6 +41,8 @@
 
 #include "resources/db/deaddb.h"
 
+#include "resources/map/map.h"
+
 #include "listeners/updatestatuslistener.h"
 
 #include "net/messagein.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 591c9c44e..e844720c3 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -38,6 +38,8 @@
 
 #include "gui/viewport.h"
 
+#include "resources/map/map.h"
+
 #include "debug.h"
 
 extern Net::PlayerHandler *playerHandler;
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index c4b7a1266..bee38f3b3 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -24,7 +24,6 @@
 
 #include "logger.h"
 
-#include "resources/map/map.h"
 #include "resources/map/mapconsts.h"
 
 #include "particle/animationparticle.h"
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;