diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index 890d9fe99c0..4e581b965ff 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -266,7 +266,7 @@ SearchExecutor GitGrep::searchExecutor() const
 
 EditorOpener GitGrep::editorOpener() const
 {
-    return [params = gitParameters()](const Utils::SearchResultItem &item,
+    return [params = gitParameters()](const SearchResultItem &item,
                                       const FileFindParameters &parameters) -> IEditor * {
         const QStringList &itemPath = item.path();
         if (params.ref.isEmpty() || itemPath.isEmpty())
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index 0f99b2db00e..a4163193994 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -11,14 +11,11 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>
 
-#include <utils/filesearch.h>
 #include <utils/algorithm.h>
 
 #include <QGridLayout>
-#include <QLabel>
 #include <QSettings>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index 4cece1f5b6f..43d709d7661 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -9,9 +9,7 @@
 #include "projecttree.h"
 
 #include <utils/qtcassert.h>
-#include <utils/filesearch.h>
 
-#include <QDebug>
 #include <QSettings>
 
 using namespace ProjectExplorer;
@@ -24,7 +22,7 @@ CurrentProjectFind::CurrentProjectFind()
     connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
             this, &CurrentProjectFind::handleProjectChanged);
     connect(ProjectManager::instance(), &ProjectManager::projectDisplayNameChanged,
-            this, [this](ProjectExplorer::Project *p) {
+            this, [this](Project *p) {
         if (p == ProjectTree::currentProject())
             emit displayNameChanged();
     });
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.cpp b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
index 5b8e6eaa684..c5e8412572f 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.cpp
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
@@ -9,7 +9,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
-#include <utils/filesearch.h>
 
 #include <QSettings>
 
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 49b506ff501..24b802857bf 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -19,22 +19,19 @@
 
 #include <utils/algorithm.h>
 #include <utils/fadingindicator.h>
-#include <utils/filesearch.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
-#include <utils/stylehelper.h>
 
-#include <QDebug>
-#include <QSettings>
-#include <QHash>
-#include <QPair>
-#include <QPromise>
-#include <QStringListModel>
-#include <QFutureWatcher>
-#include <QPointer>
 #include <QComboBox>
+#include <QFutureWatcher>
+#include <QHash>
 #include <QLabel>
+#include <QPair>
+#include <QPointer>
+#include <QPromise>
+#include <QSettings>
+#include <QStringListModel>
 
 using namespace Utils;
 using namespace Core;
@@ -389,9 +386,8 @@ void BaseFileFind::doReplace(const QString &text, const SearchResultItems &items
 {
     const FilePaths files = replaceAll(text, items, preserveCase);
     if (!files.isEmpty()) {
-        Utils::FadingIndicator::showText(ICore::dialogParent(),
-            Tr::tr("%n occurrences replaced.", nullptr, items.size()),
-            Utils::FadingIndicator::SmallText);
+        FadingIndicator::showText(ICore::dialogParent(),
+            Tr::tr("%n occurrences replaced.", nullptr, items.size()), FadingIndicator::SmallText);
         DocumentManager::notifyFilesChangedInternally(files);
         SearchResultWindow::instance()->hide();
     }
@@ -428,7 +424,7 @@ QList<QPair<QWidget *, QWidget *>> BaseFileFind::createPatternWidgets()
     syncComboWithSettings(d->m_filterCombo, d->m_filterSetting);
     QLabel *exclusionLabel = createLabel(msgExclusionPatternLabel());
     d->m_exclusionCombo = createCombo(&d->m_exclusionStrings);
-    d->m_exclusionCombo->setToolTip(msgFilePatternToolTip(Utils::InclusionType::Excluded));
+    d->m_exclusionCombo->setToolTip(msgFilePatternToolTip(InclusionType::Excluded));
     exclusionLabel->setBuddy(d->m_exclusionCombo);
     syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting);
     return {{filterLabel, d->m_filterCombo}, {exclusionLabel, d->m_exclusionCombo}};
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 2a61602569a..d26b3cea2b4 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -6,13 +6,9 @@
 #include "textdocument.h"
 #include "texteditortr.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <utils/filesearch.h>
-#include <utils/fileutils.h>
-
 #include <QSettings>
 
 using namespace Utils;
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 29c769d2d3b..64b2a78fb76 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -9,20 +9,13 @@
 #include <coreplugin/find/findplugin.h>
 #include <coreplugin/icore.h>
 
-#include <utils/filesearch.h>
-#include <utils/fileutils.h>
 #include <utils/historycompleter.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
-#include <utils/stringutils.h>
 
 #include <QComboBox>
-#include <QDebug>
-#include <QDir>
-#include <QFileDialog>
 #include <QGridLayout>
 #include <QLabel>
-#include <QPushButton>
 #include <QSettings>
 #include <QStackedWidget>
 
@@ -153,7 +146,7 @@ QWidget *FindInFiles::createConfigWidget()
                                          /*restoreLastItemFromHistory=*/ true);
         if (!HistoryCompleter::historyExistsFor(QLatin1String(HistoryKey))) {
             auto completer = static_cast<HistoryCompleter *>(m_directory->lineEdit()->completer());
-            const QStringList legacyHistory = Core::ICore::settings()->value(
+            const QStringList legacyHistory = ICore::settings()->value(
                         QLatin1String("Find/FindInFiles/directories")).toStringList();
             for (const QString &dir: legacyHistory)
                 completer->addEntry(dir);
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index 5a1a2258a23..8510d99a51f 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -5,10 +5,7 @@
 
 #include "basefilefind.h"
 
-#include <utils/fileutils.h>
-
 #include <QPointer>
-#include <QStringListModel>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp
index 2f2ee8de1d4..f4449ea3fc7 100644
--- a/src/plugins/texteditor/findinopenfiles.cpp
+++ b/src/plugins/texteditor/findinopenfiles.cpp
@@ -6,12 +6,9 @@
 #include "textdocument.h"
 #include "texteditortr.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/documentmodel.h>
 
-#include <utils/filesearch.h>
-
 #include <QSettings>
 
 using namespace Utils;