6 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 9e6968464..4b84c47b3 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -31,7 +31,6 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "item.h"
-#include "maplayer.h"
 #include "party.h"
 #include "spellmanager.h"
 
@@ -77,6 +76,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/map/maplayer.h"
+
 #include "utils/copynpaste.h"
 #include "utils/gettext.h"
 #include "utils/process.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 33690ba39..e2b039fe1 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -25,10 +25,11 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "game.h"
-#include "maplayer.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
+#include "resources/map/maplayer.h"
+
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a84ac7c6d..1ff611cab 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -24,7 +24,6 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "maplayer.h"
 
 #include "being/localplayer.h"
 
@@ -38,6 +37,8 @@
 
 #include "resources/image.h"
 
+#include "resources/map/maplayer.h"
+
 #include "debug.h"
 
 int AvatarListBox::instances = 0;
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index 707a4f2b9..daf8ed8d2 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -23,7 +23,8 @@
 #include "gui/widgets/tabs/setup_audio.h"
 
 #include "main.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "configuration.h"
 #include "soundmanager.h"
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index ed8ba11ad..4d648bba1 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -29,7 +29,8 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "configuration.h"
-#include "map.h"
+
+#include "resources/map/map.h"
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 34a8bcf12..dbbb9c75d 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -25,9 +25,10 @@
 #include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "maplayer.h"
 #include "party.h"
 
+#include "resources/map/maplayer.h"
+
 #include "being/localplayer.h"
 #include "being/playerrelations.h"