3 files changed, 6 insertions, 3 deletions
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"