4 files changed, 10 insertions, 6 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 094faea6d..40016d4f0 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -35,6 +35,8 @@
 
 #include "const/gui/chat.h"
 
+#include "fs/virtfstools.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/focushandler.h"
@@ -71,7 +73,6 @@
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
-#include "utils/virtfstools.h"
 
 #include <sys/stat.h>
 
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index e1ba2de30..91bdbe13e 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -26,7 +26,7 @@
 
 #include "enums/gui/layouttype.h"
 
-#include "input/inputmanager.h"
+#include "fs/virtfstools.h"
 
 #include "gui/gui.h"
 
@@ -37,10 +37,11 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "input/inputmanager.h"
+
 #include "utils/gettext.h"
 #include "utils/paths.h"
 #include "utils/process.h"
-#include "utils/virtfstools.h"
 
 #include "utils/translation/podict.h"
 #include "utils/translation/translationmanager.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index f19fb2239..e261dead7 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -31,6 +31,8 @@
 
 #include "enums/resources/map/blockmask.h"
 
+#include "fs/virtfs.h"
+
 #include "gui/popupmanager.h"
 #include "gui/viewport.h"
 #include "gui/userpalette.h"
@@ -50,7 +52,6 @@
 #include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
-#include "utils/virtfs.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index ddb265bc7..4d0ff9f3a 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -29,6 +29,9 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/virtfs.h"
+#include "fs/virtfstools.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
@@ -45,8 +48,6 @@
 
 #include "utils/delete2.h"
 #include "utils/files.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"