diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 1dfa5043b9a..21e1ac7e776 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -31,7 +31,7 @@
 #include <cplusplus/PreprocessorClient.h>
 #include <cplusplus/DependencyTable.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QSharedPointer>
 #include <QDateTime>
diff --git a/src/libs/languageserverprotocol/lsptypes.h b/src/libs/languageserverprotocol/lsptypes.h
index 5dd3f586049..21916852c5e 100644
--- a/src/libs/languageserverprotocol/lsptypes.h
+++ b/src/libs/languageserverprotocol/lsptypes.h
@@ -29,7 +29,7 @@
 #include "jsonobject.h"
 #include "lsputils.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/link.h>
 #include <utils/mimeutils.h>
 #include <utils/optional.h>
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index 7b19997c548..b202fd490a9 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -28,7 +28,6 @@
 #include "utils_global.h"
 
 #include "filepath.h"
-#include "hostosinfo.h"
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libs/utils/link.h b/src/libs/utils/link.h
index d12f709c572..8535f767ab0 100644
--- a/src/libs/utils/link.h
+++ b/src/libs/utils/link.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "porting.h"
 
 #include <QString>
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index 2b439faf8af..4aec88641e2 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -30,8 +30,6 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <utils/fileutils.h>
-
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 QT_END_NAMESPACE
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
index 351484ee67e..bf40ece8150 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
@@ -30,7 +30,7 @@
 #include "debugserverproviderchooser.h"
 
 #include <utils/qtcassert.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QFormLayout>
 
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h
index fb877760c35..3a4cf31e474 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h
@@ -28,7 +28,7 @@
 #include "uvtargetdeviceselection.h"
 
 #include <utils/basetreeview.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/treemodel.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
index f109df1d736..07ca4eaedec 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
@@ -29,7 +29,7 @@
 
 #include "cmaketool.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index 3f0e2bebe2f..236a43037fc 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -27,7 +27,7 @@
 
 #include <coreplugin/core_global.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QObject>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 26acc19a8c6..b6ff97f8277 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -67,7 +67,7 @@
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/executeondestruction.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/hostosinfo.h>
 #include <utils/infobar.h>
 #include <utils/link.h>
diff --git a/src/plugins/cpaster/frontend/argumentscollector.cpp b/src/plugins/cpaster/frontend/argumentscollector.cpp
index 99f9f0c0370..446c4cb9923 100644
--- a/src/plugins/cpaster/frontend/argumentscollector.cpp
+++ b/src/plugins/cpaster/frontend/argumentscollector.cpp
@@ -25,7 +25,7 @@
 
 #include "argumentscollector.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QCoreApplication>
 
diff --git a/src/plugins/cppcheck/cppchecktextmarkmanager.h b/src/plugins/cppcheck/cppchecktextmarkmanager.h
index 0f9a01fb7da..12ccba194e3 100644
--- a/src/plugins/cppcheck/cppchecktextmarkmanager.h
+++ b/src/plugins/cppcheck/cppchecktextmarkmanager.h
@@ -27,7 +27,7 @@
 
 #include <cppcheck/cppcheckdiagnosticmanager.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <unordered_map>
 
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index d4afbef62d8..91e3d066d9d 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -28,7 +28,7 @@
 #include <QMetaType>
 #include <QString>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 2a92a0187cf..87776f6916b 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -27,8 +27,6 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <utils/fileutils.h>
