Join fs/virfs.h and fs/virtfs/virtfs.h

13 files changed, 14 insertions, 13 deletions

diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 768b6db7e..d64193ccd 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -28,7 +28,7 @@
 #include "logger.h"
 #endif  // DEBUG_IMAGES
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 
 #include "utils/mathutils.h"
diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index 62db73d09..4323a28f6 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -26,7 +26,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "resources/sdlimagehelper.h"
 #ifdef USE_SDL2
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 3305988e9..14e5e5d49 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -28,7 +28,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index e141afa2d..198bfaa4e 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/imagehelper.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 
 #include "resources/image/image.h"
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index bb1415dcc..01b7bcbea 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/sdlmusic.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 
 #include "resources/loaders/musicloader.h"
diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp
index 93e7c38f9..654938d4e 100644
--- a/src/resources/loaders/soundloader.cpp
+++ b/src/resources/loaders/soundloader.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/soundeffect.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 
 #include "resources/loaders/soundloader.h"
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index b30892048..571b19abd 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -35,7 +35,8 @@
 #include "enums/resources/map/mapitemtype.h"
 
 #include "fs/mkdir.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/userpalette.h"
 
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index 2bcbdbeae..945c52b0e 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -26,7 +26,7 @@
 #include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/theme.h"
 
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index 2e4e294c4..93270d7e5 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -28,7 +28,7 @@
 
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 2fa44f57e..307364457 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -33,7 +33,7 @@
 #include "enums/resources/map/collisiontype.h"
 #include "enums/resources/map/mapitemtype.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "resources/map/map.h"
 #include "resources/map/mapheights.h"
diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc
index dce156bfb..c700bfbab 100644
--- a/src/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/resources/resourcemanager/resourcemanager_unittest.cc
@@ -25,7 +25,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "resources/sdlimagehelper.h"
 
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index cefc99dc3..d17177a6d 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -31,7 +31,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 413f733be..553e8c15b 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -24,7 +24,7 @@
 
 #include "configuration.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtlist.h"
 
 #include "resources/wallpaperdata.h"