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

48 files changed, 104 insertions, 134 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07713f159..e71e47170 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -890,7 +890,6 @@ SET(SRCS
     fs/virtfstools.h
     fs/virtlist.cpp
     fs/virtlist.h
-    fs/virtfs.h
     fs/virtfs/virtfs.cpp
     fs/virtfs/virtfs.h
     fs/virtfs/virtdirentry.cpp
@@ -1792,7 +1791,6 @@ SET(DYE_CMD_SRCS
     fs/virtfstools.h
     fs/virtlist.cpp
     fs/virtlist.h
-    fs/virtfs.h
     fs/virtfs/virtfs.cpp
     fs/virtfs/virtfs.h
     fs/virtfs/virtdirentry.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b1b14495b..5ac464a5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -577,7 +577,6 @@ BASE_SRC += events/actionevent.h \
 	      fs/virtfstools.h \
 	      fs/virtlist.cpp \
 	      fs/virtlist.h \
-	      fs/virtfs.h \
 	      utils/process.cpp \
 	      utils/process.h \
 	      utils/sdl2helper.cpp \
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 2b420d1f3..ff803ef2b 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -35,7 +35,8 @@
 #include "configuration.h"
 
 #include "fs/mkdir.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 
 #include "debug.h"
 
diff --git a/src/client.cpp b/src/client.cpp
index 63380868c..5e92f0935 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -42,7 +42,7 @@
 
 #include "enums/being/attributesstrings.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 
 #include "gui/dialogsmanager.h"
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 219f19905..78182477c 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -29,10 +29,11 @@
 #include "being/beingspeech.h"
 
 #include "fs/files.h"
-#include "fs/virtfs.h"
 #include "fs/mkdir.h"
 #include "fs/paths.h"
 
+#include "fs/virtfs/virtfs.h"
+
 #include "utils/checkutils.h"
 #include "utils/gettext.h"
 
diff --git a/src/dirs.cpp b/src/dirs.cpp
index f1112e639..765a498a6 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -30,7 +30,8 @@
 
 #include "fs/mkdir.h"
 #include "fs/paths.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/base64.h"
 #if defined(__native_client__) || (defined(ANDROID) && defined(USE_SDL2))
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 6ffa4b048..da0a5b9f8 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -30,7 +30,7 @@
 #include "settings.h"
 #include "soundmanager.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 
 #include "gui/dialogsmanager.h"
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index a9af12510..3b6fafb3b 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -24,7 +24,7 @@
 #include "maingui.h"
 #include "sdlshared.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "resources/imagewriter.h"
 
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index dca24aec1..efaadfe8f 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -23,7 +23,7 @@
 #include "fs/mkdir.h"
 #if defined(ANDROID) || defined(__native_client__)
 #include "fs/paths.h"
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 #include "fs/virtlist.h"
 #endif  // defined(ANDROID) || defined(__native_client__)
diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc
index 473e0cbdc..b4ff18851 100644
--- a/src/fs/files_unittest.cc
+++ b/src/fs/files_unittest.cc
@@ -23,7 +23,7 @@
 #include "catch.hpp"
 #include "logger.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 
 #include "utils/delete2.h"
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index bcfbf6c4d..a5941f084 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -25,7 +25,8 @@
 #endif  // _MSC_VER
 
 #include "fs/paths.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/checkutils.h"
 #include "utils/stringutils.h"
diff --git a/src/fs/virtfs.h b/src/fs/virtfs.h
deleted file mode 100644
index e73aa741f..000000000
--- a/src/fs/virtfs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2013-2017  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FS_VIRTFS_H
-#define FS_VIRTFS_H
-
-#include "enums/simpletypes/append.h"
-
-#include "localconsts.h"
-
-#include <string>
-
-struct VirtFile;
-struct VirtList;
-
-namespace VirtFs
-{
-    void init(const std::string &restrict name);
-    void updateDirSeparator();
-    const char *getDirSeparator();
-    const char *getBaseDir();
-    const char *getUserDir();
-    bool exists(std::string name);
-    VirtList *enumerateFiles(std::string dir) RETURNS_NONNULL;
-    bool isDirectory(std::string name);
-    bool isSymbolicLink(const std::string &restrict name);
-    void freeList(VirtList *restrict const handle);
-    VirtFile *openRead(std::string filename);
-    VirtFile *openWrite(std::string filename);
-    VirtFile *openAppend(std::string filename);
-    bool setWriteDir(const std::string &restrict newDir);
-    bool mountDir(std::string newDir,
-                  const Append append);
-    bool mountDirSilent(std::string newDir,
-                        const Append append);
-    bool unmountDir(std::string oldDir);
-    bool unmountDirSilent(std::string oldDir);
-    bool mountZip(std::string newDir,
-                  const Append append);
-    bool unmountZip(std::string oldDir);
-    std::string getRealDir(std::string filename);
-    bool mkdir(const std::string &restrict dirName);
-    bool remove(const std::string &restrict filename);
-    bool deinit();
-    void permitLinks(const bool val);
-    int64_t read(VirtFile *restrict const handle,
-                 void *restrict const buffer,
-                 const uint32_t objSize,
-                 const uint32_t objCount);
-    int64_t write(VirtFile *restrict const file,
-                  const void *restrict const buffer,
-                  const uint32_t objSize,
-                  const uint32_t objCount);
-    int close(VirtFile *restrict const file);
-    int64_t fileLength(VirtFile *restrict const file);
-    int64_t tell(VirtFile *restrict const file);
-    int seek(VirtFile *restrict const file,
-             const uint64_t pos);
-    int eof(VirtFile *restrict const file);
-}  // namespace VirtFs
-
-extern const char *dirSeparator;
-
-#endif  // FS_VIRTFS_H
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp
index 36aab8eab..8718a9738 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/virtfs.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "fs/files.h"
 #include "fs/paths.h"
@@ -27,7 +27,6 @@
 #include "fs/virtlist.h"
 
 #include "fs/virtfs/virtdirentry.h"
-#include "fs/virtfs/virtfs.h"
 #include "fs/virtfs/virtfsdir.h"
 #include "fs/virtfs/virtfszip.h"
 #include "fs/virtfs/virtzipentry.h"
diff --git a/src/fs/virtfs/virtfs.h b/src/fs/virtfs/virtfs.h
index 408a54832..ed6b27a3d 100644
--- a/src/fs/virtfs/virtfs.h
+++ b/src/fs/virtfs/virtfs.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_FS_VIRTFS_VIRTFS_H
-#define UTILS_FS_VIRTFS_VIRTFS_H
+#ifndef FS_VIRTFS_H
+#define FS_VIRTFS_H
 
 #include "enums/fs/fsentrytype.h"
 
@@ -30,10 +30,55 @@
 #include <string>
 #include <vector>
 
+struct VirtFile;
 struct VirtFsEntry;
+struct VirtList;
 
 namespace VirtFs
 {
+    void init(const std::string &restrict name);
+    void updateDirSeparator();
+    const char *getDirSeparator();
+    const char *getBaseDir();
+    const char *getUserDir();
+    bool exists(std::string name);
+    VirtList *enumerateFiles(std::string dir) RETURNS_NONNULL;
+    bool isDirectory(std::string name);
+    bool isSymbolicLink(const std::string &restrict name);
+    void freeList(VirtList *restrict const handle);
+    VirtFile *openRead(std::string filename);
+    VirtFile *openWrite(std::string filename);
+    VirtFile *openAppend(std::string filename);
+    bool setWriteDir(const std::string &restrict newDir);
+    bool mountDir(std::string newDir,
+                  const Append append);
+    bool mountDirSilent(std::string newDir,
+                        const Append append);
+    bool unmountDir(std::string oldDir);
+    bool unmountDirSilent(std::string oldDir);
+    bool mountZip(std::string newDir,
+                  const Append append);
+    bool unmountZip(std::string oldDir);
+    std::string getRealDir(std::string filename);
+    bool mkdir(const std::string &restrict dirName);
+    bool remove(const std::string &restrict filename);
+    bool deinit();
+    void permitLinks(const bool val);
+    int64_t read(VirtFile *restrict const handle,
+                 void *restrict const buffer,
+                 const uint32_t objSize,
+                 const uint32_t objCount);
+    int64_t write(VirtFile *restrict const file,
+                  const void *restrict const buffer,
+                  const uint32_t objSize,
+                  const uint32_t objCount);
+    int close(VirtFile *restrict const file);
+    int64_t fileLength(VirtFile *restrict const file);
+    int64_t tell(VirtFile *restrict const file);
+    int seek(VirtFile *restrict const file,
+             const uint64_t pos);
+    int eof(VirtFile *restrict const file);
+
     bool mountDirInternal(const std::string &restrict newDir,
                           const Append append);
     bool unmountDirInternal(std::string oldDir);
@@ -50,4 +95,6 @@ namespace VirtFs
 #endif  // UNITTESTS
 }  // namespace VirtFs
 
-#endif  // UTILS_FS_VIRTFS_VIRTFS_H
+extern const char *dirSeparator;
+
+#endif  // FS_VIRTFS_H
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc
index 1d5087e05..57031bd54 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/fs/virtfs/virtfs_unittest.cc
@@ -21,12 +21,11 @@
 #include "catch.hpp"
 
 #include "fs/files.h"
-#include "fs/virtfs.h"
-#include "fs/virtfstools.h"
-#include "fs/virtlist.h"
 
 #include "fs/virtfs/virtdirentry.h"
 #include "fs/virtfs/virtfs.h"
+#include "fs/virtfstools.h"
+#include "fs/virtlist.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/fs/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc
index a5844c032..34b2620db 100644
--- a/src/fs/virtfs_unittest.cc
+++ b/src/fs/virtfs_unittest.cc
@@ -22,7 +22,8 @@
 
 #include "fs/files.h"
 #include "fs/paths.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 #include "fs/virtlist.h"
 
diff --git a/src/fs/virtfsrwops.cpp b/src/fs/virtfsrwops.cpp
index 8b1ccd4cc..d44959f9a 100644
--- a/src/fs/virtfsrwops.cpp
+++ b/src/fs/virtfsrwops.cpp
@@ -46,7 +46,7 @@
 
 #include "logger.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #ifdef DEBUG_VIRTFS
 #include "utils/debugmemoryobject.h"
diff --git a/src/fs/virtfstools.cpp b/src/fs/virtfstools.cpp
index 2aba0738a..9e290f959 100644
--- a/src/fs/virtfstools.cpp
+++ b/src/fs/virtfstools.cpp
@@ -23,8 +23,8 @@
 #include "logger.h"
 
 #include "fs/paths.h"
-#include "fs/virtfs.h"
 
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtlist.h"
 
 #include "utils/stringutils.h"
diff --git a/src/game.cpp b/src/game.cpp
index a96ded978..9b4542e93 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -42,7 +42,8 @@
 #include "enums/being/beingdirection.h"
 
 #include "fs/mkdir.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 94826e537..eb9d4e075 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -29,7 +29,7 @@
 
 #include "const/gui/theme.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 #include "fs/virtlist.h"
 
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 68342b241..6064dfd72 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -27,7 +27,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 43017c90a..49ea9d97c 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -32,7 +32,7 @@
 
 #include "const/resources/currency.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/gui.h"
 #include "gui/mailmessage.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index e261dead7..e43ea4138 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -31,7 +31,7 @@
 
 #include "enums/resources/map/blockmask.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/popupmanager.h"
 #include "gui/viewport.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 783b36635..8f994271e 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -32,7 +32,8 @@
 #include "fs/files.h"
 #include "fs/mkdir.h"
 #include "fs/paths.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc
index 7da06c4c1..a2ef86a8a 100644
--- a/src/integrity_unittest.cc
+++ b/src/integrity_unittest.cc
@@ -26,7 +26,8 @@
 #include "being/actorsprite.h"
 
 #include "fs/files.h"
-#include "fs/virtfs.h"
+
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 #include "fs/virtfstools.h"
 
diff --git a/src/maingui.cpp b/src/maingui.cpp
index b4e675231..d281dee1d 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -26,7 +26,7 @@
 #include "commandline.h"
 #include "settings.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfsrwops.h"
 
 #include "utils/delete2.h"
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"
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index be3750b47..ba455f65f 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -28,7 +28,7 @@
 #include "being/localplayer.h"
 #endif  // DYECMD
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "resources/sdlmusic.h"
 #include "resources/soundeffect.h"
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index e343576fe..b5b368f31 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -30,7 +30,7 @@
 
 #include "being/localplayer.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "gui/gui.h"
 #include "gui/theme.h"
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index e95f26289..1dbe01226 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -28,7 +28,7 @@
 #include "client.h"
 #include "logger.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include <libintl.h>
 
diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc
index d46e68bb7..d93e7a007 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/utils/stringutils_unittest.cc
@@ -24,7 +24,7 @@
 
 #include "const/utils/utf8.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 3d112f22d..d73de8841 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -20,7 +20,7 @@
 
 #include "utils/translation/poparser.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 #include "fs/virtfstools.h"
 
 #include "utils/stringutils.h"
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index a296180f8..3d7ac2aaa 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -27,7 +27,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/utils/xml/pugixmlwriter.cpp b/src/utils/xml/pugixmlwriter.cpp
index 2e61800be..29e79cc76 100644
--- a/src/utils/xml/pugixmlwriter.cpp
+++ b/src/utils/xml/pugixmlwriter.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 1667723c2..a52c5f522 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -27,7 +27,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/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
index 41096bc05..1a9796b8e 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/utils/xmlutils_unittest.cc
@@ -26,7 +26,7 @@
 
 #include "being/actorsprite.h"
 
-#include "fs/virtfs.h"
+#include "fs/virtfs/virtfs.h"
 
 #include "utils/delete2.h"