-
 namespace Ios {
 namespace Internal {
 
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index 8e4909ee342..4915d5e1841 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -28,7 +28,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/mcusupport/mcusupportversiondetection.cpp b/src/plugins/mcusupport/mcusupportversiondetection.cpp
index 992d50f29b8..d3bfe33fb32 100644
--- a/src/plugins/mcusupport/mcusupportversiondetection.cpp
+++ b/src/plugins/mcusupport/mcusupportversiondetection.cpp
@@ -25,7 +25,7 @@
 
 #include "mcusupportversiondetection.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/qtcprocess.h>
 
 #include <QDir>
diff --git a/src/plugins/mesonprojectmanager/project/mesonproject.h b/src/plugins/mesonprojectmanager/project/mesonproject.h
index 3842e1ce061..ca480a4cc2d 100644
--- a/src/plugins/mesonprojectmanager/project/mesonproject.h
+++ b/src/plugins/mesonprojectmanager/project/mesonproject.h
@@ -25,15 +25,12 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
 #include "mesonprojectimporter.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectimporter.h>
 #include <projectexplorer/task.h>
 
-#include <utils/fileutils.h>
-
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index d3df3e21ea4..5a8c15e7da6 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -30,7 +30,7 @@
 #include "task.h"
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Utils { class MacroExpander; }
 
diff --git a/src/plugins/projectexplorer/buildtargetinfo.h b/src/plugins/projectexplorer/buildtargetinfo.h
index 8440286da53..0592393fb20 100644
--- a/src/plugins/projectexplorer/buildtargetinfo.h
+++ b/src/plugins/projectexplorer/buildtargetinfo.h
@@ -28,7 +28,7 @@
 #include "projectexplorer_export.h"
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/porting.h>
 
 #include <QList>
diff --git a/src/plugins/projectexplorer/projectnodeshelper.h b/src/plugins/projectexplorer/projectnodeshelper.h
index 6e159571517..f1517906fd3 100644
--- a/src/plugins/projectexplorer/projectnodeshelper.h
+++ b/src/plugins/projectexplorer/projectnodeshelper.h
@@ -31,7 +31,7 @@
 #include <coreplugin/vcsmanager.h>
 
 #include <utils/algorithm.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace ProjectExplorer {
 
@@ -40,9 +40,8 @@ QList<FileNode *> scanForFiles(QFutureInterface<Result> &future,
                                const Utils::FilePath &directory,
                                const std::function<FileNode *(const Utils::FilePath &)> factory);
 
-// IMPLEMENTATION:
-
 namespace Internal {
+
 template<typename Result>
 QList<FileNode *> scanForFilesRecursively(
     QFutureInterface<Result> &future,
diff --git a/src/plugins/python/pythonutils.h b/src/plugins/python/pythonutils.h
index 6493c612a6b..4ca5ea37a01 100644
--- a/src/plugins/python/pythonutils.h
+++ b/src/plugins/python/pythonutils.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace Python {
 namespace Internal {
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 5873728a3bc..24ffe06447c 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -25,7 +25,6 @@
 
 #include "qbsprojectimporter.h"
 
-#include "qbsbuildconfiguration.h"
 #include "qbspmlogging.h"
 #include "qbssession.h"
 
@@ -39,7 +38,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtkitinformation.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/hostosinfo.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/qmldesigner/components/eventlist/eventlist.h b/src/plugins/qmldesigner/components/eventlist/eventlist.h
index 72f951c0393..8dfbed6e42d 100644
--- a/src/plugins/qmldesigner/components/eventlist/eventlist.h
+++ b/src/plugins/qmldesigner/components/eventlist/eventlist.h
@@ -25,9 +25,9 @@
 #pragma once
 
 #include "modelnode.h"
-#include "utils/fileutils.h"
 
-#include <unordered_set>
+#include <utils/filepath.h>
+
 #include <QDialog>
 
 QT_FORWARD_DECLARE_CLASS(QStandardItemModel)
diff --git a/src/plugins/texteditor/codeassist/assistinterface.h b/src/plugins/texteditor/codeassist/assistinterface.h
index abe1b396382..a7081909d14 100644
--- a/src/plugins/texteditor/codeassist/assistinterface.h
+++ b/src/plugins/texteditor/codeassist/assistinterface.h
@@ -33,7 +33,7 @@
 #include <QTextCursor>
 #include <QVector>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace TextEditor {
 
diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h
index f44cf0b42c8..bc767a01763 100644
--- a/src/plugins/todo/todoitem.h
+++ b/src/plugins/todo/todoitem.h
@@ -29,7 +29,7 @@
 #include "constants.h"
 #include "todoicons.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QMetaType>
 #include <QString>