14 files changed, 27 insertions, 15 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index cb91f09c4..a4a6a145d 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -91,7 +91,8 @@
 #include "render/renderers.h"
 
 #include "resources/imageset.h"
-#include "resources/resourcemanager.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/delete2.h"
 #include "utils/langs.h"
diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h
index 054af17ad..adbb7fe98 100644
--- a/src/gui/models/langlistmodel.h
+++ b/src/gui/models/langlistmodel.h
@@ -24,7 +24,7 @@
 
 #include "gui/models/extendedlistmodel.h"
 
-#include "resources/resourcemanager.h"
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 04c786b4a..619bd38db 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -39,10 +39,11 @@
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/item/item.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "net/beinghandler.h"
 #include "net/serverfeatures.h"
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 516fb6402..c8468a26d 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -34,10 +34,11 @@
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/dye/dyepalette.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/dtor.h"
 #include "utils/files.h"
 #include "utils/physfstools.h"
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index d58953ab7..91727babe 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -42,10 +42,11 @@
 #include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/db/itemdb.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 #include "utils/translation/podict.h"
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 134889ee2..701145440 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -33,9 +33,10 @@
 
 #include "resources/image.h"
 #include "resources/imagehelper.h"
-#include "resources/resourcemanager.h"
 #include "resources/wallpaper.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "render/graphics.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 0791c37fc..0d186e82d 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -25,7 +25,8 @@
 #include "render/vertexes/imagecollection.h"
 
 #include "resources/imageset.h"
-#include "resources/resourcemanager.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 9df53b1d1..dee4ebebd 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -27,7 +27,8 @@
 #include "render/graphics.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index c3b5ca2ef..0360cd4bb 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -27,7 +27,8 @@
 #include "gui/theme.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 200d2178c..d37e5edc7 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -49,9 +49,10 @@
 
 #include "render/sdlgraphics.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/sdlimagehelper.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "resources/sprite/animatedsprite.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index 8ae2fb76f..78184c671 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -40,7 +40,8 @@
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
 
 #include "resources/db/itemdb.h"
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 6a28e95af..e21f51742 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -40,11 +40,12 @@
 
 #include "resources/image.h"
 #include "resources/imagehelper.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/map/map.h"
 #include "resources/map/metatile.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/gettext.h"
 #include "utils/physfstools.h"
 #include "utils/sdlcheckutils.h"
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 7369e1314..5b573d693 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -58,7 +58,6 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "resources/npcdialoginfo.h"
-#include "resources/resourcemanager.h"
 
 #include "resources/db/avatardb.h"
 #include "resources/db/npcdb.h"
@@ -68,6 +67,8 @@
 
 #include "resources/item/complexitem.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "net/npchandler.h"
 #include "net/packetlimiter.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 66887a258..3d7e23fb3 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -38,10 +38,10 @@
 #include "net/download.h"
 #include "net/updatetypeoperators.h"
 
-#include "resources/resourcemanager.h"
-
 #include "resources/db/moddb.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/delete2.h"
 #include "utils/files.h"
 #include "utils/physfstools.h"