diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 2a4e5288f53..57ce053cdfb 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -308,8 +308,8 @@ bool DiffEditorDocument::reload(QString *errorString, ReloadFlag flag, ChangeTyp
     return open(errorString, filePath(), filePath()) == OpenResult::Success;
 }
 
-Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const Utils::FilePath &filePath,
-                              const Utils::FilePath &realFilePath)
+Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const FilePath &filePath,
+                                                     const FilePath &realFilePath)
 {
     QTC_CHECK(filePath == realFilePath); // does not support autosave
     beginReload();
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index c88ff3b576d..d2a9b5513fd 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -61,7 +61,7 @@ DiffEditorFactory::DiffEditorFactory() :
     },
     rightHandler {
         Constants::DIFF_EDITOR_ID,
-        Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
+        Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
         TextEditorActionHandler::None,
         [](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->rightEditorWidget(); }
     }
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index fc607535af5..b40e399eb49 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -150,9 +150,8 @@ DiffFilesController::DiffFilesController(IDocument *document)
 
     setReloader([this] {
         cancelReload();
-        m_futureWatcher.setFuture(Utils::map(reloadInputList(),
-                                             DiffFile(ignoreWhitespace(),
-                                                      contextLineCount())));
+        m_futureWatcher.setFuture(map(reloadInputList(),
+                                      DiffFile(ignoreWhitespace(), contextLineCount())));
 
         Core::ProgressManager::addTask(m_futureWatcher.future(),
                                        tr("Calculating diff"), "DiffEditor");
@@ -203,11 +202,11 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
 
     if (textDocument && textDocument->isModified()) {
         QString errorString;
-        Utils::TextFileFormat format = textDocument->format();
+        TextFileFormat format = textDocument->format();
 
         QString leftText;
-        const Utils::TextFileFormat::ReadResult leftResult
-            = Utils::TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec,
+        const TextFileFormat::ReadResult leftResult
+            = TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec,
                                         &leftText, &format, &errorString);
 
         const QString rightText = textDocument->plainText();
@@ -220,9 +219,9 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
         reloadInput.leftFileInfo.typeInfo = tr("Saved");
         reloadInput.rightFileInfo.typeInfo = tr("Modified");
         reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
-        reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError);
+        reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
 
-        if (leftResult == Utils::TextFileFormat::ReadIOError)
+        if (leftResult == TextFileFormat::ReadIOError)
             reloadInput.fileOperation = FileData::NewFile;
 
         result << reloadInput;
@@ -259,11 +258,11 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
 
         if (textDocument && textDocument->isModified()) {
             QString errorString;
-            Utils::TextFileFormat format = textDocument->format();
+            TextFileFormat format = textDocument->format();
 
             QString leftText;
             const QString fileName = textDocument->filePath().toString();
-            const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+            const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
                 FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
 
             const QString rightText = textDocument->plainText();
@@ -276,9 +275,9 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
             reloadInput.leftFileInfo.typeInfo = tr("Saved");
             reloadInput.rightFileInfo.typeInfo = tr("Modified");
             reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
-            reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError);
+            reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
 
-            if (leftResult == Utils::TextFileFormat::ReadIOError)
+            if (leftResult == TextFileFormat::ReadIOError)
                 reloadInput.fileOperation = FileData::NewFile;
 
             result << reloadInput;
@@ -313,15 +312,15 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
 
     for (const QString &fileName : m_fileNames) {
         auto textDocument = qobject_cast<TextEditor::TextDocument *>(
-            DocumentModel::documentForFilePath(Utils::FilePath::fromString(fileName)));
+            DocumentModel::documentForFilePath(FilePath::fromString(fileName)));
 
         if (textDocument && textDocument->isModified()) {
             QString errorString;
-            Utils::TextFileFormat format = textDocument->format();
+            TextFileFormat format = textDocument->format();
 
             QString leftText;
             const QString fileName = textDocument->filePath().toString();
-            const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+            const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
                 FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
 
             const QString rightText = textDocument->plainText();
@@ -334,9 +333,9 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
             reloadInput.leftFileInfo.typeInfo = tr("Saved");
             reloadInput.rightFileInfo.typeInfo = tr("Modified");
             reloadInput.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor;
-            reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError);
+            reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
 
-            if (leftResult == Utils::TextFileFormat::ReadIOError)
+            if (leftResult == TextFileFormat::ReadIOError)
                 reloadInput.fileOperation = FileData::NewFile;
 
             result << reloadInput;
@@ -371,15 +370,15 @@ DiffExternalFilesController::DiffExternalFilesController(IDocument *document, co
 QList<ReloadInput> DiffExternalFilesController::reloadInputList() const
 {
     QString errorString;
-    Utils::TextFileFormat format;
+    TextFileFormat format;
     format.codec = EditorManager::defaultTextCodec();
 
     QString leftText;
     QString rightText;
 
-    const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+    const TextFileFormat::ReadResult leftResult = TextFileFormat::readFile(
         FilePath::fromString(m_leftFileName), format.codec, &leftText, &format, &errorString);
-    const Utils::TextFileFormat::ReadResult rightResult = Utils::TextFileFormat::readFile(
+    const TextFileFormat::ReadResult rightResult = TextFileFormat::readFile(
         FilePath::fromString(m_rightFileName), format.codec, &rightText, &format, &errorString);
 
     ReloadInput reloadInput;
@@ -387,11 +386,11 @@ QList<ReloadInput> DiffExternalFilesController::reloadInputList() const
     reloadInput.rightText = rightText;
     reloadInput.leftFileInfo.fileName = m_leftFileName;
     reloadInput.rightFileInfo.fileName = m_rightFileName;
-    reloadInput.binaryFiles = (leftResult == Utils::TextFileFormat::ReadEncodingError
-            || rightResult == Utils::TextFileFormat::ReadEncodingError);
+    reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError
+            || rightResult == TextFileFormat::ReadEncodingError);
 
-    const bool leftFileExists = (leftResult != Utils::TextFileFormat::ReadIOError);
-    const bool rightFileExists = (rightResult != Utils::TextFileFormat::ReadIOError);
+    const bool leftFileExists = (leftResult != TextFileFormat::ReadIOError);
+    const bool rightFileExists = (rightResult != TextFileFormat::ReadIOError);
     if (!leftFileExists && rightFileExists)
         reloadInput.fileOperation = FileData::NewFile;
     else if (leftFileExists && !rightFileExists)
@@ -518,7 +517,7 @@ void DiffEditorPluginPrivate::updateDiffCurrentFileAction()
 
 void DiffEditorPluginPrivate::updateDiffOpenFilesAction()
 {
-    const bool enabled = Utils::anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) {
+    const bool enabled = anyOf(DocumentModel::openedDocuments(), [](IDocument *doc) {
             QTC_ASSERT(doc, return false);
             return doc->isModified() && qobject_cast<TextEditor::TextDocument *>(doc);
         });
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 271ff5708ed..f06bb37f6e2 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -68,7 +68,7 @@ DiffEditorWidgetController::DiffEditorWidgetController(QWidget *diffEditorWidget
 void DiffEditorWidgetController::setDocument(DiffEditorDocument *document)
 {
     if (!m_progressIndicator) {
-        m_progressIndicator = new Utils::ProgressIndicator(Utils::ProgressIndicatorSize::Large);
+        m_progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Large);
         m_progressIndicator->attachToWidget(m_diffEditorWidget);
         m_progressIndicator->hide();
     }
@@ -182,7 +182,7 @@ void DiffEditorWidgetController::patch(bool revert, int fileIndex, int chunkInde
         if (!textDocument)
             return;
 
-        Utils::TemporaryFile contentsCopy("diff");
+        TemporaryFile contentsCopy("diff");
         if (!contentsCopy.open())
             return;
 
@@ -306,12 +306,12 @@ void DiffEditorWidgetController::updateCannotDecodeInfo()
     if (!m_document)
         return;
 
-    Utils::InfoBar *infoBar = m_document->infoBar();
+    InfoBar *infoBar = m_document->infoBar();
     Id selectEncodingId(Constants::SELECT_ENCODING);
     if (m_document->hasDecodingError()) {
         if (!infoBar->canInfoBeAdded(selectEncodingId))
             return;
-        Utils::InfoBarEntry info(selectEncodingId,
+        InfoBarEntry info(selectEncodingId,
                                  tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.")
                                      .arg(m_document->displayName(),
                                           QString::fromLatin1(m_document->codec()->name())));