5 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 877f112e0..8c148f003 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -66,6 +66,7 @@
 
 #include "gui/fonts/font.h"
 
+#include "fs/paths.h"
 #include "fs/virtfstools.h"
 
 #include "gui/fonts/textchunk.h"
@@ -77,7 +78,6 @@
 #include "resources/image/image.h"
 
 #include "utils/delete2.h"
-#include "utils/paths.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 91bdbe13e..f10933996 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -26,6 +26,7 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/paths.h"
 #include "fs/virtfstools.h"
 
 #include "gui/gui.h"
@@ -40,7 +41,6 @@
 #include "input/inputmanager.h"
 
 #include "utils/gettext.h"
-#include "utils/paths.h"
 #include "utils/process.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index dfa613ba3..731db0cc9 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "listeners/openurllistener.h"
+#include "fs/paths.h"
 
 #include "gui/models/updatelistmodel.h"
 #include "gui/models/updatetypemodel.h"
@@ -40,13 +40,14 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/layoutcell.h"
 
+#include "listeners/openurllistener.h"
+
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/updatetypeoperators.h"
 
 #include "utils/delete2.h"
-#include "utils/paths.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 3ccd68999..c4f65d770 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -30,6 +30,8 @@
 
 #include "net/download.h"
 
+#include "fs/paths.h"
+
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/desktop.h"
@@ -45,7 +47,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/langs.h"
-#include "utils/paths.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 4d0ff9f3a..ef4b543a1 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -29,6 +29,9 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/files.h"
+#include "fs/mkdir.h"
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 #include "fs/virtfstools.h"
 
@@ -47,10 +50,7 @@
 #include "resources/db/moddb.h"
 
 #include "utils/delete2.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
-#include "utils/mkdir.h"
-#include "utils/paths.h"
 
 #include <sys/stat.h>