Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
author: hjk <hjk@qt.io> 2020-06-26 13:59:38 +0200
committer: hjk <hjk@qt.io> 2020-07-06 11:15:18 +0000
commit: e1c88116b397ecac2ef0f0678a419790a3e40402 (patch)
tree: 830be4b2f1aabad0522c7e01287ec9197b55e4cf
parent: c9eedbe0f387f33e5e455af03a795d2114528543 (diff)
655 files changed, 2116 insertions, 2094 deletions
diff --git a/src/libs/qmldebug/qmldebugcommandlinearguments.h b/src/libs/qmldebug/qmldebugcommandlinearguments.h
index f69fec2f9b..b21ceb5fc7 100644
--- a/src/libs/qmldebug/qmldebugcommandlinearguments.h
+++ b/src/libs/qmldebug/qmldebugcommandlinearguments.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <utils/id.h>
+
 #include <QString>
 #include <QUrl>
 
@@ -88,7 +89,7 @@ inline QString qmlDebugLocalArguments(QmlDebugServicesPreset services, const QSt
     return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block);
 }
 
-inline Core::Id runnerIdForRunMode(Core::Id runMode)
+inline Utils::Id runnerIdForRunMode(Utils::Id runMode)
 {
     if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
         return ProjectExplorer::Constants::QML_PROFILER_RUNNER;
@@ -97,7 +98,7 @@ inline Core::Id runnerIdForRunMode(Core::Id runMode)
     return {};
 }
 
-inline QmlDebugServicesPreset servicesForRunMode(Core::Id runMode)
+inline QmlDebugServicesPreset servicesForRunMode(Utils::Id runMode)
 {
     if (runMode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
         return QmlDebug::QmlProfilerServices;
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 317c5b9c5b..7bba90bf9c 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -125,7 +125,7 @@ private:
                                                        this);
 };
 
-AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
+AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Utils::Id id)
     : AbstractProcessStep(parent, id),
       m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
                                          sdkManager()->latestAndroidSdkPlatform()))
@@ -512,7 +512,7 @@ void AndroidBuildApkStep::setBuildTargetSdk(const QString &sdk)
     m_buildTargetSdk = sdk;
 }
 
-QVariant AndroidBuildApkStep::data(Core::Id id) const
+QVariant AndroidBuildApkStep::data(Utils::Id id) const
 {
     if (id == Constants::AndroidNdkPlatform) {
         if (auto qtVersion = QtKitAspect::qtVersion(target()->kit()))
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index 9d11fed824..1faa5b443e 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -43,7 +43,7 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
     Q_OBJECT
 
 public:
-    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
+    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
@@ -74,7 +74,7 @@ public:
     QString buildTargetSdk() const;
     void setBuildTargetSdk(const QString &sdk);
 
-    QVariant data(Core::Id id) const override;
+    QVariant data(Utils::Id id) const override;
 private:
     void showInGraphicalShell();
 
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 423fd3794f..4154e2ad92 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -1188,7 +1188,7 @@ void AndroidConfigurations::registerNewToolChains()
 {
     const QList<ToolChain *> existingAndroidToolChains
             = ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId,
-                                                        Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
+                                                        Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
     QList<ToolChain *> newToolchains = AndroidToolChainFactory::autodetectToolChains(
         existingAndroidToolChains);
 
@@ -1201,7 +1201,7 @@ void AndroidConfigurations::registerNewToolChains()
 void AndroidConfigurations::registerCustomToolChainsAndDebuggers()
 {
     const QList<ToolChain *> existingAndroidToolChains = ToolChainManager::toolChains(
-        Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
+        Utils::equal(&ToolChain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
     QList<FilePath> customNdks = Utils::transform(currentConfig().getCustomNdkList(),
                                                   FilePath::fromString);
     QList<ToolChain *> customToolchains
@@ -1240,7 +1240,7 @@ void AndroidConfigurations::registerCustomToolChainsAndDebuggers()
 
 void AndroidConfigurations::removeOldToolChains()
 {
-    foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Core::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)))) {
+    foreach (ToolChain *tc, ToolChainManager::toolChains(Utils::equal(&ToolChain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)))) {
         if (!tc->isValid())
             ToolChainManager::deregisterToolChain(tc);
     }
@@ -1343,9 +1343,9 @@ void AndroidConfigurations::updateAutomaticKitList()
     }
 
     const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
-        Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
+        Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
         if (k->isAutoDetected() && !k->isSdkProvided()
-                && deviceTypeId == Core::Id(Constants::ANDROID_DEVICE_TYPE)) {
+                && deviceTypeId == Utils::Id(Constants::ANDROID_DEVICE_TYPE)) {
             if (!QtSupport::QtKitAspect::qtVersion(k))
                 KitManager::deregisterKit(k); // Remove autoDetected kits without Qt.
             else
@@ -1369,7 +1369,7 @@ void AndroidConfigurations::updateAutomaticKitList()
     }
 
     DeviceManager *dm = DeviceManager::instance();
-    IDevice::ConstPtr device = dm->find(Core::Id(Constants::ANDROID_DEVICE_ID));
+    IDevice::ConstPtr device = dm->find(Utils::Id(Constants::ANDROID_DEVICE_ID));
     if (device.isNull()) {
         // no device, means no sdk path
         for (Kit *k : existingKits)
@@ -1384,7 +1384,7 @@ void AndroidConfigurations::updateAutomaticKitList()
             && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID;
     });
     for (ToolChain *tc : toolchains) {
-        if (tc->language() != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
+        if (tc->language() != Utils::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
             continue;
 
         for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
@@ -1398,7 +1398,7 @@ void AndroidConfigurations::updateAutomaticKitList()
                       return tc->targetAbi() == otherTc->targetAbi() && tcNdk == otherNdk;
                   });
 
-            QHash<Core::Id, ToolChain *> toolChainForLanguage;
+            QHash<Utils::Id, ToolChain *> toolChainForLanguage;
             for (ToolChain *tc : allLanguages)
                 toolChainForLanguage[tc->language()] = tc;
 
@@ -1414,7 +1414,7 @@ void AndroidConfigurations::updateAutomaticKitList()
             const auto initializeKit = [allLanguages, device, tc, qt](Kit *k) {
                 k->setAutoDetected(true);
                 k->setAutoDetectionSource("AndroidConfiguration");
-                DeviceTypeKitAspect::setDeviceTypeId(k, Core::Id(Constants::ANDROID_DEVICE_TYPE));
+                DeviceTypeKitAspect::setDeviceTypeId(k, Utils::Id(Constants::ANDROID_DEVICE_TYPE));
                 for (ToolChain *tc : allLanguages)
                     ToolChainKitAspect::setToolChain(k, tc);
                 QtSupport::QtKitAspect::setQtVersion(k, qt);
@@ -1597,7 +1597,7 @@ void AndroidConfigurations::updateAndroidDevice()
     if (m_instance->m_config.adbToolPath().exists())
         devMgr->addDevice(AndroidDevice::create());
     else if (devMgr->find(Constants::ANDROID_DEVICE_ID))
-        devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID));
+        devMgr->removeDevice(Utils::Id(Constants::ANDROID_DEVICE_ID));
 }
 
 AndroidConfigurations *AndroidConfigurations::m_instance = nullptr;
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index cd83d0e66d..d82d050511 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -137,7 +137,7 @@ public:
 
 // AndroidDeployQtStep
 
-AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
+AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Utils::Id id)
     : BuildStep(parent, id)
 {
     setImmutable(true);
@@ -155,7 +155,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
             this, &AndroidDeployQtStep::slotSetSerialNumber);
 }
 
-Core::Id AndroidDeployQtStep::stepId()
+Utils::Id AndroidDeployQtStep::stepId()
 {
     return "Qt4ProjectManager.AndroidDeployQtStep";
 }
diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h
index c688d51706..8106d00877 100644
--- a/src/plugins/android/androiddeployqtstep.h
+++ b/src/plugins/android/androiddeployqtstep.h
@@ -65,9 +65,9 @@ public:
         ForceUnintall
     };
 
-    AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
+    AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
@@ -116,7 +116,7 @@ private:
     bool m_uninstallPreviousPackageRun = false;
     bool m_useAndroiddeployqt = false;
     bool m_askForUninstall = false;
-    static const Core::Id Id;
+    static const Utils::Id Id;
     Utils::CommandLine m_androiddeployqtArgs;
     Utils::FilePath m_adbPath;
     Utils::FilePath m_command;
diff --git a/src/plugins/android/androidmanifesteditorfactory.cpp b/src/plugins/android/androidmanifesteditorfactory.cpp
index 347ee6cac8..ff430585ed 100644
--- a/src/plugins/android/androidmanifesteditorfactory.cpp
+++ b/src/plugins/android/androidmanifesteditorfactory.cpp
@@ -28,7 +28,6 @@
 #include "androidmanifesteditorwidget.h"
 #include "androidmanifesteditor.h"
 
-#include <coreplugin/id.h>
 #include <texteditor/texteditorsettings.h>
 
 using namespace Android;
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index deb940064c..6efa02e98e 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -750,7 +750,7 @@ static const char kServicesInvalid[] = "AndroidServiceDefinitionInvalid";
 
 void AndroidManifestEditorWidget::setInvalidServiceInfo()
 {
-    Core::Id id(kServicesInvalid);
+    Utils::Id id(kServicesInvalid);
     if (m_textEditorWidget->textDocument()->infoBar()->containsInfo(id))
         return;
     Utils::InfoBarEntry info(id,
@@ -762,7 +762,7 @@ void AndroidManifestEditorWidget::setInvalidServiceInfo()
 
 void AndroidManifestEditorWidget::clearInvalidServiceInfo()
 {
-    m_textEditorWidget->textDocument()->infoBar()->removeInfo(Core::Id(kServicesInvalid));
+    m_textEditorWidget->textDocument()->infoBar()->removeInfo(Utils::Id(kServicesInvalid));
 }
 
 void setApiLevel(QComboBox *box, const QDomElement &element, const QString &attribute)
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index c6bf60a143..2d4ba1e338 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -54,7 +54,7 @@ class AndroidPackageInstallationStep final : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
 
 public:
-    AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id);
+    AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id);
 
     BuildStepConfigWidget *createConfigWidget() final;
 
@@ -82,7 +82,7 @@ public:
     }
 };
 
-AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
+AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     const QString name = tr("Copy application data");
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
index ce2851875d..efb266a27a 100644
--- a/src/plugins/android/androidpotentialkit.cpp
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -68,9 +68,9 @@ bool AndroidPotentialKit::isEnabled() const
 {
     QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
     foreach (ProjectExplorer::Kit *kit, kits) {
-        Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
+        Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
         if (kit->isAutoDetected()
-                && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
+                && deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
                 && !kit->isSdkProvided()) {
             return false;
         }
@@ -120,9 +120,9 @@ void AndroidPotentialKitWidget::recheck()
 {
     QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
     foreach (ProjectExplorer::Kit *kit, kits) {
-        Core::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
+        Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
         if (kit->isAutoDetected()
-                && deviceId == Core::Id(Constants::ANDROID_DEVICE_ID)
+                && deviceId == Utils::Id(Constants::ANDROID_DEVICE_ID)
                 && !kit->isSdkProvided()) {
             setVisible(false);
             return;
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index ef1f8328cf..0a3f80e75f 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -182,16 +182,16 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
     BaseQtVersion::parseMkSpec(evaluator);
 }
 
-QSet<Core::Id> AndroidQtVersion::availableFeatures() const
+QSet<Utils::Id> AndroidQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(QtSupport::Constants::FEATURE_MOBILE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
 {
     return {Constants::ANDROID_DEVICE_TYPE};
 }
diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h
index 5098f53356..2d00a798db 100644
--- a/src/plugins/android/androidqtversion.h
+++ b/src/plugins/android/androidqtversion.h
@@ -48,8 +48,8 @@ public:
     void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
     Utils::Environment qmakeRunEnvironment() const override;
 
-    QSet<Core::Id> availableFeatures() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> availableFeatures() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 
     QString description() const override;
     const QStringList &androidAbis() const;
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index aa85f0b12e..41f559d175 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -55,7 +55,7 @@ using namespace Utils;
 
 namespace Android {
 
-BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Core::Id id)
+BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Utils::Id id)
 {
     setSettingsKey(settingsKey);
     setId(id);
@@ -104,7 +104,7 @@ void BaseStringListAspect::setLabel(const QString &label)
 }
 
 
-AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
+AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto envAspect = addAspect<EnvironmentAspect>();
diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h
index f663c8f520..1dd6daf02e 100644
--- a/src/plugins/android/androidrunconfiguration.h
+++ b/src/plugins/android/androidrunconfiguration.h
@@ -40,7 +40,7 @@ class BaseStringListAspect : public ProjectExplorer::ProjectConfigurationAspect
 
 public:
     explicit BaseStringListAspect(const QString &settingsKey = QString(),
-                                  Core::Id id = Core::Id());
+                                  Utils::Id id = Utils::Id());
     ~BaseStringListAspect() override;
 
     void addToLayout(ProjectExplorer::LayoutBuilder &builder) override;
@@ -66,7 +66,7 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig
 {
     Q_OBJECT
 public:
-    explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 };
 
 } // namespace Android
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 2c393ae1f0..9b1b067f76 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -249,7 +249,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
                     == Debugger::LldbEngineType;
     auto aspect = runControl->aspect<Debugger::DebuggerRunConfigurationAspect>();
-    Core::Id runMode = runControl->runMode();
+    Utils::Id runMode = runControl->runMode();
     const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
     m_useCppDebugger = debuggingMode && aspect->useCppDebugger();
     if (debuggingMode && aspect->useQmlDebugger())
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 41cbc2ff2a..d26c9f0d2a 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -57,10 +57,10 @@ static const QHash<QString, Abi> ClangTargets = {
     {"aarch64-linux-android",
      Abi(Abi::ArmArchitecture, Abi::LinuxOS, Abi::AndroidLinuxFlavor, Abi::ElfFormat, 64)}};
 
-static const QList<Core::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANGUAGE_ID,
+static const QList<Utils::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANGUAGE_ID,
                                             ProjectExplorer::Constants::C_LANGUAGE_ID};
 
-static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, const QString &target,
+static ToolChain *findToolChain(Utils::FilePath &compilerPath, Utils::Id lang, const QString &target,
                                 const ToolChainList &alreadyKnown)
 {
     ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
@@ -216,7 +216,7 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
             continue;
         }
 
-        for (const Core::Id &lang : LanguageIds) {
+        for (const Utils::Id &lang : LanguageIds) {
             FilePath compilerCommand = clangPath;
             if (lang == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
                 compilerCommand = clangPlusPlusPath(clangPath);
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index b074633c62..4753104a94 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -70,7 +70,7 @@ public:
     class AndroidToolChainInformation
     {
     public:
-        Core::Id language;
+        Utils::Id language;
         Utils::FilePath compilerCommand;
         ProjectExplorer::Abi abi;
         QString version;
diff --git a/src/plugins/autotest/boost/boosttestsettingspage.cpp b/src/plugins/autotest/boost/boosttestsettingspage.cpp
index ea9d41a0d5..955d50683d 100644
--- a/src/plugins/autotest/boost/boosttestsettingspage.cpp
+++ b/src/plugins/autotest/boost/boosttestsettingspage.cpp
@@ -101,7 +101,7 @@ void BoostTestSettingsWidget::fillComboBoxes()
     m_ui.reportLevelCB->addItem("No", QVariant::fromValue(ReportLevel::No));
 }
 
-BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId)
+BoostTestSettingsPage::BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/boost/boosttestsettingspage.h b/src/plugins/autotest/boost/boosttestsettingspage.h
index 0c5340d91a..92601652d5 100644
--- a/src/plugins/autotest/boost/boosttestsettingspage.h
+++ b/src/plugins/autotest/boost/boosttestsettingspage.h
@@ -35,7 +35,7 @@ class BoostTestSettings;
 class BoostTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    BoostTestSettingsPage(BoostTestSettings *settings, Core::Id settingsId);
+    BoostTestSettingsPage(BoostTestSettings *settings, Utils::Id settingsId);
 };
 
 } // Internal
diff --git a/src/plugins/autotest/catch/catchtestsettingspage.cpp b/src/plugins/autotest/catch/catchtestsettingspage.cpp
index 8c54dbe8c8..0bb597b8b0 100644
--- a/src/plugins/autotest/catch/catchtestsettingspage.cpp
+++ b/src/plugins/autotest/catch/catchtestsettingspage.cpp
@@ -101,7 +101,7 @@ void CatchTestSettingsWidget::apply()
     m_settings->toSettings(Core::ICore::settings());
 }
 
-CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId)
+CatchTestSettingsPage::CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/catch/catchtestsettingspage.h b/src/plugins/autotest/catch/catchtestsettingspage.h
index 1c659c7f10..b2f9fe7969 100644
--- a/src/plugins/autotest/catch/catchtestsettingspage.h
+++ b/src/plugins/autotest/catch/catchtestsettingspage.h
@@ -35,7 +35,7 @@ class CatchTestSettings;
 class CatchTestSettingsPage : public Core::IOptionsPage
 {
 public:
-    CatchTestSettingsPage(CatchTestSettings *settings, Core::Id settingsId);
+    CatchTestSettingsPage(CatchTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp
index ee3be04821..9f909a9de2 100644
--- a/src/plugins/autotest/gtest/gtestresult.cpp
+++ b/src/plugins/autotest/gtest/gtestresult.cpp
@@ -28,7 +28,7 @@
 #include "../testframeworkmanager.h"
 #include "../testtreeitem.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QRegularExpression>
 
@@ -95,7 +95,7 @@ static QString normalizeTestName(const QString &testname)
 
 const TestTreeItem *GTestResult::findTestTreeItem() const
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     QTC_ASSERT(framework, return nullptr);
     const TestTreeItem *rootNode = framework->rootNode();
diff --git a/src/plugins/autotest/gtest/gtestsettingspage.cpp b/src/plugins/autotest/gtest/gtestsettingspage.cpp
index c788d201af..d3f94c671f 100644
--- a/src/plugins/autotest/gtest/gtestsettingspage.cpp
+++ b/src/plugins/autotest/gtest/gtestsettingspage.cpp
@@ -105,11 +105,11 @@ void GTestSettingsWidget::apply()
     if (m_settings->groupMode == oldGroupMode && oldFilter == m_settings->gtestFilter)
         return;
 
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
     TestTreeModel::instance()->rebuild({id});
 }
 
-GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Core::Id settingsId)
+GTestSettingsPage::GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/gtest/gtestsettingspage.h b/src/plugins/autotest/gtest/gtestsettingspage.h
index 8cc20ae8b0..acb3b3513c 100644
--- a/src/plugins/autotest/gtest/gtestsettingspage.h
+++ b/src/plugins/autotest/gtest/gtestsettingspage.h
@@ -35,7 +35,7 @@ class GTestSettings;
 class GTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    GTestSettingsPage(GTestSettings *settings, Core::Id settingsId);
+    GTestSettingsPage(GTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/itestframework.cpp b/src/plugins/autotest/itestframework.cpp
index e43a1ca65e..ca60e96019 100644
--- a/src/plugins/autotest/itestframework.cpp
+++ b/src/plugins/autotest/itestframework.cpp
@@ -52,15 +52,15 @@ ITestParser *ITestFramework::testParser()
     return m_testParser;
 }
 
-Core::Id ITestFramework::settingsId() const
+Utils::Id ITestFramework::settingsId() const
 {
-    return Core::Id(Constants::SETTINGSPAGE_PREFIX)
+    return Utils::Id(Constants::SETTINGSPAGE_PREFIX)
             .withSuffix(QString("%1.%2").arg(priority()).arg(QLatin1String(name())));
 }
 
-Core::Id ITestFramework::id() const
+Utils::Id ITestFramework::id() const
 {
-    return Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
+    return Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(name());
 }
 
 void ITestFramework::resetRootNode()
diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h
index 960b9d8ad5..eebb032617 100644
--- a/src/plugins/autotest/itestframework.h
+++ b/src/plugins/autotest/itestframework.h
@@ -46,8 +46,8 @@ public:
     TestTreeItem *rootNode();
     ITestParser *testParser();
 
-    Core::Id settingsId() const;
-    Core::Id id() const;
+    Utils::Id settingsId() const;
+    Utils::Id id() const;
 
     bool active() const { return m_active; }
     void setActive(bool active) { m_active = active; }
diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h
index e2ea592e09..3509e7b027 100644
--- a/src/plugins/autotest/itestparser.h
+++ b/src/plugins/autotest/itestparser.h
@@ -28,7 +28,7 @@
 #include "testtreeitem.h"
 #include "testtreemodel.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <cplusplus/CppDocument.h>
 #include <cpptools/cppworkingcopy.h>
 #include <qmljs/qmljsdocument.h>
diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index f5021e5c3c..9706fa7e26 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -120,7 +120,7 @@ void ProjectTestSettingsWidget::populateFrameworks(const QMap<ITestFramework *,
 
 void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
 {
-    auto id = Core::Id::fromSetting(item->data(column, FrameworkIdRole));
+    auto id = Utils::Id::fromSetting(item->data(column, FrameworkIdRole));
     m_projectSettings->activateFramework(id, item->data(0, Qt::CheckStateRole) == Qt::Checked);
     m_syncFrameworksTimer.start(3000);
 }
diff --git a/src/plugins/autotest/qtest/qttestresult.cpp b/src/plugins/autotest/qtest/qttestresult.cpp
index 38fefa171b..44daaf4aeb 100644
--- a/src/plugins/autotest/qtest/qttestresult.cpp
+++ b/src/plugins/autotest/qtest/qttestresult.cpp
@@ -28,7 +28,7 @@
 #include "../testtreeitem.h"
 #include "../quick/quicktestframework.h" // FIXME BAD! - but avoids declaring QuickTestResult
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/qtcassert.h>
 
 namespace Autotest {
@@ -131,11 +131,11 @@ TestResult *QtTestResult::createIntermediateResultFor(const TestResult *other)
 
 const TestTreeItem *QtTestResult::findTestTreeItem() const
 {
-    Core::Id id;
+    Utils::Id id;
     if (m_type == TestType::QtTest)
-        id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
+        id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
     else
-        id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME);
+        id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME);
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     QTC_ASSERT(framework, return nullptr);
     const TestTreeItem *rootNode = framework->rootNode();
diff --git a/src/plugins/autotest/qtest/qttestsettingspage.cpp b/src/plugins/autotest/qtest/qttestsettingspage.cpp
index 02a74cb344..bed1930baa 100644
--- a/src/plugins/autotest/qtest/qttestsettingspage.cpp
+++ b/src/plugins/autotest/qtest/qttestsettingspage.cpp
@@ -100,7 +100,7 @@ void QtTestSettingsWidget::apply()
     m_settings->toSettings(Core::ICore::settings());
 }
 
-QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId)
+QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId)
 {
     setId(settingsId);
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
diff --git a/src/plugins/autotest/qtest/qttestsettingspage.h b/src/plugins/autotest/qtest/qttestsettingspage.h
index 3ed9c76eaa..dbd8850a69 100644
--- a/src/plugins/autotest/qtest/qttestsettingspage.h
+++ b/src/plugins/autotest/qtest/qttestsettingspage.h
@@ -35,7 +35,7 @@ class QtTestSettings;
 class QtTestSettingsPage final : public Core::IOptionsPage
 {
 public:
-    QtTestSettingsPage(QtTestSettings *settings, Core::Id settingsId);
+    QtTestSettingsPage(QtTestSettings *settings, Utils::Id settingsId);
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotest/quick/quicktestframework.cpp b/src/plugins/autotest/quick/quicktestframework.cpp
index 50d46c7e1e..04b8eb4c9c 100644
--- a/src/plugins/autotest/quick/quicktestframework.cpp
+++ b/src/plugins/autotest/quick/quicktestframework.cpp
@@ -56,8 +56,8 @@ unsigned QuickTestFramework::priority() const
 
 IFrameworkSettings *QuickTestFramework::frameworkSettings()
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
+    static const Utils::Id id
+            = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
     ITestFramework *qtTestFramework = TestFrameworkManager::frameworkForId(id);
     return qtTestFramework->frameworkSettings();
 }
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 0f37ff6f5b..1ef39f2ccf 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -380,7 +380,7 @@ void TestCodeParser::scanForTests(const QStringList &fileList, const QList<ITest
     }
 }
 
-void TestCodeParser::onTaskStarted(Core::Id type)
+void TestCodeParser::onTaskStarted(Utils::Id type)
 {
     if (type == CppTools::Constants::TASK_INDEX) {
         m_codeModelParsing = true;
@@ -394,7 +394,7 @@ void TestCodeParser::onTaskStarted(Core::Id type)
     }
 }
 
-void TestCodeParser::onAllTasksFinished(Core::Id type)
+void TestCodeParser::onAllTasksFinished(Utils::Id type)
 {
     // if we cancel parsing ensure that progress animation is canceled as well
     if (type == Constants::TASK_PARSE && parsingHasFailed)
diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h
index 977cac180b..ad1788221f 100644
--- a/src/plugins/autotest/testcodeparser.h
+++ b/src/plugins/autotest/testcodeparser.h
@@ -92,8 +92,8 @@ private:
 
     // qml files must be handled slightly different
     void onDocumentUpdated(const QString &fileName, bool isQmlFile = false);
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
+    void onTaskStarted(Utils::Id type);
+    void onAllTasksFinished(Utils::Id type);
     void onFinished();
     void onPartialParsingFinished();
     void parsePostponedFiles();
diff --git a/src/plugins/autotest/testeditormark.cpp b/src/plugins/autotest/testeditormark.cpp
index 29ca484c9c..16602cd8e5 100644
--- a/src/plugins/autotest/testeditormark.cpp
+++ b/src/plugins/autotest/testeditormark.cpp
@@ -30,7 +30,7 @@ namespace Autotest {
 namespace Internal {
 
 TestEditorMark::TestEditorMark(QPersistentModelIndex item, const Utils::FilePath &file, int line)
-    : TextEditor::TextMark(file, line, Core::Id(Constants::TASK_MARK_ID)),
+    : TextEditor::TextMark(file, line, Utils::Id(Constants::TASK_MARK_ID)),
       m_item(item)
 {
 }
diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp
index d7f1354f30..1d663a6931 100644
--- a/src/plugins/autotest/testframeworkmanager.cpp
+++ b/src/plugins/autotest/testframeworkmanager.cpp
@@ -35,6 +35,7 @@
 #include <QSettings>
 
 using namespace Core;
+using namespace Utils;
 
 namespace Autotest {
 
diff --git a/src/plugins/autotest/testframeworkmanager.h b/src/plugins/autotest/testframeworkmanager.h
index 4655c331bc..3dfb09c56b 100644
--- a/src/plugins/autotest/testframeworkmanager.h
+++ b/src/plugins/autotest/testframeworkmanager.h
@@ -46,7 +46,7 @@ public:
     bool registerTestFramework(ITestFramework *framework);
     void synchronizeSettings(QSettings *s);
 
-    static ITestFramework *frameworkForId(Core::Id frameworkId);
+    static ITestFramework *frameworkForId(Utils::Id frameworkId);
     static void activateFrameworksFromSettings(const Internal::TestSettings *settings);
     static TestFrameworks registeredFrameworks();
 
diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp
index 3925671bde..2726bf9566 100644
--- a/src/plugins/autotest/testprojectsettings.cpp
+++ b/src/plugins/autotest/testprojectsettings.cpp
@@ -60,7 +60,7 @@ void TestProjectSettings::setUseGlobalSettings(bool useGlobal)
      m_useGlobalSettings = useGlobal;
 }
 
-void TestProjectSettings::activateFramework(const Core::Id &id, bool activate)
+void TestProjectSettings::activateFramework(const Utils::Id &id, bool activate)
 {
     ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
     m_activeTestFrameworks[framework] = activate;
@@ -81,7 +81,7 @@ void TestProjectSettings::load()
     if (activeFrameworks.isValid()) {
         const QMap<QString, QVariant> frameworksMap = activeFrameworks.toMap();
         for (ITestFramework *framework : registered) {
-            const Core::Id id = framework->id();
+            const Utils::Id id = framework->id();
             bool active = frameworksMap.value(id.toString(), framework->active()).toBool();
             m_activeTestFrameworks.insert(framework, active);
         }
diff --git a/src/plugins/autotest/testprojectsettings.h b/src/plugins/autotest/testprojectsettings.h
index d0b35d5c5f..a4ce6b34fc 100644
--- a/src/plugins/autotest/testprojectsettings.h
+++ b/src/plugins/autotest/testprojectsettings.h
@@ -49,7 +49,7 @@ public:
     void setActiveFrameworks(const QMap<ITestFramework *, bool> enabledFrameworks)
     { m_activeTestFrameworks = enabledFrameworks; }
     QMap<ITestFramework *, bool> activeFrameworks() const { return m_activeTestFrameworks; }
-    void activateFramework(const Core::Id &id, bool activate);
+    void activateFramework(const Utils::Id &id, bool activate);
 private:
     void load();
     void save();
diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
index 71d306a5cf..fffeaece48 100644
--- a/src/plugins/autotest/testsettings.cpp
+++ b/src/plugins/autotest/testsettings.cpp
@@ -27,7 +27,7 @@
 #include "autotestconstants.h"
 #include "testframeworkmanager.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QSettings>
 
@@ -69,7 +69,7 @@ void TestSettings::toSettings(QSettings *s) const
     s->setValue(popupOnFailKey, popupOnFail);
     s->setValue(runAfterBuildKey, int(runAfterBuild));
     // store frameworks and their current active and grouping state
-    for (const Core::Id &id : frameworks.keys()) {
+    for (const Utils::Id &id : frameworks.keys()) {
         s->setValue(id.toString(), frameworks.value(id));
         s->setValue(id.toString() + groupSuffix, frameworksGrouping.value(id));
     }
@@ -97,7 +97,7 @@ void TestSettings::fromSettings(QSettings *s)
     frameworksGrouping.clear();
     for (const ITestFramework *framework : registered) {
         // get their active state
-        const Core::Id id = framework->id();
+        const Utils::Id id = framework->id();
         const QString key = id.toString();
         frameworks.insert(id, s->value(key, framework->active()).toBool());
         // and whether grouping is enabled
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index 30bb78acd6..c7339b9642 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -91,12 +91,12 @@ TestSettings TestSettingsWidget::settings() const
     return result;
 }
 
-void TestSettingsWidget::populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks)
+void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks)
 {
     const TestFrameworks &registered = TestFrameworkManager::registeredFrameworks();
     m_ui.frameworkTreeWidget->clear();
     for (const ITestFramework *framework : registered) {
-        const Core::Id id = framework->id();
+        const Utils::Id id = framework->id();
         auto item = new QTreeWidgetItem(m_ui.frameworkTreeWidget, QStringList(QLatin1String(framework->name())));
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
         item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked);
@@ -118,7 +118,7 @@ void TestSettingsWidget::frameworkSettings(TestSettings &settings) const
     const int itemCount = model->rowCount();
     for (int row = 0; row < itemCount; ++row) {
         QModelIndex idx = model->index(row, 0);
-        const Core::Id id = Core::Id::fromSetting(idx.data(Qt::UserRole));
+        const Utils::Id id = Utils::Id::fromSetting(idx.data(Qt::UserRole));
         settings.frameworks.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
         idx = model->index(row, 1);
         settings.frameworksGrouping.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
@@ -162,8 +162,8 @@ void TestSettingsPage::apply()
     if (!m_widget) // page was not shown at all
         return;
     const TestSettings newSettings = m_widget->settings();
-    const QList<Core::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
-                                                       [newSettings, this] (const Core::Id &id) {
+    const QList<Utils::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
+                                                       [newSettings, this] (const Utils::Id &id) {
         return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
     });
     *m_settings = newSettings;
diff --git a/src/plugins/autotest/testsettingspage.h b/src/plugins/autotest/testsettingspage.h
index 8834511313..46551951e9 100644
--- a/src/plugins/autotest/testsettingspage.h
+++ b/src/plugins/autotest/testsettingspage.h
@@ -46,7 +46,7 @@ public:
     TestSettings settings() const;
 
 private:
-    void populateFrameworksListWidget(const QHash<Core::Id, bool> &frameworks);
+    void populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks);
     void frameworkSettings(TestSettings &settings) const;
     void onFrameworkItemChanged();
     Ui::TestSettingsPage m_ui;
diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index 6fbae85cb5..13d62216f2 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -266,9 +266,9 @@ void TestTreeModel::filterAndInsert(TestTreeItem *item, TestTreeItem *root, bool
         insertItemInParent(filtered, root, groupingEnabled);
 }
 
-void TestTreeModel::rebuild(const QList<Core::Id> &frameworkIds)
+void TestTreeModel::rebuild(const QList<Utils::Id> &frameworkIds)
 {
-    for (const Core::Id &id : frameworkIds) {
+    for (const Utils::Id &id : frameworkIds) {
         ITestFramework *framework = TestFrameworkManager::frameworkForId(id);
         TestTreeItem *frameworkRoot = framework->rootNode();
         const bool groupingEnabled = framework->grouping();
@@ -549,25 +549,25 @@ void TestTreeModel::removeAllTestItems()
 // we're inside tests - so use some internal knowledge to make testing easier
 static TestTreeItem *qtRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *quickRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("QtQuickTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *gtestRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("GTest");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
 static TestTreeItem *boostTestRootNode()
 {
-    auto id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
+    auto id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix("Boost");
     return TestFrameworkManager::frameworkForId(id)->rootNode();
 }
 
diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h
index 20ef8e0136..af3501c484 100644
--- a/src/plugins/autotest/testtreemodel.h
+++ b/src/plugins/autotest/testtreemodel.h
@@ -64,7 +64,7 @@ public:
     QList<TestConfiguration *> getTestsForFile(const Utils::FilePath &fileName) const;
     QList<TestTreeItem *> testItemsByName(const QString &testName);
     void synchronizeTestFrameworks();
-    void rebuild(const QList<Core::Id> &frameworkIds);
+    void rebuild(const QList<Utils::Id> &frameworkIds);
 
     void updateCheckStateCache();
 #ifdef WITH_TESTS
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 89d828d60a..3b093dc36a 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -60,7 +60,7 @@ class AutogenStep : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutogenStep)
 
 public:
-    AutogenStep(BuildStepList *bsl, Core::Id id);
+    AutogenStep(BuildStepList *bsl, Utils::Id id);
 
 private:
     bool init() override;
@@ -70,7 +70,7 @@ private:
     bool m_runAutogen = false;
 };
 
-AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id)
+AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autogen"));
 
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index 3be62f4e71..78b93fb107 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -57,7 +57,7 @@ class AutoreconfStep : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutoreconfStep)
 
 public:
-    AutoreconfStep(BuildStepList *bsl, Core::Id id);
+    AutoreconfStep(BuildStepList *bsl, Utils::Id id);
 
     bool init() override;
     void doRun() override;
@@ -67,7 +67,7 @@ private:
     bool m_runAutoreconf = false;
 };
 
-AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id)
+AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autoreconf"));
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 56d22a52ed..346e19ff72 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -48,7 +48,7 @@ class AutotoolsBuildConfiguration : public BuildConfiguration
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration)
 
 public:
-    AutotoolsBuildConfiguration(Target *target, Core::Id id)
+    AutotoolsBuildConfiguration(Target *target, Utils::Id id)
         : BuildConfiguration(target, id)
     {
         // /<foobar> is used so the un-changed check in setBuildDirectory() works correctly.
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 737840ef19..d418c9c42b 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -77,7 +77,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::ConfigureStep)
 
 public:
-    ConfigureStep(BuildStepList *bsl, Core::Id id);
+    ConfigureStep(BuildStepList *bsl, Utils::Id id);
 
     void setAdditionalArguments(const QString &list);
 
@@ -89,7 +89,7 @@ private:
     bool m_runConfigure = false;
 };
 
-ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id)
+ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Configure"));
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index 2ab3d684b4..7775ebdbc9 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -41,10 +41,10 @@ namespace Internal {
 class MakeStep : public ProjectExplorer::MakeStep
 {
 public:
-    MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 };
 
-MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
     : ProjectExplorer::MakeStep(bsl, id)
 {
     setAvailableBuildTargets({"all", "clean"});
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
index 1912a3e059..2555b9f591 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
@@ -48,7 +48,7 @@ BareMetalDeviceConfigurationWizard::BareMetalDeviceConfigurationWizard(QWidget *
 ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const
 {
     const auto dev = BareMetalDevice::create();
-    dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Core::Id());
+    dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
     dev->setDisplayName(m_setupPage->configurationName());
     dev->setType(Constants::BareMetalOsType);
     dev->setMachineType(ProjectExplorer::IDevice::Hardware);
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 646691ff2c..6a38e5d96e 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -45,7 +45,7 @@ class BareMetalRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalRunConfiguration)
 
 public:
-    explicit BareMetalRunConfiguration(Target *target, Core::Id id)
+    explicit BareMetalRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         const auto exeAspect = addAspect<ExecutableAspect>();
@@ -69,7 +69,7 @@ class BareMetalCustomRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalCustomRunConfiguration)
 
 public:
-    explicit BareMetalCustomRunConfiguration(Target *target, Core::Id id)
+    explicit BareMetalCustomRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         const auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp
index 01ce9de32e..314c471400 100644
--- a/src/plugins/baremetal/iarewparser.cpp
+++ b/src/plugins/baremetal/iarewparser.cpp
@@ -54,7 +54,7 @@ IarParser::IarParser()
     setObjectName("IarParser");
 }
 
-Core::Id IarParser::id()
+Utils::Id IarParser::id()
 {
     return "BareMetal.OutputParser.Iar";
 }
diff --git a/src/plugins/baremetal/iarewparser.h b/src/plugins/baremetal/iarewparser.h
index 92b38bd26f..d611c2ecd3 100644
--- a/src/plugins/baremetal/iarewparser.h
+++ b/src/plugins/baremetal/iarewparser.h
@@ -39,7 +39,7 @@ class IarParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit IarParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 7c6f81fa84..84b57d4db6 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -89,7 +89,7 @@ static QString cppLanguageOption(const FilePath &compiler)
 }
 
 static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &extraArgs,
-                                   const Core::Id languageId, const QStringList &env)
+                                   const Utils::Id languageId, const QStringList &env)
 {
     if (compiler.isEmpty() || !compiler.toFileInfo().isExecutable())
         return {};
@@ -130,7 +130,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &
     return Macro::toMacros(output);
 }
 
-static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Core::Id languageId,
+static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Utils::Id languageId,
                                    const QStringList &env)
 {
     if (!compiler.exists())
@@ -280,7 +280,7 @@ static Abi guessAbi(const Macros &macros)
             guessFormat(arch), guessWordWidth(macros)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -320,7 +320,7 @@ ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() con
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id languageId = language();
+    const Utils::Id languageId = language();
     const QStringList extraArgs = m_extraCodeModelFlags;
     MacrosCache macrosCache = predefinedMacrosCache();
 
@@ -367,7 +367,7 @@ ToolChain::BuiltInHeaderPathsRunner IarToolChain::createBuiltInHeaderPathsRunner
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id languageId = language();
+    const Utils::Id languageId = language();
 
     HeaderPathsCache headerPaths = headerPathsCache();
 
@@ -583,7 +583,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> IarToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id languageId) const
+        const Candidate &candidate, Utils::Id languageId) const
 {
     const auto env = Environment::systemEnvironment();
     const Macros macros = dumpPredefinedMacros(candidate.compilerPath, {}, languageId,
diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h
index 0486629539..ffe3384908 100644
--- a/src/plugins/baremetal/iarewtoolchain.h
+++ b/src/plugins/baremetal/iarewtoolchain.h
@@ -111,7 +111,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
             const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id languageId) const;
+            const Candidate &candidate, Utils::Id languageId) const;
 };
 
 // IarToolChainConfigWidget
diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h
index 2045e054ed..cf82d8c7b9 100644
--- a/src/plugins/baremetal/idebugserverprovider.h
+++ b/src/plugins/baremetal/idebugserverprovider.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <debugger/debuggerconstants.h>
 #include <projectexplorer/abi.h>
 #include <utils/fileutils.h>
diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp
index 5ee130073e..d1589e87e9 100644
--- a/src/plugins/baremetal/keilparser.cpp
+++ b/src/plugins/baremetal/keilparser.cpp
@@ -56,7 +56,7 @@ KeilParser::KeilParser()
     setObjectName("KeilParser");
 }
 
-Core::Id KeilParser::id()
+Utils::Id KeilParser::id()
 {
     return "BareMetal.OutputParser.Keil";
 }
diff --git a/src/plugins/baremetal/keilparser.h b/src/plugins/baremetal/keilparser.h
index 26fa00fdea..f12bbee720 100644
--- a/src/plugins/baremetal/keilparser.h
+++ b/src/plugins/baremetal/keilparser.h
@@ -39,7 +39,7 @@ class KeilParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit KeilParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 208752f346..96cef9a583 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -404,7 +404,7 @@ static Abi guessAbi(const Macros &macros)
                 guessFormat(arch), guessWordWidth(macros, arch)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -459,7 +459,7 @@ ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() co
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
 
     MacrosCache macroCache = predefinedMacrosCache();
     const QStringList extraArgs = m_extraCodeModelFlags;
@@ -734,7 +734,7 @@ QList<ToolChain *> KeilToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> KeilToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id language) const
+        const Candidate &candidate, Utils::Id language) const
 {
     const auto env = Environment::systemEnvironment();
 
diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h
index d9f85d33f6..63e527d937 100644
--- a/src/plugins/baremetal/keiltoolchain.h
+++ b/src/plugins/baremetal/keiltoolchain.h
@@ -112,7 +112,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
                                                              const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id language) const;
+            const Candidate &candidate, Utils::Id language) const;
 };
 
 // KeilToolchainConfigWidget
diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp
index 5a6b23c0d0..4c2409b214 100644
--- a/src/plugins/baremetal/sdccparser.cpp
+++ b/src/plugins/baremetal/sdccparser.cpp
@@ -56,7 +56,7 @@ SdccParser::SdccParser()
     setObjectName("SdccParser");
 }
 
-Core::Id SdccParser::id()
+Utils::Id SdccParser::id()
 {
     return "BareMetal.OutputParser.Sdcc";
 }
diff --git a/src/plugins/baremetal/sdccparser.h b/src/plugins/baremetal/sdccparser.h
index 0b92b70225..9ca009a196 100644
--- a/src/plugins/baremetal/sdccparser.h
+++ b/src/plugins/baremetal/sdccparser.h
@@ -39,7 +39,7 @@ class SdccParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit SdccParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index 97db9a5910..aa701d08f0 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -197,7 +197,7 @@ static Abi guessAbi(const Macros &macros)
             guessFormat(arch), guessWordWidth(macros)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -244,7 +244,7 @@ ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() co
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
     const Abi abi = m_targetAbi;
 
     MacrosCache macrosCache = predefinedMacrosCache();
@@ -458,7 +458,7 @@ QList<ToolChain *> SdccToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> SdccToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id language) const
+        const Candidate &candidate, Utils::Id language) const
 {
     const auto env = Environment::systemEnvironment();
 
diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h
index 09aff331af..c888b15bd2 100644
--- a/src/plugins/baremetal/sdcctoolchain.h
+++ b/src/plugins/baremetal/sdcctoolchain.h
@@ -107,7 +107,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
             const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id language) const;
+            const Candidate &candidate, Utils::Id language) const;
 };
 
 // SdccToolChainConfigWidget
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 503eb4db88..84ff8c7d7d 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -26,8 +26,6 @@
 #include "bazaarclient.h"
 #include "constants.h"
 
-#include <coreplugin/id.h>
-
 #include <vcsbase/vcsbaseplugin.h>
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseeditorconfig.h>
@@ -206,7 +204,7 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL
     VcsBaseClient::view(source, id, args);
 }
 
-Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
+Utils::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
 {
     switch (cmd) {
     case AnnotateCommand:
@@ -216,7 +214,7 @@ Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
     case LogCommand:
         return Constants::FILELOG_ID;
     default:
-        return Core::Id();
+        return Utils::Id();
     }
 }
 
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 4b3c2acc42..801d5c81f5 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -56,7 +56,7 @@ public:
     void view(const QString &source, const QString &id,
               const QStringList &extraOptions = QStringList()) override;
 
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const override;
     QString vcsCommandString(VcsCommandTag cmd) const override;
     Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override;
     QStringList revisionSpec(const QString &revision) const override;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 1b0b43d21f..0b58feaca2 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -44,7 +44,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
@@ -147,7 +146,7 @@ public:
     BazaarPluginPrivate();
 
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -840,9 +839,9 @@ QString BazaarPluginPrivate::displayName() const
     return tr("Bazaar");
 }
 
-Core::Id BazaarPluginPrivate::id() const
+Utils::Id BazaarPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_BAZAAR);
+    return Utils::Id(VcsBase::Constants::VCS_ID_BAZAAR);
 }
 
 bool BazaarPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 5d15dd6288..6ace310acb 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -46,12 +46,12 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/id.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/find/ifindsupport.h>
 #include <coreplugin/idocument.h>
 #include <extensionsystem/pluginmanager.h>
+
 #include <utils/reloadpromptutils.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 911702cc1d..4ac250d0a8 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -48,6 +48,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 using namespace Bookmarks::Constants;
 
diff --git a/src/plugins/boot2qt/device-detection/devicedetector.cpp b/src/plugins/boot2qt/device-detection/devicedetector.cpp
index 89dbb60e2f..931ffe24b7 100644
--- a/src/plugins/boot2qt/device-detection/devicedetector.cpp
+++ b/src/plugins/boot2qt/device-detection/devicedetector.cpp
@@ -95,7 +95,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
         return;
     }
 
-    const Core::Id deviceId = Constants::QdbHardwareDevicePrefix.withSuffix(':' + serial);
+    const Utils::Id deviceId = Constants::QdbHardwareDevicePrefix.withSuffix(':' + serial);
     const auto messagePrefix = tr("Device \"%1\" %2").arg(serial);
     DeviceManager * const dm = DeviceManager::instance();
 
diff --git a/src/plugins/boot2qt/qdbconstants.h b/src/plugins/boot2qt/qdbconstants.h
index 3ea41608e9..6c37c1ac8b 100644
--- a/src/plugins/boot2qt/qdbconstants.h
+++ b/src/plugins/boot2qt/qdbconstants.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 namespace Qdb {
 namespace Constants {
@@ -37,7 +37,7 @@ const char QdbDeployConfigurationId[] = "Qt4ProjectManager.Qdb.QdbDeployConfigur
 const char QdbStopApplicationStepId[] = "Qdb.StopApplicationStep";
 const char QdbMakeDefaultAppStepId[] = "Qdb.MakeDefaultAppStep";
 
-const Core::Id QdbHardwareDevicePrefix = "QdbHardwareDevice";
+const Utils::Id QdbHardwareDevicePrefix = "QdbHardwareDevice";
 const char AppcontrollerFilepath[] = "/usr/bin/appcontroller";
 
 } // namespace Constants
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 5f424234cd..02b262f8c5 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -264,7 +264,7 @@ public:
         QdbDevice::Ptr device = QdbDevice::create();
 
         device->setDisplayName(settingsPage.deviceName());
-        device->setupId(ProjectExplorer::IDevice::ManuallyAdded, Core::Id());
+        device->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
         device->setType(Constants::QdbLinuxOsType);
         device->setMachineType(ProjectExplorer::IDevice::Hardware);
 
diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
index 8cb4ab2bdf..c43fa0970c 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -42,12 +42,12 @@ class QdbMakeDefaultAppStep final : public RemoteLinux::AbstractRemoteLinuxDeplo
     Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbMakeDefaultAppStep)
 
 public:
-    QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id);
+    QdbMakeDefaultAppStep(BuildStepList *bsl, Utils::Id id);
 
     static QString stepDisplayName() { return tr("Change default application"); }
 };
 
-QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id)
+QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Utils::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     setDefaultDisplayName(stepDisplayName());
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index a3cb3a695f..449b7a8db2 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -155,7 +155,7 @@ template <class Step>
 class QdbDeployStepFactory : public ProjectExplorer::BuildStepFactory
 {
 public:
-    explicit QdbDeployStepFactory(Core::Id id)
+    explicit QdbDeployStepFactory(Utils::Id id)
     {
         registerStep<Step>(id);
         setDisplayName(Step::displayName());
@@ -183,7 +183,7 @@ public:
     QdbDeployStepFactory<RemoteLinux::MakeInstallStep>
         m_makeInstallStepFactory{RemoteLinux::Constants::MakeInstallStepId};
 
-    const QList<Core::Id> supportedRunConfigs {
+    const QList<Utils::Id> supportedRunConfigs {
         m_runConfigFactory.runConfigurationId(),
         "QmlProjectManager.QmlRunConfiguration"
     };
diff --git a/src/plugins/boot2qt/qdbqtversion.cpp b/src/plugins/boot2qt/qdbqtversion.cpp
index ea62199106..a621585e3a 100644
--- a/src/plugins/boot2qt/qdbqtversion.cpp
+++ b/src/plugins/boot2qt/qdbqtversion.cpp
@@ -27,8 +27,6 @@
 
 #include "qdbconstants.h"
 
-#include <coreplugin/id.h>
-
 namespace Qdb {
 namespace Internal {
 
@@ -37,9 +35,9 @@ QString QdbQtVersion::description() const
     return QCoreApplication::translate("QtVersion", "Boot2Qt", "Qt version is used for Boot2Qt development");
 }
 
-QSet<Core::Id> QdbQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> QdbQtVersion::targetDeviceTypes() const
 {
-    return {Core::Id(Constants::QdbLinuxOsType)};
+    return {Utils::Id(Constants::QdbLinuxOsType)};
 
 }
 
diff --git a/src/plugins/boot2qt/qdbqtversion.h b/src/plugins/boot2qt/qdbqtversion.h
index ac95a70701..d34a262982 100644
--- a/src/plugins/boot2qt/qdbqtversion.h
+++ b/src/plugins/boot2qt/qdbqtversion.h
@@ -37,7 +37,7 @@ public:
     ~QdbQtVersion() = default;
 
     QString description() const final;
-    QSet<Core::Id> targetDeviceTypes() const final;
+    QSet<Utils::Id> targetDeviceTypes() const final;
 };
 
 } // namespace Internal
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index dbeb9e9e15..e47460e8f4 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -77,14 +77,14 @@ class QdbRunConfiguration : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbRunConfiguration);
 
 public:
-    QdbRunConfiguration(Target *target, Core::Id id);
+    QdbRunConfiguration(Target *target, Utils::Id id);
 
 private:
     Tasks checkForIssues() const override;
     QString defaultDisplayName() const;
 };
 
-QdbRunConfiguration::QdbRunConfiguration(Target *target, Core::Id id)
+QdbRunConfiguration::QdbRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
index a6a329666e..1dbccac1a0 100644
--- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp
+++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp
@@ -42,12 +42,12 @@ class QdbStopApplicationStep final : public RemoteLinux::AbstractRemoteLinuxDepl
     Q_DECLARE_TR_FUNCTIONS(Qdb::Internal::QdbStopApplicationStep)
 
 public:
-    QdbStopApplicationStep(BuildStepList *bsl, Core::Id id);
+    QdbStopApplicationStep(BuildStepList *bsl, Utils::Id id);
 
     static QString stepDisplayName() { return tr("Stop already running application"); }
 };
 
-QdbStopApplicationStep::QdbStopApplicationStep(BuildStepList *bsl, Core::Id id)
+QdbStopApplicationStep::QdbStopApplicationStep(BuildStepList *bsl, Utils::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<QdbStopApplicationService>();
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 718b0dad28..ad7d3e53c0 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -180,7 +180,7 @@ void ClangEditorDocumentProcessor::clearProjectPart()
     m_projectPart.clear();
 }
 
-Core::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
+::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
 {
     return m_diagnosticConfigId;
 }
@@ -451,7 +451,7 @@ public:
     }
 
     const QStringList &options() const { return m_options; }
-    const Core::Id &diagnosticConfigId() const { return m_diagnosticConfigId; }
+    const ::Utils::Id &diagnosticConfigId() const { return m_diagnosticConfigId; }
     CppTools::UseBuildSystemWarnings useBuildSystemWarnings() const
     {
         return m_useBuildSystemWarnings;
@@ -479,7 +479,7 @@ private:
         if (m_projectPart.project) {
             ClangProjectSettings &projectSettings = getProjectSettings(m_projectPart.project);
             if (!projectSettings.useGlobalConfig()) {
-                const Core::Id warningConfigId = projectSettings.warningConfigId();
+                const ::Utils::Id warningConfigId = projectSettings.warningConfigId();
                 const CppTools::ClangDiagnosticConfigsModel configsModel
                     = CppTools::diagnosticConfigsModel();
                 if (configsModel.hasConfigWithId(warningConfigId)) {
@@ -538,7 +538,7 @@ private:
     const QString &m_filePath;
     const CppTools::ProjectPart &m_projectPart;
 
-    Core::Id m_diagnosticConfigId;
+    ::Utils::Id m_diagnosticConfigId;
     CppTools::UseBuildSystemWarnings m_useBuildSystemWarnings = CppTools::UseBuildSystemWarnings::No;
     CppTools::CompilerOptionsBuilder m_builder;
     bool m_isClMode = false;
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index 8e0ee003d3..36ef30b8da 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -28,10 +28,11 @@
 #include "clangdiagnosticmanager.h"
 #include "clangeditordocumentparser.h"
 
-#include <coreplugin/id.h>
 #include <cpptools/builtineditordocumentprocessor.h>
 #include <cpptools/semantichighlighter.h>
 
+#include <utils/id.h>
+
 #include <QFutureWatcher>
 #include <QTimer>
 
@@ -68,7 +69,7 @@ public:
     CppTools::ProjectPart::Ptr projectPart() const;
     void clearProjectPart();
 
-    Core::Id diagnosticConfigId() const;
+    ::Utils::Id diagnosticConfigId() const;
 
     void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
                             const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic,
@@ -134,7 +135,7 @@ private:
     BackendCommunicator &m_communicator;
     QSharedPointer<ClangEditorDocumentParser> m_parser;
     CppTools::ProjectPart::Ptr m_projectPart;
-    Core::Id m_diagnosticConfigId;
+    ::Utils::Id m_diagnosticConfigId;
     bool m_isProjectFile = false;
     QFutureWatcher<void> m_parserWatcher;
     QTimer m_updateBackendDocumentTimer;
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index aed9bcaadb..931ed8ad34 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -425,14 +425,14 @@ void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectP
 }
 
 static ClangEditorDocumentProcessors clangProcessorsWithDiagnosticConfig(
-    const QVector<Core::Id> &configIds)
+    const QVector<::Utils::Id> &configIds)
 {
     return ::Utils::filtered(clangProcessors(), [configIds](ClangEditorDocumentProcessor *p) {
         return configIds.contains(p->diagnosticConfigId());
     });
 }
 
-void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds)
+void ClangModelManagerSupport::onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds)
 {
     updateProcessors(clangProcessorsWithDiagnosticConfig(configIds));
 }
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index f7ac464f4a..58426a941d 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -30,8 +30,9 @@
 
 #include <cpptools/cppmodelmanagersupport.h>
 
+#include <utils/id.h>
+
 #include <QObject>
-#include <QScopedPointer>
 
 #include <memory>
 
@@ -40,9 +41,6 @@ class QMenu;
 class QWidget;
 QT_END_NAMESPACE
 
-namespace Core {
-class IDocument;
-} // namespace Core
 namespace TextEditor { class TextEditorWidget; }
 namespace CppTools {
 class FollowSymbolInterface;
@@ -108,7 +106,7 @@ private:
     void onProjectPartsUpdated(ProjectExplorer::Project *project);
     void onProjectPartsRemoved(const QStringList &projectPartIds);
 
-    void onDiagnosticConfigsInvalidated(const QVector<Core::Id> &configIds);
+    void onDiagnosticConfigsInvalidated(const QVector<::Utils::Id> &configIds);
 
     void reinitializeBackendDocuments(const QStringList &projectPartIds);
 
diff --git a/src/plugins/clangcodemodel/clangprojectsettings.cpp b/src/plugins/clangcodemodel/clangprojectsettings.cpp
index c081203669..2d1019a057 100644
--- a/src/plugins/clangcodemodel/clangprojectsettings.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettings.cpp
@@ -51,9 +51,9 @@ static bool useGlobalConfigFromSettings(ProjectExplorer::Project *project)
     return useGlobalConfigVariant.isValid() ? useGlobalConfigVariant.toBool() : true;
 }
 
-static Core::Id warningConfigIdFromSettings(ProjectExplorer::Project *project)
+static Utils::Id warningConfigIdFromSettings(ProjectExplorer::Project *project)
 {
-    return Core::Id::fromSetting(project->namedSettings(warningConfigIdKey()));
+    return Utils::Id::fromSetting(project->namedSettings(warningConfigIdKey()));
 }
 
 static QStringList customCommandLineFromSettings(ProjectExplorer::Project *project)
@@ -75,7 +75,7 @@ ClangProjectSettings::ClangProjectSettings(ProjectExplorer::Project *project)
             this, &ClangProjectSettings::store);
 }
 
-Core::Id ClangProjectSettings::warningConfigId() const
+Utils::Id ClangProjectSettings::warningConfigId() const
 {
     const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel();
     if (!model.hasConfigWithId(m_warningConfigId))
@@ -83,7 +83,7 @@ Core::Id ClangProjectSettings::warningConfigId() const
     return m_warningConfigId;
 }
 
-void ClangProjectSettings::setWarningConfigId(const Core::Id &customConfigId)
+void ClangProjectSettings::setWarningConfigId(const Utils::Id &customConfigId)
 {
     m_warningConfigId = customConfigId;
 }
diff --git a/src/plugins/clangcodemodel/clangprojectsettings.h b/src/plugins/clangcodemodel/clangprojectsettings.h
index 0b591b6ccb..511ac60875 100644
--- a/src/plugins/clangcodemodel/clangprojectsettings.h
+++ b/src/plugins/clangcodemodel/clangprojectsettings.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <projectexplorer/project.h>
 
+#include <utils/id.h>
+
 #include <QObject>
 #include <QString>
 
@@ -48,8 +49,8 @@ public:
     bool useGlobalConfig() const;
     void setUseGlobalConfig(bool useGlobalConfig);
 
-    Core::Id warningConfigId() const;
-    void setWarningConfigId(const Core::Id &warningConfigId);
+    ::Utils::Id warningConfigId() const;
+    void setWarningConfigId(const ::Utils::Id &warningConfigId);
 
     QStringList commandLineOptions() const;
     void setCommandLineOptions(const QStringList &options);
@@ -65,7 +66,7 @@ signals:
 private:
     ProjectExplorer::Project *m_project;
     bool m_useGlobalConfig = true;
-    Core::Id m_warningConfigId;
+    ::Utils::Id m_warningConfigId;
 
     QStringList m_customCommandLineOptions;
 };
diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
index e5187defbe..26aa264b9b 100644
--- a/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.cpp
@@ -41,7 +41,7 @@
 namespace ClangCodeModel {
 namespace Internal {
 
-static Core::Id configIdForProject(ClangProjectSettings &projectSettings)
+static Utils::Id configIdForProject(ClangProjectSettings &projectSettings)
 {
     if (projectSettings.useGlobalConfig())
         return CppTools::codeModelSettings()->clangDiagnosticConfigId();
@@ -67,7 +67,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
             this,
             [this]() {
                 // Save project's config id
-                const Core::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget
+                const Utils::Id currentConfigId = m_ui.clangDiagnosticConfigsSelectionWidget
                                                      ->currentConfigId();
                 m_projectSettings.setWarningConfigId(currentConfigId);
 
@@ -150,7 +150,7 @@ void ClangProjectSettingsWidget::syncOtherWidgetsToComboBox()
         ->refresh(CppTools::diagnosticConfigsModel(),
                   configIdForProject(m_projectSettings),
                   [](const CppTools::ClangDiagnosticConfigs &configs,
-                     const Core::Id &configToSelect) {
+                     const Utils::Id &configToSelect) {
                       return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
                   });
 }
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 8a8639802d..15e11ce669 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -71,7 +71,7 @@ bool isWarningOrNote(ClangBackEnd::DiagnosticSeverity severity)
     Q_UNREACHABLE();
 }
 
-static Core::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity)
+static ::Utils::Id categoryForSeverity(ClangBackEnd::DiagnosticSeverity severity)
 {
     return isWarningOrNote(severity) ? Constants::CLANG_WARNING : Constants::CLANG_ERROR;
 }
@@ -134,7 +134,7 @@ ClangDiagnosticConfig diagnosticConfig(const ClangProjectSettings &projectSettin
     QTC_ASSERT(project, return {});
 
     // Get config id
-    Core::Id currentConfigId = projectSettings.warningConfigId();
+    ::Utils::Id currentConfigId = projectSettings.warningConfigId();
     if (projectSettings.useGlobalConfig())
         currentConfigId = globalSettings.clangDiagnosticConfigId();
 
diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h
index e8c21bbcf6..74fd84c9c6 100644
--- a/src/plugins/clangformat/clangformatutils.h
+++ b/src/plugins/clangformat/clangformatutils.h
@@ -25,8 +25,9 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
+
 #include <clang/Format/Format.h>
 
 #include <QFile>
diff --git a/src/plugins/clangrefactoring/locatorfilter.h b/src/plugins/clangrefactoring/locatorfilter.h
index 15eaf93f0e..08560ce049 100644
--- a/src/plugins/clangrefactoring/locatorfilter.h
+++ b/src/plugins/clangrefactoring/locatorfilter.h
@@ -39,7 +39,7 @@ public:
     LocatorFilter(SymbolQueryInterface &symbolQuery,
                   EditorManagerInterface &editorManager,
                   ClangBackEnd::SymbolKinds &&symbolKinds,
-                  Core::Id id,
+                  Utils::Id id,
                   const QString &displayName,
                   const QString &shortCut,
                   bool includedByDefault=false)
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 3eefa29732..49f389b4f2 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -376,7 +376,7 @@ static RunSettings runSettings()
     return ClangToolsSettings::instance()->runSettings();
 }
 
-static ClangDiagnosticConfig diagnosticConfig(const Core::Id &diagConfigId)
+static ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId)
 {
     const ClangDiagnosticConfigsModel configs = diagnosticConfigsModel();
     QTC_ASSERT(configs.hasConfigWithId(diagConfigId), return ClangDiagnosticConfig());
@@ -879,8 +879,8 @@ void ClangTool::reset()
 static bool canAnalyzeProject(Project *project)
 {
     if (const Target *target = project->activeTarget()) {
-        const Core::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID;
-        const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
+        const Utils::Id c = ProjectExplorer::Constants::C_LANGUAGE_ID;
+        const Utils::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
         const bool projectSupportsLanguage = project->projectLanguages().contains(c)
                                              || project->projectLanguages().contains(cxx);
         return projectSupportsLanguage
diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index f497413247..97f667a01a 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -116,7 +116,7 @@ private:
     CppTools::ProjectInfo m_projectInfoBeforeBuild;
     CppTools::ProjectInfo m_projectInfo;
     QString m_targetTriple;
-    Core::Id m_toolChainType;
+    Utils::Id m_toolChainType;
 
     QFutureInterface<void> m_progress;
     QueueItems m_queue;
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index fdb113f7e3..6cf881c159 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -382,7 +382,7 @@ static TextEditor::TextMark *generateDiagnosticTextMark(const Diagnostic &diag)
 {
     auto mark = new TextEditor::TextMark(Utils::FilePath::fromString(diag.location.filePath),
                                          diag.location.line,
-                                         Core::Id("ClangTool.DiagnosticMark"));
+                                         Utils::Id("ClangTool.DiagnosticMark"));
     if (diag.type == "error" || diag.type == "fatal")
         mark->setColor(Utils::Theme::CodeModel_Error_TextMarkColor);
     else
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h
index 1b872c3c31..aa6c035395 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.h
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.h
@@ -27,7 +27,6 @@
 
 #include "clangtoolssettings.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/project.h>
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index ad704728ac..ec76cdd729 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -50,7 +50,7 @@ using namespace CppTools;
 namespace ClangTools {
 namespace Internal {
 
-static Core::Id defaultDiagnosticId()
+static Utils::Id defaultDiagnosticId()
 {
     return ClangTools::Constants::DIAG_CONFIG_TIDY_AND_CLAZY;
 }
@@ -63,7 +63,7 @@ RunSettings::RunSettings()
 
 void RunSettings::fromMap(const QVariantMap &map, const QString &prefix)
 {
-    m_diagnosticConfigId = Core::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
+    m_diagnosticConfigId = Utils::Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
     m_parallelJobs = map.value(prefix + parallelJobsKey).toInt();
     m_buildBeforeAnalysis = map.value(prefix + buildBeforeAnalysisKey).toBool();
 }
@@ -75,7 +75,7 @@ void RunSettings::toMap(QVariantMap &map, const QString &prefix) const
     map.insert(prefix + buildBeforeAnalysisKey, m_buildBeforeAnalysis);
 }
 
-Core::Id RunSettings::diagnosticConfigId() const
+Utils::Id RunSettings::diagnosticConfigId() const
 {
     if (!diagnosticConfigsModel().hasConfigWithId(m_diagnosticConfigId))
         return defaultDiagnosticId();
diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h
index fd7022ba6c..21b62e02a4 100644
--- a/src/plugins/clangtools/clangtoolssettings.h
+++ b/src/plugins/clangtools/clangtoolssettings.h
@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <cpptools/clangdiagnosticconfig.h>
 
+#include <utils/id.h>
+
 #include <QObject>
 #include <QString>
 
@@ -44,8 +45,8 @@ public:
     void fromMap(const QVariantMap &map, const QString &prefix = QString());
     void toMap(QVariantMap &map, const QString &prefix = QString()) const;
 
-    Core::Id diagnosticConfigId() const;
-    void setDiagnosticConfigId(const Core::Id &id) { m_diagnosticConfigId = id; }
+    Utils::Id diagnosticConfigId() const;
+    void setDiagnosticConfigId(const Utils::Id &id) { m_diagnosticConfigId = id; }
 
     bool buildBeforeAnalysis() const { return m_buildBeforeAnalysis; }
     void setBuildBeforeAnalysis(bool yesno) { m_buildBeforeAnalysis = yesno; }
@@ -54,7 +55,7 @@ public:
     void setParallelJobs(int jobs) { m_parallelJobs = jobs; }
 
 private:
-    Core::Id m_diagnosticConfigId;
+    Utils::Id m_diagnosticConfigId;
     int m_parallelJobs = -1;
     bool m_buildBeforeAnalysis = true;
 };
diff --git a/src/plugins/clangtools/clangtoolsutils.h b/src/plugins/clangtools/clangtoolsutils.h
index 751304ebc8..a9a1e3ce93 100644
--- a/src/plugins/clangtools/clangtoolsutils.h
+++ b/src/plugins/clangtools/clangtoolsutils.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <cpptools/clangdiagnosticconfig.h>
 
 #include <QtGlobal>
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp
index e70fcd72ce..9e12f89a02 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.cpp
+++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp
@@ -694,7 +694,7 @@ static void setupTreeView(QTreeView *view, QAbstractItemModel *model, int expand
 }
 
 DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
-                                                 const Core::Id &configToSelect,
+                                                 const Utils::Id &configToSelect,
                                                  const ClangTidyInfo &tidyInfo,
                                                  const ClazyStandaloneInfo &clazyInfo)
     : ClangDiagnosticConfigsWidget(configs, configToSelect)
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.h b/src/plugins/clangtools/diagnosticconfigswidget.h
index fcbaeef844..251fdd0f47 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.h
+++ b/src/plugins/clangtools/diagnosticconfigswidget.h
@@ -50,7 +50,7 @@ class DiagnosticConfigsWidget : public CppTools::ClangDiagnosticConfigsWidget
 
 public:
     DiagnosticConfigsWidget(const CppTools::ClangDiagnosticConfigs &configs,
-                            const Core::Id &configToSelect,
+                            const Utils::Id &configToSelect,
                             const ClangTidyInfo &tidyInfo,
                             const ClazyStandaloneInfo &clazyInfo);
     ~DiagnosticConfigsWidget();
diff --git a/src/plugins/clangtools/runsettingswidget.cpp b/src/plugins/clangtools/runsettingswidget.cpp
index 336f9d772b..76fc820373 100644
--- a/src/plugins/clangtools/runsettingswidget.cpp
+++ b/src/plugins/clangtools/runsettingswidget.cpp
@@ -57,7 +57,7 @@ CppTools::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSe
 }
 
 static CppTools::ClangDiagnosticConfigsWidget *createEditWidget(
-    const CppTools::ClangDiagnosticConfigs &configs, const Core::Id &configToSelect)
+    const CppTools::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
 {
     // Determine executable paths
     QString clangTidyPath;
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index 1910cf419c..ca616f86ee 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -45,6 +45,7 @@
 #include <QMutexLocker>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ClassView {
 namespace Internal {
diff --git a/src/plugins/classview/classviewmanager.h b/src/plugins/classview/classviewmanager.h
index 63158d459d..e634e6d24d 100644
--- a/src/plugins/classview/classviewmanager.h
+++ b/src/plugins/classview/classviewmanager.h
@@ -29,9 +29,10 @@
 #include <QSharedPointer>
 #include <QStandardItem>
 
-#include <coreplugin/id.h>
 #include <cplusplus/CppDocument.h>
 
+#include <utils/id.h>
+
 namespace ClassView {
 namespace Internal {
 
@@ -87,8 +88,8 @@ protected:
     void onStateChanged(bool state);
     void onProjectListChanged();
     void onDocumentUpdated(CPlusPlus::Document::Ptr doc);
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
+    void onTaskStarted(Utils::Id type);
+    void onAllTasksFinished(Utils::Id type);
     void onTreeDataUpdate(QSharedPointer<QStandardItem> result);
 
 protected:
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index e5996f2e13..a0471b6777 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -181,7 +181,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -280,7 +280,7 @@ private:
     void updateIndex();
     void updateView();
     void projectChanged(ProjectExplorer::Project *project);
-    void tasksFinished(Core::Id type);
+    void tasksFinished(Utils::Id type);
     void closing();
 
     inline bool isCheckInEditorOpen() const;
@@ -1682,7 +1682,7 @@ ClearCasePluginPrivate::runCleartool(const QString &workingDir,
 }
 
 IEditor *ClearCasePluginPrivate::showOutputInEditor(const QString& title, const QString &output,
-                                                   Core::Id id, const QString &source,
+                                                   Utils::Id id, const QString &source,
                                                    QTextCodec *codec) const
 {
     if (Constants::debug)
@@ -2393,7 +2393,7 @@ QString ClearCasePluginPrivate::displayName() const
     return QLatin1String("ClearCase");
 }
 
-Core::Id ClearCasePluginPrivate::id() const
+Utils::Id ClearCasePluginPrivate::id() const
 {
     return Constants::VCS_ID_CLEARCASE;
 }
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h
index 5074a62fba..05da7f126a 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.h
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.h
@@ -57,7 +57,7 @@ public:
 
     Utils::Environment environment;
 
-    Core::Id cmakeToolId;
+    Utils::Id cmakeToolId;
 
     QStringList initialCMakeArguments;
     QStringList extraCMakeArguments;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index d8d726eef8..84312316a3 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -98,7 +98,7 @@ static QStringList defaultInitialCMakeArguments(const Kit *k, const QString buil
 // CMakeBuildConfiguration:
 // -----------------------------------------------------------------------------
 
-CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Core::Id id)
+CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     m_buildSystem = new CMakeBuildSystem(this);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 24a3ca1d43..32a1b7278a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -44,7 +44,7 @@ class CMakeBuildConfiguration final : public ProjectExplorer::BuildConfiguration
     Q_OBJECT
 
     friend class ProjectExplorer::BuildConfigurationFactory;
-    CMakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    CMakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
     ~CMakeBuildConfiguration() final;
 
 public:
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index fdc849ae69..0f99ad4fce 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -85,7 +85,7 @@ static bool isCurrentExecutableTarget(const QString &target)
     return target == ADD_RUNCONFIGURATION_TEXT;
 }
 
-CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Core::Id id) :
+CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
     AbstractProcessStep(bsl, id)
 {
     m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]");
@@ -268,7 +268,7 @@ QString CMakeBuildStep::defaultBuildTarget() const
 {
     const BuildStepList *const bsl = stepList();
     QTC_ASSERT(bsl, return {});
-    const Core::Id parentId = bsl->id();
+    const Utils::Id parentId = bsl->id();
     if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
         return cleanTarget();
     if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index ce9a574397..ffab03c180 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -43,7 +43,7 @@ class CMakeBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class CMakeBuildStepFactory;
 
 public:
-    CMakeBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    CMakeBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
     CMakeBuildConfiguration *cmakeBuildConfiguration() const;
 
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 86c9f8114b..eeae05f921 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -66,10 +66,10 @@ namespace CMakeProjectManager {
 // CMakeKitAspect:
 // --------------------------------------------------------------------
 
-static Core::Id defaultCMakeToolId()
+static Utils::Id defaultCMakeToolId()
 {
     CMakeTool *defaultTool = CMakeToolManager::defaultCMakeTool();
-    return defaultTool ? defaultTool->id() : Core::Id();
+    return defaultTool ? defaultTool->id() : Utils::Id();
 }
 
 static const char TOOL_ID[] = "CMakeProjectManager.CMakeKitInformation";
@@ -125,10 +125,10 @@ private:
         m_comboBox->setCurrentIndex(tool ? indexOf(tool->id()) : -1);
     }
 
-    int indexOf(const Core::Id &id)
+    int indexOf(const Utils::Id &id)
     {
         for (int i = 0; i < m_comboBox->count(); ++i) {
-            if (id == Core::Id::fromSetting(m_comboBox->itemData(i)))
+            if (id == Utils::Id::fromSetting(m_comboBox->itemData(i)))
                 return i;
         }
         return -1;
@@ -137,20 +137,20 @@ private:
     void updateComboBox()
     {
         // remove unavailable cmake tool:
-        int pos = indexOf(Core::Id());
+        int pos = indexOf(Utils::Id());
         if (pos >= 0)
             m_comboBox->removeItem(pos);
 
         if (m_comboBox->count() == 0) {
             m_comboBox->addItem(tr("<No CMake Tool available>"),
-                                Core::Id().toSetting());
+                                Utils::Id().toSetting());
             m_comboBox->setEnabled(false);
         } else {
             m_comboBox->setEnabled(true);
         }
     }
 
-    void cmakeToolAdded(const Core::Id &id)
+    void cmakeToolAdded(const Utils::Id &id)
     {
         const CMakeTool *tool = CMakeToolManager::findById(id);
         QTC_ASSERT(tool, return);
@@ -160,7 +160,7 @@ private:
         refresh();
     }
 
-    void cmakeToolUpdated(const Core::Id &id)
+    void cmakeToolUpdated(const Utils::Id &id)
     {
         const int pos = indexOf(id);
         QTC_ASSERT(pos >= 0, return);
@@ -171,7 +171,7 @@ private:
         m_comboBox->setItemText(pos, tool->displayName());
     }
 
-    void cmakeToolRemoved(const Core::Id &id)
+    void cmakeToolRemoved(const Utils::Id &id)
     {
         const int pos = indexOf(id);
         QTC_ASSERT(pos >= 0, return);
@@ -191,7 +191,7 @@ private:
         if (m_removingItem)
             return;
 
-        const Core::Id id = Core::Id::fromSetting(m_comboBox->itemData(index));
+        const Utils::Id id = Utils::Id::fromSetting(m_comboBox->itemData(index));
         CMakeKitAspect::setCMakeTool(m_kit, id);
     }
 
@@ -223,16 +223,16 @@ CMakeKitAspect::CMakeKitAspect()
             [this]() { foreach (Kit *k, KitManager::kits()) fix(k); });
 }
 
-Core::Id CMakeKitAspect::id()
+Utils::Id CMakeKitAspect::id()
 {
     return TOOL_ID;
 }
 
-Core::Id CMakeKitAspect::cmakeToolId(const Kit *k)
+Utils::Id CMakeKitAspect::cmakeToolId(const Kit *k)
 {
     if (!k)
         return {};
-    return Core::Id::fromSetting(k->value(TOOL_ID));
+    return Utils::Id::fromSetting(k->value(TOOL_ID));
 }
 
 CMakeTool *CMakeKitAspect::cmakeTool(const Kit *k)
@@ -240,9 +240,9 @@ CMakeTool *CMakeKitAspect::cmakeTool(const Kit *k)
     return CMakeToolManager::findById(cmakeToolId(k));
 }
 
-void CMakeKitAspect::setCMakeTool(Kit *k, const Core::Id id)
+void CMakeKitAspect::setCMakeTool(Kit *k, const Utils::Id id)
 {
-    const Core::Id toSet = id.isValid() ? id : defaultCMakeToolId();
+    const Utils::Id toSet = id.isValid() ? id : defaultCMakeToolId();
     QTC_ASSERT(!id.isValid() || CMakeToolManager::findById(toSet), return);
     if (k)
         k->setValue(TOOL_ID, toSet.toSetting());
@@ -298,7 +298,7 @@ void CMakeKitAspect::addToMacroExpander(Kit *k, Utils::MacroExpander *expander)
     });
 }
 
-QSet<Core::Id> CMakeKitAspect::availableFeatures(const Kit *k) const
+QSet<Utils::Id> CMakeKitAspect::availableFeatures(const Kit *k) const
 {
     if (cmakeTool(k))
         return { CMakeProjectManager::Constants::CMAKE_FEATURE_ID };
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h
index fd6af308cf..8edfba91e6 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h
@@ -40,11 +40,11 @@ class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
 public:
     CMakeKitAspect();
 
-    static Core::Id id();
+    static Utils::Id id();
 
-    static Core::Id cmakeToolId(const ProjectExplorer::Kit *k);
+    static Utils::Id cmakeToolId(const ProjectExplorer::Kit *k);
     static CMakeTool *cmakeTool(const ProjectExplorer::Kit *k);
-    static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id);
+    static void setCMakeTool(ProjectExplorer::Kit *k, const Utils::Id id);
 
     // KitAspect interface
     ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const final;
@@ -55,7 +55,7 @@ public:
 
     void addToMacroExpander(ProjectExplorer::Kit *k, Utils::MacroExpander *expander) const final;
 
-    QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
+    QSet<Utils::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
 };
 
 class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index a288cadbd6..de40ecbd2d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -217,13 +217,13 @@ static QVector<ToolChainDescription> extractToolChainsFromCache(const CMakeConfi
         if (!i.key.startsWith("CMAKE_") || !i.key.endsWith("_COMPILER"))
             continue;
         const QByteArray language = i.key.mid(6, i.key.count() - 6 - 9); // skip "CMAKE_" and "_COMPILER"
-        Core::Id languageId;
+        Utils::Id languageId;
         if (language == "CXX")
             languageId = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
         else  if (language == "C")
             languageId = ProjectExplorer::Constants::C_LANGUAGE_ID;
         else
-            languageId = Core::Id::fromName(language);
+            languageId = Utils::Id::fromName(language);
         result.append({Utils::FilePath::fromUtf8(i.value), languageId});
     }
     return result;
@@ -380,8 +380,8 @@ void CMakeProjectImporter::cleanupTemporaryCMake(Kit *k, const QVariantList &vl)
     if (vl.isEmpty())
         return; // No temporary CMake
     QTC_ASSERT(vl.count() == 1, return);
-    CMakeKitAspect::setCMakeTool(k, Core::Id()); // Always mark Kit as not using this Qt
-    CMakeToolManager::deregisterCMakeTool(Core::Id::fromSetting(vl.at(0)));
+    CMakeKitAspect::setCMakeTool(k, Utils::Id()); // Always mark Kit as not using this Qt
+    CMakeToolManager::deregisterCMakeTool(Utils::Id::fromSetting(vl.at(0)));
     qCDebug(cmInputLog) << "Temporary CMake tool cleaned up.";
 }
 
@@ -391,7 +391,7 @@ void CMakeProjectImporter::persistTemporaryCMake(Kit *k, const QVariantList &vl)
         return; // No temporary CMake
     QTC_ASSERT(vl.count() == 1, return);
     const QVariant data = vl.at(0);
-    CMakeTool *tmpCmake = CMakeToolManager::findById(Core::Id::fromSetting(data));
+    CMakeTool *tmpCmake = CMakeToolManager::findById(Utils::Id::fromSetting(data));
     CMakeTool *actualCmake = CMakeKitAspect::cmakeTool(k);
 
     // User changed Kit away from temporary CMake that was set up:
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 6f130f2b1a..1b487a5a6c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -109,7 +109,7 @@ void CMakeTargetNode::setBuildDirectory(const Utils::FilePath &directory)
     m_buildDirectory = directory;
 }
 
-QVariant CMakeTargetNode::data(Core::Id role) const
+QVariant CMakeTargetNode::data(Utils::Id role) const
 {
     auto value = [this](const QByteArray &key) -> QVariant {
         for (const CMakeConfigItem &configItem : m_config) {
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
index 5698f00c9c..34dc5f1e95 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
@@ -71,7 +71,7 @@ public:
 
     void build() override;
 
-    QVariant data(Core::Id role) const override;
+    QVariant data(Utils::Id role) const override;
     void setConfig(const CMakeConfig &config);
 
 private:
diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index d1009d2a16..61e3dba76f 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -71,7 +71,7 @@ class CMakeToolItemModel : public TreeModel<TreeItem, TreeItem, CMakeToolTreeIte
 public:
     CMakeToolItemModel();
 
-    CMakeToolTreeItem *cmakeToolItem(const Core::Id &id) const;
+    CMakeToolTreeItem *cmakeToolItem(const Utils::Id &id) const;
     CMakeToolTreeItem *cmakeToolItem(const QModelIndex &index) const;
     QModelIndex addCMakeTool(const QString &name,
                              const FilePath &executable,
@@ -83,22 +83,22 @@ public:
     TreeItem *autoGroupItem() const;
     TreeItem *manualGroupItem() const;
     void reevaluateChangedFlag(CMakeToolTreeItem *item) const;
-    void updateCMakeTool(const Core::Id &id,
+    void updateCMakeTool(const Utils::Id &id,
                          const QString &displayName,
                          const FilePath &executable,
                          const FilePath &qchFile,
                          bool autoRun,
                          bool autoCreate);
-    void removeCMakeTool(const Core::Id &id);
+    void removeCMakeTool(const Utils::Id &id);
     void apply();
 
-    Core::Id defaultItemId() const;
-    void setDefaultItemId(const Core::Id &id);
+    Utils::Id defaultItemId() const;
+    void setDefaultItemId(const Utils::Id &id);
 
     QString uniqueDisplayName(const QString &base) const;
 private:
-    Core::Id m_defaultItemId;
-    QList<Core::Id> m_removedItems;
+    Utils::Id m_defaultItemId;
+    QList<Utils::Id> m_removedItems;
 };
 
 class CMakeToolTreeItem : public TreeItem
@@ -129,7 +129,7 @@ public:
                       bool autoRun,
                       bool autoCreate,
                       bool autodetected)
-        : m_id(Core::Id::fromString(QUuid::createUuid().toString()))
+        : m_id(Utils::Id::fromString(QUuid::createUuid().toString()))
         , m_name(name)
         , m_executable(executable)
         , m_qchFile(qchFile)
@@ -213,7 +213,7 @@ public:
         return QVariant();
     }
 
-    Core::Id m_id;
+    Utils::Id m_id;
     QString m_name;
     QString m_tooltip;
     FilePath m_executable;
@@ -238,11 +238,11 @@ CMakeToolItemModel::CMakeToolItemModel()
         addCMakeTool(item, false);
 
     CMakeTool *defTool = CMakeToolManager::defaultCMakeTool();
-    m_defaultItemId = defTool ? defTool->id() : Core::Id();
+    m_defaultItemId = defTool ? defTool->id() : Utils::Id();
     connect(CMakeToolManager::instance(), &CMakeToolManager::cmakeRemoved,
             this, &CMakeToolItemModel::removeCMakeTool);
     connect(CMakeToolManager::instance(), &CMakeToolManager::cmakeAdded,
-            this, [this](const Core::Id &id) { addCMakeTool(CMakeToolManager::findById(id), false); });
+            this, [this](const Utils::Id &id) { addCMakeTool(CMakeToolManager::findById(id), false); });
 
 }
 
@@ -295,7 +295,7 @@ void CMakeToolItemModel::reevaluateChangedFlag(CMakeToolTreeItem *item) const
 
     //make sure the item is marked as changed when the default cmake was changed
     CMakeTool *origDefTool = CMakeToolManager::defaultCMakeTool();
-    Core::Id origDefault = origDefTool ? origDefTool->id() : Core::Id();
+    Utils::Id origDefault = origDefTool ? origDefTool->id() : Utils::Id();
     if (origDefault != m_defaultItemId) {
         if (item->m_id == origDefault || item->m_id == m_defaultItemId)
             item->m_changed = true;
@@ -304,7 +304,7 @@ void CMakeToolItemModel::reevaluateChangedFlag(CMakeToolTreeItem *item) const
     item->update(); // Notify views.
 }
 
-void CMakeToolItemModel::updateCMakeTool(const Core::Id &id,
+void CMakeToolItemModel::updateCMakeTool(const Utils::Id &id,
                                          const QString &displayName,
                                          const FilePath &executable,
                                          const FilePath &qchFile,
@@ -325,7 +325,7 @@ void CMakeToolItemModel::updateCMakeTool(const Core::Id &id,
     reevaluateChangedFlag(treeItem);
 }
 
-CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const Core::Id &id) const
+CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const Utils::Id &id) const
 {
     return findItemAtLevel<2>([id](CMakeToolTreeItem *n) { return n->m_id == id; });
 }
@@ -335,7 +335,7 @@ CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const QModelIndex &index) c
     return itemForIndexAtLevel<2>(index);
 }
 
-void CMakeToolItemModel::removeCMakeTool(const Core::Id &id)
+void CMakeToolItemModel::removeCMakeTool(const Utils::Id &id)
 {
     if (m_removedItems.contains(id))
         return; // Item has already been removed in the model!
@@ -349,7 +349,7 @@ void CMakeToolItemModel::removeCMakeTool(const Core::Id &id)
 
 void CMakeToolItemModel::apply()
 {
-    foreach (const Core::Id &id, m_removedItems)
+    foreach (const Utils::Id &id, m_removedItems)
         CMakeToolManager::deregisterCMakeTool(id);
 
     QList<CMakeToolTreeItem *> toRegister;
@@ -380,17 +380,17 @@ void CMakeToolItemModel::apply()
     CMakeToolManager::setDefaultCMakeTool(defaultItemId());
 }
 
-Core::Id CMakeToolItemModel::defaultItemId() const
+Utils::Id CMakeToolItemModel::defaultItemId() const
 {
     return m_defaultItemId;
 }
 
-void CMakeToolItemModel::setDefaultItemId(const Core::Id &id)
+void CMakeToolItemModel::setDefaultItemId(const Utils::Id &id)
 {
     if (m_defaultItemId == id)
         return;
 
-    Core::Id oldDefaultId = m_defaultItemId;
+    Utils::Id oldDefaultId = m_defaultItemId;
     m_defaultItemId = id;
 
     CMakeToolTreeItem *newDefault = cmakeToolItem(id);
@@ -432,7 +432,7 @@ private:
     QCheckBox *m_autoCreateBuildDirectoryCheckBox;
     PathChooser *m_binaryChooser;
     PathChooser *m_qchFileChooser;
-    Core::Id m_id;
+    Utils::Id m_id;
     bool m_loadingItem;
 };
 
@@ -503,7 +503,7 @@ void CMakeToolItemConfigWidget::updateQchFilePath()
 void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item)
 {
     m_loadingItem = true; // avoid intermediate signal handling
-    m_id = Core::Id();
+    m_id = Utils::Id();
     if (!item) {
         m_loadingItem = false;
         return;
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 90bc67fc26..865a19faac 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -109,17 +109,17 @@ public:
 ///////////////////////////
 // CMakeTool
 ///////////////////////////
-CMakeTool::CMakeTool(Detection d, const Core::Id &id)
+CMakeTool::CMakeTool(Detection d, const Utils::Id &id)
     : m_id(id)
     , m_isAutoDetected(d == AutoDetection)
     , m_introspection(std::make_unique<Internal::IntrospectionData>())
 {
-    QTC_ASSERT(m_id.isValid(), m_id = Core::Id::fromString(QUuid::createUuid().toString()));
+    QTC_ASSERT(m_id.isValid(), m_id = Utils::Id::fromString(QUuid::createUuid().toString()));
 }
 
 CMakeTool::CMakeTool(const QVariantMap &map, bool fromSdk) :
     CMakeTool(fromSdk ? CMakeTool::AutoDetection : CMakeTool::ManualDetection,
-              Core::Id::fromSetting(map.value(CMAKE_INFORMATION_ID)))
+              Utils::Id::fromSetting(map.value(CMAKE_INFORMATION_ID)))
 {
     m_displayName = map.value(CMAKE_INFORMATION_DISPLAYNAME).toString();
     m_isAutoRun = map.value(CMAKE_INFORMATION_AUTORUN, true).toBool();
@@ -141,9 +141,9 @@ CMakeTool::CMakeTool(const QVariantMap &map, bool fromSdk) :
 
 CMakeTool::~CMakeTool() = default;
 
-Core::Id CMakeTool::createId()
+Utils::Id CMakeTool::createId()
 {
-    return Core::Id::fromString(QUuid::createUuid().toString());
+    return Utils::Id::fromString(QUuid::createUuid().toString());
 }
 
 void CMakeTool::setFilePath(const Utils::FilePath &executable)
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h
index c22a07fb7f..12a71c546c 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.h
+++ b/src/plugins/cmakeprojectmanager/cmaketool.h
@@ -27,10 +27,10 @@
 
 #include "cmake_global.h"
 
-#include <coreplugin/id.h>
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/optional.h>
 #include <utils/synchronousprocess.h>
 
@@ -74,15 +74,15 @@ public:
 
     using PathMapper = std::function<Utils::FilePath (const Utils::FilePath &)>;
 
-    explicit CMakeTool(Detection d, const Core::Id &id);
+    explicit CMakeTool(Detection d, const Utils::Id &id);
     explicit CMakeTool(const QVariantMap &map, bool fromSdk);
     ~CMakeTool();
 
-    static Core::Id createId();
+    static Utils::Id createId();
 
     bool isValid() const;
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QVariantMap toMap () const;
 
     void setAutorun(bool autoRun);
@@ -123,7 +123,7 @@ private:
     void fetchFromCapabilities() const;
     void parseFromCapabilities(const QString &input) const;
 
-    Core::Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     Utils::FilePath m_executable;
     Utils::FilePath m_qchFilePath;
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index aeb33ba754..85884edb46 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -34,6 +34,7 @@
 #include <utils/qtcassert.h>
 
 using namespace Core;
+using namespace Utils;
 
 namespace CMakeProjectManager {
 
@@ -90,7 +91,7 @@ bool CMakeToolManager::registerCMakeTool(std::unique_ptr<CMakeTool> &&tool)
     if (!tool || Utils::contains(d->m_cmakeTools, tool.get()))
         return true;
 
-    const Core::Id toolId = tool->id();
+    const Utils::Id toolId = tool->id();
     QTC_ASSERT(toolId.isValid(),return false);
 
     //make sure the same id was not used before
@@ -184,9 +185,9 @@ void CMakeToolManager::saveCMakeTools()
 
 void CMakeToolManager::ensureDefaultCMakeToolIsValid()
 {
-    const Core::Id oldId = d->m_defaultCMake;
+    const Utils::Id oldId = d->m_defaultCMake;
     if (d->m_cmakeTools.size() == 0) {
-        d->m_defaultCMake = Core::Id();
+        d->m_defaultCMake = Utils::Id();
     } else {
         if (findById(d->m_defaultCMake))
             return;
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
index 7b3e3c4aa0..b84532b27e 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
@@ -29,9 +29,8 @@
 
 #include "cmaketool.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -51,12 +50,12 @@ public:
     static QList<CMakeTool *> cmakeTools();
 
     static bool registerCMakeTool(std::unique_ptr<CMakeTool> &&tool);
-    static void deregisterCMakeTool(const Core::Id &id);
+    static void deregisterCMakeTool(const Utils::Id &id);
 
     static CMakeTool *defaultCMakeTool();
-    static void setDefaultCMakeTool(const Core::Id &id);
+    static void setDefaultCMakeTool(const Utils::Id &id);
     static CMakeTool *findByCommand(const Utils::FilePath &command);
-    static CMakeTool *findById(const Core::Id &id);
+    static CMakeTool *findById(const Utils::Id &id);
 
     static void notifyAboutUpdate(CMakeTool *);
     static void restoreCMakeTools();
@@ -64,9 +63,9 @@ public:
     static void updateDocumentation();
 
 signals:
-    void cmakeAdded (const Core::Id &id);
-    void cmakeRemoved (const Core::Id &id);
-    void cmakeUpdated (const Core::Id &id);
+    void cmakeAdded (const Utils::Id &id);
+    void cmakeRemoved (const Utils::Id &id);
+    void cmakeUpdated (const Utils::Id &id);
     void cmakeToolsChanged ();
     void cmakeToolsLoaded ();
     void defaultCMakeChanged ();
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
index 4d90eb8099..808cf7b3eb 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
@@ -201,7 +201,7 @@ CMakeToolSettingsAccessor::CMakeTools CMakeToolSettingsAccessor::restoreCMakeToo
 }
 
 void CMakeToolSettingsAccessor::saveCMakeTools(const QList<CMakeTool *> &cmakeTools,
-                                               const Core::Id &defaultId,
+                                               const Utils::Id &defaultId,
                                                QWidget *parent)
 {
     QVariantMap data;
@@ -246,8 +246,8 @@ CMakeToolSettingsAccessor::cmakeTools(const QVariantMap &data, bool fromSdk) con
         result.cmakeTools.emplace_back(std::move(item));
     }
 
-    result.defaultToolId = Core::Id::fromSetting(data.value(CMAKE_TOOL_DEFAULT_KEY,
-                                                            Core::Id().toSetting()));
+    result.defaultToolId = Utils::Id::fromSetting(data.value(CMAKE_TOOL_DEFAULT_KEY,
+                                                            Utils::Id().toSetting()));
 
     return result;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h
index 5837110f12..ce53a1c597 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.h
@@ -25,10 +25,9 @@
 
 #pragma once
 
+#include <utils/id.h>
 #include <utils/settingsaccessor.h>
 
-#include <coreplugin/id.h>
-
 namespace CMakeProjectManager {
 
 class CMakeTool;
@@ -41,14 +40,14 @@ public:
     CMakeToolSettingsAccessor();
 
     struct CMakeTools {
-        Core::Id defaultToolId;
+        Utils::Id defaultToolId;
         std::vector<std::unique_ptr<CMakeTool>> cmakeTools;
     };
 
     CMakeTools restoreCMakeTools(QWidget *parent) const;
 
     void saveCMakeTools(const QList<CMakeTool *> &cmakeTools,
-                        const Core::Id &defaultId,
+                        const Utils::Id &defaultId,
                         QWidget *parent);
 
 private:
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 42a5b3028f..4504fd82b9 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -77,7 +77,7 @@ bool isClCompatibleCompiler(const QString &compilerName)
     return compilerName.endsWith("cl");
 }
 
-Core::Id getCompilerId(QString compilerName)
+Utils::Id getCompilerId(QString compilerName)
 {
     if (Utils::HostOsInfo::isWindowsHost()) {
         if (compilerName.endsWith(".exe"))
@@ -95,7 +95,7 @@ Core::Id getCompilerId(QString compilerName)
     return ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID;
 }
 
-ToolChain *toolchainFromCompilerId(const Core::Id &compilerId, const Core::Id &language)
+ToolChain *toolchainFromCompilerId(const Utils::Id &compilerId, const Utils::Id &language)
 {
     return ToolChainManager::toolChain([&compilerId, &language](const ToolChain *tc) {
         if (!tc->isValid() || tc->language() != language)
@@ -125,7 +125,7 @@ QString compilerPath(QString pathFlag)
     return QDir::fromNativeSeparators(pathFlag);
 }
 
-ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Core::Id &language)
+ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Utils::Id &language)
 {
     if (flags.empty())
         return ToolChainKitAspect::toolChain(kit, language);
@@ -138,7 +138,7 @@ ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Co
     if (toolchain)
         return toolchain;
 
-    Core::Id compilerId = getCompilerId(compiler.fileName());
+    Utils::Id compilerId = getCompilerId(compiler.fileName());
     if ((toolchain = toolchainFromCompilerId(compilerId, language)))
         return toolchain;
 
@@ -518,7 +518,7 @@ CompilationDatabaseEditorFactory::CompilationDatabaseEditorFactory()
 class CompilationDatabaseBuildConfiguration : public BuildConfiguration
 {
 public:
-    CompilationDatabaseBuildConfiguration(Target *target, Core::Id id)
+    CompilationDatabaseBuildConfiguration(Target *target, Utils::Id id)
         : BuildConfiguration(target, id)
     {
     }
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 460e978bcd..54f57f154d 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -28,7 +28,6 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/id.h>
 
 #include <utils/qtcassert.h>
 
@@ -118,13 +117,13 @@ namespace Core {
 */
 
 /*!
-    \fn QAction *Core::ActionContainer::insertLocation(Core::Id group) const
+    \fn QAction *Core::ActionContainer::insertLocation(Utils::Id group) const
     Returns an action representing the \a group,
     that could be used with \c{QWidget::insertAction}.
 */
 
 /*!
-    \fn void Core::ActionContainer::appendGroup(Core::Id group)
+    \fn void Core::ActionContainer::appendGroup(Utils::Id group)
     Adds \a group to the action container.
 
     Use groups to segment your action container into logical parts. You can add
@@ -134,7 +133,7 @@ namespace Core {
 */
 
 /*!
-    \fn void Core::ActionContainer::addAction(Core::Command *action, Core::Id group = Id())
+    \fn void Core::ActionContainer::addAction(Core::Command *action, Utils::Id group = Id())
     Add the \a action as a menu item to this action container. The action is added as the
     last item of the specified \a group.
     \sa appendGroup()
@@ -142,7 +141,7 @@ namespace Core {
 */
 
 /*!
-    \fn void Core::ActionContainer::addMenu(Core::ActionContainer *menu, Core::Id group = Core::Id())
+    \fn void Core::ActionContainer::addMenu(Core::ActionContainer *menu, Utils::Id group = Utils::Id())
     Add the \a menu as a submenu to this action container. The menu is added as the
     last item of the specified \a group.
     \sa appendGroup()
@@ -166,7 +165,7 @@ namespace Core {
 */
 
 /*!
-    \fn Core::ActionContainer::insertGroup(Core::Id before, Core::Id group)
+    \fn Core::ActionContainer::insertGroup(Utils::Id before, Utils::Id group)
 
     Inserts \a group to the action container before the group specified by
     \a before.
@@ -179,7 +178,7 @@ namespace Core {
 */
 
 /*!
-    \fn Core::ActionContainer::addSeparator(const Core::Context &context, Core::Id group, QAction **outSeparator)
+    \fn Core::ActionContainer::addSeparator(const Core::Context &context, Utils::Id group, QAction **outSeparator)
 
     Adds a separator to the end of the given \a group to the action container,
     which is enabled for a given \a context. Returns the created separator
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index d86e6e63e4..5feeff8d9a 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -56,20 +56,20 @@ public:
     virtual void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) = 0;
     virtual ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const = 0;
 
-    virtual Id id() const = 0;
+    virtual Utils::Id id() const = 0;
 
     virtual QMenu *menu() const = 0;
     virtual QMenuBar *menuBar() const = 0;
     virtual Utils::TouchBar *touchBar() const = 0;
 
-    virtual QAction *insertLocation(Id group) const = 0;
-    virtual void appendGroup(Id group) = 0;
-    virtual void insertGroup(Id before, Id group) = 0;
-    virtual void addAction(Command *action, Id group = Id()) = 0;
-    virtual void addMenu(ActionContainer *menu, Id group = Id()) = 0;
+    virtual QAction *insertLocation(Utils::Id group) const = 0;
+    virtual void appendGroup(Utils::Id group) = 0;
+    virtual void insertGroup(Utils::Id before, Utils::Id group) = 0;
+    virtual void addAction(Command *action, Utils::Id group = {}) = 0;
+    virtual void addMenu(ActionContainer *menu, Utils::Id group = {}) = 0;
     virtual void addMenu(ActionContainer *before, ActionContainer *menu) = 0;
-    Command *addSeparator(Id group = Id());
-    virtual Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) = 0;
+    Command *addSeparator(Utils::Id group = {});
+    virtual Command *addSeparator(const Context &context, Utils::Id group = {}, QAction **outSeparator = nullptr) = 0;
 
     // This clears this menu and submenus from all actions and submenus.
     // It does not destroy the submenus and commands, just removes them from their parents.
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
index 124f21259b..c563563e33 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h
@@ -37,8 +37,8 @@ namespace Internal {
 
 struct Group
 {
-    Group(Id id) : id(id) {}
-    Id id;
+    Group(Utils::Id id) : id(id) {}
+    Utils::Id id;
     QList<QObject *> items; // Command * or ActionContainer *
 };
 
@@ -47,22 +47,22 @@ class ActionContainerPrivate : public ActionContainer
     Q_OBJECT
 
 public:
-    ActionContainerPrivate(Id id);
+    ActionContainerPrivate(Utils::Id id);
     ~ActionContainerPrivate() override = default;
 
     void setOnAllDisabledBehavior(OnAllDisabledBehavior behavior) override;
     ActionContainer::OnAllDisabledBehavior onAllDisabledBehavior() const override;
 
-    QAction *insertLocation(Id groupId) const override;
-    void appendGroup(Id id) override;
-    void insertGroup(Id before, Id groupId) override;
-    void addAction(Command *action, Id group = Id()) override;
-    void addMenu(ActionContainer *menu, Id group = Id()) override;
+    QAction *insertLocation(Utils::Id groupId) const override;
+    void appendGroup(Utils::Id id) override;
+    void insertGroup(Utils::Id before, Utils::Id groupId) override;
+    void addAction(Command *action, Utils::Id group = {}) override;
+    void addMenu(ActionContainer *menu, Utils::Id group = {}) override;
     void addMenu(ActionContainer *before, ActionContainer *menu) override;
-    Command *addSeparator(const Context &context, Id group = Id(), QAction **outSeparator = nullptr) override;
+    Command *addSeparator(const Context &context, Utils::Id group = {}, QAction **outSeparator = nullptr) override;
     void clear() override;
 
-    Id id() const override;
+    Utils::Id id() const override;
 
     QMenu *menu() const override;
     QMenuBar *menuBar() const override;
@@ -92,11 +92,11 @@ private:
     void update();
     void itemDestroyed();
 
-    QList<Group>::const_iterator findGroup(Id groupId) const;
+    QList<Group>::const_iterator findGroup(Utils::Id groupId) const;
     QAction *insertLocation(QList<Group>::const_iterator group) const;
 
     OnAllDisabledBehavior m_onAllDisabledBehavior;
-    Id m_id;
+    Utils::Id m_id;
     bool m_updateRequested;
 };
 
@@ -105,7 +105,7 @@ class MenuActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    explicit MenuActionContainer(Id id);
+    explicit MenuActionContainer(Utils::Id id);
     ~MenuActionContainer() override;
 
     QMenu *menu() const override;
@@ -131,7 +131,7 @@ class MenuBarActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    explicit MenuBarActionContainer(Id id);
+    explicit MenuBarActionContainer(Utils::Id id);
 
     void setMenuBar(QMenuBar *menuBar);
     QMenuBar *menuBar() const override;
@@ -157,7 +157,7 @@ class TouchBarActionContainer : public ActionContainerPrivate
     Q_OBJECT
 
 public:
-    TouchBarActionContainer(Id id, const QIcon &icon, const QString &text);
+    TouchBarActionContainer(Utils::Id id, const QIcon &icon, const QString &text);
     ~TouchBarActionContainer() override;
 
     Utils::TouchBar *touchBar() const override;
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 4eb9e256af..391cc077f4 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -29,7 +29,7 @@
 #include "command_p.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
+
 #include <utils/algorithm.h>
 #include <utils/fadingindicator.h>
 #include <utils/qtcassert.h>
@@ -51,6 +51,7 @@ static const char kKeyboardSettingsKeyV2[] = "KeyboardShortcutsV2";
 
 using namespace Core;
 using namespace Core::Internal;
+using namespace Utils;
 
 /*!
     \class Core::ActionManager
@@ -121,7 +122,7 @@ using namespace Core::Internal;
 */
 
 /*!
-    \fn void Core::ActionManager::commandAdded(Core::Id id)
+    \fn void Core::ActionManager::commandAdded(Utils::Id id)
 
     Emitted when a command (with the \a id) is added.
 */
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index 20d56bfb21..3dacfd0057 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -55,22 +55,22 @@ class CORE_EXPORT ActionManager : public QObject
 public:
     static ActionManager *instance();
 
-    static ActionContainer *createMenu(Id id);
-    static ActionContainer *createMenuBar(Id id);
-    static ActionContainer *createTouchBar(Id id,
+    static ActionContainer *createMenu(Utils::Id id);
+    static ActionContainer *createMenuBar(Utils::Id id);
+    static ActionContainer *createTouchBar(Utils::Id id,
                                            const QIcon &icon,
                                            const QString &text = QString());
 
-    static Command *registerAction(QAction *action, Id id,
+    static Command *registerAction(QAction *action, Utils::Id id,
                                    const Context &context = Context(Constants::C_GLOBAL),
                                    bool scriptable = false);
 
-    static Command *command(Id id);
-    static ActionContainer *actionContainer(Id id);
+    static Command *command(Utils::Id id);
+    static ActionContainer *actionContainer(Utils::Id id);
 
     static QList<Command *> commands();
 
-    static void unregisterAction(QAction *action, Id id);
+    static void unregisterAction(QAction *action, Utils::Id id);
 
     static void setPresentationModeEnabled(bool enabled);
     static bool isPresentationModeEnabled();
@@ -79,7 +79,7 @@ public:
 
 signals:
     void commandListChanged();
-    void commandAdded(Core::Id id);
+    void commandAdded(Utils::Id id);
 
 private:
     ActionManager(QObject *parent = nullptr);
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
index 216f936273..e8627a3244 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -46,8 +46,8 @@ class ActionManagerPrivate : public QObject
     Q_OBJECT
 
 public:
-    using IdCmdMap = QHash<Id, Action *>;
-    using IdContainerMap = QHash<Id, ActionContainerPrivate *>;
+    using IdCmdMap = QHash<Utils::Id, Action *>;
+    using IdContainerMap = QHash<Utils::Id, ActionContainerPrivate *>;
 
     ~ActionManagerPrivate() override;
 
@@ -59,9 +59,9 @@ public:
 
     void showShortcutPopup(const QString &shortcut);
     bool hasContext(const Context &context) const;
-    Action *overridableAction(Id id);
+    Action *overridableAction(Utils::Id id);
 
-    void readUserSettings(Id id, Action *cmd);
+    void readUserSettings(Utils::Id id, Action *cmd);
 
     void containerDestroyed();
     void actionTriggered();
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 3e790f9cae..c7eab9442f 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -27,7 +27,6 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/id.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/stringutils.h>
@@ -258,6 +257,8 @@
     \internal
 */
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index d17ef0d266..677a130818 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -26,9 +26,9 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
 #include <utils/hostosinfo.h>
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -69,7 +69,7 @@ public:
     virtual void setDescription(const QString &text) = 0;
     virtual QString description() const = 0;
 
-    virtual Id id() const = 0;
+    virtual Utils::Id id() const = 0;
 
     virtual QAction *action() const = 0;
     virtual Context context() const = 0;
diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h
index de722d41cf..94f72ddfa1 100644
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -27,9 +27,9 @@
 
 #include "command.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 
+#include <utils/id.h>
 #include <utils/proxyaction.h>
 
 #include <QList>
@@ -47,9 +47,9 @@ class Action : public Command
 {
     Q_OBJECT
 public:
-    Action(Id id);
+    Action(Utils::Id id);
 
-    Id id() const override;
+    Utils::Id id() const override;
 
     void setDefaultKeySequence(const QKeySequence &key) override;
     void setDefaultKeySequences(const QList<QKeySequence> &key) override;
@@ -93,7 +93,7 @@ private:
 
     Context m_context;
     CommandAttributes m_attributes;
-    Id m_id;
+    Utils::Id m_id;
     QList<QKeySequence> m_defaultKeys;
     QString m_defaultText;
     QString m_touchBarText;
@@ -104,7 +104,7 @@ private:
     mutable std::unique_ptr<Utils::ProxyAction> m_touchBarAction;
     QString m_toolTip;
 
-    QMap<Id, QPointer<QAction> > m_contextActionMap;
+    QMap<Utils::Id, QPointer<QAction> > m_contextActionMap;
     QMap<QAction*, bool> m_scriptableMap;
     bool m_active = false;
     bool m_contextInitialized = false;
diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.cpp b/src/plugins/coreplugin/actionmanager/commandbutton.cpp
index 8aa9c87eba..8bac1ab7b2 100644
--- a/src/plugins/coreplugin/actionmanager/commandbutton.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandbutton.cpp
@@ -26,11 +26,12 @@
 #include "commandbutton.h"
 #include "actionmanager.h"
 #include "command.h"
-#include "../id.h"
+
 
 #include <utils/proxyaction.h>
 
 using namespace Core;
+using namespace Utils;
 
 /*!
     \class Core::CommandButton
diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.h b/src/plugins/coreplugin/actionmanager/commandbutton.h
index 1b7d27fcc7..fa6357f501 100644
--- a/src/plugins/coreplugin/actionmanager/commandbutton.h
+++ b/src/plugins/coreplugin/actionmanager/commandbutton.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QPointer>
 #include <QString>
@@ -42,8 +43,8 @@ class CORE_EXPORT CommandButton : public QToolButton
     Q_PROPERTY(QString toolTipBase READ toolTipBase WRITE setToolTipBase)
 public:
     explicit CommandButton(QWidget *parent = nullptr);
-    explicit CommandButton(Id id, QWidget *parent = nullptr);
-    void setCommandId(Id id);
+    explicit CommandButton(Utils::Id id, QWidget *parent = nullptr);
+    void setCommandId(Utils::Id id);
     QString toolTipBase() const;
     void setToolTipBase(const QString &toolTipBase);
 
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index 8b03fee9e5..a13229d464 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -40,6 +40,8 @@
 #include <QDebug>
 #include <QDateTime>
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index c04b694219..358efd6caf 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -45,6 +45,8 @@
 
 enum { debugWizard = 0 };
 
+using namespace Utils;
+
 namespace Core {
 
 static int indexOfFile(const GeneratedFiles &f, const QString &path)
diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h
index d37592d5fd..26f8a164f4 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.h
+++ b/src/plugins/coreplugin/basefilewizardfactory.h
@@ -54,8 +54,8 @@ public:
     };
     Q_DECLARE_FLAGS(DialogParameterFlags, DialogParameterEnum)
 
-    explicit WizardDialogParameters(const QString &defaultPath, Id platform,
-                                    const QSet<Id> &requiredFeatures, DialogParameterFlags flags,
+    explicit WizardDialogParameters(const QString &defaultPath, Utils::Id platform,
+                                    const QSet<Utils::Id> &requiredFeatures, DialogParameterFlags flags,
                                     const QVariantMap &extraValues)
         : m_defaultPath(defaultPath),
           m_selectedPlatform(platform),
@@ -67,10 +67,10 @@ public:
     QString defaultPath() const
     { return m_defaultPath; }
 
-    Id selectedPlatform() const
+    Utils::Id selectedPlatform() const
     { return m_selectedPlatform; }
 
-    QSet<Id> requiredFeatures() const
+    QSet<Utils::Id> requiredFeatures() const
     { return m_requiredFeatures; }
 
     DialogParameterFlags flags() const
@@ -81,8 +81,8 @@ public:
 
 private:
     QString m_defaultPath;
-    Id m_selectedPlatform;
-    QSet<Id> m_requiredFeatures;
+    Utils::Id m_selectedPlatform;
+    QSet<Utils::Id> m_requiredFeatures;
     DialogParameterFlags m_parameterFlags;
     QVariantMap m_extraValues;
 };
@@ -115,7 +115,7 @@ protected:
 
 private:
     // IWizard
-    Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Id platform,
+    Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform,
                                  const QVariantMap &extraValues) override;
 };
 
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index 64c4bb1455..de32db8633 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -35,11 +35,10 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QPointer>
-#include <QStringList>
 #include <QDebug>
-
+#include <QPointer>
 #include <QStackedWidget>
+#include <QStringList>
 
 namespace Core {
 
@@ -201,7 +200,7 @@ void DesignMode::updateActions()
     emit actionsUpdated(d->m_currentEditor.data());
 }
 
-void DesignMode::updateContext(Id newMode, Id oldMode)
+void DesignMode::updateContext(Utils::Id newMode, Utils::Id oldMode)
 {
     if (newMode == id())
         ICore::addAdditionalContext(d->m_activeContext);
diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h
index 48c46bca14..ff55b1439e 100644
--- a/src/plugins/coreplugin/designmode.h
+++ b/src/plugins/coreplugin/designmode.h
@@ -64,7 +64,7 @@ private:
     void updateActions();
 
     void currentEditorChanged(IEditor *editor);
-    void updateContext(Id newMode, Id oldMode);
+    void updateContext(Utils::Id newMode, Utils::Id oldMode);
     void setActiveContext(const Context &context);
 };
 
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
index 8684c67d10..a3a0f7eb38 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -65,7 +65,7 @@ using namespace Utils;
 
 /*!
 
-    \fn Core::Id Core::IOptionsPage::id() const
+    \fn Utils::Id Core::IOptionsPage::id() const
 
     Returns a unique identifier for referencing the options page.
 */
@@ -77,7 +77,7 @@ using namespace Utils;
 */
 
 /*!
-    \fn Core::Id Core::IOptionsPage::category() const
+    \fn Utils::Id Core::IOptionsPage::category() const
 
     Returns the unique id for the category that the options page should be displayed in. This id is
     used for sorting the list on the left side of the \uicontrol Options dialog.
@@ -171,7 +171,7 @@ void Core::IOptionsPage::setCategoryIconPath(const QString &categoryIconPath)
 }
 
 /*!
-    \fn void Core::IOptionsPage::setId(Core::Id id)
+    \fn void Core::IOptionsPage::setId(Utils::Id id)
 
     Sets the \a id of the options page.
 */
@@ -183,7 +183,7 @@ void Core::IOptionsPage::setCategoryIconPath(const QString &categoryIconPath)
 */
 
 /*!
-    \fn void Core::IOptionsPage::setCategory(Core::Id category)
+    \fn void Core::IOptionsPage::setCategory(Utils::Id category)
 
     Uses \a category to sort the options pages.
 */
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 95145f13cd..36ee209b38 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -26,9 +26,9 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
 #include <utils/icon.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QPointer>
@@ -56,9 +56,9 @@ public:
 
     static const QList<IOptionsPage *> allOptionsPages();
 
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const { return m_displayName; }
-    Id category() const { return m_category; }
+    Utils::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const;
 
@@ -71,15 +71,15 @@ public:
     virtual void finish();
 
 protected:
-    void setId(Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
-    void setCategory(Id category) { m_category = category; }
+    void setCategory(Utils::Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
     void setCategoryIconPath(const QString &categoryIconPath);
 
-    Id m_id;
-    Id m_category;
+    Utils::Id m_id;
+    Utils::Id m_category;
     QString m_displayName;
     QString m_displayCategory;
     Utils::Icon m_categoryIcon;
@@ -108,7 +108,7 @@ public:
 
     static const QList<IOptionsPageProvider *> allOptionsPagesProviders();
 
-    Id category() const { return m_category; }
+    Utils::Id category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QIcon categoryIcon() const;
 
@@ -116,11 +116,11 @@ public:
     virtual bool matches(const QRegularExpression &regexp) const = 0;
 
 protected:
-    void setCategory(Id category) { m_category = category; }
+    void setCategory(Utils::Id category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
 
-    Id m_category;
+    Utils::Id m_category;
     QString m_displayCategory;
     Utils::Icon m_categoryIcon;
 };
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 5ce317ea35..28aae51b6a 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -45,6 +45,8 @@
 
 Q_DECLARE_METATYPE(Core::IWizardFactory*)
 
+using namespace Utils;
+
 namespace {
 
 const int ICON_SIZE = 48;
@@ -84,7 +86,7 @@ public:
                         Id::fromStringList(ICore::settings()->value(BLACKLISTED_CATEGORIES_KEY).toStringList());
     }
 
-    void setPlatform(Core::Id platform)
+    void setPlatform(Id platform)
     {
         m_platform = platform;
         invalidateFilter();
@@ -114,7 +116,7 @@ public:
                 factoryOfItem(qobject_cast<QStandardItemModel*>(sourceModel())->itemFromIndex(sourceIndex));
 
         if (wizard) {
-            if (m_blacklistedCategories.contains(Core::Id::fromString(wizard->category())))
+            if (m_blacklistedCategories.contains(Id::fromString(wizard->category())))
                 return false;
             return wizard->isAvailable(m_platform);
         }
@@ -122,7 +124,7 @@ public:
         return true;
     }
 private:
-    Core::Id m_platform;
+    Id m_platform;
     QSet<Id> m_blacklistedCategories;
 };
 
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index 0e41019964..5bbad3dd40 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -57,7 +57,7 @@ public:
     void setWizardFactories(QList<IWizardFactory*> factories, const QString &defaultLocation, const QVariantMap &extraVariables);
 
     void showDialog();
-    Id selectedPlatform() const;
+    Utils::Id selectedPlatform() const;
 
     static QWidget *currentDialog();
 
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 192d0843ed..24c78b6513 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -64,6 +64,8 @@ const int kMaxMinimumHeight = 250;
 static const char pageKeyC[] = "General/LastPreferencePage";
 const int categoryIconSize = 24;
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index 8dd0978f2b..fce450d8dd 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -25,14 +25,14 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 namespace Core {
 namespace Internal {
 
 // Run the settings dialog and wait for it to finish.
 // Returns if the changes have been applied.
-bool executeSettingsDialog(QWidget *parent, Id initialPage);
+bool executeSettingsDialog(QWidget *parent, Utils::Id initialPage);
 
 } // namespace Internal
 } // namespace Core
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index a2b26cc701..cf88311efe 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -27,7 +27,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/actionmanager/command_p.h>
@@ -49,6 +48,8 @@
 #include <QApplication>
 #include <QDebug>
 
+using namespace Utils;
+
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 
 const char kSeparator[] = " | ";
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index d31113cc76..e9b9d66adb 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QObject>
 #include <QPair>
@@ -55,7 +56,7 @@ public:
         KeepLinks
     };
 
-    using RecentFile = QPair<QString, Id>;
+    using RecentFile = QPair<QString, Utils::Id>;
 
     static DocumentManager *instance();
 
@@ -71,7 +72,7 @@ public:
     static void unexpectFileChange(const QString &fileName);
 
     // recent files
-    static void addToRecentFiles(const QString &fileName, Id editorId = Id());
+    static void addToRecentFiles(const QString &fileName, Utils::Id editorId = {});
     Q_SLOT void clearRecentFiles();
     static QList<RecentFile> recentFiles();
 
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index d53d76e46d..6340bd804e 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -102,7 +102,7 @@ EditMode::~EditMode()
     delete m_splitter;
 }
 
-void EditMode::grabEditorManager(Id mode)
+void EditMode::grabEditorManager(Utils::Id mode)
 {
     if (mode != id())
         return;
diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h
index 4bce114511..b4784b69ef 100644
--- a/src/plugins/coreplugin/editmode.h
+++ b/src/plugins/coreplugin/editmode.h
@@ -47,7 +47,7 @@ public:
     ~EditMode() override;
 
 private:
-    void grabEditorManager(Id mode);
+    void grabEditorManager(Utils::Id mode);
 
     QSplitter *m_splitter;
     QVBoxLayout *m_rightSplitWidgetLayout;
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index aa18827b04..181dae6ce1 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -43,6 +43,8 @@
 #include <QSet>
 #include <QUrl>
 
+using namespace Utils;
+
 static Core::Internal::DocumentModelPrivate *d;
 
 namespace Core {
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h
index 72b4caeedb..46045d76f4 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.h
+++ b/src/plugins/coreplugin/editormanager/documentmodel.h
@@ -26,9 +26,9 @@
 #pragma once
 
 #include "../core_global.h"
-#include "../id.h"
 
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/optional.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,7 +57,7 @@ public:
         QString displayName() const;
         QString plainDisplayName() const;
         QString uniqueDisplayName() const;
-        Id id() const;
+        Utils::Id id() const;
 
         IDocument *document;
         // When an entry is suspended, it means that it is not in memory,
diff --git a/src/plugins/coreplugin/editormanager/documentmodel_p.h b/src/plugins/coreplugin/editormanager/documentmodel_p.h
index e5d7fa2a2c..a8c9f65ac3 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel_p.h
+++ b/src/plugins/coreplugin/editormanager/documentmodel_p.h
@@ -70,7 +70,7 @@ public:
     static void addEditor(IEditor *editor, bool *isNewDocument);
     static DocumentModel::Entry *addSuspendedDocument(const QString &fileName,
                                                       const QString &displayName,
-                                                      Id id);
+                                                      Utils::Id id);
     static DocumentModel::Entry *firstSuspendedEntry();
     static DocumentModel::Entry *removeEditor(IEditor *editor);
     static void removeEntry(DocumentModel::Entry *entry);
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index c0300900d2..afb4404878 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -807,7 +807,7 @@ IEditor *EditorManagerPrivate::openEditorAt(EditorView *view, const QString &fil
     return editor;
 }
 
-IEditor *EditorManagerPrivate::openEditorWith(const QString &fileName, Core::Id editorId)
+IEditor *EditorManagerPrivate::openEditorWith(const QString &fileName, Utils::Id editorId)
 {
     // close any open editors that have this file open
     // remember the views to open new editors in there
@@ -2722,7 +2722,7 @@ void EditorManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
     if (anyMatches) {
         // Add all suitable editors
         foreach (IEditorFactory *editorFactory, factories) {
-            Core::Id editorId = editorFactory->id();
+            Utils::Id editorId = editorFactory->id();
             // Add action to open with this very editor factory
             QString const actionTitle = editorFactory->displayName();
             QAction *action = menu->addAction(actionTitle);
@@ -2738,7 +2738,7 @@ void EditorManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
         // Add all suitable external editors
         foreach (IExternalEditor *externalEditor, extEditors) {
             QAction *action = menu->addAction(externalEditor->displayName());
-            Core::Id editorId = externalEditor->id();
+            Utils::Id editorId = externalEditor->id();
             connect(action, &QAction::triggered, [fileName, editorId]() {
                 EditorManager::openExternalEditor(fileName, editorId);
             });
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 2d8f9eb8f3..07d142c648 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -99,20 +99,20 @@ public:
         int columnNumber; // extracted column number, -1 if none
     };
     static FilePathInfo splitLineAndColumnNumber(const QString &filePath);
-    static IEditor *openEditor(const QString &fileName, Id editorId = Id(),
+    static IEditor *openEditor(const QString &fileName, Utils::Id editorId = {},
         OpenEditorFlags flags = NoFlags, bool *newEditor = nullptr);
     static IEditor *openEditorAt(const QString &fileName,  int line, int column = 0,
-                                 Id editorId = Id(), OpenEditorFlags flags = NoFlags,
+                                 Utils::Id editorId = {}, OpenEditorFlags flags = NoFlags,
                                  bool *newEditor = nullptr);
     static void openEditorAtSearchResult(const SearchResultItem &item, OpenEditorFlags flags = NoFlags);
-    static IEditor *openEditorWithContents(Id editorId, QString *titlePattern = nullptr,
+    static IEditor *openEditorWithContents(Utils::Id editorId, QString *titlePattern = nullptr,
                                            const QByteArray &contents = QByteArray(),
                                            const QString &uniqueId = QString(),
                                            OpenEditorFlags flags = NoFlags);
     static bool skipOpeningBigTextFile(const QString &filePath);
     static void clearUniqueId(IDocument *document);
 
-    static bool openExternalEditor(const QString &fileName, Id editorId);
+    static bool openExternalEditor(const QString &fileName, Utils::Id editorId);
     static void addCloseEditorListener(const std::function<bool(IEditor *)> &listener);
 
     static QStringList getOpenFileNames();
diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
index 3a32b4f7e4..2832ff867e 100644
--- a/src/plugins/coreplugin/editormanager/editormanager_p.h
+++ b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -79,17 +79,17 @@ public:
     static void setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory = false);
     static IEditor *openEditor(EditorView *view,
                                const QString &fileName,
-                               Id editorId = Id(),
+                               Utils::Id editorId = {},
                                EditorManager::OpenEditorFlags flags = EditorManager::NoFlags,
                                bool *newEditor = nullptr);
     static IEditor *openEditorAt(EditorView *view,
                                  const QString &fileName,
                                  int line,
                                  int column = 0,
-                                 Id editorId = Id(),
+                                 Utils::Id editorId = {},
                                  EditorManager::OpenEditorFlags flags = EditorManager::NoFlags,
                                  bool *newEditor = nullptr);
-    static IEditor *openEditorWith(const QString &fileName, Core::Id editorId);
+    static IEditor *openEditorWith(const QString &fileName, Utils::Id editorId);
     static IEditor *duplicateEditor(IEditor *editor);
     static IEditor *activateEditor(EditorView *view, IEditor *editor,
                                    EditorManager::OpenEditorFlags flags = EditorManager::NoFlags);
@@ -108,7 +108,7 @@ public:
     static MakeWritableResult makeFileWritable(IDocument *document);
     static void doEscapeKeyFocusMoveMagic();
 
-    static Id getOpenWithEditorId(const QString &fileName, bool *isExternalEditor = nullptr);
+    static Utils::Id getOpenWithEditorId(const QString &fileName, bool *isExternalEditor = nullptr);
 
     static void saveSettings();
     static void readSettings();
@@ -193,7 +193,7 @@ private:
     static OpenEditorsWindow *windowPopup();
     static void showPopupOrSelectDocument();
 
-    static EditorFactoryList findFactories(Id editorId, const QString &fileName);
+    static EditorFactoryList findFactories(Utils::Id editorId, const QString &fileName);
     static IEditor *createEditor(IEditorFactory *factory, const QString &fileName);
     static void addEditor(IEditor *editor);
     static void removeEditor(IEditor *editor, bool removeSusependedEntry);
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 528a7cf07d..3b7e1519e7 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -25,9 +25,8 @@
 
 #pragma once
 
-#include "../id.h"
-
 #include <utils/dropsupport.h>
+#include <utils/id.h>
 
 #include <QMap>
 #include <QList>
@@ -64,7 +63,7 @@ namespace Internal {
 struct EditLocation {
     QPointer<IDocument> document;
     QString fileName;
-    Id id;
+    Utils::Id id;
     QVariant state;
 };
 
diff --git a/src/plugins/coreplugin/editormanager/editorwindow.cpp b/src/plugins/coreplugin/editormanager/editorwindow.cpp
index 02da562e5a..02b5d15aae 100644
--- a/src/plugins/coreplugin/editormanager/editorwindow.cpp
+++ b/src/plugins/coreplugin/editormanager/editorwindow.cpp
@@ -70,7 +70,7 @@ EditorWindow::EditorWindow(QWidget *parent) :
     static int windowId = 0;
 
     ICore::registerWindow(this,
-                          Context(Id("EditorManager.ExternalWindow.").withSuffix(++windowId),
+                          Context(Utils::Id("EditorManager.ExternalWindow.").withSuffix(++windowId),
                                   Constants::C_EDITORMANAGER));
 
     connect(m_area, &EditorArea::windowTitleNeedsUpdate,
diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.cpp b/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
index 8feb88ec4b..84f94fb2f2 100644
--- a/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
@@ -70,7 +70,7 @@ namespace Core {
 */
 
 /*!
-    \fn Core::Id Core::IEditorFactory::id() const
+    \fn Utils::Id Core::IEditorFactory::id() const
     Returns the ID of the factory or editor type.
 */
 
diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h
index 01073b4b42..ed43e70b14 100644
--- a/src/plugins/coreplugin/editormanager/ieditorfactory.h
+++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h
@@ -26,8 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
+#include <utils/id.h>
 #include <utils/mimetypes/mimetype.h>
 
 #include <QObject>
@@ -54,21 +54,21 @@ public:
     static const EditorFactoryList defaultEditorFactories(const Utils::MimeType &mimeType);
     static const EditorFactoryList preferredEditorFactories(const QString &fileName);
 
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const { return m_displayName; }
     QStringList mimeTypes() const { return m_mimeTypes; }
 
     IEditor *createEditor() const;
 
 protected:
-    void setId(Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
     void setMimeTypes(const QStringList &mimeTypes) { m_mimeTypes = mimeTypes; }
     void addMimeType(const QString &mimeType) { m_mimeTypes.append(mimeType); }
     void setEditorCreator(const std::function<IEditor *()> &creator);
 
 private:
-    Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     QStringList m_mimeTypes;
     std::function<IEditor *()> m_creator;
diff --git a/src/plugins/coreplugin/editormanager/iexternaleditor.cpp b/src/plugins/coreplugin/editormanager/iexternaleditor.cpp
index 30c9084c04..99dcbe2703 100644
--- a/src/plugins/coreplugin/editormanager/iexternaleditor.cpp
+++ b/src/plugins/coreplugin/editormanager/iexternaleditor.cpp
@@ -45,7 +45,7 @@ namespace Core {
 */
 
 /*!
-    \fn Core::Id Core::IExternalEditor::id() const
+    \fn Utils::Id Core::IExternalEditor::id() const
     Returns the ID of the factory or editor type.
 */
 
diff --git a/src/plugins/coreplugin/editormanager/iexternaleditor.h b/src/plugins/coreplugin/editormanager/iexternaleditor.h
index 9b91ece86d..fea99e35f3 100644
--- a/src/plugins/coreplugin/editormanager/iexternaleditor.h
+++ b/src/plugins/coreplugin/editormanager/iexternaleditor.h
@@ -26,8 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
+#include <utils/id.h>
 #include <utils/mimetypes/mimetype.h>
 
 #include <QObject>
@@ -50,7 +50,7 @@ public:
     static const ExternalEditorList externalEditors(const Utils::MimeType &mimeType);
 
     virtual QStringList mimeTypes() const = 0;
-    virtual Id id() const = 0;
+    virtual Utils::Id id() const = 0;
     virtual QString displayName() const = 0;
     virtual bool startEditor(const QString &fileName, QString *errorMessage) = 0;
 };
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp
index 4b1e15c94b..c8ccd88ca7 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "systemeditor.h"
-#include <coreplugin/id.h>
 
 #include <QStringList>
 #include <QUrl>
@@ -32,6 +31,7 @@
 
 using namespace Core;
 using namespace Core::Internal;
+using namespace Utils;
 
 SystemEditor::SystemEditor(QObject *parent) :
     IExternalEditor(parent)
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.h b/src/plugins/coreplugin/editormanager/systemeditor.h
index 10fb0dc949..9d260def05 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.h
+++ b/src/plugins/coreplugin/editormanager/systemeditor.h
@@ -38,7 +38,7 @@ public:
     explicit SystemEditor(QObject *parent = nullptr);
 
     QStringList mimeTypes() const override;
-    Id id() const override;
+    Utils::Id id() const override;
     QString displayName() const override;
 
     bool startEditor(const QString &fileName, QString *errorMessage) override;
diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h
index 4294615cb9..5e179885e4 100644
--- a/src/plugins/coreplugin/externaltool.h
+++ b/src/plugins/coreplugin/externaltool.h
@@ -25,10 +25,9 @@
 
 #pragma once
 
-#include "id.h"
-
-#include <utils/fileutils.h>
 #include <utils/environment.h>
+#include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QStringList>
@@ -69,7 +68,7 @@ public:
     QString arguments() const;
     QString input() const;
     QString workingDirectory() const;
-    Id baseEnvironmentProviderId() const;
+    Utils::Id baseEnvironmentProviderId() const;
     Utils::Environment baseEnvironment() const;
     Utils::EnvironmentItems environmentUserChanges() const;
 
@@ -100,7 +99,7 @@ public:
     void setArguments(const QString &arguments);
     void setInput(const QString &input);
     void setWorkingDirectory(const QString &workingDirectory);
-    void setBaseEnvironmentProviderId(Id id);
+    void setBaseEnvironmentProviderId(Utils::Id id);
     void setEnvironmentUserChanges(const Utils::EnvironmentItems &items);
 
 private:
@@ -113,7 +112,7 @@ private:
     QString m_arguments;
     QString m_input;
     QString m_workingDirectory;
-    Id m_baseEnvironmentProviderId;
+    Utils::Id m_baseEnvironmentProviderId;
     Utils::EnvironmentItems m_environment;
     OutputHandling m_outputHandling = ShowInPane;
     OutputHandling m_errorHandling = ShowInPane;
diff --git a/src/plugins/coreplugin/externaltoolmanager.cpp b/src/plugins/coreplugin/externaltoolmanager.cpp
index 67f2dc1374..881f112418 100644
--- a/src/plugins/coreplugin/externaltoolmanager.cpp
+++ b/src/plugins/coreplugin/externaltoolmanager.cpp
@@ -41,6 +41,7 @@
 #include <QMenu>
 
 using namespace Core::Internal;
+using namespace Utils;
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h
index 43c1a3a536..023fa0d236 100644
--- a/src/plugins/coreplugin/featureprovider.h
+++ b/src/plugins/coreplugin/featureprovider.h
@@ -27,7 +27,7 @@
 
 #include "core_global.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QSet>
 #include <QStringList>
@@ -41,9 +41,9 @@ class CORE_EXPORT IFeatureProvider
 public:
     virtual ~IFeatureProvider() = default;
 
-    virtual QSet<Id> availableFeatures(Id id) const = 0;
-    virtual QSet<Id> availablePlatforms() const = 0;
-    virtual QString displayNameForPlatform(Id id) const = 0;
+    virtual QSet<Utils::Id> availableFeatures(Utils::Id id) const = 0;
+    virtual QSet<Utils::Id> availablePlatforms() const = 0;
+    virtual QString displayNameForPlatform(Utils::Id id) const = 0;
 };
 
 } // namespace Core
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index aa3165547c..c87d6c9cfd 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -38,7 +38,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreplugin.h>
 
 #include <extensionsystem/pluginmanager.h>
@@ -66,6 +65,7 @@
 Q_DECLARE_METATYPE(Core::IFindFilter*)
 
 using namespace Qt;
+using namespace Utils;
 
 namespace {
     const int MAX_COMPLETIONS = 50;
diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h
index 1e9d9b5d41..4239282ec8 100644
--- a/src/plugins/coreplugin/find/findtoolbar.h
+++ b/src/plugins/coreplugin/find/findtoolbar.h
@@ -28,7 +28,7 @@
 #include "ui_findwidget.h"
 #include "currentdocumentfind.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/styledbar.h>
 
 #include <QTimer>
diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
index bce46e68c0..a6edc2a781 100644
--- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
+++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
@@ -34,6 +34,7 @@
 #include <QTimer>
 
 using namespace Utils;
+
 namespace Core {
 
 /*!
diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.h b/src/plugins/coreplugin/find/highlightscrollbarcontroller.h
index f9f4c334f4..b701804f4b 100644
--- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.h
+++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.h
@@ -30,7 +30,8 @@
 #include <QVector>
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 #include <utils/theme/theme.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,10 +51,10 @@ struct CORE_EXPORT Highlight
         HighestPriority = 3
     };
 
-    Highlight(Id category, int position, Utils::Theme::Color color, Priority priority);
+    Highlight(Utils::Id category, int position, Utils::Theme::Color color, Priority priority);
     Highlight() = default;
 
-    Id category;
+    Utils::Id category;
     int position = -1;
     Utils::Theme::Color color = Utils::Theme::TextColorNormal;
     Priority priority = Invalid;
@@ -80,14 +81,14 @@ public:
     double margin() const;
     void setMargin(double margin);
 
-    QHash<Id, QVector<Highlight>> highlights() const;
+    QHash<Utils::Id, QVector<Highlight>> highlights() const;
     void addHighlight(Highlight highlight);
 
-    void removeHighlights(Id id);
+    void removeHighlights(Utils::Id id);
     void removeAllHighlights();
 
 private:
-    QHash<Id, QVector<Highlight> > m_highlights;
+    QHash<Utils::Id, QVector<Highlight> > m_highlights;
     double m_lineHeight = 0.0;
     double m_visibleRange = 0.0; // in pixels
     double m_margin = 0.0;       // in pixels
diff --git a/src/plugins/coreplugin/find/optionspopup.cpp b/src/plugins/coreplugin/find/optionspopup.cpp
index b766cee162..ed34cb8c8c 100644
--- a/src/plugins/coreplugin/find/optionspopup.cpp
+++ b/src/plugins/coreplugin/find/optionspopup.cpp
@@ -35,6 +35,8 @@
 #include <QKeyEvent>
 #include <QVBoxLayout>
 
+using namespace Utils;
+
 namespace Core {
 
 /*!
diff --git a/src/plugins/coreplugin/find/optionspopup.h b/src/plugins/coreplugin/find/optionspopup.h
index a427c511d0..c743a5ece6 100644
--- a/src/plugins/coreplugin/find/optionspopup.h
+++ b/src/plugins/coreplugin/find/optionspopup.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QMap>
 #include <QWidget>
@@ -43,7 +44,7 @@ class CORE_EXPORT OptionsPopup : public QWidget
     Q_OBJECT
 
 public:
-    OptionsPopup(QWidget *parent, const QVector<Id> &commands);
+    OptionsPopup(QWidget *parent, const QVector<Utils::Id> &commands);
 
 protected:
     bool event(QEvent *ev) override;
@@ -52,7 +53,7 @@ protected:
 private:
     void actionChanged();
 
-    QCheckBox *createCheckboxForCommand(Id id);
+    QCheckBox *createCheckboxForCommand(Utils::Id id);
 
     QMap<QAction *, QCheckBox *> m_checkboxMap;
 };
diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp
index 5209cb8397..2ddeeeb1a9 100644
--- a/src/plugins/coreplugin/generatedfile.cpp
+++ b/src/plugins/coreplugin/generatedfile.cpp
@@ -34,6 +34,8 @@
 #include <QDir>
 #include <QString>
 
+using namespace Utils;
+
 namespace Core {
 
 /*!
diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h
index bcb94eca09..4caf2bf119 100644
--- a/src/plugins/coreplugin/generatedfile.h
+++ b/src/plugins/coreplugin/generatedfile.h
@@ -26,10 +26,11 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
 
-#include <QSharedDataPointer>
+#include <utils/id.h>
+
 #include <QList>
+#include <QSharedDataPointer>
 
 namespace Core {
 class GeneratedFilePrivate;
@@ -75,8 +76,8 @@ public:
     void setBinary(bool b);
 
     // Id of editor to open the file with
-    Id editorId() const;
-    void setEditorId(Id id);
+    Utils::Id editorId() const;
+    void setEditorId(Utils::Id id);
 
     bool write(QString *errorMessage) const;
 
diff --git a/src/plugins/coreplugin/icontext.cpp b/src/plugins/coreplugin/icontext.cpp
index 681ce9eab0..5d482a293c 100644
--- a/src/plugins/coreplugin/icontext.cpp
+++ b/src/plugins/coreplugin/icontext.cpp
@@ -78,25 +78,25 @@ QDebug operator<<(QDebug debug, const Core::Context &context)
 */
 
 /*!
-    \fn Core::Context::Context(Core::Id c1)
+    \fn Core::Context::Context(Utils::Id c1)
 
     Creates a context list with a single ID \a c1.
 */
 
 /*!
-    \fn Core::Context::Context(Core::Id c1, Core::Id c2)
+    \fn Core::Context::Context(Utils::Id c1, Utils::Id c2)
 
     Creates a context list with IDs \a c1 and \a c2.
 */
 
 /*!
-    \fn Core::Context::Context(Core::Id c1, Core::Id c2, Core::Id c3)
+    \fn Core::Context::Context(Utils::Id c1, Utils::Id c2, Utils::Id c3)
 
     Creates a context list with IDs \a c1, \a c2 and \a c3.
 */
 
 /*!
-    \fn bool Core::Context::contains(Core::Id c) const
+    \fn bool Core::Context::contains(Utils::Id c) const
 
     Returns whether this context list contains the ID \a c.
 */
@@ -115,7 +115,7 @@ QDebug operator<<(QDebug debug, const Core::Context &context)
 */
 
 /*!
-    \fn Core::Id Core::Context::at(int i) const
+    \fn Utils::Id Core::Context::at(int i) const
 
     Returns the ID at index \a i in the context list.
 */
@@ -134,7 +134,7 @@ QDebug operator<<(QDebug debug, const Core::Context &context)
 */
 
 /*!
-    \fn int Core::Context::indexOf(Core::Id c) const
+    \fn int Core::Context::indexOf(Utils::Id c) const
 
     Returns the index position of the ID \a c in the context list. Returns -1
     if no item matched.
@@ -147,7 +147,7 @@ QDebug operator<<(QDebug debug, const Core::Context &context)
 */
 
 /*!
-    \fn void Core::Context::prepend(Core::Id c)
+    \fn void Core::Context::prepend(Utils::Id c)
 
     Adds the ID \a c as the first item to the context list.
 */
@@ -159,7 +159,7 @@ QDebug operator<<(QDebug debug, const Core::Context &context)
 */
 
 /*!
-    \fn void Core::Context::add(Core::Id c)
+    \fn void Core::Context::add(Utils::Id c)
 
     Adds the ID \a c at the end of the context list.
 */
diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h
index 5c60ed1f4c..8884dd3198 100644
--- a/src/plugins/coreplugin/icontext.h
+++ b/src/plugins/coreplugin/icontext.h
@@ -43,27 +43,27 @@ class CORE_EXPORT Context
 public:
     Context() = default;
 
-    explicit Context(Id c1) { add(c1); }
-    Context(Id c1, Id c2) { add(c1); add(c2); }
-    Context(Id c1, Id c2, Id c3) { add(c1); add(c2); add(c3); }
-    bool contains(Id c) const { return d.contains(c); }
+    explicit Context(Utils::Id c1) { add(c1); }
+    Context(Utils::Id c1, Utils::Id c2) { add(c1); add(c2); }
+    Context(Utils::Id c1, Utils::Id c2, Utils::Id c3) { add(c1); add(c2); add(c3); }
+    bool contains(Utils::Id c) const { return d.contains(c); }
     int size() const { return d.size(); }
     bool isEmpty() const { return d.isEmpty(); }
-    Id at(int i) const { return d.at(i); }
+    Utils::Id at(int i) const { return d.at(i); }
 
     // FIXME: Make interface slimmer.
-    using const_iterator = QList<Id>::const_iterator;
+    using const_iterator = QList<Utils::Id>::const_iterator;
     const_iterator begin() const { return d.begin(); }
     const_iterator end() const { return d.end(); }
-    int indexOf(Id c) const { return d.indexOf(c); }
+    int indexOf(Utils::Id c) const { return d.indexOf(c); }
     void removeAt(int i) { d.removeAt(i); }
-    void prepend(Id c) { d.prepend(c); }
+    void prepend(Utils::Id c) { d.prepend(c); }
     void add(const Context &c) { d += c.d; }
-    void add(Id c) { d.append(c); }
+    void add(Utils::Id c) { d.append(c); }
     bool operator==(const Context &c) const { return d == c.d; }
 
 private:
-    QList<Id> d;
+    QList<Utils::Id> d;
 };
 
 class CORE_EXPORT IContext : public QObject
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 7311e7b174..c048b9f641 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -158,6 +158,7 @@
 
 using namespace Core::Internal;
 using namespace ExtensionSystem;
+using namespace Utils;
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index f5f5e261e1..119c9035bc 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -78,13 +78,13 @@ public:
                                   const QString &defaultLocation = QString(),
                                   const QVariantMap &extraVariables = QVariantMap());
 
-    static bool showOptionsDialog(const Id page, QWidget *parent = nullptr);
+    static bool showOptionsDialog(const Utils::Id page, QWidget *parent = nullptr);
     static QString msgShowOptionsDialog();
     static QString msgShowOptionsDialogToolTip();
 
     static bool showWarningWithOptions(const QString &title, const QString &text,
                                        const QString &details = QString(),
-                                       Id settingsId = Id(),
+                                       Utils::Id settingsId = {},
                                        QWidget *parent = nullptr);
 
     static QSettings *settings(QSettings::Scope scope = QSettings::UserScope);
diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h
index 53a3a410fa..dbf790593d 100644
--- a/src/plugins/coreplugin/id.h
+++ b/src/plugins/coreplugin/id.h
@@ -31,4 +31,4 @@ namespace Core {
 
 using Id = Utils::Id;
 
-} // namespace Core
+} // Core
diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp
index adedc52389..3e5f51cef7 100644
--- a/src/plugins/coreplugin/idocument.cpp
+++ b/src/plugins/coreplugin/idocument.cpp
@@ -58,8 +58,9 @@
     \sa setFilePath()
 */
 
-namespace Core {
+using namespace Utils;
 
+namespace Core {
 namespace Internal {
 
 class IDocumentPrivate
diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h
index 206cac981a..c2a7e90cf8 100644
--- a/src/plugins/coreplugin/idocument.h
+++ b/src/plugins/coreplugin/idocument.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -84,8 +85,8 @@ public:
     IDocument(QObject *parent = nullptr);
     ~IDocument() override;
 
-    void setId(Id id);
-    Id id() const;
+    void setId(Utils::Id id);
+    Utils::Id id() const;
 
     // required to be re-implemented for documents of IEditors
     virtual OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName);
diff --git a/src/plugins/coreplugin/idocumentfactory.h b/src/plugins/coreplugin/idocumentfactory.h
index d70d12b6e1..44f1859bad 100644
--- a/src/plugins/coreplugin/idocumentfactory.h
+++ b/src/plugins/coreplugin/idocumentfactory.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QObject>
 #include <QStringList>
@@ -58,7 +59,7 @@ public:
     void addMimeType(const QString &mimeType) { m_mimeTypes.append(mimeType); }
 
 private:
-    Id m_id;
+    Utils::Id m_id;
     Opener m_opener;
     QStringList m_mimeTypes;
     QString m_displayName;
diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h
index f2678034a4..bd71e32ce1 100644
--- a/src/plugins/coreplugin/imode.h
+++ b/src/plugins/coreplugin/imode.h
@@ -39,7 +39,7 @@ class CORE_EXPORT IMode : public IContext
     Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName)
     Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
     Q_PROPERTY(int priority READ priority WRITE setPriority)
-    Q_PROPERTY(Id id READ id WRITE setId)
+    Q_PROPERTY(Utils::Id id READ id WRITE setId)
     Q_PROPERTY(QMenu *menu READ menu WRITE setMenu)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledStateChanged)
 
@@ -50,7 +50,7 @@ public:
     QString displayName() const { return m_displayName; }
     QIcon icon() const { return m_icon; }
     int priority() const { return m_priority; }
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     bool isEnabled() const;
     QMenu *menu() const { return m_menu; }
 
@@ -58,7 +58,7 @@ public:
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
     void setIcon(const QIcon &icon) { m_icon = icon; }
     void setPriority(int priority) { m_priority = priority; }
-    void setId(Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setMenu(QMenu *menu) { m_menu = menu; }
 
 signals:
@@ -69,7 +69,7 @@ private:
     QIcon m_icon;
     QMenu *m_menu = nullptr;
     int m_priority = -1;
-    Id m_id;
+    Utils::Id m_id;
     bool m_isEnabled = true;
 };
 
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index 31c9ebfdf5..7e36dbdd08 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
@@ -127,7 +127,7 @@ void INavigationWidgetFactory::setPriority(int priority)
 
     \sa id()
 */
-void INavigationWidgetFactory::setId(Id id)
+void INavigationWidgetFactory::setId(Utils::Id id)
 {
     m_id = id;
 }
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index 55681a0bf7..802f1ca5d8 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QObject>
 #include <QList>
@@ -60,12 +61,12 @@ public:
 
     void setDisplayName(const QString &displayName);
     void setPriority(int priority);
-    void setId(Id id);
+    void setId(Utils::Id id);
     void setActivationSequence(const QKeySequence &keys);
 
     QString displayName() const { return m_displayName ; }
     int priority() const { return m_priority; }
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QKeySequence activationSequence() const;
 
     // This design is not optimal, think about it again once we need to extend it
@@ -80,7 +81,7 @@ public:
 private:
     QString m_displayName;
     int m_priority = 0;
-    Id m_id;
+    Utils::Id m_id;
     QKeySequence m_activationSequence;
 };
 
diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index d9a09e5677..8d3bfc50ef 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -26,9 +26,9 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
 
 #include <utils/fancylineedit.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QList>
@@ -115,9 +115,9 @@ private:
     void filterOutputButtonClicked();
     void setCaseSensitive(bool caseSensitive);
     void setRegularExpressions(bool regularExpressions);
-    Id filterRegexpActionId() const;
-    Id filterCaseSensitivityActionId() const;
-    Id filterInvertedActionId() const;
+    Utils::Id filterRegexpActionId() const;
+    Utils::Id filterCaseSensitivityActionId() const;
+    Utils::Id filterInvertedActionId() const;
 
     Core::CommandButton * const m_zoomInButton;
     Core::CommandButton * const m_zoomOutButton;
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index 54a9adff8e..d5a529e72e 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -26,8 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
 
+#include <utils/id.h>
 #include <utils/fileutils.h>
 
 #include <QDateTime>
@@ -92,7 +92,7 @@ public:
     ~IVersionControl() override;
 
     virtual QString displayName() const = 0;
-    virtual Id id() const = 0;
+    virtual Utils::Id id() const = 0;
 
     /*!
      * \brief isVcsFileOrDirectory
@@ -277,7 +277,7 @@ class CORE_EXPORT TestVersionControl : public IVersionControl
 {
     Q_OBJECT
 public:
-    TestVersionControl(Id id, const QString &name) :
+    TestVersionControl(Utils::Id id, const QString &name) :
         m_id(id), m_displayName(name)
     { }
     ~TestVersionControl() override;
@@ -293,7 +293,7 @@ public:
 
     // IVersionControl interface
     QString displayName() const override { return m_displayName; }
-    Id id() const override { return m_id; }
+    Utils::Id id() const override { return m_id; }
     bool managesDirectory(const QString &filename, QString *topLevel) const override;
     bool managesFile(const QString &workingDirectory, const QString &fileName) const override;
     bool isConfigured() const override { return true; }
@@ -307,7 +307,7 @@ public:
     void vcsDescribe(const QString &, const QString &) override {}
 
 private:
-    Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     QHash<QString, QString> m_managedDirs;
     QSet<QString> m_managedFiles;
@@ -316,4 +316,5 @@ private:
 };
 
 } // namespace Core
+
 #endif
diff --git a/src/plugins/coreplugin/iwelcomepage.h b/src/plugins/coreplugin/iwelcomepage.h
index a25039c406..18240541e9 100644
--- a/src/plugins/coreplugin/iwelcomepage.h
+++ b/src/plugins/coreplugin/iwelcomepage.h
@@ -53,7 +53,7 @@ public:
 
     virtual QString title() const = 0;
     virtual int priority() const { return 0; }
-    virtual Core::Id id() const = 0;
+    virtual Utils::Id id() const = 0;
     virtual QWidget *createWidget() const = 0;
 
     static const QList<IWelcomePage *> allWelcomePages();
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 367e607705..3dff6e023d 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -125,7 +125,7 @@
 */
 
 using namespace Core;
-
+using namespace Utils;
 
 namespace {
 static QList<IFeatureProvider *> s_providerList;
diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h
index 1717133ee8..40e485f3c6 100644
--- a/src/plugins/coreplugin/iwizardfactory.h
+++ b/src/plugins/coreplugin/iwizardfactory.h
@@ -57,7 +57,7 @@ public:
     };
     Q_DECLARE_FLAGS(WizardFlags, WizardFlag)
 
-    Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     WizardKind kind() const { return m_supportedProjectTypes.isEmpty() ? FileWizard : ProjectWizard; }
     QIcon icon() const { return m_icon; }
     QString iconText() const { return m_iconText; }
@@ -66,12 +66,12 @@ public:
     QString category() const { return m_category; }
     QString displayCategory() const { return m_displayCategory; }
     QString descriptionImage() const { return m_descriptionImage; }
-    QSet<Id> requiredFeatures() const { return m_requiredFeatures; }
+    QSet<Utils::Id> requiredFeatures() const { return m_requiredFeatures; }
     WizardFlags flags() const { return m_flags; }
-    QSet<Id> supportedProjectTypes() const { return m_supportedProjectTypes; }
+    QSet<Utils::Id> supportedProjectTypes() const { return m_supportedProjectTypes; }
 
-    void setId(const Id id) { m_id = id; }
-    void setSupportedProjectTypes(const QSet<Id> &projectTypes) { m_supportedProjectTypes = projectTypes; }
+    void setId(const Utils::Id id) { m_id = id; }
+    void setSupportedProjectTypes(const QSet<Utils::Id> &projectTypes) { m_supportedProjectTypes = projectTypes; }
     void setIcon(const QIcon &icon) { m_icon = icon; }
     void setIconText(const QString &iconText) { m_iconText = iconText; }
     void setDescription(const QString &description) { m_description = description; }
@@ -79,26 +79,26 @@ public:
     void setCategory(const QString &category) { m_category = category; }
     void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
     void setDescriptionImage(const QString &descriptionImage) { m_descriptionImage = descriptionImage; }
-    void setRequiredFeatures(const QSet<Id> &featureSet) { m_requiredFeatures = featureSet; }
-    void addRequiredFeature(const Id &feature) { m_requiredFeatures |= feature; }
+    void setRequiredFeatures(const QSet<Utils::Id> &featureSet) { m_requiredFeatures = featureSet; }
+    void addRequiredFeature(const Utils::Id &feature) { m_requiredFeatures |= feature; }
     void setFlags(WizardFlags flags) { m_flags = flags; }
 
     QString runPath(const QString &defaultPath);
 
     // Does bookkeeping and the calls runWizardImpl. Please implement that.
-    Utils::Wizard *runWizard(const QString &path, QWidget *parent, Id platform,
+    Utils::Wizard *runWizard(const QString &path, QWidget *parent, Utils::Id platform,
                              const QVariantMap &variables);
 
-    virtual bool isAvailable(Id platformId) const;
-    QSet<Id> supportedPlatforms() const;
+    virtual bool isAvailable(Utils::Id platformId) const;
+    QSet<Utils::Id> supportedPlatforms() const;
 
     using FactoryCreator = std::function<QList<IWizardFactory *>()>;
     static void registerFactoryCreator(const FactoryCreator &creator);
 
     // Utility to find all registered wizards
     static QList<IWizardFactory*> allWizardFactories();
-    static QSet<Id> allAvailablePlatforms();
-    static QString displayNameForPlatform(Id i);
+    static QSet<Utils::Id> allAvailablePlatforms();
+    static QString displayNameForPlatform(Utils::Id i);
 
     static void registerFeatureProvider(IFeatureProvider *provider);
 
@@ -111,10 +111,10 @@ public:
                                      const QVariantMap &extraVariables);
 
 protected:
-    QSet<Id> pluginFeatures() const;
-    QSet<Id> availableFeatures(Id platformId) const;
+    QSet<Utils::Id> pluginFeatures() const;
+    QSet<Utils::Id> availableFeatures(Utils::Id platformId) const;
 
-    virtual Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Id platform,
+    virtual Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform,
                                          const QVariantMap &variables) = 0;
 
 private:
@@ -131,10 +131,10 @@ private:
     QString m_category;
     QString m_displayCategory;
     QString m_descriptionImage;
-    QSet<Id> m_requiredFeatures;
-    QSet<Id> m_supportedProjectTypes;
+    QSet<Utils::Id> m_requiredFeatures;
+    QSet<Utils::Id> m_supportedProjectTypes;
     WizardFlags m_flags;
-    Id m_id;
+    Utils::Id m_id;
 
     friend class Internal::CorePlugin;
 };
diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp
index 5053bd9290..f2b83e74e3 100644
--- a/src/plugins/coreplugin/locator/commandlocator.cpp
+++ b/src/plugins/coreplugin/locator/commandlocator.cpp
@@ -33,6 +33,8 @@
 #include <QAction>
 #include <QTimer>
 
+using namespace Utils;
+
 namespace Core {
 
 struct CommandLocatorPrivate
diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h
index db86bb94ab..3e828952e5 100644
--- a/src/plugins/coreplugin/locator/commandlocator.h
+++ b/src/plugins/coreplugin/locator/commandlocator.h
@@ -39,7 +39,7 @@ class CORE_EXPORT CommandLocator : public ILocatorFilter
     Q_OBJECT
 
 public:
-    CommandLocator(Id id, const QString &displayName,
+    CommandLocator(Utils::Id id, const QString &displayName,
                    const QString &shortCutString, QObject *parent = nullptr);
     ~CommandLocator() override;
 
diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index 718039c5ce..2a41b60d71 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -35,6 +35,8 @@
 #include <QFileDialog>
 #include <QTimer>
 
+using namespace Utils;
+
 namespace Core {
 
 /*!
diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h
index 40463315cb..4b48aa636c 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.h
+++ b/src/plugins/coreplugin/locator/directoryfilter.h
@@ -46,7 +46,7 @@ class CORE_EXPORT DirectoryFilter : public BaseFileFilter
     Q_OBJECT
 
 public:
-    DirectoryFilter(Id id);
+    DirectoryFilter(Utils::Id id);
     QByteArray saveState() const override;
     void restoreState(const QByteArray &state) override;
     bool openConfigDialog(QWidget *parent, bool &needsRefresh) override;
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index dcb5925842..f23b226546 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -43,6 +43,7 @@
 
 using namespace Core;
 using namespace Core::Internal;
+using namespace Utils;
 
 ILocatorFilter::MatchLevel FileSystemFilter::matchLevelFor(const QRegularExpressionMatch &match,
                                                            const QString &matchText) const
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index 78e805bfc5..31f63cf72c 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -38,6 +38,7 @@
 #include <QRegularExpression>
 
 using namespace Core;
+using namespace Utils;
 
 /*!
     \class Core::ILocatorFilter
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h
index b87c1a0ac0..e506a567b9 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.h
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.h
@@ -26,8 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
 
+#include <utils/id.h>
 #include <utils/optional.h>
 
 #include <QVariant>
@@ -121,8 +121,8 @@ public:
 
     static const QList<ILocatorFilter *> allLocatorFilters();
 
-    Id id() const;
-    Id actionId() const;
+    Utils::Id id() const;
+    Utils::Id actionId() const;
 
     QString displayName() const;
 
@@ -170,13 +170,13 @@ public slots:
 
 protected:
     void setHidden(bool hidden);
-    void setId(Id id);
+    void setId(Utils::Id id);
     void setPriority(Priority priority);
     void setDisplayName(const QString &displayString);
     void setConfigurable(bool configurable);
 
 private:
-    Id m_id;
+    Utils::Id m_id;
     QString m_shortcut;
     Priority m_priority = Medium;
     QString m_displayName;
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index 66d7f2d81a..e7b3f05859 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -63,6 +63,8 @@
 #include "spotlightlocatorfilter.h"
 #endif
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h
index 4af5ad1fee..ea74e90df8 100644
--- a/src/plugins/coreplugin/locator/locator.h
+++ b/src/plugins/coreplugin/locator/locator.h
@@ -77,7 +77,7 @@ private:
     bool m_settingsInitialized = false;
     QList<ILocatorFilter *> m_filters;
     QList<ILocatorFilter *> m_customFilters;
-    QMap<Id, QAction *> m_filterActionMap;
+    QMap<Utils::Id, QAction *> m_filterActionMap;
     QTimer m_refreshTimer;
     QFuture<void> m_refreshTask;
     QList<ILocatorFilter *> m_refreshingFilters;
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
index 355804f152..7392d38d85 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
@@ -31,6 +31,8 @@
 #include <QMutexLocker>
 #include <QUrl>
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.h b/src/plugins/coreplugin/locator/urllocatorfilter.h
index b15dcdde3a..e12878d068 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.h
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.h
@@ -40,8 +40,8 @@ class CORE_EXPORT UrlLocatorFilter final : public Core::ILocatorFilter
 {
     Q_OBJECT
 public:
-    UrlLocatorFilter(Id id);
-    UrlLocatorFilter(const QString &displayName, Id id);
+    UrlLocatorFilter(Utils::Id id);
+    UrlLocatorFilter(const QString &displayName, Utils::Id id);
     ~UrlLocatorFilter() final;
 
     // ILocatorFilter
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index f37124276b..d09ec460e5 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -46,6 +46,8 @@
 #include <QMouseEvent>
 #include <QVector>
 
+using namespace Utils;
+
 namespace Core {
 
 /*!
diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h
index a3db404e99..811a4d1032 100644
--- a/src/plugins/coreplugin/modemanager.h
+++ b/src/plugins/coreplugin/modemanager.h
@@ -26,7 +26,9 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
+
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -56,12 +58,12 @@ public:
     static ModeManager *instance();
 
     static IMode *currentMode();
-    static Id currentModeId();
+    static Utils::Id currentModeId();
 
     static void addAction(QAction *action, int priority);
     static void addProjectSelector(QAction *action);
 
-    static void activateMode(Id id);
+    static void activateMode(Utils::Id id);
     static void setFocusToCurrentMode();
     static Style modeStyle();
 
@@ -70,10 +72,10 @@ public slots:
     static void cycleModeStyle();
 
 signals:
-    void currentModeAboutToChange(Core::Id mode);
+    void currentModeAboutToChange(Utils::Id mode);
 
     // the default argument '=0' is important for connects without the oldMode argument.
-    void currentModeChanged(Core::Id mode, Core::Id oldMode = Core::Id());
+    void currentModeChanged(Utils::Id mode, Utils::Id oldMode = {});
 
 private:
     explicit ModeManager(Internal::MainWindow *mainWindow, Internal::FancyTabWidget *modeStack);
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index c839b3b551..3a97ff6b58 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -43,6 +43,8 @@
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 6cb8fed496..4b77bd3a14 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -48,6 +48,8 @@
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 
+using namespace Utils;
+
 namespace Core {
 
 NavigationWidgetPlaceHolder *NavigationWidgetPlaceHolder::s_currentLeft = nullptr;
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 69b16a96e3..e1a2efed19 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/minisplitter.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QHash>
 
@@ -53,17 +54,17 @@ class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget
     friend class Core::NavigationWidget;
 
 public:
-    explicit NavigationWidgetPlaceHolder(Id mode, Side side, QWidget *parent = nullptr);
+    explicit NavigationWidgetPlaceHolder(Utils::Id mode, Side side, QWidget *parent = nullptr);
     ~NavigationWidgetPlaceHolder() override;
     static NavigationWidgetPlaceHolder *current(Side side);
     static void setCurrent(Side side, NavigationWidgetPlaceHolder *navWidget);
     void applyStoredSize();
 
 private:
-    void currentModeAboutToChange(Id mode);
+    void currentModeAboutToChange(Utils::Id mode);
     int storedWidth() const;
 
-    Id m_mode;
+    Utils::Id m_mode;
     Side m_side;
     static NavigationWidgetPlaceHolder *s_currentLeft;
     static NavigationWidgetPlaceHolder *s_currentRight;
@@ -89,21 +90,21 @@ public:
     void saveSettings(QSettings *settings);
     void restoreSettings(QSettings *settings);
 
-    QWidget *activateSubWidget(Id factoryId, int preferredPosition);
+    QWidget *activateSubWidget(Utils::Id factoryId, int preferredPosition);
     void closeSubWidgets();
 
     bool isShown() const;
     void setShown(bool b);
 
     static NavigationWidget *instance(Side side);
-    static QWidget *activateSubWidget(Id factoryId, Side fallbackSide);
+    static QWidget *activateSubWidget(Utils::Id factoryId, Side fallbackSide);
 
     int storedWidth();
 
     // Called from the place holders
     void placeHolderChanged(NavigationWidgetPlaceHolder *holder);
 
-    QHash<Id, Command *> commandMap() const;
+    QHash<Utils::Id, Command *> commandMap() const;
     QAbstractItemModel *factoryModel() const;
 
 protected:
@@ -114,7 +115,7 @@ private:
     void closeSubWidget();
     void updateToggleText();
     Internal::NavigationSubWidget *insertSubItem(int position, int factoryIndex);
-    int factoryIndex(Id id);
+    int factoryIndex(Utils::Id id);
     QString settingsKey(const QString &key) const;
     void onSubWidgetFactoryIndexChanged(int factoryIndex);
 
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 5043ac8abd..4b2f4556a8 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -32,6 +32,8 @@
 #include <QSplitter>
 #include <QVBoxLayout>
 
+using namespace Utils;
+
 namespace Core {
 
 class OutputPanePlaceHolderPrivate {
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 36b58458e3..16231b0555 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QWidget>
 
@@ -43,7 +44,7 @@ class CORE_EXPORT OutputPanePlaceHolder : public QWidget
     Q_OBJECT
 
 public:
-    explicit OutputPanePlaceHolder(Id mode, QSplitter *parent = nullptr);
+    explicit OutputPanePlaceHolder(Utils::Id mode, QSplitter *parent = nullptr);
     ~OutputPanePlaceHolder() override;
 
     static OutputPanePlaceHolder *getCurrent();
@@ -63,7 +64,7 @@ protected:
 
 private:
     void setHeight(int height);
-    void currentModeChanged(Id mode);
+    void currentModeChanged(Utils::Id mode);
 
     OutputPanePlaceHolderPrivate *d;
 };
diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h
index 1219edeeba..8d32527a9b 100644
--- a/src/plugins/coreplugin/outputpanemanager.h
+++ b/src/plugins/coreplugin/outputpanemanager.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QToolButton>
 
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index bec4933513..ab92e46ac9 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -26,8 +26,6 @@
 #include "futureprogress.h"
 #include "progressbar.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
 
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index d3748a072d..9f7a7bee98 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QString>
 #include <QFuture>
@@ -62,8 +63,8 @@ public:
     void setSubtitleVisibleInStatusBar(bool visible);
     bool isSubtitleVisibleInStatusBar() const;
 
-    void setType(Id type);
-    Id type() const;
+    void setType(Utils::Id type);
+    Utils::Id type() const;
 
     void setKeepOnFinish(KeepOnFinishType keepType);
     bool keepOnFinish() const;
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 711a5f4734..39e78468e5 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -212,13 +212,13 @@ using namespace Utils;
 */
 
 /*!
-    \fn void Core::ProgressManager::taskStarted(Core::Id type)
+    \fn void Core::ProgressManager::taskStarted(Utils::Id type)
 
     Sent whenever a task of a given \a type is started.
 */
 
 /*!
-    \fn void Core::ProgressManager::allTasksFinished(Core::Id type)
+    \fn void Core::ProgressManager::allTasksFinished(Utils::Id type)
 
     Sent when all tasks of a \a type have finished.
 */
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 5023a57b6a..d421b15b6d 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/id.h>
+
+#include <utils/id.h>
 
 #include <QFuture>
 #include <QFutureInterfaceBase>
@@ -52,17 +53,17 @@ public:
     static ProgressManager *instance();
 
     static FutureProgress *addTask(const QFuture<void> &future, const QString &title,
-                                   Id type, ProgressFlags flags = {});
+                                   Utils::Id type, ProgressFlags flags = {});
     static FutureProgress *addTimedTask(const QFutureInterface<void> &fi, const QString &title,
-                                   Id type, int expectedSeconds, ProgressFlags flags = {});
+                                        Utils::Id type, int expectedSeconds, ProgressFlags flags = {});
     static void setApplicationLabel(const QString &text);
 
 public slots:
-    static void cancelTasks(Id type);
+    static void cancelTasks(Utils::Id type);
 
 signals:
-    void taskStarted(Core::Id type);
-    void allTasksFinished(Core::Id type);
+    void taskStarted(Utils::Id type);
+    void allTasksFinished(Utils::Id type);
 
 private:
     ProgressManager();
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h
index 4eabe50204..fe1416cb3a 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h
@@ -54,14 +54,14 @@ public:
     void init();
     void cleanup();
 
-    FutureProgress *doAddTask(const QFuture<void> &future, const QString &title, Id type,
+    FutureProgress *doAddTask(const QFuture<void> &future, const QString &title, Utils::Id type,
                             ProgressFlags flags);
 
     void doSetApplicationLabel(const QString &text);
     ProgressView *progressView();
 
 public slots:
-    void doCancelTasks(Core::Id type);
+    void doCancelTasks(Utils::Id type);
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
@@ -89,14 +89,14 @@ private:
     bool hasError() const;
     bool isLastFading() const;
 
-    void removeOldTasks(Id type, bool keepOne = false);
+    void removeOldTasks(Utils::Id type, bool keepOne = false);
     void removeOneOldTask();
     void removeTask(FutureProgress *task);
     void deleteTask(FutureProgress *task);
 
     QPointer<ProgressView> m_progressView;
     QList<FutureProgress *> m_taskList;
-    QMap<QFutureWatcher<void> *, Id> m_runningTasks;
+    QMap<QFutureWatcher<void> *, Utils::Id> m_runningTasks;
     QFutureWatcher<void> *m_applicationTask = nullptr;
     StatusBarWidget *m_statusBarWidgetContainer;
     QWidget *m_statusBarWidget;
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 6674106396..67504b9a4a 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -37,6 +37,7 @@
 
 using namespace Core;
 using namespace Core::Internal;
+using namespace Utils;
 
 RightPanePlaceHolder *RightPanePlaceHolder::m_current = nullptr;
 
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index 8b18fcd3c9..f4d5a50818 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/src/plugins/coreplugin/rightpane.h
@@ -45,14 +45,14 @@ class CORE_EXPORT RightPanePlaceHolder : public QWidget
     Q_OBJECT
 
 public:
-    explicit RightPanePlaceHolder(Id mode, QWidget *parent = nullptr);
+    explicit RightPanePlaceHolder(Utils::Id mode, QWidget *parent = nullptr);
     ~RightPanePlaceHolder() override;
     static RightPanePlaceHolder *current();
 
 private:
-    void currentModeChanged(Id mode);
+    void currentModeChanged(Utils::Id mode);
     void applyStoredSize(int width);
-    Id m_mode;
+    Utils::Id m_mode;
     static RightPanePlaceHolder* m_current;
 };
 
diff --git a/src/plugins/coreplugin/shellcommand.cpp b/src/plugins/coreplugin/shellcommand.cpp
index a1ddd083eb..0e643d5df4 100644
--- a/src/plugins/coreplugin/shellcommand.cpp
+++ b/src/plugins/coreplugin/shellcommand.cpp
@@ -48,7 +48,7 @@ FutureProgress *ShellCommand::futureProgress() const
 void ShellCommand::addTask(QFuture<void> &future)
 {
     const QString name = displayName();
-    const auto id = Core::Id::fromString(name + QLatin1String(".action"));
+    const auto id = Utils::Id::fromString(name + QLatin1String(".action"));
     if (hasProgressParser()) {
         m_progress = ProgressManager::addTask(future, name, id);
     } else {
diff --git a/src/plugins/coreplugin/themechooser.h b/src/plugins/coreplugin/themechooser.h
index 3af09d0055..3fdfec3eca 100644
--- a/src/plugins/coreplugin/themechooser.h
+++ b/src/plugins/coreplugin/themechooser.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "id.h"
+#include <utils/id.h>
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
@@ -42,17 +42,17 @@ class ThemeEntry
 {
 public:
     ThemeEntry() = default;
-    ThemeEntry(Id id, const QString &filePath);
+    ThemeEntry(Utils::Id id, const QString &filePath);
 
-    Id id() const;
+    Utils::Id id() const;
     QString displayName() const;
     QString filePath() const;
     static QList<ThemeEntry> availableThemes();
-    static Id themeSetting();
-    static Utils::Theme *createTheme(Id id);
+    static Utils::Id themeSetting();
+    static Utils::Theme *createTheme(Utils::Id id);
 
 private:
-    Id m_id;
+    Utils::Id m_id;
     QString m_filePath;
     mutable QString m_displayName;
 };
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index eebdbde441..db06547cba 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -48,6 +48,8 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
+using namespace Utils;
+
 namespace Core {
 
 #if defined(WITH_TESTS)
diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h
index 9596801aba..5adaf3f65e 100644
--- a/src/plugins/coreplugin/vcsmanager.h
+++ b/src/plugins/coreplugin/vcsmanager.h
@@ -26,7 +26,8 @@
 #pragma once
 
 #include "core_global.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QString>
 #include <QObject>
@@ -59,7 +60,7 @@ public:
     static void extensionsInitialized();
 
     static const QList<IVersionControl *> versionControls();
-    static IVersionControl *versionControl(Id id);
+    static IVersionControl *versionControl(Utils::Id id);
 
     static void resetVersionControlForDirectory(const QString &inputDirectory);
     static IVersionControl *findVersionControlForDirectory(const QString &directory,
diff --git a/src/plugins/coreplugin/windowsupport.cpp b/src/plugins/coreplugin/windowsupport.cpp
index 195d172dc4..4915c58d9a 100644
--- a/src/plugins/coreplugin/windowsupport.cpp
+++ b/src/plugins/coreplugin/windowsupport.cpp
@@ -42,6 +42,8 @@
 #include <QWidget>
 #include <QWindowStateChangeEvent>
 
+using namespace Utils;
+
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/windowsupport.h b/src/plugins/coreplugin/windowsupport.h
index 1e640f6edb..ce609f8f10 100644
--- a/src/plugins/coreplugin/windowsupport.h
+++ b/src/plugins/coreplugin/windowsupport.h
@@ -55,7 +55,7 @@ private:
     QMenu *m_dockMenu = nullptr;
     QList<QWidget *> m_windows;
     QList<QAction *> m_windowActions;
-    QList<Id> m_windowActionIds;
+    QList<Utils::Id> m_windowActionIds;
 };
 
 class WindowSupport : public QObject
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 49dcc1f085..aa01c7edb3 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 4bbab6a4de..6d338a1df3 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -145,7 +145,7 @@ void CppcheckPluginPrivate::updateManualRunAction()
     using namespace ProjectExplorer;
     const Project *project = SessionManager::startupProject();
     const Target *target = SessionManager::startupTarget();
-    const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
+    const Utils::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
     const bool canRun = target && project->projectLanguages().contains(cxx)
                   && ToolChainKitAspect::cxxToolChain(target->kit());
     manualRunAction->setEnabled(canRun);
diff --git a/src/plugins/cppcheck/cppchecktextmark.cpp b/src/plugins/cppcheck/cppchecktextmark.cpp
index 68489709df..512ba37ce9 100644
--- a/src/plugins/cppcheck/cppchecktextmark.cpp
+++ b/src/plugins/cppcheck/cppchecktextmark.cpp
@@ -65,7 +65,7 @@ static Visual getVisual(Diagnostic::Severity type)
 
 CppcheckTextMark::CppcheckTextMark (const Diagnostic &diagnostic)
     : TextEditor::TextMark (diagnostic.fileName, diagnostic.lineNumber,
-                            Core::Id(Constants::TEXTMARK_CATEGORY_ID)),
+                            Utils::Id(Constants::TEXTMARK_CATEGORY_ID)),
     m_severity(diagnostic.severity),
     m_checkId(diagnostic.checkId),
     m_message(diagnostic.message)
diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp
index cf52af1958..492f1b2e25 100644
--- a/src/plugins/cppcheck/cppchecktool.cpp
+++ b/src/plugins/cppcheck/cppchecktool.cpp
@@ -45,7 +45,7 @@ namespace Cppcheck {
 namespace Internal {
 
 CppcheckTool::CppcheckTool(CppcheckDiagnosticManager &manager,
-                           const Core::Id &progressId) :
+                           const Utils::Id &progressId) :
     m_manager(manager),
     m_progressRegexp("^.* checked (\\d+)% done$"),
     m_messageRegexp("^(.+),(\\d+),(\\w+),(\\w+),(.*)$"),
diff --git a/src/plugins/cppcheck/cppchecktool.h b/src/plugins/cppcheck/cppchecktool.h
index a443264d81..abce347fbf 100644
--- a/src/plugins/cppcheck/cppchecktool.h
+++ b/src/plugins/cppcheck/cppchecktool.h
@@ -58,7 +58,7 @@ class CppcheckTool final : public QObject
     Q_OBJECT
 
 public:
-    CppcheckTool(CppcheckDiagnosticManager &manager, const Core::Id &progressId);
+    CppcheckTool(CppcheckDiagnosticManager &manager, const Utils::Id &progressId);
     ~CppcheckTool() override;
 
     void updateOptions(const CppcheckOptions &options);
@@ -87,7 +87,7 @@ private:
     QVector<QRegExp> m_filters;
     QRegularExpression m_progressRegexp;
     QRegularExpression m_messageRegexp;
-    Core::Id m_progressId;
+    Utils::Id m_progressId;
 };
 
 } // namespace Internal
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index d0a2133a45..bae58d49cc 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -351,7 +351,7 @@ void CppEditorDocument::releaseResources()
 
 void CppEditorDocument::showHideInfoBarAboutMultipleParseContexts(bool show)
 {
-    const Core::Id id = Constants::MULTIPLE_PARSE_CONTEXTS_AVAILABLE;
+    const Utils::Id id = Constants::MULTIPLE_PARSE_CONTEXTS_AVAILABLE;
 
     if (show) {
         Utils::InfoBarEntry info(id,
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index b4789cf313..3cbdd9d6be 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -115,8 +115,8 @@ public:
 class CppEditorPluginPrivate : public QObject
 {
 public:
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
+    void onTaskStarted(Utils::Id type);
+    void onAllTasksFinished(Utils::Id type);
     void inspectCppCodeModel();
 
     QAction *m_reparseExternallyChangedFiles = nullptr;
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 354638dca7..8861cd63e9 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -105,6 +105,7 @@ using namespace Core;
 using namespace CPlusPlus;
 using namespace CppTools;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cppeditorwidget.h b/src/plugins/cppeditor/cppeditorwidget.h
index 64172862fc..bdb5ce313b 100644
--- a/src/plugins/cppeditor/cppeditorwidget.h
+++ b/src/plugins/cppeditor/cppeditorwidget.h
@@ -124,7 +124,7 @@ private:
     void onIfdefedOutBlocksUpdated(unsigned revision,
                                    const QList<TextEditor::BlockRange> ifdefedOutBlocks);
 
-    void onShowInfoBarAction(const Core::Id &id, bool show);
+    void onShowInfoBarAction(const Utils::Id &id, bool show);
 
     void updateSemanticInfo(const CppTools::SemanticInfo &semanticInfo,
                             bool updateUseSelectionSynchronously = false);
diff --git a/src/plugins/cppeditor/cppminimizableinfobars.cpp b/src/plugins/cppeditor/cppminimizableinfobars.cpp
index 114f7109f9..d0a7b38aaf 100644
--- a/src/plugins/cppeditor/cppminimizableinfobars.cpp
+++ b/src/plugins/cppeditor/cppminimizableinfobars.cpp
@@ -30,15 +30,12 @@
 #include <QTimer>
 #include <QToolButton>
 
-#include <coreplugin/id.h>
-
 #include <cpptools/cpptoolssettings.h>
 
 #include <utils/infobar.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 
-using namespace Core;
 using namespace CppTools;
 using namespace Utils;
 
diff --git a/src/plugins/cppeditor/cppminimizableinfobars.h b/src/plugins/cppeditor/cppminimizableinfobars.h
index 9e21f30ec2..8c9ef9dfd1 100644
--- a/src/plugins/cppeditor/cppminimizableinfobars.h
+++ b/src/plugins/cppeditor/cppminimizableinfobars.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QAction>
 #include <QHash>
@@ -47,7 +47,7 @@ class MinimizableInfoBars : public QObject
 public:
     using DiagnosticWidgetCreator = std::function<QWidget *()>;
     using ActionCreator = std::function<QAction *(QWidget *widget)>;
-    using Actions = QHash<Core::Id, QAction *>;
+    using Actions = QHash<Utils::Id, QAction *>;
 
     static Actions createShowInfoBarActions(const ActionCreator &actionCreator);
 
@@ -59,14 +59,14 @@ public:
     void processHeaderDiagnostics(const DiagnosticWidgetCreator &diagnosticWidgetCreator);
 
 signals:
-    void showAction(const Core::Id &id, bool show);
+    void showAction(const Utils::Id &id, bool show);
 
 private:
     void updateNoProjectConfiguration();
     void updateHeaderErrors();
 
-    void addNoProjectConfigurationEntry(const Core::Id &id);
-    void addHeaderErrorEntry(const Core::Id &id,
+    void addNoProjectConfigurationEntry(const Utils::Id &id);
+    void addHeaderErrorEntry(const Utils::Id &id,
                              const DiagnosticWidgetCreator &diagnosticWidgetCreator);
 
 private:
diff --git a/src/plugins/cpptools/clangdiagnosticconfig.cpp b/src/plugins/cpptools/clangdiagnosticconfig.cpp
index a9427e4e74..3c3758c37a 100644
--- a/src/plugins/cpptools/clangdiagnosticconfig.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfig.cpp
@@ -32,12 +32,12 @@
 
 namespace CppTools {
 
-Core::Id ClangDiagnosticConfig::id() const
+Utils::Id ClangDiagnosticConfig::id() const
 {
     return m_id;
 }
 
-void ClangDiagnosticConfig::setId(const Core::Id &id)
+void ClangDiagnosticConfig::setId(const Utils::Id &id)
 {
     m_id = id;
 }
@@ -199,7 +199,7 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
         s->setArrayIndex(i);
 
         ClangDiagnosticConfig config;
-        config.setId(Core::Id::fromSetting(s->value(diagnosticConfigIdKey)));
+        config.setId(Utils::Id::fromSetting(s->value(diagnosticConfigIdKey)));
         config.setDisplayName(s->value(diagnosticConfigDisplayNameKey).toString());
         config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList());
         config.setUseBuildSystemWarnings(s->value(useBuildSystemFlagsKey, false).toBool());
diff --git a/src/plugins/cpptools/clangdiagnosticconfig.h b/src/plugins/cpptools/clangdiagnosticconfig.h
index 76f5983c1d..d442a1a312 100644
--- a/src/plugins/cpptools/clangdiagnosticconfig.h
+++ b/src/plugins/cpptools/clangdiagnosticconfig.h
@@ -27,7 +27,7 @@
 
 #include "cpptools_global.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QStringList>
 #include <QVector>
@@ -42,8 +42,8 @@ namespace CppTools {
 class CPPTOOLS_EXPORT ClangDiagnosticConfig
 {
 public:
-    Core::Id id() const;
-    void setId(const Core::Id &id);
+    Utils::Id id() const;
+    void setId(const Utils::Id &id);
 
     QString displayName() const;
     void setDisplayName(const QString &displayName);
@@ -91,7 +91,7 @@ public:
     bool operator!=(const ClangDiagnosticConfig &other) const;
 
 private:
-    Core::Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     QStringList m_clangOptions;
     TidyMode m_clangTidyMode = TidyMode::UseDefaultChecks;
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
index 6e6ece6b8d..1a583ffd45 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
@@ -60,7 +60,7 @@ void ClangDiagnosticConfigsModel::appendOrUpdate(const ClangDiagnosticConfig &co
         m_diagnosticConfigs.append(config);
 }
 
-void ClangDiagnosticConfigsModel::removeConfigWithId(const Core::Id &id)
+void ClangDiagnosticConfigsModel::removeConfigWithId(const Utils::Id &id)
 {
     m_diagnosticConfigs.removeOne(configWithId(id));
 }
@@ -77,21 +77,21 @@ ClangDiagnosticConfigs ClangDiagnosticConfigsModel::customConfigs() const
     });
 }
 
-bool ClangDiagnosticConfigsModel::hasConfigWithId(const Core::Id &id) const
+bool ClangDiagnosticConfigsModel::hasConfigWithId(const Utils::Id &id) const
 {
     return indexOfConfig(id) != -1;
 }
 
-const ClangDiagnosticConfig &ClangDiagnosticConfigsModel::configWithId(const Core::Id &id) const
+const ClangDiagnosticConfig &ClangDiagnosticConfigsModel::configWithId(const Utils::Id &id) const
 {
     return m_diagnosticConfigs.at(indexOfConfig(id));
 }
 
-QVector<Core::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
+QVector<Utils::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
     const ClangDiagnosticConfigs &oldConfigs, const ClangDiagnosticConfigs &newConfigs)
 {
     ClangDiagnosticConfigsModel newConfigsModel(newConfigs);
-    QVector<Core::Id> changedConfigs;
+    QVector<Utils::Id> changedConfigs;
 
     for (const ClangDiagnosticConfig &old: oldConfigs) {
         const int i = newConfigsModel.indexOfConfig(old.id());
@@ -108,7 +108,7 @@ ClangDiagnosticConfig ClangDiagnosticConfigsModel::createCustomConfig(
     const ClangDiagnosticConfig &baseConfig, const QString &displayName)
 {
     ClangDiagnosticConfig copied = baseConfig;
-    copied.setId(Core::Id::fromString(QUuid::createUuid().toString()));
+    copied.setId(Utils::Id::fromString(QUuid::createUuid().toString()));
     copied.setDisplayName(displayName);
     copied.setIsReadOnly(false);
 
@@ -127,7 +127,7 @@ QStringList ClangDiagnosticConfigsModel::globalDiagnosticOptions()
     };
 }
 
-int ClangDiagnosticConfigsModel::indexOfConfig(const Core::Id &id) const
+int ClangDiagnosticConfigsModel::indexOfConfig(const Utils::Id &id) const
 {
     return Utils::indexOf(m_diagnosticConfigs, [&](const ClangDiagnosticConfig &config) {
        return config.id() == id;
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsmodel.h b/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
index ee73627394..1c6a29d0f7 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
+++ b/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
@@ -43,16 +43,16 @@ public:
     const ClangDiagnosticConfig &at(int index) const;
 
     void appendOrUpdate(const ClangDiagnosticConfig &config);
-    void removeConfigWithId(const Core::Id &id);
+    void removeConfigWithId(const Utils::Id &id);
 
     ClangDiagnosticConfigs allConfigs() const;
     ClangDiagnosticConfigs customConfigs() const;
 
-    bool hasConfigWithId(const Core::Id &id) const;
-    const ClangDiagnosticConfig &configWithId(const Core::Id &id) const;
-    int indexOfConfig(const Core::Id &id) const;
+    bool hasConfigWithId(const Utils::Id &id) const;
+    const ClangDiagnosticConfig &configWithId(const Utils::Id &id) const;
+    int indexOfConfig(const Utils::Id &id) const;
 
-    static QVector<Core::Id> changedOrRemovedConfigs(const ClangDiagnosticConfigs &oldConfigs,
+    static QVector<Utils::Id> changedOrRemovedConfigs(const ClangDiagnosticConfigs &oldConfigs,
                                                      const ClangDiagnosticConfigs &newConfigs);
     static ClangDiagnosticConfig createCustomConfig(const ClangDiagnosticConfig &baseConfig,
                                                     const QString &displayName);
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
index abcc7c5ff0..8398c4855b 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
@@ -58,7 +58,7 @@ ClangDiagnosticConfigsSelectionWidget::ClangDiagnosticConfigsSelectionWidget(QWi
 }
 
 void ClangDiagnosticConfigsSelectionWidget::refresh(const ClangDiagnosticConfigsModel &model,
-                                                    const Core::Id &configToSelect,
+                                                    const Utils::Id &configToSelect,
                                                     const CreateEditWidget &createEditWidget)
 {
     m_diagnosticConfigsModel = model;
@@ -69,7 +69,7 @@ void ClangDiagnosticConfigsSelectionWidget::refresh(const ClangDiagnosticConfigs
     m_button->setText(config.displayName());
 }
 
-Core::Id ClangDiagnosticConfigsSelectionWidget::currentConfigId() const
+Utils::Id ClangDiagnosticConfigsSelectionWidget::currentConfigId() const
 {
     return m_currentConfigId;
 }
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h
index df0283c181..3589872f07 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h
+++ b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h
@@ -51,13 +51,13 @@ public:
 
     using CreateEditWidget
         = std::function<ClangDiagnosticConfigsWidget *(const ClangDiagnosticConfigs &configs,
-                                                       const Core::Id &configToSelect)>;
+                                                       const Utils::Id &configToSelect)>;
 
     void refresh(const ClangDiagnosticConfigsModel &model,
-                 const Core::Id &configToSelect,
+                 const Utils::Id &configToSelect,
                  const CreateEditWidget &createEditWidget);
 
-    Core::Id currentConfigId() const;
+    Utils::Id currentConfigId() const;
     ClangDiagnosticConfigs customConfigs() const;
 
 signals:
@@ -67,7 +67,7 @@ private:
     void onButtonClicked();
 
     ClangDiagnosticConfigsModel m_diagnosticConfigsModel;
-    Core::Id m_currentConfigId;
+    Utils::Id m_currentConfigId;
     bool m_showTidyClazyUi = true;
 
     QLabel *m_label = nullptr;
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
index 3e74b9da2a..f7172a63ae 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
@@ -109,13 +109,13 @@ public:
         m_customRoot->appendChild(new ConfigNode(config));
     }
 
-    void removeConfig(const Core::Id &id)
+    void removeConfig(const Utils::Id &id)
     {
        ConfigNode *node = itemForConfigId(id);
        node->parent()->removeChildAt(node->indexInParent());
     }
 
-    ConfigNode *itemForConfigId(const Core::Id &id) const
+    ConfigNode *itemForConfigId(const Utils::Id &id) const
     {
         return findItemAtLevel<2>([id](const ConfigNode *node) {
             return node->config.id() == id;
@@ -128,7 +128,7 @@ private:
 };
 
 ClangDiagnosticConfigsWidget::ClangDiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
-                                                           const Core::Id &configToSelect,
+                                                           const Utils::Id &configToSelect,
                                                            QWidget *parent)
     : QWidget(parent)
     , m_ui(new Ui::ClangDiagnosticConfigsWidget)
@@ -215,7 +215,7 @@ const ClangDiagnosticConfig ClangDiagnosticConfigsWidget::currentConfig() const
 
 void ClangDiagnosticConfigsWidget::onRemoveButtonClicked()
 {
-    const Core::Id configToRemove = currentConfig().id();
+    const Utils::Id configToRemove = currentConfig().id();
     if (m_configsModel->customConfigsCount() == 1)
         m_ui->configsView->setCurrentIndex(m_configsModel->fallbackConfigIndex());
     m_configsModel->removeConfig(configToRemove);
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.h b/src/plugins/cpptools/clangdiagnosticconfigswidget.h
index 6e4253e11f..0db97badf9 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.h
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.h
@@ -55,7 +55,7 @@ class CPPTOOLS_EXPORT ClangDiagnosticConfigsWidget : public QWidget
 
 public:
     explicit ClangDiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
-                                          const Core::Id &configToSelect,
+                                          const Utils::Id &configToSelect,
                                           QWidget *parent = nullptr);
     ~ClangDiagnosticConfigsWidget() override;
 
@@ -85,7 +85,7 @@ private:
 private:
     Ui::ClangDiagnosticConfigsWidget *m_ui;
     ConfigsModel *m_configsModel = nullptr;
-    QHash<Core::Id, QString> m_notAcceptedOptions;
+    QHash<Utils::Id, QString> m_notAcceptedOptions;
 
     std::unique_ptr<CppTools::Ui::ClangBaseChecks> m_clangBaseChecks;
     QWidget *m_clangBaseChecksWidget = nullptr;
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 448d9c2d72..1e9568294a 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -745,7 +745,7 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
                                            qgetenv("QTC_CLANG_CMD_OPTIONS_BLACKLIST"))
                                            .split(';', Utils::SkipEmptyParts);
 
-    const Core::Id &toolChain = m_projectPart.toolchainType;
+    const Utils::Id &toolChain = m_projectPart.toolchainType;
     bool containsDriverMode = false;
     bool skipNext = false;
     const QStringList allFlags = m_projectPart.compilerFlags + m_projectPart.extraCodeModelFlags;
diff --git a/src/plugins/cpptools/cppcodemodelsettings.cpp b/src/plugins/cpptools/cppcodemodelsettings.cpp
index ee90d178b8..98d9a1098d 100644
--- a/src/plugins/cpptools/cppcodemodelsettings.cpp
+++ b/src/plugins/cpptools/cppcodemodelsettings.cpp
@@ -36,7 +36,7 @@
 
 using namespace CppTools;
 
-static Core::Id initialClangDiagnosticConfigId()
+static Utils::Id initialClangDiagnosticConfigId()
 { return Constants::CPP_CLANG_DIAG_CONFIG_QUESTIONABLE; }
 
 static CppCodeModelSettings::PCHUsage initialPchUsage()
@@ -60,11 +60,11 @@ static QString skipIndexingBigFilesKey()
 static QString indexerFileSizeLimitKey()
 { return QLatin1String(Constants::CPPTOOLS_INDEXER_FILE_SIZE_LIMIT); }
 
-static Core::Id clangDiagnosticConfigIdFromSettings(QSettings *s)
+static Utils::Id clangDiagnosticConfigIdFromSettings(QSettings *s)
 {
-    QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Core::Id());
+    QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Utils::Id());
 
-    return Core::Id::fromSetting(
+    return Utils::Id::fromSetting(
         s->value(clangDiagnosticConfigKey(), initialClangDiagnosticConfigId().toSetting()));
 }
 
@@ -113,7 +113,7 @@ static ClangDiagnosticConfigs removedBuiltinConfigs()
     return configs;
 }
 
-static ClangDiagnosticConfig convertToCustomConfig(const Core::Id &id)
+static ClangDiagnosticConfig convertToCustomConfig(const Utils::Id &id)
 {
     const ClangDiagnosticConfig config
         = Utils::findOrDefault(removedBuiltinConfigs(), [id](const ClangDiagnosticConfig &config) {
@@ -131,7 +131,7 @@ void CppCodeModelSettings::fromSettings(QSettings *s)
 
     // Qt Creator 4.11 removes some built-in configs.
     bool write = false;
-    const Core::Id id = m_clangDiagnosticConfigId;
+    const Utils::Id id = m_clangDiagnosticConfigId;
     if (id == "Builtin.Pedantic" || id == "Builtin.EverythingWithExceptions") {
         // If one of them was used, continue to use it, but convert it to a custom config.
         const ClangDiagnosticConfig customConfig = convertToCustomConfig(id);
@@ -172,7 +172,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
 {
     s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP));
     const ClangDiagnosticConfigs previousConfigs = diagnosticConfigsFromSettings(s);
-    const Core::Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
+    const Utils::Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
 
     diagnosticConfigsToSettings(s, m_clangCustomDiagnosticConfigs);
 
@@ -186,7 +186,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
 
     s->endGroup();
 
-    QVector<Core::Id> invalidated
+    QVector<Utils::Id> invalidated
         = ClangDiagnosticConfigsModel::changedOrRemovedConfigs(previousConfigs,
                                                                m_clangCustomDiagnosticConfigs);
 
@@ -198,19 +198,19 @@ void CppCodeModelSettings::toSettings(QSettings *s)
     emit changed();
 }
 
-Core::Id CppCodeModelSettings::clangDiagnosticConfigId() const
+Utils::Id CppCodeModelSettings::clangDiagnosticConfigId() const
 {
     if (!diagnosticConfigsModel().hasConfigWithId(m_clangDiagnosticConfigId))
         return defaultClangDiagnosticConfigId();
     return m_clangDiagnosticConfigId;
 }
 
-void CppCodeModelSettings::setClangDiagnosticConfigId(const Core::Id &configId)
+void CppCodeModelSettings::setClangDiagnosticConfigId(const Utils::Id &configId)
 {
     m_clangDiagnosticConfigId = configId;
 }
 
-Core::Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
+Utils::Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
 {
     return initialClangDiagnosticConfigId();
 }
diff --git a/src/plugins/cpptools/cppcodemodelsettings.h b/src/plugins/cpptools/cppcodemodelsettings.h
index 99b7e35dbb..afc326dedc 100644
--- a/src/plugins/cpptools/cppcodemodelsettings.h
+++ b/src/plugins/cpptools/cppcodemodelsettings.h
@@ -53,9 +53,9 @@ public:
     void toSettings(QSettings *s);
 
 public:
-    Core::Id clangDiagnosticConfigId() const;
-    void setClangDiagnosticConfigId(const Core::Id &configId);
-    static Core::Id defaultClangDiagnosticConfigId() ;
+    Utils::Id clangDiagnosticConfigId() const;
+    void setClangDiagnosticConfigId(const Utils::Id &configId);
+    static Utils::Id defaultClangDiagnosticConfigId() ;
     const ClangDiagnosticConfig clangDiagnosticConfig() const;
 
     ClangDiagnosticConfigs clangCustomDiagnosticConfigs() const;
@@ -77,7 +77,7 @@ public:
     void setIndexerFileSizeLimitInMb(int sizeInMB);
 
 signals:
-    void clangDiagnosticConfigsInvalidated(const QVector<Core::Id> &configId);
+    void clangDiagnosticConfigsInvalidated(const QVector<Utils::Id> &configId);
     void changed();
 
 private:
@@ -86,7 +86,7 @@ private:
     bool m_skipIndexingBigFiles = true;
     int m_indexerFileSizeLimitInMB = 5;
     ClangDiagnosticConfigs m_clangCustomDiagnosticConfigs;
-    Core::Id m_clangDiagnosticConfigId;
+    Utils::Id m_clangDiagnosticConfigId;
     bool m_enableLowerClazyLevels = true; // For UI behavior only
 };
 
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
index 5b259d7ab5..2c1b0ddc02 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
@@ -93,7 +93,7 @@ void CppCodeModelSettingsWidget::setupClangCodeModelWidgets()
         ->refresh(diagnosticConfigsModel(),
                   m_settings->clangDiagnosticConfigId(),
                   [](const CppTools::ClangDiagnosticConfigs &configs,
-                     const Core::Id &configToSelect) {
+                     const Utils::Id &configToSelect) {
                       return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
                   });
 
@@ -123,8 +123,8 @@ bool CppCodeModelSettingsWidget::applyClangCodeModelWidgetsToSettings() const
 {
     bool changed = false;
 
-    const Core::Id oldConfigId = m_settings->clangDiagnosticConfigId();
-    const Core::Id currentConfigId = m_ui->clangDiagnosticConfigsSelectionWidget->currentConfigId();
+    const Utils::Id oldConfigId = m_settings->clangDiagnosticConfigId();
+    const Utils::Id currentConfigId = m_ui->clangDiagnosticConfigsSelectionWidget->currentConfigId();
     if (oldConfigId != currentConfigId) {
         m_settings->setClangDiagnosticConfigId(currentConfigId);
         changed = true;
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
index 0146af8336..500219769a 100644
--- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
+++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
@@ -84,7 +84,7 @@ static const char *defaultPreviewText =
 
 CppCodeStylePreferencesFactory::CppCodeStylePreferencesFactory() = default;
 
-Core::Id CppCodeStylePreferencesFactory::languageId()
+Utils::Id CppCodeStylePreferencesFactory::languageId()
 {
     return Constants::CPP_SETTINGS_ID;
 }
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.h b/src/plugins/cpptools/cppcodestylepreferencesfactory.h
index eefe3adce2..fbe7460510 100644
--- a/src/plugins/cpptools/cppcodestylepreferencesfactory.h
+++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.h
@@ -36,7 +36,7 @@ class CPPTOOLS_EXPORT CppCodeStylePreferencesFactory : public TextEditor::ICodeS
 public:
     CppCodeStylePreferencesFactory();
 
-    Core::Id languageId() override;
+    Utils::Id languageId() override;
     QString displayName() override;
     TextEditor::ICodeStylePreferences *createCodeStyle() const override;
     QWidget *createEditor(TextEditor::ICodeStylePreferences *settings,
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
index 0edbb60aa9..bd2959b83c 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
@@ -654,7 +654,7 @@ void CppToolsPlugin::test_format_pointerdeclaration_macros_data()
            "public:\n"
            "    typedef QPair<QString, QString> Item;\n"
            " \n"
-           "    Core::Id dataId(); // the higher the closer to top.\n"
+           "    Utils::Id dataId(); // the higher the closer to top.\n"
            " \n"
            "    unsigned int priority() = 0;\n"
            " \n"
@@ -675,7 +675,7 @@ void CppToolsPlugin::test_format_pointerdeclaration_macros_data()
            "public:\n"
            "    typedef QPair<QString, QString> Item;\n"
            " \n"
-           "    Core::Id dataId(); // the higher the closer to top.\n"
+           "    Utils::Id dataId(); // the higher the closer to top.\n"
            " \n"
            "    unsigned int priority() = 0;\n"
            " \n"
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index b94406b185..babbd5eacb 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -68,6 +68,7 @@
 
 using namespace Core;
 using namespace CPlusPlus;
+using namespace Utils;
 
 namespace CppTools {
 namespace Internal {
diff --git a/src/plugins/cpptools/modelmanagertesthelper.cpp b/src/plugins/cpptools/modelmanagertesthelper.cpp
index f1029be36b..3d5f5cbdc9 100644
--- a/src/plugins/cpptools/modelmanagertesthelper.cpp
+++ b/src/plugins/cpptools/modelmanagertesthelper.cpp
@@ -41,7 +41,7 @@ TestProject::TestProject(const QString &name, QObject *parent) :
     m_name(name)
 {
     setParent(parent);
-    setId(Core::Id::fromString(name));
+    setId(Utils::Id::fromString(name));
     setDisplayName(name);
     qRegisterMetaType<QSet<QString> >();
 }
diff --git a/src/plugins/cpptools/projectpart.h b/src/plugins/cpptools/projectpart.h
index 89f7605830..8759a7275f 100644
--- a/src/plugins/cpptools/projectpart.h
+++ b/src/plugins/cpptools/projectpart.h
@@ -34,14 +34,11 @@
 #include <projectexplorer/projectmacro.h>
 #include <projectexplorer/rawprojectpart.h>
 
-#include <coreplugin/id.h>
-
-#include <utils/cpplanguage_details.h>
-
 #include <cplusplus/Token.h>
 
 #include <utils/cpplanguage_details.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QString>
 #include <QSharedPointer>
@@ -104,7 +101,7 @@ public:
     bool selectedForBuilding = true;
 
     // ToolChain
-    Core::Id toolchainType;
+    Utils::Id toolchainType;
     bool isMsvc2015Toolchain = false;
     QString toolChainTargetTriple;
     ToolChainWordWidth toolChainWordWidth = WordWidth32Bit;
diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp
index 3cba030352..201e528cb8 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -46,6 +46,7 @@
 #include <QButtonGroup>
 
 using namespace Core;
+using namespace Utils;
 
 namespace CppTools {
 namespace Internal {
diff --git a/src/plugins/cpptools/symbolsfindfilter.h b/src/plugins/cpptools/symbolsfindfilter.h
index e93ad48050..b8d746da1e 100644
--- a/src/plugins/cpptools/symbolsfindfilter.h
+++ b/src/plugins/cpptools/symbolsfindfilter.h
@@ -79,8 +79,8 @@ private:
     void finish();
     void cancel();
     void setPaused(bool paused);
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
+    void onTaskStarted(Utils::Id type);
+    void onAllTasksFinished(Utils::Id type);
     void searchAgain();
 
     QString label() const;
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 9b2cad8cf9..0bfd311f12 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -56,7 +56,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
@@ -214,13 +213,13 @@ public:
         return Utils::defaultExitCodeInterpreter;
     }
 
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const override
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const override
     {
         switch (cmd) {
         case DiffCommand:
             return "CVS Diff Editor"; // TODO: replace by string from cvsconstants.h
         default:
-            return Core::Id();
+            return Utils::Id();
         }
     }
 };
@@ -235,7 +234,7 @@ public:
 
     // IVersionControl
     QString displayName() const final { return QLatin1String("cvs"); }
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -305,7 +304,7 @@ private:
 
     bool isCommitEditorOpen() const;
     Core::IEditor *showOutputInEditor(const QString& title, const QString &output,
-                                      Core::Id id, const QString &source,
+                                      Utils::Id id, const QString &source,
                                       QTextCodec *codec);
 
     CvsResponse runCvs(const QString &workingDirectory,
@@ -401,9 +400,9 @@ public:
     };
 };
 
-Core::Id CvsPluginPrivate::id() const
+Utils::Id CvsPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_CVS);
+    return Utils::Id(VcsBase::Constants::VCS_ID_CVS);
 }
 
 bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
@@ -1471,7 +1470,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
 }
 
 IEditor *CvsPluginPrivate::showOutputInEditor(const QString& title, const QString &output,
-                                              Core::Id id, const QString &source,
+                                              Utils::Id id, const QString &source,
                                               QTextCodec *codec)
 {
     QString s = title;
diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index e34d0df38d..29d50c45e4 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
@@ -87,7 +87,7 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
     QSettings *settings = Core::ICore::settings();
     settings->beginGroup("AnalyzerStartRemoteDialog");
     d->kitChooser->populate();
-    d->kitChooser->setCurrentKitId(Core::Id::fromSetting(settings->value("profile")));
+    d->kitChooser->setCurrentKitId(Utils::Id::fromSetting(settings->value("profile")));
     d->executable->setText(settings->value("executable").toString());
     d->workingDirectory->setText(settings->value("workingDirectory").toString());
     d->arguments->setText(settings->value("arguments").toString());
diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h
index 03c2b16224..91ac86c840 100644
--- a/src/plugins/debugger/debuggercore.h
+++ b/src/plugins/debugger/debuggercore.h
@@ -27,7 +27,6 @@
 
 #include "debuggerconstants.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/abi.h>
 
 #include <functional>
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index 20d38307e7..51e2c6df44 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -82,7 +82,7 @@ public:
     void setPort(const int port);
 
     ProjectExplorer::Kit *kit() const;
-    void setKitId(Core::Id id);
+    void setKitId(Utils::Id id);
 
 private:
     AttachToQmlPortDialogPrivate *d;
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index f13fcb1038..c852d4a086 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -445,7 +445,7 @@ void DebuggerKitAspect::setDebugger(Kit *k, const QVariant &id)
     k->setValue(DebuggerKitAspect::id(), id);
 }
 
-Core::Id DebuggerKitAspect::id()
+Utils::Id DebuggerKitAspect::id()
 {
     return "Debugger.Information";
 }
diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h
index 3e5bfba1bb..66cb98cb83 100644
--- a/src/plugins/debugger/debuggerkitinformation.h
+++ b/src/plugins/debugger/debuggerkitinformation.h
@@ -71,7 +71,7 @@ public:
 
     static void setDebugger(ProjectExplorer::Kit *k, const QVariant &id);
 
-    static Core::Id id();
+    static Utils::Id id();
     static DebuggerEngineType engineType(const ProjectExplorer::Kit *k);
     static QString displayString(const ProjectExplorer::Kit *k);
 };
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 9116687547..fd9d0e52f5 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -89,7 +89,7 @@ public:
     bool changedByUser() const;
     void recordVisibility();
 
-    Core::Id commandId;
+    Utils::Id commandId;
     QPointer<QWidget> widget;
     QPointer<QDockWidget> dock;
     QPointer<QWidget> anchorWidget;
diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp
index 1770758b11..97e8b27455 100644
--- a/src/plugins/debugger/enginemanager.cpp
+++ b/src/plugins/debugger/enginemanager.cpp
@@ -163,7 +163,7 @@ public:
 
     TreeModel<TypedTreeItem<EngineItem>, EngineItem> m_engineModel;
     QPointer<EngineItem> m_currentItem; // The primary information is DebuggerMainWindow::d->m_currentPerspective
-    Core::Id m_previousMode;
+    Utils::Id m_previousMode;
     QPointer<QComboBox> m_engineChooser;
     bool m_shuttingDown = false;
 
@@ -468,7 +468,7 @@ void EngineManager::deactivateDebugMode()
         // If stopping the application also makes Qt Creator active (as the
         // "previously active application"), doing the switch synchronously
         // leads to funny effects with floating dock widgets
-        const Core::Id mode = d->m_previousMode;
+        const Utils::Id mode = d->m_previousMode;
         QTimer::singleShot(0, d, [mode]() { ModeManager::activateMode(mode); });
         d->m_previousMode = Id();
     }
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 76ca8ea1d9..b354111bc9 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -36,8 +36,7 @@
 #include <debugger/debuggertooltipmanager.h>
 #include <debugger/outputcollector.h>
 
-#include <coreplugin/id.h>
-
+#include <utils/id.h>
 #include <utils/qtcprocess.h>
 
 #include <QProcess>
@@ -102,7 +101,7 @@ private: ////////// General Interface //////////
     // Something went wrong with the adapter *before* adapterStarted() was emitted.
     // Make sure to clean up everything before emitting this signal.
     void handleAdapterStartFailed(const QString &msg,
-        Core::Id settingsIdHint = Core::Id());
+        Utils::Id settingsIdHint = Utils::Id());
 
     // This triggers the initial breakpoint synchronization and causes
     // finishInferiorSetup() being called once done.
diff --git a/src/plugins/debugger/loadcoredialog.h b/src/plugins/debugger/loadcoredialog.h
index ad8328cb15..2dc0250c60 100644
--- a/src/plugins/debugger/loadcoredialog.h
+++ b/src/plugins/debugger/loadcoredialog.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QDialog>
 
@@ -61,7 +61,7 @@ public:
     void setLocalCoreFile(const QString &core);
     void setRemoteCoreFile(const QString &core);
     void setOverrideStartScript(const QString &scriptName);
-    void setKitId(Core::Id id);
+    void setKitId(Utils::Id id);
     void setForceLocalCoreFile(bool on);
 
 private:
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 033ce59652..4558c7fdd0 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -711,10 +711,10 @@ void QmlInspectorAgent::toolsClientStateChanged(QmlDebugClient::State state)
     if (state == QmlDebugClient::Enabled) {
         Core::ICore::addAdditionalContext(m_inspectorToolsContext);
         Core::ActionManager::registerAction(m_selectAction,
-                                            Core::Id(Constants::QML_SELECTTOOL),
+                                            Utils::Id(Constants::QML_SELECTTOOL),
                                             m_inspectorToolsContext);
         Core::ActionManager::registerAction(m_showAppOnTopAction,
-                                            Core::Id(Constants::QML_SHOW_APP_ON_TOP),
+                                            Utils::Id(Constants::QML_SHOW_APP_ON_TOP),
                                             m_inspectorToolsContext);
 
         enableTools(m_qmlEngine->state() == InferiorRunOk);
@@ -723,9 +723,9 @@ void QmlInspectorAgent::toolsClientStateChanged(QmlDebugClient::State state)
     } else  {
         enableTools(false);
 
-        Core::ActionManager::unregisterAction(m_selectAction, Core::Id(Constants::QML_SELECTTOOL));
+        Core::ActionManager::unregisterAction(m_selectAction, Utils::Id(Constants::QML_SELECTTOOL));
         Core::ActionManager::unregisterAction(m_showAppOnTopAction,
-                                              Core::Id(Constants::QML_SHOW_APP_ON_TOP));
+                                              Utils::Id(Constants::QML_SHOW_APP_ON_TOP));
         Core::ICore::removeAdditionalContext(m_inspectorToolsContext);
     }
 }
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 65c89fc359..d340f30fc1 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -186,7 +186,7 @@ SharedTools::WidgetHost *FormEditorStack::formWindowEditorForXmlEditor(const Cor
     return i != -1 ? m_formEditors.at(i).widgetHost : static_cast<SharedTools::WidgetHost *>(nullptr);
 }
 
-void FormEditorStack::modeAboutToChange(Core::Id mode)
+void FormEditorStack::modeAboutToChange(Utils::Id mode)
 {
     if (Designer::Constants::Internal::debug)
         qDebug() << "FormEditorStack::modeAboutToChange"  << mode.toString();
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index bd82f5cc69..a49455f752 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -27,7 +27,7 @@
 
 #include "editordata.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QStackedWidget>
 #include <QList>
@@ -67,7 +67,7 @@ public:
 
 private:
     void updateFormWindowSelectionHandles();
-    void modeAboutToChange(Core::Id mode);
+    void modeAboutToChange(Utils::Id mode);
     void formSizeChanged(int w, int h);
 
     inline int indexOfFormWindow(const QDesignerFormWindowInterface *) const;
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 3bcecb05ee..f068888b49 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -101,6 +101,7 @@ static inline QIcon designerIcon(const QString &iconName)
 
 using namespace Core;
 using namespace Designer::Constants;
+using namespace Utils;
 
 namespace Designer {
 namespace Internal {
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 738a70285d..cd85310d1a 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -52,7 +52,7 @@ FormPageFactory::FormPageFactory()
     setTypeIdsSuffix("Form");
 }
 
-Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
                                            const QVariant &data)
 {
     Q_UNUSED(wizard)
@@ -63,7 +63,7 @@ Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard,
     return new FormTemplateWizardPage;
 }
 
-bool FormPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool FormPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
     if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) {
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index 6fb665c4a6..f5d75cb1f1 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -41,9 +41,9 @@ class FormPageFactory : public ProjectExplorer::JsonWizardPageFactory
 public:
     FormPageFactory();
 
-    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
+    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
 
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 // A wizard page embedding Qt Designer's QDesignerNewFormWidgetInterface
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 176cf41741..7fbc442a72 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -51,7 +51,7 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
 {
     setMimeType(Designer::Constants::FORM_MIMETYPE);
     setParent(parent);
-    setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID));
+    setId(Utils::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID));
     // Designer needs UTF-8 regardless of settings.
     setCodec(QTextCodec::codecForName("UTF-8"));
     connect(m_formWindow->core()->formWindowManager(), &QDesignerFormWindowManagerInterface::formWindowRemoved,
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 79c6ad4e2f..2542da69eb 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -266,7 +266,7 @@ static Document::Ptr findDefinition(Function *functionDeclaration, int *line)
 static inline BaseTextEditor *editorAt(const QString &fileName, int line, int column)
 {
     return qobject_cast<BaseTextEditor *>(Core::EditorManager::openEditorAt(fileName, line, column,
-                                                                         Core::Id(),
+                                                                         Utils::Id(),
                                                                          Core::EditorManager::DoNotMakeVisible));
 }
 
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index 0c51d80ab3..ce5a7b5436 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -39,7 +39,7 @@ SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
     Core::IOptionsPage(nullptr, false),
     m_designerPage(designerPage)
 {
-    setId(Core::Id::fromString(m_designerPage->name()));
+    setId(Utils::Id::fromString(m_designerPage->name()));
     setDisplayName(m_designerPage->name());
     setCategory(Designer::Constants::SETTINGS_CATEGORY);
 }
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 52499aa4b2..f303c22e70 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -257,7 +257,7 @@ Core::IEditor *DiffEditor::duplicate()
     editor->m_sync = m_sync;
     editor->m_showDescription = m_showDescription;
 
-    Core::Id id = currentView()->id();
+    Utils::Id id = currentView()->id();
     IDiffView *view = Utils::findOr(editor->m_views, editor->m_views.at(0),
                                     Utils::equal(&IDiffView::id, id));
     QTC_ASSERT(view, view = editor->currentView());
@@ -523,7 +523,7 @@ IDiffView *DiffEditor::loadSettings()
     m_sync = s->value(horizontalScrollBarSynchronizationKeyC, true).toBool();
     m_document->setIgnoreWhitespace(s->value(ignoreWhitespaceKeyC, false).toBool());
     m_document->setContextLineCount(s->value(contextLineCountKeyC, 3).toInt());
-    Core::Id id = Core::Id::fromSetting(s->value(diffViewKeyC));
+    Utils::Id id = Utils::Id::fromSetting(s->value(diffViewKeyC));
     s->endGroup();
 
     IDiffView *view = Utils::findOr(m_views, m_views.at(0),
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 46c79df29d..c88ff3b576 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -35,6 +35,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace DiffEditor {
 namespace Internal {
@@ -60,7 +61,7 @@ DiffEditorFactory::DiffEditorFactory() :
     },
     rightHandler {
         Constants::DIFF_EDITOR_ID,
-        Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
+        Utils::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/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 253bf67a61..a5757f42d2 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -51,6 +51,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace DiffEditor {
 namespace Internal {
diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index 7c7086f52d..1b68399e4d 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -61,7 +61,7 @@ QString IDiffView::syncToolTip() const
     return m_syncToolTip;
 }
 
-Core::Id IDiffView::id() const
+Utils::Id IDiffView::id() const
 {
     return m_id;
 }
@@ -76,7 +76,7 @@ void IDiffView::setToolTip(const QString &toolTip)
     m_toolTip = toolTip;
 }
 
-void IDiffView::setId(const Core::Id &id)
+void IDiffView::setId(const Utils::Id &id)
 {
     m_id = id;
 }
diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h
index 1f760d82c4..417e654ba4 100644
--- a/src/plugins/diffeditor/diffview.h
+++ b/src/plugins/diffeditor/diffview.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QIcon>
 #include <QString>
@@ -57,7 +57,7 @@ public:
     bool supportsSync() const;
     QString syncToolTip() const;
 
-    Core::Id id() const;
+    Utils::Id id() const;
     virtual QWidget *widget() = 0;
     virtual void setDocument(DiffEditorDocument *document) = 0;
 
@@ -74,14 +74,14 @@ signals:
 protected:
     void setIcon(const QIcon &icon);
     void setToolTip(const QString &toolTip);
-    void setId(const Core::Id &id);
+    void setId(const Utils::Id &id);
     void setSupportsSync(bool sync);
     void setSyncToolTip(const QString &text);
 
 private:
     QIcon m_icon;
     QString m_toolTip;
-    Core::Id m_id;
+    Utils::Id m_id;
     bool m_supportsSync = false;
     QString m_syncToolTip;
 };
diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
index 5d35b06e56..bffedaf75c 100644
--- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp
+++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
@@ -33,7 +33,7 @@
 namespace DiffEditor {
 namespace Internal {
 
-SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent)
+SelectableTextEditorWidget::SelectableTextEditorWidget(Utils::Id id, QWidget *parent)
     : TextEditorWidget(parent)
 {
     setFrameStyle(QFrame::NoFrame);
diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h
index 7059177f64..0f9a1791e3 100644
--- a/src/plugins/diffeditor/selectabletexteditorwidget.h
+++ b/src/plugins/diffeditor/selectabletexteditorwidget.h
@@ -46,7 +46,7 @@ class SelectableTextEditorWidget : public TextEditor::TextEditorWidget
 {
     Q_OBJECT
 public:
-    SelectableTextEditorWidget(Core::Id id, QWidget *parent = nullptr);
+    SelectableTextEditorWidget(Utils::Id id, QWidget *parent = nullptr);
     ~SelectableTextEditorWidget() override;
     void setSelections(const QMap<int, QList<DiffSelection> > &selections);
 
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 584e065300..d9b593befa 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -804,11 +804,11 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
 
     auto leftContext = new IContext(this);
     leftContext->setWidget(m_leftEditor);
-    leftContext->setContext(Core::Context(Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1)));
+    leftContext->setContext(Core::Context(Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1)));
     Core::ICore::addContextObject(leftContext);
     auto rightContext = new IContext(this);
     rightContext->setWidget(m_rightEditor);
-    rightContext->setContext(Core::Context(Core::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2)));
+    rightContext->setContext(Core::Context(Utils::Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2)));
     Core::ICore::addContextObject(rightContext);
 }
 
diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp
index 300326f21d..11063de3d6 100644
--- a/src/plugins/emacskeys/emacskeysplugin.cpp
+++ b/src/plugins/emacskeys/emacskeysplugin.cpp
@@ -48,6 +48,7 @@ extern void qt_set_sequence_auto_mnemonic(bool enable);
 QT_END_NAMESPACE
 
 using namespace Core;
+using namespace Utils;
 
 namespace {
 QString plainSelectedText(const QTextCursor &cursor)
diff --git a/src/plugins/emacskeys/emacskeysplugin.h b/src/plugins/emacskeys/emacskeysplugin.h
index d83b6b64f0..dca1f3960c 100644
--- a/src/plugins/emacskeys/emacskeysplugin.h
+++ b/src/plugins/emacskeys/emacskeysplugin.h
@@ -26,7 +26,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QTextCursor>
 
@@ -88,7 +88,7 @@ private:
     void scrollHalfDown();        // C-v
     void scrollHalfUp();          // M-v
 
-    QAction *registerAction(Core::Id id, void (EmacsKeysPlugin::*callback)(),
+    QAction *registerAction(Utils::Id id, void (EmacsKeysPlugin::*callback)(),
                             const QString &title);
     void genericGoto(QTextCursor::MoveOperation op, bool abortAssist = true);
     void genericVScroll(int direction);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 5c1dab1b73..827c5083d3 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -46,7 +46,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/id.h>
 #include <coreplugin/statusbarmanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index f241a3d317..9191c76caf 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -49,7 +49,7 @@ using namespace Utils;
 namespace GenericProjectManager {
 namespace Internal {
 
-GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, Core::Id id)
+GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, Utils::Id id)
     : BuildConfiguration(parent, id)
 {
     setConfigWidgetDisplayName(tr("Generic Manager"));
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index 0c4d1fe52c..ed50e2d28d 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
@@ -35,7 +35,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration
     Q_OBJECT
 
     friend class ProjectExplorer::BuildConfigurationFactory;
-    GenericBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    GenericBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
     void addToEnvironment(Utils::Environment &env) const final;
 };
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index f987ac6586..f5cacc7c03 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -37,10 +37,10 @@ namespace Internal {
 class GenericMakeStep : public ProjectExplorer::MakeStep
 {
 public:
-    explicit GenericMakeStep(BuildStepList *parent, Core::Id id);
+    explicit GenericMakeStep(BuildStepList *parent, Utils::Id id);
 };
 
-GenericMakeStep::GenericMakeStep(BuildStepList *parent, Core::Id id)
+GenericMakeStep::GenericMakeStep(BuildStepList *parent, Utils::Id id)
     : MakeStep(parent, id)
 {
     if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 9872112bdf..7e79778396 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -52,7 +52,7 @@ using namespace Utils;
 namespace Git {
 namespace Internal {
 
-ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Core::Id id,
+ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id,
                                              QWidget *parent) :
     QDialog(parent), m_ui(new Ui::ChangeSelectionDialog)
 {
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index b7714cece6..d49cc18b22 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -25,9 +25,8 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QDialog>
 #include <QProcessEnvironment>
@@ -55,7 +54,7 @@ class ChangeSelectionDialog : public QDialog
 {
     Q_OBJECT
 public:
-    ChangeSelectionDialog(const QString &workingDirectory, Core::Id id, QWidget *parent);
+    ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id, QWidget *parent);
     ~ChangeSelectionDialog() override;
 
     QString change() const;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 253b9d7473..70f34604ae 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -38,7 +38,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index fc6b74d358..940945d3be 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -262,7 +262,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
 void GitEditorWidget::init()
 {
     VcsBaseEditorWidget::init();
-    Core::Id editorId = textDocument()->id();
+    Utils::Id editorId = textDocument()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
         textDocument()->setSyntaxHighlighter(new GitSubmitHighlighter);
     else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
@@ -287,7 +287,7 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk)
 void GitEditorWidget::aboutToOpen(const QString &fileName, const QString &realFileName)
 {
     Q_UNUSED(realFileName)
-    Core::Id editorId = textDocument()->id();
+    Utils::Id editorId = textDocument()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID
             || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) {
         QFileInfo fi(fileName);
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6a17e89f08..aa1d36d13b 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -48,7 +48,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -234,7 +233,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
@@ -308,7 +307,7 @@ public:
     void resetRepository();
     void recoverDeletedFiles();
     void startRebase();
-    void startChangeRelatedAction(const Core::Id &id);
+    void startChangeRelatedAction(const Utils::Id &id);
     void stageFile();
     void unstageFile();
     void gitkForCurrentFile();
@@ -335,37 +334,37 @@ public:
     void updateContinueAndAbortCommands();
     void delayedPushToGerrit();
 
-    Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Core::Id id,
+    Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Utils::Id id,
                                  const Core::Context &context, bool addToLocator,
                                  const std::function<void()> &callback, const QKeySequence &keys);
 
     Utils::ParameterAction *createParameterAction(Core::ActionContainer *ac,
                                                   const QString &defaultText, const QString &parameterText,
-                                                  Core::Id id, const Core::Context &context, bool addToLocator,
+                                                  Utils::Id id, const Core::Context &context, bool addToLocator,
                                                   const std::function<void()> &callback,
                                                   const QKeySequence &keys = QKeySequence());
 
     QAction *createFileAction(Core::ActionContainer *ac,
                               const QString &defaultText, const QString &parameterText,
-                              Core::Id id, const Core::Context &context, bool addToLocator,
+                              Utils::Id id, const Core::Context &context, bool addToLocator,
                               const std::function<void()> &callback,
                               const QKeySequence &keys = QKeySequence());
 
     QAction *createProjectAction(Core::ActionContainer *ac,
                                  const QString &defaultText, const QString &parameterText,
-                                 Core::Id id, const Core::Context &context, bool addToLocator,
+                                 Utils::Id id, const Core::Context &context, bool addToLocator,
                                  void (GitPluginPrivate::*func)(),
                                  const QKeySequence &keys = QKeySequence());
 
-    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
+    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
                                     const Core::Context &context, bool addToLocator,
                                     const std::function<void()> &callback,
                                     const QKeySequence &keys = QKeySequence());
-    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
+    QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
                                     const Core::Context &context, bool addToLocator,
                                     GitClientMemberFunc, const QKeySequence &keys = QKeySequence());
 
-    QAction *createChangeRelatedRepositoryAction(const QString &text, Core::Id id,
+    QAction *createChangeRelatedRepositoryAction(const QString &text, Utils::Id id,
                                                  const Core::Context &context);
 
     void updateRepositoryBrowserAction();
@@ -1812,9 +1811,9 @@ QString GitPluginPrivate::displayName() const
     return QLatin1String("Git");
 }
 
-Core::Id GitPluginPrivate::id() const
+Utils::Id GitPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_GIT);
+    return Utils::Id(VcsBase::Constants::VCS_ID_GIT);
 }
 
 bool GitPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 6bd13532c7..8275006787 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -27,7 +27,6 @@
 
 #include "gitsettings.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/iversioncontrol.h>
 
 #include <extensionsystem/iplugin.h>
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index c018e15f90..d9b039f8b1 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -42,7 +42,6 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index ec6624df19..99c6c8e04b 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -44,6 +44,7 @@
 #include <QMenu>
 
 using namespace Core;
+using namespace Utils;
 
 namespace GlslEditor {
 namespace Internal {
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index 7fe8e31afd..4f5f6ef42a 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -31,7 +31,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/modemanager.h>
-#include <coreplugin/id.h>
 
 #include <QDebug>
 #include <QAction>
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 6ec180e09d..209703c607 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -51,7 +51,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -108,7 +107,7 @@ class HelpPluginPrivate : public QObject
 public:
     HelpPluginPrivate();
 
-    void modeChanged(Core::Id mode, Core::Id old);
+    void modeChanged(Utils::Id mode, Utils::Id old);
 
     void requestContextHelp();
     void showContextHelp(const HelpItem &contextHelp);
@@ -451,7 +450,7 @@ void HelpPluginPrivate::showLinksInCurrentViewer(const QMultiMap<QString, QUrl>
     widget->showLinks(links, key);
 }
 
-void HelpPluginPrivate::modeChanged(Core::Id mode, Core::Id old)
+void HelpPluginPrivate::modeChanged(Utils::Id mode, Utils::Id old)
 {
     Q_UNUSED(old)
     if (mode == m_mode.id()) {
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 608a4ddbb5..7d25d631a9 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -238,7 +238,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     if (style == ExternalWindow) {
         static int windowId = 0;
         Core::ICore::registerWindow(this,
-                                    Core::Context(Core::Id("Help.Window.").withSuffix(++windowId)));
+                                    Core::Context(Utils::Id("Help.Window.").withSuffix(++windowId)));
         setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing
     }
     if (style != SideBarWidget) {
diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp
index b1ea7f6d58..2b8c68315f 100644
--- a/src/plugins/imageviewer/imageviewerplugin.cpp
+++ b/src/plugins/imageviewer/imageviewerplugin.cpp
@@ -40,6 +40,7 @@
 #include <QKeySequence>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ImageViewer {
 namespace Internal {
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp
index 60c30e5c1b..a2061bbd52 100644
--- a/src/plugins/incredibuild/buildconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp
@@ -67,7 +67,7 @@ const QLatin1String BUILDCONSOLE_COMMANDBUILDER("IncrediBuild.BuildConsole.Comma
 }
 
 BuildConsoleBuildStep::BuildConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList,
-                                             Core::Id id)
+                                             Utils::Id id)
     : ProjectExplorer::AbstractProcessStep(buildStepList, id)
     , m_earlierSteps(buildStepList)
 {
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.h b/src/plugins/incredibuild/buildconsolebuildstep.h
index 0c8745404d..60cabc8740 100644
--- a/src/plugins/incredibuild/buildconsolebuildstep.h
+++ b/src/plugins/incredibuild/buildconsolebuildstep.h
@@ -39,7 +39,7 @@ class BuildConsoleBuildStep : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
 public:
-    explicit BuildConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Core::Id id);
+    explicit BuildConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Utils::Id id);
     ~BuildConsoleBuildStep() override;
 
     bool init() override;
diff --git a/src/plugins/incredibuild/ibconsolebuildstep.cpp b/src/plugins/incredibuild/ibconsolebuildstep.cpp
index 90edb6bd56..8241b3896b 100644
--- a/src/plugins/incredibuild/ibconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp
@@ -52,7 +52,7 @@ const QLatin1String IBCONSOLE_FORCEREMOTE("IncrediBuild.IBConsole.ForceRemote");
 const QLatin1String IBCONSOLE_ALTERNATE("IncrediBuild.IBConsole.Alternate");
 }
 
-IBConsoleBuildStep::IBConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Core::Id id)
+IBConsoleBuildStep::IBConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Utils::Id id)
     : ProjectExplorer::AbstractProcessStep(buildStepList, id)
     , m_earlierSteps(buildStepList)
 {
diff --git a/src/plugins/incredibuild/ibconsolebuildstep.h b/src/plugins/incredibuild/ibconsolebuildstep.h
index 0de10d6102..f022cb6a00 100644
--- a/src/plugins/incredibuild/ibconsolebuildstep.h
+++ b/src/plugins/incredibuild/ibconsolebuildstep.h
@@ -39,7 +39,7 @@ class IBConsoleBuildStep : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
 public:
-    explicit IBConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Core::Id id);
+    explicit IBConsoleBuildStep(ProjectExplorer::BuildStepList *buildStepList, Utils::Id id);
     ~IBConsoleBuildStep() override;
 
     bool init() override;
diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index 8de29a3566..d3f61f3003 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -375,7 +375,7 @@ void IosBuildSettingsWidget::updateWarningText()
 
 // IosBuildConfiguration
 
-IosBuildConfiguration::IosBuildConfiguration(Target *target, Core::Id id)
+IosBuildConfiguration::IosBuildConfiguration(Target *target, Utils::Id id)
     : QmakeBuildConfiguration(target, id)
 {
     m_signingIdentifier = addAspect<BaseStringAspect>();
@@ -422,7 +422,7 @@ void IosBuildConfiguration::updateQmakeCommand()
         if (signingIdentifier.isEmpty() )
             extraArgs << forceOverrideArg;
 
-        Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+        Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
         if (devType == Constants::IOS_DEVICE_TYPE && !signingIdentifier.isEmpty()) {
             if (m_autoManagedSigning->value()) {
                 extraArgs << qmakeIosTeamSettings + signingIdentifier;
diff --git a/src/plugins/ios/iosbuildconfiguration.h b/src/plugins/ios/iosbuildconfiguration.h
index d575b328b0..28804a57c2 100644
--- a/src/plugins/ios/iosbuildconfiguration.h
+++ b/src/plugins/ios/iosbuildconfiguration.h
@@ -36,7 +36,7 @@ class IosBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguratio
     Q_OBJECT
 
 public:
-    IosBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    IosBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     friend class IosBuildSettingsWidget;
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 9fbe292299..c7f61fb197 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -71,7 +71,7 @@ class IosBuildStep final : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep)
 
 public:
-    IosBuildStep(BuildStepList *parent, Core::Id id);
+    IosBuildStep(BuildStepList *parent, Utils::Id id);
 
     BuildStepConfigWidget *createConfigWidget() final;
     void setBaseArguments(const QStringList &args);
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index b90787ff63..b7b5e94275 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -98,7 +98,7 @@ const char profileTeamIdTag[] = "TeamIdentifier";
 static const QString xcodePlistPath = QDir::homePath() + "/Library/Preferences/com.apple.dt.Xcode.plist";
 static const QString provisioningProfileDirPath = QDir::homePath() + "/Library/MobileDevice/Provisioning Profiles";
 
-static Core::Id deviceId(const QString &sdkName)
+static Utils::Id deviceId(const QString &sdkName)
 {
     if (sdkName.startsWith("iphoneos", Qt::CaseInsensitive))
         return Constants::IOS_DEVICE_TYPE;
@@ -107,7 +107,7 @@ static Core::Id deviceId(const QString &sdkName)
     return {};
 }
 
-static bool isSimulatorDeviceId(const Core::Id &id)
+static bool isSimulatorDeviceId(const Utils::Id &id)
 {
     return id == Constants::IOS_SIMULATOR_TYPE;
 }
@@ -168,7 +168,7 @@ static QHash<XcodePlatform::ToolchainTarget, ToolChainPair> findToolChains(const
 static QSet<Kit *> existingAutoDetectedIosKits()
 {
     return Utils::toSet(Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool {
-        Core::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
+        Utils::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit);
         return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE
                                          || deviceKind == Constants::IOS_SIMULATOR_TYPE);
     }));
@@ -180,7 +180,7 @@ static void printKits(const QSet<Kit *> &kits)
         qCDebug(kitSetupLog) << "  -" << kit->displayName();
 }
 
-static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolChains,
+static void setupKit(Kit *kit, Utils::Id pDeviceType, const ToolChainPair& toolChains,
                      const QVariant &debuggerId, const Utils::FilePath &sdkPath, BaseQtVersion *qtVersion)
 {
     DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
@@ -276,7 +276,7 @@ void IosConfigurations::updateAutomaticKitList()
                 qCDebug(kitSetupLog) << "  - No tool chain found";
                 continue;
             }
-            Core::Id pDeviceType = deviceId(sdk.directoryName);
+            Utils::Id pDeviceType = deviceId(sdk.directoryName);
             if (!pDeviceType.isValid()) {
                 qCDebug(kitSetupLog) << "Unsupported/Invalid device type" << sdk.directoryName;
                 continue;
@@ -416,7 +416,7 @@ void IosConfigurations::updateSimulators()
 {
     // currently we have just one simulator
     DeviceManager *devManager = DeviceManager::instance();
-    Core::Id devId = Constants::IOS_SIMULATOR_DEVICE_ID;
+    Utils::Id devId = Constants::IOS_SIMULATOR_DEVICE_ID;
     IDevice::ConstPtr dev = devManager->find(devId);
     if (dev.isNull()) {
         dev = IDevice::ConstPtr(new IosSimulator(devId));
@@ -590,7 +590,7 @@ QList<ToolChain *> IosToolChainFactory::autoDetect(const QList<ToolChain *> &exi
         for (const XcodePlatform::ToolchainTarget &target : platform.targets) {
             ToolChainPair platformToolchains = findToolChainForPlatform(platform, target,
                                                                         existingClangToolChains);
-            auto createOrAdd = [&](ClangToolChain *toolChain, Core::Id l) {
+            auto createOrAdd = [&](ClangToolChain *toolChain, Utils::Id l) {
                 if (!toolChain) {
                     toolChain = new ClangToolChain;
                     toolChain->setDetection(ToolChain::AutoDetection);
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 7bd5a87944..cdb2199ba6 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -65,7 +65,7 @@ public:
         TransferFailed
     };
 
-    IosDeployStep(BuildStepList *bc, Core::Id id);
+    IosDeployStep(BuildStepList *bc, Utils::Id id);
 
 private:
     void cleanup();
@@ -99,7 +99,7 @@ private:
     bool m_expectFail = false;
 };
 
-IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
+IosDeployStep::IosDeployStep(BuildStepList *parent, Utils::Id id)
     : BuildStep(parent, id)
 {
     setImmutable(true);
@@ -322,7 +322,7 @@ IosDeployStepFactory::IosDeployStepFactory()
     setRepeatable(false);
 }
 
-Core::Id IosDeployStepFactory::stepId()
+Utils::Id IosDeployStepFactory::stepId()
 {
     return "Qt4ProjectManager.IosDeployStep";
 }
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index bdd23a74f7..f72732b8a5 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -35,7 +35,7 @@ class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory
 public:
     IosDeployStepFactory();
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 9a9e79d7e7..d6a6cb2274 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -112,7 +112,7 @@ IosDevice::IosDevice()
 IosDevice::IosDevice(const QString &uid)
     : IosDevice(CtorHelper{})
 {
-    setupId(IDevice::AutoDetected, Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid));
+    setupId(IDevice::AutoDetected, Utils::Id(Constants::IOS_DEVICE_ID).withSuffix(uid));
 }
 
 IDevice::DeviceInfo IosDevice::deviceInformation() const
@@ -158,7 +158,7 @@ QVariantMap IosDevice::toMap() const
 
 QString IosDevice::uniqueDeviceID() const
 {
-    return id().suffixAfter(Core::Id(Constants::IOS_DEVICE_ID));
+    return id().suffixAfter(Utils::Id(Constants::IOS_DEVICE_ID));
 }
 
 QString IosDevice::name()
@@ -209,9 +209,9 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap()
 void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
 {
     DeviceManager *devManager = DeviceManager::instance();
-    Core::Id baseDevId(Constants::IOS_DEVICE_ID);
-    Core::Id devType(Constants::IOS_DEVICE_TYPE);
-    Core::Id devId = baseDevId.withSuffix(uid);
+    Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
+    Utils::Id devType(Constants::IOS_DEVICE_TYPE);
+    Utils::Id devId = baseDevId.withSuffix(uid);
     IDevice::ConstPtr dev = devManager->find(devId);
     if (dev.isNull()) {
         auto newDev = new IosDevice(uid);
@@ -234,9 +234,9 @@ void IosDeviceManager::deviceDisconnected(const QString &uid)
 {
     qCDebug(detectLog) << "detected disconnection of ios device " << uid;
     DeviceManager *devManager = DeviceManager::instance();
-    Core::Id baseDevId(Constants::IOS_DEVICE_ID);
-    Core::Id devType(Constants::IOS_DEVICE_TYPE);
-    Core::Id devId = baseDevId.withSuffix(uid);
+    Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
+    Utils::Id devType(Constants::IOS_DEVICE_TYPE);
+    Utils::Id devId = baseDevId.withSuffix(uid);
     IDevice::ConstPtr dev = devManager->find(devId);
     if (dev.isNull() || dev->type() != devType) {
         qCWarning(detectLog) << "ignoring disconnection of ios device " << uid; // should neve happen
@@ -266,9 +266,9 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
                                   const Ios::IosToolHandler::Dict &info)
 {
     DeviceManager *devManager = DeviceManager::instance();
-    Core::Id baseDevId(Constants::IOS_DEVICE_ID);
-    Core::Id devType(Constants::IOS_DEVICE_TYPE);
-    Core::Id devId = baseDevId.withSuffix(uid);
+    Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
+    Utils::Id devType(Constants::IOS_DEVICE_TYPE);
+    Utils::Id devId = baseDevId.withSuffix(uid);
     IDevice::ConstPtr dev = devManager->find(devId);
     bool skipUpdate = false;
     IosDevice *newDev = nullptr;
@@ -519,7 +519,7 @@ void IosDeviceManager::updateAvailableDevices(const QStringList &devices)
     DeviceManager *devManager = DeviceManager::instance();
     for (int iDevice = 0; iDevice < devManager->deviceCount(); ++iDevice) {
         IDevice::ConstPtr dev = devManager->deviceAt(iDevice);
-        Core::Id devType(Constants::IOS_DEVICE_TYPE);
+        Utils::Id devType(Constants::IOS_DEVICE_TYPE);
         if (dev.isNull() || dev->type() != devType)
             continue;
         auto iosDev = static_cast<const IosDevice *>(dev.data());
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 7e08b1a6ad..4123f7faad 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -42,7 +42,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class IosDsymBuildStepConfigWidget;
 
 public:
-    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
+    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     void setArguments(const QStringList &args);
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index 35ca7f39b4..9aeecd1ac6 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -78,16 +78,16 @@ QString IosQtVersion::description() const
     return tr("iOS");
 }
 
-QSet<Core::Id> IosQtVersion::availableFeatures() const
+QSet<Utils::Id> IosQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(QtSupport::Constants::FEATURE_MOBILE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> IosQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> IosQtVersion::targetDeviceTypes() const
 {
     // iOS Qt version supports ios devices as well as simulator.
     return {Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE};
diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h
index 5f82e94569..5c21520058 100644
--- a/src/plugins/ios/iosqtversion.h
+++ b/src/plugins/ios/iosqtversion.h
@@ -45,8 +45,8 @@ public:
 
     ProjectExplorer::Abis detectQtAbis() const override;
 
-    QSet<Core::Id> availableFeatures() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> availableFeatures() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 
     QString description() const override;
 };
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index d1079ebec7..cdcbff90b6 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -102,7 +102,7 @@ public:
     QComboBox *m_deviceTypeComboBox = nullptr;
 };
 
-IosRunConfiguration::IosRunConfiguration(Target *target, Core::Id id)
+IosRunConfiguration::IosRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto executableAspect = addAspect<ExecutableAspect>();
@@ -140,7 +140,7 @@ void IosDeviceTypeAspect::updateDeviceType()
 
 bool IosRunConfiguration::isEnabled() const
 {
-    Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return false;
 
@@ -162,7 +162,7 @@ QString IosRunConfiguration::applicationName() const
 
 FilePath IosRunConfiguration::bundleDirectory() const
 {
-    Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
     bool isDevice = (devType == Constants::IOS_DEVICE_TYPE);
     if (!isDevice && devType != Constants::IOS_SIMULATOR_TYPE) {
         qCWarning(iosLog) << "unexpected device type in bundleDirForTarget: " << devType.toString();
@@ -220,7 +220,7 @@ void IosDeviceTypeAspect::toMap(QVariantMap &map) const
 
 QString IosRunConfiguration::disabledReason() const
 {
-    Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target()->kit());
     if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
         return tr("Kit has incorrect device type for running on iOS devices.");
     IDevice::ConstPtr dev = DeviceKitAspect::device(target()->kit());
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index c71b048723..bb74726330 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -42,7 +42,7 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
     Q_OBJECT
 
 public:
-    IosRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    IosRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
     QString applicationName() const;
     Utils::FilePath bundleDirectory() const;
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 690921c59f..1aa5fc5233 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -75,10 +75,10 @@ namespace Internal {
 
 static void stopRunningRunControl(RunControl *runControl)
 {
-    static QMap<Core::Id, QPointer<RunControl>> activeRunControls;
+    static QMap<Utils::Id, QPointer<RunControl>> activeRunControls;
 
     Target *target = runControl->target();
-    Core::Id devId = DeviceKitAspect::deviceId(target->kit());
+    Utils::Id devId = DeviceKitAspect::deviceId(target->kit());
 
     // The device can only run an application at a time, if an app is running stop it.
     if (activeRunControls.contains(devId)) {
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 2b671fffe6..1cf87a6915 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -44,7 +44,7 @@ static const QLatin1String iosDeviceTypeDisplayNameKey = QLatin1String("displayN
 static const QLatin1String iosDeviceTypeTypeKey = QLatin1String("type");
 static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifier");
 
-IosSimulator::IosSimulator(Core::Id id)
+IosSimulator::IosSimulator(Utils::Id id)
     : m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
 {
     setupId(IDevice::AutoDetected, id);
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index d6fca46a47..8e4909ee34 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -80,7 +80,7 @@ protected:
     friend class IosSimulatorFactory;
     friend class IosConfigurations;
     IosSimulator();
-    IosSimulator(Core::Id id);
+    IosSimulator(Utils::Id id);
 
 private:
     mutable quint16 m_lastPort;
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 0fce76921d..acfd0d3a69 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -74,7 +74,7 @@ static Q_LOGGING_CATEGORY(LOGLSPCLIENT, "qtc.languageclient.client", QtWarningMs
 class TextMark : public TextEditor::TextMark
 {
 public:
-    TextMark(const Utils::FilePath &fileName, const Diagnostic &diag, const Core::Id &clientId)
+    TextMark(const Utils::FilePath &fileName, const Diagnostic &diag, const Utils::Id &clientId)
         : TextEditor::TextMark(fileName, diag.range().start().line() + 1, clientId)
         , m_diagnostic(diag)
     {
@@ -97,7 +97,7 @@ private:
 };
 
 Client::Client(BaseClientInterface *clientInterface)
-    : m_id(Core::Id::fromString(QUuid::createUuid().toString()))
+    : m_id(Utils::Id::fromString(QUuid::createUuid().toString()))
     , m_clientInterface(clientInterface)
     , m_documentSymbolCache(this)
     , m_hoverHandler(this)
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index f3246660a4..85609efdea 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -36,8 +36,9 @@
 #include "languageclientsettings.h"
 #include "languageclientsymbolsupport.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/messagemanager.h>
+
+#include <utils/id.h>
 #include <utils/link.h>
 
 #include <languageserverprotocol/client.h>
@@ -150,7 +151,7 @@ public:
     void setName(const QString &name) { m_displayName = name; }
     QString name() const { return m_displayName; }
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
 
     bool needsRestart(const BaseSettings *) const;
 
@@ -227,7 +228,7 @@ private:
          QList<LanguageServerProtocol::DidChangeTextDocumentParams::TextDocumentContentChangeEvent>>
         m_documentsToUpdate;
     QTimer m_documentUpdateTimer;
-    Core::Id m_id;
+    Utils::Id m_id;
     LanguageServerProtocol::ServerCapabilities m_serverCapabilities;
     DynamicCapabilities m_dynamicCapabilities;
     struct AssistProviders
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index aece267d0d..4fa44757f2 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -31,7 +31,7 @@
 #include "locatorfilter.h"
 #include "lsplogger.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <languageserverprotocol/diagnostics.h>
 #include <languageserverprotocol/languagefeatures.h>
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 83f7a09b89..6238875b0d 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -32,7 +32,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 
 #include <texteditor/texteditorconstants.h>
 
@@ -40,6 +39,7 @@
 #include <QEvent>
 
 using namespace Core;
+using namespace Utils;
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index 84735203a6..ff1b48b662 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -27,7 +27,6 @@
 
 #include "imacrohandler.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 
 #include <QSet>
@@ -46,12 +45,12 @@ public:
     bool executeEvent(const MacroEvent &macroEvent) override;
 
 private:
-    void registerCommand(Core::Id id);
+    void registerCommand(Utils::Id id);
     Core::Command *command(const QString &id);
-    void addCommand(Core::Id id);
+    void addCommand(Utils::Id id);
 
 private:
-    QSet<Core::Id> m_commandIds;
+    QSet<Utils::Id> m_commandIds;
 };
 
 } // namespace Internal
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 4b0d93c34e..9b37298798 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -60,7 +60,7 @@ void MacroEvent::load(QDataStream &stream)
 {
     QByteArray ba;
     stream >> ba;
-    m_id = Core::Id::fromName(ba);
+    m_id = Utils::Id::fromName(ba);
     int count;
     stream >> count;
     quint8 id;
@@ -80,12 +80,12 @@ void MacroEvent::save(QDataStream &stream) const
         stream << i.key() << i.value();
 }
 
-Core::Id MacroEvent::id() const
+Utils::Id MacroEvent::id() const
 {
     return m_id;
 }
 
-void MacroEvent::setId(Core::Id id)
+void MacroEvent::setId(Utils::Id id)
 {
     m_id = id;
 }
diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index b5f69f94f8..3d145d8ada 100644
--- a/src/plugins/macros/macroevent.h
+++ b/src/plugins/macros/macroevent.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QMap>
 #include <QVariant>
@@ -42,8 +42,8 @@ class MacroEvent
 public:
     MacroEvent() = default;
 
-    Core::Id id() const;
-    void setId(Core::Id id);
+    Utils::Id id() const;
+    void setId(Utils::Id id);
 
     QVariant value(quint8 id) const;
     void setValue(quint8 id, const QVariant &value);
@@ -52,7 +52,7 @@ public:
     void save(QDataStream &stream) const;
 
 private:
-    Core::Id m_id;
+    Utils::Id m_id;
     QMap<quint8, QVariant> m_values;
 };
 
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index c221eb3512..59e87e17ee 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -41,7 +41,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -144,9 +143,9 @@ void MacroManagerPrivate::initialize()
     }
 }
 
-static Core::Id makeId(const QString &name)
+static Utils::Id makeId(const QString &name)
 {
-    return Core::Id(Macros::Constants::PREFIX_MACRO).withSuffix(name);
+    return Utils::Id(Macros::Constants::PREFIX_MACRO).withSuffix(name);
 }
 
 void MacroManagerPrivate::addMacro(Macro *macro)
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 1d4b5716a8..9bade1fea5 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -33,7 +33,6 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 
 #include <QAction>
 #include <QDir>
@@ -85,7 +84,7 @@ void MacroOptionsWidget::initialize()
 void MacroOptionsWidget::createTable()
 {
     QDir dir(MacroManager::macrosDirectory());
-    const Core::Id base = Core::Id(Constants::PREFIX_MACRO);
+    const Utils::Id base = Utils::Id(Constants::PREFIX_MACRO);
     for (Macro *macro : MacroManager::macros()) {
         QFileInfo fileInfo(macro->fileName());
         if (fileInfo.absoluteDir() == dir.absolutePath()) {
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index bb8f086914..e4f634a7d0 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/icontext.h>
 
 #include <QSettings>
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index fac0796e7d..5d9d7cf39a 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -35,7 +35,6 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 
 #include <QAction>
 #include <QKeyEvent>
diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
index beea69f670..e8bbc25d6e 100644
--- a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
+++ b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
@@ -55,7 +55,7 @@ int QtMarketplaceWelcomePage::priority() const
     return 60;
 }
 
-Core::Id QtMarketplaceWelcomePage::id() const
+Utils::Id QtMarketplaceWelcomePage::id() const
 {
     return "Marketplace";
 }
diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.h b/src/plugins/marketplace/qtmarketplacewelcomepage.h
index dc7a0546c0..695dfd5867 100644
--- a/src/plugins/marketplace/qtmarketplacewelcomepage.h
+++ b/src/plugins/marketplace/qtmarketplacewelcomepage.h
@@ -40,7 +40,7 @@ public:
 
     QString title() const final;
     int priority() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
     QWidget *createWidget() const final;
 };
 
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index ce182bd070..6c2f24d5b0 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -235,7 +235,7 @@ McuToolChainPackage::Type McuToolChainPackage::type() const
     return m_type;
 }
 
-static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
+static ProjectExplorer::ToolChain *desktopToolChain(Utils::Id language)
 {
     using namespace ProjectExplorer;
 
@@ -251,7 +251,7 @@ static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
     return toolChain;
 }
 
-static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Core::Id language)
+static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Utils::Id language)
 {
     using namespace ProjectExplorer;
 
@@ -277,7 +277,7 @@ static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path,
     return toolChain;
 }
 
-ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Core::Id language) const
+ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Utils::Id language) const
 {
     ProjectExplorer::ToolChain *tc = nullptr;
     if (m_type == TypeDesktop) {
@@ -500,7 +500,7 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k,
     k->makeSticky();
     if (mcuTarget->toolChainPackage()->type() == McuToolChainPackage::TypeDesktop)
         k->setDeviceTypeForIcon(DEVICE_TYPE);
-    QSet<Core::Id> irrelevant = {
+    QSet<Utils::Id> irrelevant = {
         SysRootKitAspect::id(),
         QtSupport::QtKitAspect::id()
     };
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 3b4db43bb1..64a0dda1e2 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QVector>
@@ -116,7 +116,7 @@ public:
                         const QString &detectionPath, const QString &settingsKey, Type type);
 
     Type type() const;
-    ProjectExplorer::ToolChain *toolChain(Core::Id language) const;
+    ProjectExplorer::ToolChain *toolChain(Utils::Id language) const;
     QString cmakeToolChainFileName() const;
     QVariant debuggerId() const;
 
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 4a6947a029..216746d578 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -264,7 +264,7 @@ void McuSupportOptionsWidget::populateMcuTargetsComboBox()
 
 McuSupportOptionsPage::McuSupportOptionsPage()
 {
-    setId(Core::Id(Constants::SETTINGS_ID));
+    setId(Utils::Id(Constants::SETTINGS_ID));
     setDisplayName(McuSupportOptionsWidget::tr("MCU"));
     setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
     setWidgetCreator([] { return new McuSupportOptionsWidget; });
diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
index 1f9b4dbe67..584e21d4f7 100644
--- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
+++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
@@ -64,7 +64,7 @@ class FlashAndRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(McuSupport::Internal::FlashAndRunConfiguration)
 
 public:
-    FlashAndRunConfiguration(Target *target, Core::Id id)
+    FlashAndRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         auto flashAndRunParameters = addAspect<BaseStringAspect>();
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index a1a050e43d..3c42617871 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -399,7 +399,7 @@ QString MercurialClient::findTopLevelForFile(const QFileInfo &file) const
                 VcsBase::findRepositoryForDirectory(file.absolutePath(), repositoryCheckFile);
 }
 
-Core::Id MercurialClient::vcsEditorKind(VcsCommandTag cmd) const
+Utils::Id MercurialClient::vcsEditorKind(VcsCommandTag cmd) const
 {
     switch (cmd) {
     case AnnotateCommand:
@@ -409,7 +409,7 @@ Core::Id MercurialClient::vcsEditorKind(VcsCommandTag cmd) const
     case LogCommand:
         return Constants::FILELOG_ID;
     default:
-        return Core::Id();
+        return Utils::Id();
     }
 }
 
diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h
index 909601a8a0..ce541a3429 100644
--- a/src/plugins/mercurial/mercurialclient.h
+++ b/src/plugins/mercurial/mercurialclient.h
@@ -81,7 +81,7 @@ public:
               const QStringList &extraOptions = QStringList()) override;
 
 protected:
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const override;
     QStringList revisionSpec(const QString &revision) const override;
     StatusItem parseStatusLine(const QString &line) const override;
 
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 8b84bc9be0..91aa6dfc71 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/documentmanager.h>
-#include <coreplugin/id.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
@@ -132,7 +131,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
     bool managesDirectory(const QString &filename, QString *topLevel = nullptr) const final;
@@ -299,7 +298,7 @@ void MercurialPluginPrivate::createMenu(const Core::Context &context)
     m_mercurialContainer->addSeparator(context);
 
     // Request the Tools menu and add the Mercurial menu to it
-    Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Core::Id(Core::Constants::M_TOOLS));
+    Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Utils::Id(Core::Constants::M_TOOLS));
     toolsMenu->addMenu(m_mercurialContainer);
     m_menuAction = m_mercurialContainer->menu()->menuAction();
 }
@@ -309,14 +308,14 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context)
     Core::Command *command;
 
     annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(annotateFile, Core::Id(Constants::ANNOTATE), context);
+    command = Core::ActionManager::registerAction(annotateFile, Utils::Id(Constants::ANNOTATE), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(annotateFile, &QAction::triggered, this, &MercurialPluginPrivate::annotateCurrentFile);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(diffFile, Core::Id(Constants::DIFF), context);
+    command = Core::ActionManager::registerAction(diffFile, Utils::Id(Constants::DIFF), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+G,Alt+D")));
     connect(diffFile, &QAction::triggered, this, &MercurialPluginPrivate::diffCurrentFile);
@@ -324,7 +323,7 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context)
     m_commandLocator->appendCommand(command);
 
     logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(logFile, Core::Id(Constants::LOG), context);
+    command = Core::ActionManager::registerAction(logFile, Utils::Id(Constants::LOG), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+G,Alt+L")));
     connect(logFile, &QAction::triggered, this, &MercurialPluginPrivate::logCurrentFile);
@@ -332,7 +331,7 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context)
     m_commandLocator->appendCommand(command);
 
     statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(statusFile, Core::Id(Constants::STATUS), context);
+    command = Core::ActionManager::registerAction(statusFile, Utils::Id(Constants::STATUS), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+G,Alt+S")));
     connect(statusFile, &QAction::triggered, this, &MercurialPluginPrivate::statusCurrentFile);
@@ -342,21 +341,21 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context)
     m_mercurialContainer->addSeparator(context);
 
     m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(m_addAction, Core::Id(Constants::ADD), context);
+    command = Core::ActionManager::registerAction(m_addAction, Utils::Id(Constants::ADD), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(m_addAction, &QAction::triggered, this, &MercurialPluginPrivate::addCurrentFile);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(m_deleteAction, Core::Id(Constants::DELETE), context);
+    command = Core::ActionManager::registerAction(m_deleteAction, Utils::Id(Constants::DELETE), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(m_deleteAction, &QAction::triggered, this, &MercurialPluginPrivate::promptToDeleteCurrentFile);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this);
-    command = Core::ActionManager::registerAction(revertFile, Core::Id(Constants::REVERT), context);
+    command = Core::ActionManager::registerAction(revertFile, Utils::Id(Constants::REVERT), context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(revertFile, &QAction::triggered, this, &MercurialPluginPrivate::revertCurrentFile);
     m_mercurialContainer->addAction(command);
@@ -417,28 +416,28 @@ void MercurialPluginPrivate::createDirectoryActions(const Core::Context &context
 {
     auto action = new QAction(tr("Diff"), this);
     m_repositoryActionList.append(action);
-    Core::Command *command = Core::ActionManager::registerAction(action, Core::Id(Constants::DIFFMULTI), context);
+    Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::DIFFMULTI), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::diffRepository);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Log"), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::LOGMULTI), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::LOGMULTI), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::logRepository);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Revert..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::REVERTMULTI), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::REVERTMULTI), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::revertMulti);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Status"), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::STATUSMULTI), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::STATUSMULTI), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::statusMulti);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -481,56 +480,56 @@ void MercurialPluginPrivate::createRepositoryActions(const Core::Context &contex
 {
     auto action = new QAction(tr("Pull..."), this);
     m_repositoryActionList.append(action);
-    Core::Command *command = Core::ActionManager::registerAction(action, Core::Id(Constants::PULL), context);
+    Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PULL), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::pull);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Push..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::PUSH), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PUSH), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::push);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Update..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::UPDATE), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::UPDATE), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::update);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Import..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::IMPORT), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::IMPORT), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::import);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Incoming..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::INCOMING), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::INCOMING), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::incoming);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Outgoing..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::OUTGOING), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::OUTGOING), context);
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::outgoing);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     action = new QAction(tr("Commit..."), this);
     m_repositoryActionList.append(action);
-    command = Core::ActionManager::registerAction(action, Core::Id(Constants::COMMIT), context);
+    command = Core::ActionManager::registerAction(action, Utils::Id(Constants::COMMIT), context);
     command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+G,Alt+C")));
     connect(action, &QAction::triggered, this, &MercurialPluginPrivate::commit);
     m_mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     m_createRepositoryAction = new QAction(tr("Create Repository..."), this);
-    command = Core::ActionManager::registerAction(m_createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context);
+    command = Core::ActionManager::registerAction(m_createRepositoryAction, Utils::Id(Constants::CREATE_REPOSITORY), context);
     connect(m_createRepositoryAction, &QAction::triggered, this, &MercurialPluginPrivate::createRepository);
     m_mercurialContainer->addAction(command);
 }
@@ -742,7 +741,7 @@ QString MercurialPluginPrivate::displayName() const
     return tr("Mercurial");
 }
 
-Core::Id MercurialPluginPrivate::id() const
+Utils::Id MercurialPluginPrivate::id() const
 {
     return {VcsBase::Constants::VCS_ID_MERCURIAL};
 }
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
index 9c773818c8..4b63d1ac12 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
@@ -34,7 +34,7 @@ inline bool is(const MesonTools::Tool_t &tool)
 }
 
 template<typename T>
-std::shared_ptr<T> tool(const Core::Id &id, const std::vector<MesonTools::Tool_t> &tools)
+std::shared_ptr<T> tool(const Utils::Id &id, const std::vector<MesonTools::Tool_t> &tools)
 {
     static_assert(std::is_base_of<ToolWrapper, T>::value, "Type must derive from ToolWrapper");
     const auto tool = std::find_if(std::cbegin(tools),
@@ -89,11 +89,11 @@ void MesonTools::setTools(std::vector<MesonTools::Tool_t> &&tools)
     fixAutoDetected<NinjaWrapper>(self->m_tools);
 }
 
-std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Core::Id &id)
+std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Utils::Id &id)
 {
     return tool<NinjaWrapper>(id, MesonTools::instance()->m_tools);
 }
-std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Core::Id &id)
+std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Utils::Id &id)
 {
     return tool<MesonWrapper>(id, MesonTools::instance()->m_tools);
 }
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
index 35337d4fc4..f3d4f12887 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
@@ -50,7 +50,7 @@ public:
     static bool isMesonWrapper(const Tool_t &tool);
     static bool isNinjaWrapper(const Tool_t &tool);
 
-    static inline void addTool(const Core::Id &itemId,
+    static inline void addTool(const Utils::Id &itemId,
                                const QString &name,
                                const Utils::FilePath &exe)
     {
@@ -72,7 +72,7 @@ public:
 
     static inline const std::vector<Tool_t> &tools() { return instance()->m_tools; }
 
-    static inline void updateTool(const Core::Id &itemId,
+    static inline void updateTool(const Utils::Id &itemId,
                                   const QString &name,
                                   const Utils::FilePath &exe)
     {
@@ -87,7 +87,7 @@ public:
             addTool(itemId, name, exe);
         }
     }
-    static void removeTool(const Core::Id &id)
+    static void removeTool(const Utils::Id &id)
     {
         auto self = instance();
         auto item = Utils::take(self->m_tools, [&id](const auto &item) { return item->id() == id; });
@@ -95,8 +95,8 @@ public:
         emit self->toolRemoved(*item);
     }
 
-    static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Core::Id &id);
-    static std::shared_ptr<MesonWrapper> mesonWrapper(const Core::Id &id);
+    static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Utils::Id &id);
+    static std::shared_ptr<MesonWrapper> mesonWrapper(const Utils::Id &id);
 
     static std::shared_ptr<NinjaWrapper> ninjaWrapper();
     static std::shared_ptr<MesonWrapper> mesonWrapper();
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
index 5bdaba7882..7053244f62 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
@@ -28,8 +28,8 @@
 #include "toolwrapper.h"
 #include "utils/environment.h"
 #include "utils/fileutils.h"
+#include <utils/id.h>
 #include "utils/optional.h"
-#include <coreplugin/id.h>
 #include <tuple>
 #include <QFile>
 #include <QFileInfo>
@@ -120,7 +120,7 @@ inline MesonWrapper *fromVariantMap<MesonWrapper *>(const QVariantMap &data)
 {
     return new MesonWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
                             Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
-                            Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
+                            Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
                             data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
 }
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
index 8566f27523..a4fca60ed9 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
@@ -56,7 +56,7 @@ inline NinjaWrapper *fromVariantMap<NinjaWrapper *>(const QVariantMap &data)
 {
     return new NinjaWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
                             Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
-                            Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
+                            Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
                             data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
 }
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
index a89d2bf336..716026c66c 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
@@ -31,14 +31,14 @@ ToolWrapper::ToolWrapper(const QString &name, const Utils::FilePath &path, bool
     : m_version(read_version(path))
     , m_isValid{path.exists() && m_version.isValid}
     , m_autoDetected{autoDetected}
-    , m_id{Core::Id::fromString(QUuid::createUuid().toString())}
+    , m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
     , m_exe{path}
     , m_name{name}
 {}
 
 ToolWrapper::ToolWrapper(const QString &name,
                          const Utils::FilePath &path,
-                         const Core::Id &id,
+                         const Utils::Id &id,
                          bool autoDetected)
     : m_version(read_version(path))
     , m_isValid{path.exists() && m_version.isValid}
@@ -47,7 +47,7 @@ ToolWrapper::ToolWrapper(const QString &name,
     , m_exe{path}
     , m_name{name}
 {
-    QTC_ASSERT(m_id.isValid(), m_id = Core::Id::fromString(QUuid::createUuid().toString()));
+    QTC_ASSERT(m_id.isValid(), m_id = Utils::Id::fromString(QUuid::createUuid().toString()));
 }
 
 void ToolWrapper::setExe(const Utils::FilePath &newExe)
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
index 717b38e4c1..5f58dbac31 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 #pragma once
-#include <coreplugin/id.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/qtcassert.h>
 #include <versionhelper.h>
 #include <QFileInfo>
@@ -64,7 +64,7 @@ public:
     ToolWrapper(const QString &name, const Utils::FilePath &path, bool autoDetected = false);
     ToolWrapper(const QString &name,
                 const Utils::FilePath &path,
-                const Core::Id &id,
+                const Utils::Id &id,
                 bool autoDetected = false);
     ToolWrapper(const ToolWrapper &other) = default;
     ToolWrapper(ToolWrapper &&other) = default;
@@ -74,7 +74,7 @@ public:
     inline const Version &version() const noexcept { return m_version; };
     inline bool isValid() const noexcept { return m_isValid; };
     inline bool autoDetected() const noexcept { return m_autoDetected; };
-    inline Core::Id id() const noexcept { return m_id; };
+    inline Utils::Id id() const noexcept { return m_id; };
     inline Utils::FilePath exe() const noexcept { return m_exe; };
     inline QString name() const noexcept { return m_name; };
 
@@ -94,7 +94,7 @@ protected:
     Version m_version;
     bool m_isValid;
     bool m_autoDetected;
-    Core::Id m_id;
+    Utils::Id m_id;
     Utils::FilePath m_exe;
     QString m_name;
 };
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
index a76e54590e..0736a69382 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
@@ -45,7 +45,7 @@
 
 namespace MesonProjectManager {
 namespace Internal {
-MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id)
+MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::BuildConfiguration{target, id}
 {
     appendInitialBuildStep(Constants::MESON_BUILD_STEP_ID);
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
index 8afd949a4f..4e36c843a2 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 #pragma once
-#include "coreplugin/id.h"
+
 #include "projectexplorer/buildconfiguration.h"
 #include "projectexplorer/target.h"
 #include "utils/fileutils.h"
@@ -95,7 +95,7 @@ class MesonBuildConfiguration final : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 public:
-    MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
     ~MesonBuildConfiguration() final;
 
     static Utils::FilePath shadowBuildDirectory(
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
index 6c34f50d3b..6161659a65 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
@@ -105,7 +105,7 @@ QStringList toAbsolutePath(const Utils::FilePath &refPath, QStringList &pathList
     return allAbs;
 }
 
-MesonProjectParser::MesonProjectParser(const Core::Id &meson,
+MesonProjectParser::MesonProjectParser(const Utils::Id &meson,
                                        Utils::Environment env,
                                        ProjectExplorer::Project *project)
     : m_env{env}
@@ -127,7 +127,7 @@ MesonProjectParser::MesonProjectParser(const Core::Id &meson,
     m_outputParser.setFileFinder(fileFinder);
 }
 
-void MesonProjectParser::setMesonTool(const Core::Id &meson)
+void MesonProjectParser::setMesonTool(const Utils::Id &meson)
 {
     m_meson = meson;
 }
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
index 867af8135b..3eeb0ba910 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
@@ -52,8 +52,8 @@ class MesonProjectParser : public QObject
     };
 
 public:
-    MesonProjectParser(const Core::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
-    void setMesonTool(const Core::Id &meson);
+    MesonProjectParser(const Utils::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
+    void setMesonTool(const Utils::Id &meson);
     bool configure(const Utils::FilePath &sourcePath,
                    const Utils::FilePath &buildPath,
                    const QStringList &args);
@@ -112,7 +112,7 @@ private:
     MesonProcess m_process;
     MesonOutputParser m_outputParser;
     Utils::Environment m_env;
-    Core::Id m_meson;
+    Utils::Id m_meson;
     Utils::FilePath m_buildDir;
     Utils::FilePath m_srcDir;
     QFuture<ParserData *> m_parserFutureResult;
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
index 2c4b1e9f6e..28e2a3579a 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
@@ -34,7 +34,7 @@
 #include <QLatin1String>
 namespace MesonProjectManager {
 namespace Internal {
-MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id)
+MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::RunConfiguration{target, id}
 {
     auto envAspect = addAspect<ProjectExplorer::LocalEnvironmentAspect>(target);
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
index 4d31bc1bf1..896380d4c5 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
@@ -32,7 +32,7 @@ namespace Internal {
 class MesonRunConfiguration final : public ProjectExplorer::RunConfiguration
 {
 public:
-    MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     void updateTargetInformation();
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
index 5e701277dc..f39a7aaef1 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
@@ -31,7 +31,7 @@
 #include "mesonpluginconstants.h"
 #include <settings/general/settings.h>
 #include <settings/tools/kitaspect/ninjatoolkitaspect.h>
-#include <coreplugin/id.h>
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/processparameters.h>
@@ -43,7 +43,7 @@ namespace Internal {
 const char TARGETS_KEY[] = "MesonProjectManager.BuildStep.BuildTargets";
 const char TOOL_ARGUMENTS_KEY[] = "MesonProjectManager.BuildStep.AdditionalArguments";
 
-NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
     : ProjectExplorer::AbstractProcessStep{bsl, id}
 {
     setDefaultDisplayName(tr("Meson Build"));
@@ -116,7 +116,7 @@ QString NinjaBuildStep::defaultBuildTarget() const
 {
     const ProjectExplorer::BuildStepList *const bsl = stepList();
     QTC_ASSERT(bsl, return {});
-    const Core::Id parentId = bsl->id();
+    const Utils::Id parentId = bsl->id();
     if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
         return {Constants::Targets::clean};
     if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
index 12dc9c2b5a..ae50f4263a 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
@@ -36,7 +36,7 @@ class NinjaBuildStep final : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
 public:
-    NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() final;
     Utils::CommandLine command();
     QStringList projectTargets();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
index f8861f1e88..c98bf5db7c 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *MesonToolKitAspect::createConfigWidget(Project
     return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Meson};
 }
 
-void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Core::Id id)
+void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id)
 {
     QTC_ASSERT(kit && id.isValid(), return );
     kit->setValue(TOOL_ID, id.toSetting());
 }
 
-Core::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
+Utils::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
 {
     QTC_ASSERT(kit, return {});
-    return Core::Id::fromSetting(kit->value(TOOL_ID));
+    return Utils::Id::fromSetting(kit->value(TOOL_ID));
 }
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
index 759cdae319..ea2bd8fc8b 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
@@ -26,7 +26,6 @@
 #pragma once
 #include <exewrappers/mesontools.h>
 
-#include <coreplugin/id.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
@@ -43,8 +42,8 @@ public:
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
     ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
 
-    static void setMesonTool(ProjectExplorer::Kit *kit, Core::Id id);
-    static Core::Id mesonToolId(const ProjectExplorer::Kit *kit);
+    static void setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id);
+    static Utils::Id mesonToolId(const ProjectExplorer::Kit *kit);
 
     static inline decltype(auto) mesonTool(const ProjectExplorer::Kit *kit)
     {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
index aaa41f3228..d5fafc3e37 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(Project
     return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Ninja};
 }
 
-void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id)
+void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id)
 {
     QTC_ASSERT(kit && id.isValid(), return );
     kit->setValue(TOOL_ID, id.toSetting());
 }
 
-Core::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
+Utils::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
 {
     QTC_ASSERT(kit, return {});
-    return Core::Id::fromSetting(kit->value(TOOL_ID));
+    return Utils::Id::fromSetting(kit->value(TOOL_ID));
 }
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
index 59e869af8c..64c10c6a9b 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
@@ -26,7 +26,6 @@
 #pragma once
 #include <exewrappers/mesontools.h>
 
-#include <coreplugin/id.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
@@ -43,8 +42,8 @@ public:
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
     ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
 
-    static void setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id);
-    static Core::Id ninjaToolId(const ProjectExplorer::Kit *kit);
+    static void setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id);
+    static Utils::Id ninjaToolId(const ProjectExplorer::Kit *kit);
 
     static inline decltype(auto) ninjaTool(const ProjectExplorer::Kit *kit)
     {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
index 64d7439045..76ee4543d9 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
@@ -92,17 +92,17 @@ void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
 
 void ToolKitAspectWidget::setCurrentToolIndex(int index)
 {
-    const Core::Id id = Core::Id::fromSetting(m_toolsComboBox->itemData(index));
+    const Utils::Id id = Utils::Id::fromSetting(m_toolsComboBox->itemData(index));
     if (m_type == ToolType::Meson)
         MesonToolKitAspect::setMesonTool(m_kit, id);
     else
         NinjaToolKitAspect::setNinjaTool(m_kit, id);
 }
 
-int ToolKitAspectWidget::indexOf(const Core::Id &id)
+int ToolKitAspectWidget::indexOf(const Utils::Id &id)
 {
     for (int i = 0; i < m_toolsComboBox->count(); ++i) {
-        if (id == Core::Id::fromSetting(m_toolsComboBox->itemData(i)))
+        if (id == Utils::Id::fromSetting(m_toolsComboBox->itemData(i)))
             return i;
     }
     return -1;
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
index b217232cf4..af2af7c12e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
@@ -50,7 +50,7 @@ private:
     void addTool(const MesonTools::Tool_t &tool);
     void removeTool(const MesonTools::Tool_t &tool);
     void setCurrentToolIndex(int index);
-    int indexOf(const Core::Id &id);
+    int indexOf(const Utils::Id &id);
     bool isCompatible(const MesonTools::Tool_t &tool);
     void loadTools();
     void setToDefault();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
index 08f2d1f42b..9a692b00c1 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #pragma once
-#include "coreplugin/id.h"
+#include "utils/id.h"
 #include "utils/fileutils.h"
 #include "utils/optional.h"
 #include <QWidget>
@@ -47,11 +47,11 @@ public:
     ~ToolItemSettings();
     void load(ToolTreeItem *item);
     void store();
-    Q_SIGNAL void applyChanges(Core::Id itemId, const QString &name, const Utils::FilePath &exe);
+    Q_SIGNAL void applyChanges(Utils::Id itemId, const QString &name, const Utils::FilePath &exe);
 
 private:
     Ui::ToolItemSettings *ui;
-    Utils::optional<Core::Id> m_currentId{Utils::nullopt};
+    Utils::optional<Utils::Id> m_currentId{Utils::nullopt};
 };
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
index de13515a5a..f30d6b5b53 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
@@ -47,7 +47,7 @@ ToolTreeItem *ToolsModel::mesoneToolTreeItem(const QModelIndex &index) const
     return itemForIndexAtLevel<2>(index);
 }
 
-void ToolsModel::updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe)
+void ToolsModel::updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe)
 {
     auto treeItem = findItemAtLevel<2>([itemId](ToolTreeItem *n) { return n->id() == itemId; });
     QTC_ASSERT(treeItem, return );
@@ -62,7 +62,7 @@ void ToolsModel::addMesonTool()
 void ToolsModel::removeMesonTool(ToolTreeItem *item)
 {
     QTC_ASSERT(item, return );
-    const Core::Id id = item->id();
+    const Utils::Id id = item->id();
     destroyItem(item);
     m_itemsToRemove.enqueue(id);
 }
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
index 3707dc63c2..8bbcc1bb38 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
@@ -41,7 +41,7 @@ class ToolsModel final : public Utils::TreeModel<Utils::TreeItem, Utils::TreeIte
 public:
     ToolsModel();
     ToolTreeItem *mesoneToolTreeItem(const QModelIndex &index) const;
-    void updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe);
+    void updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe);
     void addMesonTool();
     void removeMesonTool(ToolTreeItem *item);
     ToolTreeItem *cloneMesonTool(ToolTreeItem *item);
@@ -52,7 +52,7 @@ private:
     QString uniqueName(const QString &baseName);
     Utils::TreeItem *autoDetectedGroup() const;
     Utils::TreeItem *manualGroup() const;
-    QQueue<Core::Id> m_itemsToRemove;
+    QQueue<Utils::Id> m_itemsToRemove;
 };
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
index b7abb4dfee..3fe2374242 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
@@ -33,7 +33,7 @@ namespace Internal {
 ToolTreeItem::ToolTreeItem(const QString &name)
     : m_name{name}
     , m_autoDetected{false}
-    , m_id(Core::Id::fromString(QUuid::createUuid().toString()))
+    , m_id(Utils::Id::fromString(QUuid::createUuid().toString()))
     , m_unsavedChanges{true}
 {
     self_check();
@@ -54,7 +54,7 @@ ToolTreeItem::ToolTreeItem(const ToolTreeItem &other)
     : m_name{tr("Clone of %1").arg(other.m_name)}
     , m_executable{other.m_executable}
     , m_autoDetected{false}
-    , m_id{Core::Id::fromString(QUuid::createUuid().toString())}
+    , m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
     , m_unsavedChanges{true}
 {
     self_check();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
index 029d00ea05..6b6946364e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
@@ -26,7 +26,7 @@
 #pragma once
 #include "toolssettingspage.h"
 #include <exewrappers/mesontools.h>
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/fileutils.h>
 #include <utils/optional.h>
 #include <utils/treemodel.h>
@@ -46,7 +46,7 @@ public:
     inline bool isAutoDetected() const noexcept { return m_autoDetected; }
     inline QString name() const noexcept { return m_name; }
     inline Utils::FilePath executable() const noexcept { return m_executable; }
-    inline Core::Id id() const noexcept { return m_id; }
+    inline Utils::Id id() const noexcept { return m_id; }
     inline bool hasUnsavedChanges() const noexcept { return m_unsavedChanges; }
     inline void setSaved() { m_unsavedChanges = false; }
     void update(const QString &name, const Utils::FilePath &exe);
@@ -62,7 +62,7 @@ private:
     bool m_pathExists;
     bool m_pathIsFile;
     bool m_pathIsExecutable;
-    Core::Id m_id;
+    Utils::Id m_id;
 
     bool m_unsavedChanges = false;
 };
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp
index 7a92dcde60..638c184884 100644
--- a/src/plugins/modeleditor/actionhandler.cpp
+++ b/src/plugins/modeleditor/actionhandler.cpp
@@ -226,7 +226,7 @@ std::function<void()> invokeOnCurrentModelEditor(void (ModelEditor::*function)()
     };
 }
 
-Core::Command *ActionHandler::registerCommand(const Core::Id &id, void (ModelEditor::*function)(),
+Core::Command *ActionHandler::registerCommand(const Utils::Id &id, void (ModelEditor::*function)(),
                                               const Core::Context &context, const QString &title,
                                               const QKeySequence &keySequence, const QIcon &icon)
 {
diff --git a/src/plugins/modeleditor/actionhandler.h b/src/plugins/modeleditor/actionhandler.h
index fcc2665736..b790cf7bfc 100644
--- a/src/plugins/modeleditor/actionhandler.h
+++ b/src/plugins/modeleditor/actionhandler.h
@@ -78,7 +78,7 @@ private:
     void onEditProperties();
     void onEditItem();
 
-    Core::Command *registerCommand(const Core::Id &id, void (ModelEditor::*function)(),
+    Core::Command *registerCommand(const Utils::Id &id, void (ModelEditor::*function)(),
                                    const Core::Context &context, const QString &title = QString(),
                                    const QKeySequence &keySequence = QKeySequence(),
                                    const QIcon &icon = QIcon());
diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp
index a84bdd6863..827472c3bf 100644
--- a/src/plugins/modeleditor/modeldocument.cpp
+++ b/src/plugins/modeleditor/modeldocument.cpp
@@ -37,7 +37,7 @@
 #include "qmt/project_controller/projectcontroller.h"
 #include "qmt/project/project.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/fileutils.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index 1f665ed352..3b33249db3 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -842,7 +842,7 @@ void ModelEditor::expandModelTreeToDepth(int depth)
     d->modelTreeView->expandToDepth(depth);
 }
 
-QToolButton *ModelEditor::createToolbarCommandButton(const Core::Id &id,
+QToolButton *ModelEditor::createToolbarCommandButton(const Utils::Id &id,
                                                      const std::function<void()> &slot,
                                                      QWidget *parent)
 {
diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h
index 7e91b38dae..7491ce0f76 100644
--- a/src/plugins/modeleditor/modeleditor.h
+++ b/src/plugins/modeleditor/modeleditor.h
@@ -104,7 +104,7 @@ private:
     void showProperties(qmt::MDiagram *diagram, const QList<qmt::DElement *> &diagramElements);
     void clearProperties();
     void expandModelTreeToDepth(int depth);
-    QToolButton *createToolbarCommandButton(const Core::Id &id,
+    QToolButton *createToolbarCommandButton(const Utils::Id &id,
                                             const std::function<void()> &slot,
                                             QWidget *parent);
     bool updateButtonIconByTheme(QAbstractButton *button, const QString &name);
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp
index 6665191a2a..8bc9119302 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimblebuildconfiguration.cpp
@@ -47,7 +47,7 @@ using namespace Nim;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Core::Id id)
+NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     setConfigWidgetDisplayName(tr("General"));
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.h b/src/plugins/nim/project/nimblebuildconfiguration.h
index e3a170294e..745cb3ddf4 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.h
+++ b/src/plugins/nim/project/nimblebuildconfiguration.h
@@ -36,7 +36,7 @@ class NimbleBuildConfiguration : public ProjectExplorer::BuildConfiguration
 
     friend class ProjectExplorer::BuildConfigurationFactory;
 
-    NimbleBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    NimbleBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
     BuildType buildType() const override;
 
diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp
index 33fb0845b9..cd2e64ffb7 100644
--- a/src/plugins/nim/project/nimblebuildstep.cpp
+++ b/src/plugins/nim/project/nimblebuildstep.cpp
@@ -82,7 +82,7 @@ class NimParser : public OutputTaskParser
 
 }
 
-NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Core::Id id)
+NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Utils::Id id)
     : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMBLEBUILDSTEP_DISPLAY));
diff --git a/src/plugins/nim/project/nimblebuildstep.h b/src/plugins/nim/project/nimblebuildstep.h
index 7d903e5135..4c425d8837 100644
--- a/src/plugins/nim/project/nimblebuildstep.h
+++ b/src/plugins/nim/project/nimblebuildstep.h
@@ -34,7 +34,7 @@ class NimbleBuildStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    NimbleBuildStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
+    NimbleBuildStep(ProjectExplorer::BuildStepList *parentList, Utils::Id id);
 
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
diff --git a/src/plugins/nim/project/nimblerunconfiguration.cpp b/src/plugins/nim/project/nimblerunconfiguration.cpp
index ebb77a037d..53b7b6dd5e 100644
--- a/src/plugins/nim/project/nimblerunconfiguration.cpp
+++ b/src/plugins/nim/project/nimblerunconfiguration.cpp
@@ -48,7 +48,7 @@ class NimbleRunConfiguration : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(Nim::NimbleRunConfiguration)
 
 public:
-    NimbleRunConfiguration(Target *target, Core::Id id)
+    NimbleRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<LocalEnvironmentAspect>(target);
@@ -86,7 +86,7 @@ class NimbleTestConfiguration : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTestConfiguration)
 
 public:
-    NimbleTestConfiguration(ProjectExplorer::Target *target, Core::Id id)
+    NimbleTestConfiguration(ProjectExplorer::Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<ExecutableAspect>()->setExecutable(Utils::FilePath::fromString(QStandardPaths::findExecutable("nimble")));
diff --git a/src/plugins/nim/project/nimbletaskstep.cpp b/src/plugins/nim/project/nimbletaskstep.cpp
index f5f95160d3..6488e46123 100644
--- a/src/plugins/nim/project/nimbletaskstep.cpp
+++ b/src/plugins/nim/project/nimbletaskstep.cpp
@@ -40,7 +40,7 @@
 using namespace Nim;
 using namespace ProjectExplorer;
 
-NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Core::Id id)
+NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Utils::Id id)
     : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY));
diff --git a/src/plugins/nim/project/nimbletaskstep.h b/src/plugins/nim/project/nimbletaskstep.h
index 15e67885cd..cd27946833 100644
--- a/src/plugins/nim/project/nimbletaskstep.h
+++ b/src/plugins/nim/project/nimbletaskstep.h
@@ -34,7 +34,7 @@ class NimbleTaskStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    NimbleTaskStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
+    NimbleTaskStep(ProjectExplorer::BuildStepList *parentList, Utils::Id id);
 
     bool init() override;
 
diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp
index ea249956cf..10677d9476 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimbuildconfiguration.cpp
@@ -65,7 +65,7 @@ static FilePath defaultBuildDirectory(const Kit *k,
     return projectDir.pathAppended(buildDirectory);
 }
 
-NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id)
+NimBuildConfiguration::NimBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     setConfigWidgetDisplayName(tr("General"));
diff --git a/src/plugins/nim/project/nimbuildconfiguration.h b/src/plugins/nim/project/nimbuildconfiguration.h
index cd39e6e40d..584a396ca8 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.h
+++ b/src/plugins/nim/project/nimbuildconfiguration.h
@@ -37,7 +37,7 @@ class NimBuildConfiguration : public ProjectExplorer::BuildConfiguration
     Q_OBJECT
 
     friend class ProjectExplorer::BuildConfigurationFactory;
-    NimBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    NimBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 public:
     Utils::FilePath cacheDirectory() const;
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index a04b440521..2e8a53ee3f 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -82,7 +82,7 @@ class NimParser : public ProjectExplorer::OutputTaskParser
     }
 };
 
-NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Core::Id id)
+NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Utils::Id id)
     : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEP_DISPLAY));
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.h b/src/plugins/nim/project/nimcompilerbuildstep.h
index cd194e06ea..ddb31adb28 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.h
+++ b/src/plugins/nim/project/nimcompilerbuildstep.h
@@ -39,7 +39,7 @@ class NimCompilerBuildStep : public ProjectExplorer::AbstractProcessStep
 public:
     enum DefaultBuildOptions { Empty = 0, Debug, Release};
 
-    NimCompilerBuildStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
+    NimCompilerBuildStep(ProjectExplorer::BuildStepList *parentList, Utils::Id id);
 
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp
index 3fce967a34..ca5626776a 100644
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -45,7 +45,7 @@ class NimCompilerCleanStep final : public BuildStep
     Q_DECLARE_TR_FUNCTIONS(Nim::NimCompilerCleanStep)
 
 public:
-    NimCompilerCleanStep(BuildStepList *parentList, Core::Id id);
+    NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id);
 
 private:
     bool init() final;
@@ -58,7 +58,7 @@ private:
     Utils::FilePath m_buildDir;
 };
 
-NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Core::Id id)
+NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id)
     : BuildStep(parentList, id)
 {
     setDefaultDisplayName(tr("Nim Clean Step"));
diff --git a/src/plugins/nim/project/nimrunconfiguration.cpp b/src/plugins/nim/project/nimrunconfiguration.cpp
index 142e434490..ef3e478b85 100644
--- a/src/plugins/nim/project/nimrunconfiguration.cpp
+++ b/src/plugins/nim/project/nimrunconfiguration.cpp
@@ -46,7 +46,7 @@ class NimRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(Nim::NimRunConfiguration)
 
 public:
-    NimRunConfiguration(Target *target, Core::Id id)
+    NimRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<LocalEnvironmentAspect>(target);
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index 1d1cf4e1a7..81a957c588 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -43,7 +43,7 @@ NimToolChain::NimToolChain()
     : NimToolChain(Constants::C_NIMTOOLCHAIN_TYPEID)
 {}
 
-NimToolChain::NimToolChain(Core::Id typeId)
+NimToolChain::NimToolChain(Utils::Id typeId)
     : ToolChain(typeId)
     , m_compilerCommand(FilePath())
     , m_version(std::make_tuple(-1,-1,-1))
diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h
index d61448e6a0..4f883e6bbc 100644
--- a/src/plugins/nim/project/nimtoolchain.h
+++ b/src/plugins/nim/project/nimtoolchain.h
@@ -36,7 +36,7 @@ class NimToolChain : public ProjectExplorer::ToolChain
 
 public:
     NimToolChain();
-    explicit NimToolChain(Core::Id typeId);
+    explicit NimToolChain(Utils::Id typeId);
 
     ProjectExplorer::Abi targetAbi() const override;
     bool isValid() const override;
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
index d7b7eac6c1..ec54db7871 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
@@ -29,7 +29,7 @@
 #include "../nimconstants.h"
 #include "../editor/nimindenter.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <texteditor/simplecodestylepreferences.h>
 
@@ -44,7 +44,7 @@ NimCodeStylePreferencesFactory::NimCodeStylePreferencesFactory()
 {
 }
 
-Core::Id NimCodeStylePreferencesFactory::languageId()
+Utils::Id NimCodeStylePreferencesFactory::languageId()
 {
     return Constants::C_NIMLANGUAGE_ID;
 }
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
index 8068215639..9c3848ed21 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
@@ -36,7 +36,7 @@ class NimCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesF
 public:
     NimCodeStylePreferencesFactory();
 
-    Core::Id languageId() override;
+    Utils::Id languageId() override;
     QString displayName() override;
     TextEditor::ICodeStylePreferences *createCodeStyle() const override;
     QWidget *createEditor(TextEditor::ICodeStylePreferences *settings,
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 6bb0b5d55b..aa47a3fe2e 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -36,7 +36,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/documentmanager.h>
@@ -1419,7 +1418,7 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const QString &workingDir,
 
 IEditor *PerforcePluginPrivate::showOutputInEditor(const QString &title,
                                                    const QString &output,
-                                                   Core::Id id,
+                                                   Utils::Id id,
                                                    const QString &source,
                                                    QTextCodec *codec)
 {
diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index 4695005367..9f949d331e 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -555,7 +555,7 @@ void PerfProfilerTool::gotoSourceLocation(QString filePath, int lineNumber, int
 
     // The text editors count columns starting with 0, but the ASTs store the
     // location starting with 1, therefore the -1.
-    EditorManager::openEditorAt(fi.filePath(), lineNumber, columnNumber - 1, Core::Id(),
+    EditorManager::openEditorAt(fi.filePath(), lineNumber, columnNumber - 1, Utils::Id(),
                                 EditorManager::DoNotSwitchToDesignMode
                                 | EditorManager::DoNotSwitchToEditMode);
 
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 1a9d18a937..7b1dd44d3c 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -113,7 +113,7 @@ public:
     OutputFormatter *outputFormatter = nullptr;
 };
 
-AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Core::Id id) :
+AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Utils::Id id) :
     BuildStep(bsl, id),
     d(new Private(this))
 {
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 9431c3a97c..cee8ece9fc 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -48,7 +48,7 @@ public:
     void emitFaultyConfigurationMessage();
 
 protected:
-    AbstractProcessStep(BuildStepList *bsl, Core::Id id);
+    AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
     ~AbstractProcessStep() override;
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index de92f588cb..320cd5ac6e 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -419,7 +419,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
     }
     // Create new
     static int counter = 0;
-    Core::Id contextId = Core::Id(C_APP_OUTPUT).withSuffix(counter++);
+    Utils::Id contextId = Utils::Id(C_APP_OUTPUT).withSuffix(counter++);
     Core::Context context(contextId);
     Core::OutputWindow *ow = new Core::OutputWindow(context, SETTINGS_KEY, m_tabWidget);
     ow->setWindowTitle(tr("Application Output Window"));
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 14551d1d44..ef93d5b6f7 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -49,8 +49,8 @@ struct BaseProjectWizardDialogPrivate {
     const int desiredIntroPageId;
     Utils::ProjectIntroPage *introPage;
     int introPageId;
-    Core::Id selectedPlatform;
-    QSet<Core::Id> requiredFeatureSet;
+    Utils::Id selectedPlatform;
+    QSet<Utils::Id> requiredFeatureSet;
 };
 
 BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id) :
@@ -182,22 +182,22 @@ void BaseProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wiza
         addPage(p);
 }
 
-Core::Id BaseProjectWizardDialog::selectedPlatform() const
+Utils::Id BaseProjectWizardDialog::selectedPlatform() const
 {
     return d->selectedPlatform;
 }
 
-void BaseProjectWizardDialog::setSelectedPlatform(Core::Id platform)
+void BaseProjectWizardDialog::setSelectedPlatform(Utils::Id platform)
 {
     d->selectedPlatform = platform;
 }
 
-QSet<Core::Id> BaseProjectWizardDialog::requiredFeatures() const
+QSet<Utils::Id> BaseProjectWizardDialog::requiredFeatures() const
 {
     return d->requiredFeatureSet;
 }
 
-void BaseProjectWizardDialog::setRequiredFeatures(const QSet<Core::Id> &featureSet)
+void BaseProjectWizardDialog::setRequiredFeatures(const QSet<Utils::Id> &featureSet)
 {
     d->requiredFeatureSet = featureSet;
 }
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 98db214c96..7b2fd3c546 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -73,11 +73,11 @@ signals:
 
 protected:
     Utils::ProjectIntroPage *introPage() const;
-    Core::Id selectedPlatform() const;
-    void setSelectedPlatform(Core::Id platform);
+    Utils::Id selectedPlatform() const;
+    void setSelectedPlatform(Utils::Id platform);
 
-    QSet<Core::Id> requiredFeatures() const;
-    void setRequiredFeatures(const QSet<Core::Id> &featureSet);
+    QSet<Utils::Id> requiredFeatures() const;
+    void setRequiredFeatures(const QSet<Utils::Id> &featureSet);
 
 private:
     void init();
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index de8ac4dbe4..0e3a30427c 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -146,10 +146,10 @@ public:
     mutable Environment m_cachedEnvironment;
     QString m_configWidgetDisplayName;
     bool m_configWidgetHasFrame = false;
-    QList<Core::Id> m_initialBuildSteps;
-    QList<Core::Id> m_initialCleanSteps;
+    QList<Utils::Id> m_initialBuildSteps;
+    QList<Utils::Id> m_initialCleanSteps;
     Utils::MacroExpander m_macroExpander;
-    QList<Core::Id> m_customParsers;
+    QList<Utils::Id> m_customParsers;
 
     // FIXME: Remove.
     BuildConfiguration::BuildType m_initialBuildType = BuildConfiguration::Unknown;
@@ -158,7 +158,7 @@ public:
 
 } // Internal
 
-BuildConfiguration::BuildConfiguration(Target *target, Core::Id id)
+BuildConfiguration::BuildConfiguration(Target *target, Utils::Id id)
     : ProjectConfiguration(target, id), d(new Internal::BuildConfigurationPrivate(this))
 {
     QTC_CHECK(target && target == this->target());
@@ -256,10 +256,10 @@ void BuildConfiguration::doInitialize(const BuildInfo &info)
 
     d->m_initialBuildType = info.buildType;
 
-    for (Core::Id id : qAsConst(d->m_initialBuildSteps))
+    for (Utils::Id id : qAsConst(d->m_initialBuildSteps))
         d->m_buildSteps.appendStep(id);
 
-    for (Core::Id id : qAsConst(d->m_initialCleanSteps))
+    for (Utils::Id id : qAsConst(d->m_initialCleanSteps))
         d->m_cleanSteps.appendStep(id);
 
     acquaintAspects();
@@ -338,12 +338,12 @@ BuildStepList *BuildConfiguration::cleanSteps() const
     return &d->m_cleanSteps;
 }
 
-void BuildConfiguration::appendInitialBuildStep(Core::Id id)
+void BuildConfiguration::appendInitialBuildStep(Utils::Id id)
 {
     d->m_initialBuildSteps.append(id);
 }
 
-void BuildConfiguration::appendInitialCleanStep(Core::Id id)
+void BuildConfiguration::appendInitialCleanStep(Utils::Id id)
 {
     d->m_initialCleanSteps.append(id);
 }
@@ -359,7 +359,7 @@ QVariantMap BuildConfiguration::toMap() const
     map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(0), d->m_buildSteps.toMap());
     map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(1), d->m_cleanSteps.toMap());
 
-    map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Core::Id::toSetting));
+    map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Utils::Id::toSetting));
 
     return map;
 }
@@ -381,7 +381,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
             qWarning() << "No data for build step list" << i << "found!";
             continue;
         }
-        Core::Id id = idFromMap(data);
+        Utils::Id id = idFromMap(data);
         if (id == Constants::BUILDSTEPS_BUILD) {
             if (!d->m_buildSteps.fromMap(data))
                 qWarning() << "Failed to restore build step list";
@@ -393,7 +393,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
         }
     }
 
-    d->m_customParsers = transform(map.value(CUSTOM_PARSERS_KEY).toList(), &Core::Id::fromSetting);
+    d->m_customParsers = transform(map.value(CUSTOM_PARSERS_KEY).toList(), &Utils::Id::fromSetting);
 
     return ProjectConfiguration::fromMap(map);
 }
@@ -478,12 +478,12 @@ void BuildConfiguration::addToEnvironment(Environment &env) const
     Q_UNUSED(env)
 }
 
-const QList<Core::Id> BuildConfiguration::customParsers() const
+const QList<Utils::Id> BuildConfiguration::customParsers() const
 {
     return d->m_customParsers;
 }
 
-void BuildConfiguration::setCustomParsers(const QList<Core::Id> &parsers)
+void BuildConfiguration::setCustomParsers(const QList<Utils::Id> &parsers)
 {
     d->m_customParsers = parsers;
 }
@@ -622,7 +622,7 @@ const QList<BuildInfo>
     return list;
 }
 
-bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const
+bool BuildConfigurationFactory::supportsTargetDeviceType(Utils::Id id) const
 {
     if (m_supportedTargetDeviceTypes.isEmpty())
         return true;
@@ -633,7 +633,7 @@ bool BuildConfigurationFactory::supportsTargetDeviceType(Core::Id id) const
 BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const FilePath &projectPath)
 {
     QTC_ASSERT(k, return nullptr);
-    const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
     for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) {
         if (Utils::mimeTypeForFile(projectPath.toString())
                 .matchesName(factory->m_supportedProjectMimeTypeName)
@@ -653,7 +653,7 @@ BuildConfigurationFactory * BuildConfigurationFactory::find(Target *parent)
     return nullptr;
 }
 
-void BuildConfigurationFactory::setSupportedProjectType(Core::Id id)
+void BuildConfigurationFactory::setSupportedProjectType(Utils::Id id)
 {
     m_supportedProjectType = id;
 }
@@ -663,7 +663,7 @@ void BuildConfigurationFactory::setSupportedProjectMimeTypeName(const QString &m
     m_supportedProjectMimeTypeName = mimeTypeName;
 }
 
-void BuildConfigurationFactory::addSupportedTargetDeviceType(Core::Id id)
+void BuildConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id)
 {
     m_supportedTargetDeviceTypes.append(id);
 }
@@ -707,7 +707,7 @@ BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const Buil
 
 BuildConfiguration *BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map)
 {
-    const Core::Id id = idFromMap(map);
+    const Utils::Id id = idFromMap(map);
     for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) {
         QTC_ASSERT(factory->m_creator, return nullptr);
         if (!factory->canHandle(parent))
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 5e7bf1d03a..73d2eb3fe9 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -54,7 +54,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
 
 protected:
     friend class BuildConfigurationFactory;
-    explicit BuildConfiguration(Target *target, Core::Id id);
+    explicit BuildConfiguration(Target *target, Utils::Id id);
 
 public:
     ~BuildConfiguration() override;
@@ -79,14 +79,14 @@ public:
 
     virtual void addToEnvironment(Utils::Environment &env) const;
 
-    const QList<Core::Id> customParsers() const;
-    void setCustomParsers(const QList<Core::Id> &parsers);
+    const QList<Utils::Id> customParsers() const;
+    void setCustomParsers(const QList<Utils::Id> &parsers);
 
     BuildStepList *buildSteps() const;
     BuildStepList *cleanSteps() const;
 
-    void appendInitialBuildStep(Core::Id id);
-    void appendInitialCleanStep(Core::Id id);
+    void appendInitialBuildStep(Utils::Id id);
+    void appendInitialCleanStep(Utils::Id id);
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
@@ -177,16 +177,16 @@ protected:
         = std::function<QList<BuildInfo>(const Kit *, const Utils::FilePath &, bool)>;
     void setBuildGenerator(const BuildGenerator &buildGenerator);
 
-    bool supportsTargetDeviceType(Core::Id id) const;
-    void setSupportedProjectType(Core::Id id);
+    bool supportsTargetDeviceType(Utils::Id id) const;
+    void setSupportedProjectType(Utils::Id id);
     void setSupportedProjectMimeTypeName(const QString &mimeTypeName);
-    void addSupportedTargetDeviceType(Core::Id id);
+    void addSupportedTargetDeviceType(Utils::Id id);
     void setDefaultDisplayName(const QString &defaultDisplayName);
 
     using BuildConfigurationCreator = std::function<BuildConfiguration *(Target *)>;
 
     template <class BuildConfig>
-    void registerBuildConfiguration(Core::Id buildConfigId)
+    void registerBuildConfiguration(Utils::Id buildConfigId)
     {
         m_creator = [buildConfigId](Target *t) { return new BuildConfig(t, buildConfigId); };
         m_buildConfigId = buildConfigId;
@@ -196,9 +196,9 @@ private:
     bool canHandle(const ProjectExplorer::Target *t) const;
 
     BuildConfigurationCreator m_creator;
-    Core::Id m_buildConfigId;
-    Core::Id m_supportedProjectType;
-    QList<Core::Id> m_supportedTargetDeviceTypes;
+    Utils::Id m_buildConfigId;
+    Utils::Id m_supportedProjectType;
+    QList<Utils::Id> m_supportedTargetDeviceTypes;
     QString m_supportedProjectMimeTypeName;
     IssueReporter m_issueReporter;
     BuildGenerator m_buildGenerator;
diff --git a/src/plugins/projectexplorer/buildinfo.h b/src/plugins/projectexplorer/buildinfo.h
index e54285af35..02148a17ff 100644
--- a/src/plugins/projectexplorer/buildinfo.h
+++ b/src/plugins/projectexplorer/buildinfo.h
@@ -29,8 +29,8 @@
 
 #include "buildconfiguration.h"
 
-#include <coreplugin/id.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 namespace ProjectExplorer {
 
@@ -44,7 +44,7 @@ public:
     QString displayName;
     QString typeName;
     Utils::FilePath buildDirectory;
-    Core::Id kitId;
+    Utils::Id kitId;
     BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
 
     QVariant extraInfo;
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index f312648540..16ae265bca 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -61,6 +61,7 @@
 #include <QTimer>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ProjectExplorer {
 using namespace Internal;
diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h
index f50b458b23..c964c417a1 100644
--- a/src/plugins/projectexplorer/buildmanager.h
+++ b/src/plugins/projectexplorer/buildmanager.h
@@ -91,7 +91,7 @@ public:
     static void setCompileOutputSettings(const Internal::CompileOutputSettings &settings);
     static const Internal::CompileOutputSettings &compileOutputSettings();
 
-    static QString displayNameForStepId(Core::Id stepId);
+    static QString displayNameForStepId(Utils::Id stepId);
 
 public slots:
     static void cancel();
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 4a56d805c4..39a2e647fd 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -130,7 +130,7 @@ namespace ProjectExplorer {
 
 static QList<BuildStepFactory *> g_buildStepFactories;
 
-BuildStep::BuildStep(BuildStepList *bsl, Core::Id id) :
+BuildStep::BuildStep(BuildStepList *bsl, Utils::Id id) :
     ProjectConfiguration(bsl, id)
 {
     QTC_CHECK(bsl->target() && bsl->target() == this->target());
@@ -265,7 +265,7 @@ QString BuildStep::fallbackWorkingDirectory() const
 
 void BuildStep::setupOutputFormatter(OutputFormatter *formatter)
 {
-    for (const Core::Id id : buildConfiguration()->customParsers()) {
+    for (const Utils::Id id : buildConfiguration()->customParsers()) {
         if (Internal::CustomParser * const parser = Internal::CustomParser::createFromId(id))
             formatter->addLineParser(parser);
     }
@@ -291,7 +291,7 @@ void BuildStep::setWidgetExpandedByDefault(bool widgetExpandedByDefault)
     m_widgetExpandedByDefault = widgetExpandedByDefault;
 }
 
-QVariant BuildStep::data(Core::Id id) const
+QVariant BuildStep::data(Utils::Id id) const
 {
     Q_UNUSED(id)
     return {};
@@ -386,7 +386,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const
     if (!m_supportedDeviceTypes.isEmpty()) {
         Target *target = bsl->target();
         QTC_ASSERT(target, return false);
-        Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit());
+        Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(target->kit());
         if (!m_supportedDeviceTypes.contains(deviceType))
             return false;
     }
@@ -394,7 +394,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const
     if (m_supportedProjectType.isValid()) {
         if (!config)
             return false;
-        Core::Id projectId = config->project()->id();
+        Utils::Id projectId = config->project()->id();
         if (projectId != m_supportedProjectType)
             return false;
     }
@@ -405,7 +405,7 @@ bool BuildStepFactory::canHandle(BuildStepList *bsl) const
     if (m_supportedConfiguration.isValid()) {
         if (!config)
             return false;
-        Core::Id configId = config->id();
+        Utils::Id configId = config->id();
         if (configId != m_supportedConfiguration)
             return false;
     }
@@ -423,32 +423,32 @@ void BuildStepFactory::setFlags(BuildStepInfo::Flags flags)
     m_info.flags = flags;
 }
 
-void BuildStepFactory::setSupportedStepList(Core::Id id)
+void BuildStepFactory::setSupportedStepList(Utils::Id id)
 {
     m_supportedStepLists = {id};
 }
 
-void BuildStepFactory::setSupportedStepLists(const QList<Core::Id> &ids)
+void BuildStepFactory::setSupportedStepLists(const QList<Utils::Id> &ids)
 {
     m_supportedStepLists = ids;
 }
 
-void BuildStepFactory::setSupportedConfiguration(Core::Id id)
+void BuildStepFactory::setSupportedConfiguration(Utils::Id id)
 {
     m_supportedConfiguration = id;
 }
 
-void BuildStepFactory::setSupportedProjectType(Core::Id id)
+void BuildStepFactory::setSupportedProjectType(Utils::Id id)
 {
     m_supportedProjectType = id;
 }
 
-void BuildStepFactory::setSupportedDeviceType(Core::Id id)
+void BuildStepFactory::setSupportedDeviceType(Utils::Id id)
 {
     m_supportedDeviceTypes = {id};
 }
 
-void BuildStepFactory::setSupportedDeviceTypes(const QList<Core::Id> &ids)
+void BuildStepFactory::setSupportedDeviceTypes(const QList<Utils::Id> &ids)
 {
     m_supportedDeviceTypes = ids;
 }
@@ -458,12 +458,12 @@ BuildStepInfo BuildStepFactory::stepInfo() const
     return m_info;
 }
 
-Core::Id BuildStepFactory::stepId() const
+Utils::Id BuildStepFactory::stepId() const
 {
     return m_info.id;
 }
 
-BuildStep *BuildStepFactory::create(BuildStepList *parent, Core::Id id)
+BuildStep *BuildStepFactory::create(BuildStepList *parent, Utils::Id id)
 {
     BuildStep *bs = nullptr;
     if (id == m_info.id)
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 03a88c8b1a..f736e2474e 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -65,7 +65,7 @@ class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration
 
 protected:
     friend class BuildStepFactory;
-    explicit BuildStep(BuildStepList *bsl, Core::Id id);
+    explicit BuildStep(BuildStepList *bsl, Utils::Id id);
 
 public:
     ~BuildStep() override;
@@ -114,7 +114,7 @@ public:
     bool isImmutable() const { return m_immutable; }
     void setImmutable(bool immutable) { m_immutable = immutable; }
 
-    virtual QVariant data(Core::Id id) const;
+    virtual QVariant data(Utils::Id id) const;
     void setSummaryUpdater(const std::function<QString ()> &summaryUpdater);
 
     void addMacroExpander();
@@ -168,7 +168,7 @@ public:
 
     using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>;
 
-    Core::Id id;
+    Utils::Id id;
     QString displayName;
     Flags flags = Flags();
     BuildStepCreator creator;
@@ -185,8 +185,8 @@ public:
     static const QList<BuildStepFactory *> allBuildStepFactories();
 
     BuildStepInfo stepInfo() const;
-    Core::Id stepId() const;
-    BuildStep *create(BuildStepList *parent, Core::Id id);
+    Utils::Id stepId() const;
+    BuildStep *create(BuildStepList *parent, Utils::Id id);
     BuildStep *restore(BuildStepList *parent, const QVariantMap &map);
 
     bool canHandle(BuildStepList *bsl) const;
@@ -195,19 +195,19 @@ protected:
     using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>;
 
     template <class BuildStepType>
-    void registerStep(Core::Id id)
+    void registerStep(Utils::Id id)
     {
         QTC_CHECK(!m_info.creator);
         m_info.id = id;
         m_info.creator = [id](BuildStepList *bsl) { return new BuildStepType(bsl, id); };
     }
 
-    void setSupportedStepList(Core::Id id);
-    void setSupportedStepLists(const QList<Core::Id> &ids);
-    void setSupportedConfiguration(Core::Id id);
-    void setSupportedProjectType(Core::Id id);
-    void setSupportedDeviceType(Core::Id id);
-    void setSupportedDeviceTypes(const QList<Core::Id> &ids);
+    void setSupportedStepList(Utils::Id id);
+    void setSupportedStepLists(const QList<Utils::Id> &ids);
+    void setSupportedConfiguration(Utils::Id id);
+    void setSupportedProjectType(Utils::Id id);
+    void setSupportedDeviceType(Utils::Id id);
+    void setSupportedDeviceTypes(const QList<Utils::Id> &ids);
     void setRepeatable(bool on) { m_isRepeatable = on; }
     void setDisplayName(const QString &displayName);
     void setFlags(BuildStepInfo::Flags flags);
@@ -215,10 +215,10 @@ protected:
 private:
     BuildStepInfo m_info;
 
-    Core::Id m_supportedProjectType;
-    QList<Core::Id> m_supportedDeviceTypes;
-    QList<Core::Id> m_supportedStepLists;
-    Core::Id m_supportedConfiguration;
+    Utils::Id m_supportedProjectType;
+    QList<Utils::Id> m_supportedDeviceTypes;
+    QList<Utils::Id> m_supportedStepLists;
+    Utils::Id m_supportedConfiguration;
     bool m_isRepeatable = true;
 };
 
diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp
index 273835bd99..3fd22f8c4e 100644
--- a/src/plugins/projectexplorer/buildsteplist.cpp
+++ b/src/plugins/projectexplorer/buildsteplist.cpp
@@ -39,7 +39,7 @@ namespace ProjectExplorer {
 const char STEPS_COUNT_KEY[] = "ProjectExplorer.BuildStepList.StepsCount";
 const char STEPS_PREFIX[] = "ProjectExplorer.BuildStepList.Step.";
 
-BuildStepList::BuildStepList(QObject *parent, Core::Id id)
+BuildStepList::BuildStepList(QObject *parent, Utils::Id id)
     : QObject(parent), m_id(id)
 {
     QTC_ASSERT(parent, return);
@@ -91,7 +91,7 @@ bool BuildStepList::isEmpty() const
     return m_steps.isEmpty();
 }
 
-bool BuildStepList::contains(Core::Id id) const
+bool BuildStepList::contains(Utils::Id id) const
 {
     return Utils::anyOf(steps(), [id](BuildStep *bs){
         return bs->id() == id;
@@ -130,7 +130,7 @@ bool BuildStepList::fromMap(const QVariantMap &map)
             continue;
         }
         bool handled = false;
-        Core::Id stepId = idFromMap(bsData);
+        Utils::Id stepId = idFromMap(bsData);
         for (BuildStepFactory *factory : factories) {
             if (factory->stepId() == stepId) {
                 if (factory->canHandle(this)) {
@@ -153,7 +153,7 @@ QList<BuildStep *> BuildStepList::steps() const
     return m_steps;
 }
 
-BuildStep *BuildStepList::firstStepWithId(Core::Id id) const
+BuildStep *BuildStepList::firstStepWithId(Utils::Id id) const
 {
     return Utils::findOrDefault(m_steps, Utils::equal(&BuildStep::id, id));
 }
@@ -164,7 +164,7 @@ void BuildStepList::insertStep(int position, BuildStep *step)
     emit stepInserted(position);
 }
 
-void BuildStepList::insertStep(int position, Core::Id stepId)
+void BuildStepList::insertStep(int position, Utils::Id stepId)
 {
     for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) {
         if (BuildStep *step = factory->create(this, stepId)) {
diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h
index 52fdd99f89..49c0f8b206 100644
--- a/src/plugins/projectexplorer/buildsteplist.h
+++ b/src/plugins/projectexplorer/buildsteplist.h
@@ -27,7 +27,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QVariantMap>
@@ -42,7 +42,7 @@ class PROJECTEXPLORER_EXPORT BuildStepList : public QObject
     Q_OBJECT
 
 public:
-    explicit BuildStepList(QObject *parent, Core::Id id);
+    explicit BuildStepList(QObject *parent, Utils::Id id);
     ~BuildStepList() override;
 
     void clear();
@@ -58,19 +58,19 @@ public:
         }
         return nullptr;
     }
-    BuildStep *firstStepWithId(Core::Id id) const;
+    BuildStep *firstStepWithId(Utils::Id id) const;
 
     int count() const;
     bool isEmpty() const;
-    bool contains(Core::Id id) const;
+    bool contains(Utils::Id id) const;
 
     void insertStep(int position, BuildStep *step);
-    void insertStep(int position, Core::Id id);
+    void insertStep(int position, Utils::Id id);
     void appendStep(BuildStep *step) { insertStep(count(), step); }
-    void appendStep(Core::Id stepId) { insertStep(count(), stepId); }
+    void appendStep(Utils::Id stepId) { insertStep(count(), stepId); }
 
     struct StepCreationInfo {
-        Core::Id stepId;
+        Utils::Id stepId;
         std::function<bool(Target *)> condition; // unset counts as unrestricted
     };
 
@@ -83,7 +83,7 @@ public:
     QVariantMap toMap() const;
     bool fromMap(const QVariantMap &map);
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const;
 
 signals:
@@ -94,7 +94,7 @@ signals:
 
 private:
     Target *m_target;
-    Core::Id m_id;
+    Utils::Id m_id;
     QList<BuildStep *> m_steps;
 };
 
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 7877e0e968..5d44ba143a 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -253,7 +253,7 @@ void BuildStepListWidget::updateEnabledState()
 
 void BuildStepListWidget::updateAddBuildStepMenu()
 {
-    QMap<QString, QPair<Core::Id, BuildStepFactory *> > map;
+    QMap<QString, QPair<Utils::Id, BuildStepFactory *> > map;
     //Build up a list of possible steps and save map the display names to the (internal) name and factories.
     for (BuildStepFactory *factory : BuildStepFactory::allBuildStepFactories()) {
         if (factory->canHandle(m_buildStepList)) {
@@ -270,12 +270,12 @@ void BuildStepListWidget::updateAddBuildStepMenu()
     QMenu *menu = m_addButton->menu();
     menu->clear();
     if (!map.isEmpty()) {
-        QMap<QString, QPair<Core::Id, BuildStepFactory *> >::const_iterator it, end;
+        QMap<QString, QPair<Utils::Id, BuildStepFactory *> >::const_iterator it, end;
         end = map.constEnd();
         for (it = map.constBegin(); it != end; ++it) {
             QAction *action = menu->addAction(it.key());
             BuildStepFactory *factory = it.value().second;
-            Core::Id id = it.value().first;
+            Utils::Id id = it.value().first;
 
             connect(action, &QAction::triggered, [id, factory, this]() {
                 BuildStep *newStep = factory->create(m_buildStepList, id);
diff --git a/src/plugins/projectexplorer/buildsystem.cpp b/src/plugins/projectexplorer/buildsystem.cpp
index 7b6f4bbf5a..b91af550d6 100644
--- a/src/plugins/projectexplorer/buildsystem.cpp
+++ b/src/plugins/projectexplorer/buildsystem.cpp
@@ -253,7 +253,7 @@ QStringList BuildSystem::filesGeneratedFrom(const QString &sourceFile) const
     return {};
 }
 
-QVariant BuildSystem::additionalData(Core::Id id) const
+QVariant BuildSystem::additionalData(Utils::Id id) const
 {
     Q_UNUSED(id)
     return {};
@@ -341,14 +341,14 @@ void BuildSystem::emitBuildSystemUpdated()
     target()->buildSystemUpdated(this);
 }
 
-void BuildSystem::setExtraData(const QString &buildKey, Core::Id dataKey, const QVariant &data)
+void BuildSystem::setExtraData(const QString &buildKey, Utils::Id dataKey, const QVariant &data)
 {
     const ProjectNode *node = d->m_target->project()->findNodeForBuildKey(buildKey);
     QTC_ASSERT(node, return);
     node->setData(dataKey, data);
 }
 
-QVariant BuildSystem::extraData(const QString &buildKey, Core::Id dataKey) const
+QVariant BuildSystem::extraData(const QString &buildKey, Utils::Id dataKey) const
 {
     const ProjectNode *node = d->m_target->project()->findNodeForBuildKey(buildKey);
     QTC_ASSERT(node, return {});
diff --git a/src/plugins/projectexplorer/buildsystem.h b/src/plugins/projectexplorer/buildsystem.h
index 5d38e8300c..305d296b4c 100644
--- a/src/plugins/projectexplorer/buildsystem.h
+++ b/src/plugins/projectexplorer/buildsystem.h
@@ -84,7 +84,7 @@ public:
     virtual bool supportsAction(Node *context, ProjectAction action, const Node *node) const;
 
     virtual QStringList filesGeneratedFrom(const QString &sourceFile) const;
-    virtual QVariant additionalData(Core::Id id) const;
+    virtual QVariant additionalData(Utils::Id id) const;
 
     void setDeploymentData(const DeploymentData &deploymentData);
     DeploymentData deploymentData() const;
@@ -122,8 +122,8 @@ public:
 
     void emitBuildSystemUpdated();
 
-    void setExtraData(const QString &buildKey, Core::Id dataKey, const QVariant &data);
-    QVariant extraData(const QString &buildKey, Core::Id dataKey) const;
+    void setExtraData(const QString &buildKey, Utils::Id dataKey, const QVariant &data);
+    QVariant extraData(const QString &buildKey, Utils::Id dataKey) const;
 
 public:
     // FIXME: Make this private and the BuildSystem a friend
diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp
index 4c34209671..dcf935b2db 100644
--- a/src/plugins/projectexplorer/clangparser.cpp
+++ b/src/plugins/projectexplorer/clangparser.cpp
@@ -120,9 +120,9 @@ OutputLineParser::Result ClangParser::handleLine(const QString &line, OutputForm
     return Status::NotHandled;
 }
 
-Core::Id ClangParser::id()
+Utils::Id ClangParser::id()
 {
-    return Core::Id("ProjectExplorer.OutputParser.Clang");
+    return Utils::Id("ProjectExplorer.OutputParser.Clang");
 }
 
 // Unit tests:
diff --git a/src/plugins/projectexplorer/clangparser.h b/src/plugins/projectexplorer/clangparser.h
index 5b61d0cbaa..8dd311cd66 100644
--- a/src/plugins/projectexplorer/clangparser.h
+++ b/src/plugins/projectexplorer/clangparser.h
@@ -41,7 +41,7 @@ public:
 
     static QList<Utils::OutputLineParser *> clangParserSuite();
 
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index 098596d3c1..7c42b0bc49 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -41,7 +41,7 @@ CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project) : QWidget(),
     const EditorConfiguration *config = m_project->editorConfiguration();
 
     for (ICodeStylePreferencesFactory *factory : TextEditorSettings::codeStyleFactories()) {
-        Core::Id languageId = factory->languageId();
+        Utils::Id languageId = factory->languageId();
         ICodeStylePreferences *codeStylePreferences = config->codeStyle(languageId);
 
         auto preview = factory->createCodeStyleEditor(codeStylePreferences, m_ui.stackedWidget);
diff --git a/src/plugins/projectexplorer/configtaskhandler.cpp b/src/plugins/projectexplorer/configtaskhandler.cpp
index e7daf060c2..80eea3c4a7 100644
--- a/src/plugins/projectexplorer/configtaskhandler.cpp
+++ b/src/plugins/projectexplorer/configtaskhandler.cpp
@@ -37,7 +37,7 @@
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
-ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Core::Id page) :
+ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Utils::Id page) :
     m_pattern(pattern),
     m_targetPage(page)
 { }
diff --git a/src/plugins/projectexplorer/configtaskhandler.h b/src/plugins/projectexplorer/configtaskhandler.h
index 418c325233..879828bef9 100644
--- a/src/plugins/projectexplorer/configtaskhandler.h
+++ b/src/plugins/projectexplorer/configtaskhandler.h
@@ -37,7 +37,7 @@ class ConfigTaskHandler : public ITaskHandler
     Q_OBJECT
 
 public:
-    ConfigTaskHandler(const Task &pattern, Core::Id page);
+    ConfigTaskHandler(const Task &pattern, Utils::Id page);
 
     bool canHandle(const Task &task) const override;
     void handle(const Task &task) override;
@@ -45,7 +45,7 @@ public:
 
 private:
     const Task m_pattern;
-    const Core::Id m_targetPage;
+    const Utils::Id m_targetPage;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp
index 574cad4b90..6a12c5251d 100644
--- a/src/plugins/projectexplorer/copytaskhandler.cpp
+++ b/src/plugins/projectexplorer/copytaskhandler.cpp
@@ -57,9 +57,9 @@ void CopyTaskHandler::handle(const Task &task)
                                        + type + task.description());
 }
 
-Core::Id CopyTaskHandler::actionManagerId() const
+Utils::Id CopyTaskHandler::actionManagerId() const
 {
-    return Core::Id(Core::Constants::COPY);
+    return Utils::Id(Core::Constants::COPY);
 }
 
 QAction *CopyTaskHandler::createAction(QObject *parent) const
diff --git a/src/plugins/projectexplorer/copytaskhandler.h b/src/plugins/projectexplorer/copytaskhandler.h
index 373cace0a1..da95a413c4 100644
--- a/src/plugins/projectexplorer/copytaskhandler.h
+++ b/src/plugins/projectexplorer/copytaskhandler.h
@@ -37,7 +37,7 @@ class CopyTaskHandler : public ITaskHandler
 public:
     bool canHandle(const Task &) const override { return true; }
     void handle(const Task &task) override;
-    Core::Id actionManagerId() const override;
+    Utils::Id actionManagerId() const override;
     QAction *createAction(QObject *parent) const override;
 };
 
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index e0de305e5f..95c8760ad0 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -63,7 +63,7 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *targe
     : CustomExecutableRunConfiguration(target, CUSTOM_EXECUTABLE_ID)
 {}
 
-CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *target, Core::Id id)
+CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto envAspect = addAspect<LocalEnvironmentAspect>(target);
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index 4d3bd49eeb..090058305b 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -34,7 +34,7 @@ class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public RunConfig
     Q_OBJECT
 
 public:
-    CustomExecutableRunConfiguration(Target *target, Core::Id id);
+    CustomExecutableRunConfiguration(Target *target, Utils::Id id);
     explicit CustomExecutableRunConfiguration(Target *target);
 
     QString defaultDisplayName() const;
diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp
index 03eee63c30..aaa97f703a 100644
--- a/src/plugins/projectexplorer/customparser.cpp
+++ b/src/plugins/projectexplorer/customparser.cpp
@@ -171,7 +171,7 @@ QVariantMap CustomParserSettings::toMap() const
 
 void CustomParserSettings::fromMap(const QVariantMap &map)
 {
-    id = Core::Id::fromSetting(map.value(idKey));
+    id = Utils::Id::fromSetting(map.value(idKey));
     displayName = map.value(nameKey).toString();
     error.fromMap(map.value(errorKey).toMap());
     warning.fromMap(map.value(warningKey).toMap());
@@ -190,7 +190,7 @@ void CustomParser::setSettings(const CustomParserSettings &settings)
     m_warning = settings.warning;
 }
 
-CustomParser *CustomParser::createFromId(Core::Id id)
+CustomParser *CustomParser::createFromId(Utils::Id id)
 {
     const Internal::CustomParserSettings parser = findOrDefault(ProjectExplorerPlugin::customParsers(),
             [id](const Internal::CustomParserSettings &p) { return p.id == id; });
@@ -199,9 +199,9 @@ CustomParser *CustomParser::createFromId(Core::Id id)
     return nullptr;
 }
 
-Core::Id CustomParser::id()
+Utils::Id CustomParser::id()
 {
-    return Core::Id("ProjectExplorer.OutputParser.Custom");
+    return Utils::Id("ProjectExplorer.OutputParser.Custom");
 }
 
 OutputLineParser::Result CustomParser::handleLine(const QString &line, OutputFormat type)
@@ -273,16 +273,16 @@ public:
                 this, &SelectionWidget::updateUi);
     }
 
-    void setSelectedParsers(const QList<Core::Id> &parsers)
+    void setSelectedParsers(const QList<Utils::Id> &parsers)
     {
         for (const auto &p : qAsConst(parserCheckBoxes))
             p.first->setChecked(parsers.contains(p.second));
         emit selectionChanged();
     }
 
-    QList<Core::Id> selectedParsers() const
+    QList<Utils::Id> selectedParsers() const
     {
-        QList<Core::Id> parsers;
+        QList<Utils::Id> parsers;
         for (const auto &p : qAsConst(parserCheckBoxes)) {
             if (p.first->isChecked())
                 parsers << p.second;
@@ -298,7 +298,7 @@ private:
     {
         const auto layout = qobject_cast<QVBoxLayout *>(this->layout());
         QTC_ASSERT(layout, return);
-        const QList<Core::Id> parsers = selectedParsers();
+        const QList<Utils::Id> parsers = selectedParsers();
         for (const auto &p : qAsConst(parserCheckBoxes))
             delete p.first;
         parserCheckBoxes.clear();
@@ -312,7 +312,7 @@ private:
         setSelectedParsers(parsers);
     }
 
-    QList<QPair<QCheckBox *, Core::Id>> parserCheckBoxes;
+    QList<QPair<QCheckBox *, Utils::Id>> parserCheckBoxes;
 };
 } // anonymous namespace
 
@@ -327,19 +327,19 @@ CustomParsersSelectionWidget::CustomParsersSelectionWidget(QWidget *parent) : De
     updateSummary();
 }
 
-void CustomParsersSelectionWidget::setSelectedParsers(const QList<Core::Id> &parsers)
+void CustomParsersSelectionWidget::setSelectedParsers(const QList<Utils::Id> &parsers)
 {
     qobject_cast<SelectionWidget *>(widget())->setSelectedParsers(parsers);
 }
 
-QList<Core::Id> CustomParsersSelectionWidget::selectedParsers() const
+QList<Utils::Id> CustomParsersSelectionWidget::selectedParsers() const
 {
     return qobject_cast<SelectionWidget *>(widget())->selectedParsers();
 }
 
 void CustomParsersSelectionWidget::updateSummary()
 {
-    const QList<Core::Id> parsers
+    const QList<Utils::Id> parsers
             = qobject_cast<SelectionWidget *>(widget())->selectedParsers();
     if (parsers.isEmpty())
         setSummaryText(tr("There are no custom parsers active"));
@@ -364,12 +364,12 @@ CustomParsersAspect::CustomParsersAspect(Target *target)
 
 void CustomParsersAspect::fromMap(const QVariantMap &map)
 {
-    m_parsers = transform(map.value(settingsKey()).toList(), &Core::Id::fromSetting);
+    m_parsers = transform(map.value(settingsKey()).toList(), &Utils::Id::fromSetting);
 }
 
 void CustomParsersAspect::toMap(QVariantMap &map) const
 {
-    map.insert(settingsKey(), transform(m_parsers, &Core::Id::toSetting));
+    map.insert(settingsKey(), transform(m_parsers, &Utils::Id::toSetting));
 }
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/customparser.h b/src/plugins/projectexplorer/customparser.h
index 48a88096d2..0d431487e1 100644
--- a/src/plugins/projectexplorer/customparser.h
+++ b/src/plugins/projectexplorer/customparser.h
@@ -89,7 +89,7 @@ public:
     QVariantMap toMap() const;
     void fromMap(const QVariantMap &map);
 
-    Core::Id id;
+    Utils::Id id;
     QString displayName;
     CustomParserExpression error;
     CustomParserExpression warning;
@@ -102,8 +102,8 @@ public:
 
     void setSettings(const CustomParserSettings &settings);
 
-    static CustomParser *createFromId(Core::Id id);
-    static Core::Id id();
+    static CustomParser *createFromId(Utils::Id id);
+    static Utils::Id id();
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
@@ -122,8 +122,8 @@ class CustomParsersSelectionWidget : public Utils::DetailsWidget
 public:
     CustomParsersSelectionWidget(QWidget *parent = nullptr);
 
-    void setSelectedParsers(const QList<Core::Id> &parsers);
-    QList<Core::Id> selectedParsers() const;
+    void setSelectedParsers(const QList<Utils::Id> &parsers);
+    QList<Utils::Id> selectedParsers() const;
 
 signals:
     void selectionChanged();
@@ -138,14 +138,14 @@ class CustomParsersAspect : public ProjectConfigurationAspect
 public:
     CustomParsersAspect(Target *target);
 
-    void setParsers(const QList<Core::Id> &parsers) { m_parsers = parsers; }
-    const QList<Core::Id> parsers() const { return m_parsers; }
+    void setParsers(const QList<Utils::Id> &parsers) { m_parsers = parsers; }
+    const QList<Utils::Id> parsers() const { return m_parsers; }
 
 private:
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
 
-    QList<Core::Id> m_parsers;
+    QList<Utils::Id> m_parsers;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/customparserssettingspage.cpp b/src/plugins/projectexplorer/customparserssettingspage.cpp
index 78163555db..dc280bf1ff 100644
--- a/src/plugins/projectexplorer/customparserssettingspage.cpp
+++ b/src/plugins/projectexplorer/customparserssettingspage.cpp
@@ -73,7 +73,7 @@ public:
             if (dlg.exec() != QDialog::Accepted)
                 return;
             CustomParserSettings newParser = dlg.settings();
-            newParser.id = Core::Id::fromString(QUuid::createUuid().toString());
+            newParser.id = Utils::Id::fromString(QUuid::createUuid().toString());
             newParser.displayName = tr("New Parser");
             m_customParsers << newParser;
             resetListView();
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 9b19eafc8e..afb824105c 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -107,7 +107,7 @@ bool CustomToolChain::isValid() const
 ToolChain::MacroInspectionRunner CustomToolChain::createMacroInspectionRunner() const
 {
     const Macros theMacros = m_predefinedMacros;
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
 
     // This runner must be thread-safe!
     return [theMacros, lang](const QStringList &cxxflags){
@@ -306,7 +306,7 @@ bool CustomToolChain::fromMap(const QVariantMap &data)
     setHeaderPaths(data.value(QLatin1String(headerPathsKeyC)).toStringList());
     m_cxx11Flags = data.value(QLatin1String(cxx11FlagsKeyC)).toStringList();
     setMkspecs(data.value(QLatin1String(mkspecsKeyC)).toString());
-    setOutputParserId(Core::Id::fromSetting(data.value(QLatin1String(outputParserKeyC))));
+    setOutputParserId(Utils::Id::fromSetting(data.value(QLatin1String(outputParserKeyC))));
 
     // Restore Pre-4.13 settings.
     if (outputParserId() == Internal::CustomParser::id()) {
@@ -340,7 +340,7 @@ bool CustomToolChain::fromMap(const QVariantMap &data)
         if (!customParserSettings.error.pattern().isEmpty()
                 || !customParserSettings.error.pattern().isEmpty()) {
             // Found custom parser in old settings, move to new place.
-            customParserSettings.id = Core::Id::fromString(QUuid::createUuid().toString());
+            customParserSettings.id = Utils::Id::fromString(QUuid::createUuid().toString());
             setOutputParserId(customParserSettings.id);
             customParserSettings.displayName = tr("Parser for toolchain %1").arg(displayName());
             QList<Internal::CustomParserSettings> settings
@@ -366,12 +366,12 @@ bool CustomToolChain::operator ==(const ToolChain &other) const
             && m_builtInHeaderPaths == customTc->m_builtInHeaderPaths;
 }
 
-Core::Id CustomToolChain::outputParserId() const
+Utils::Id CustomToolChain::outputParserId() const
 {
     return m_outputParserId;
 }
 
-void CustomToolChain::setOutputParserId(Core::Id parserId)
+void CustomToolChain::setOutputParserId(Utils::Id parserId)
 {
     if (m_outputParserId == parserId)
         return;
@@ -557,7 +557,7 @@ void CustomToolChainConfigWidget::applyImpl()
     tc->setCxx11Flags(m_cxx11Flags->text().split(QLatin1Char(',')));
     tc->setMkspecs(m_mkspecs->text());
     tc->setDisplayName(displayName); // reset display name
-    tc->setOutputParserId(Core::Id::fromSetting(m_errorParserComboBox->currentData()));
+    tc->setOutputParserId(Utils::Id::fromSetting(m_errorParserComboBox->currentData()));
 
     setFromToolchain(); // Refresh with actual data from the toolchain. This shows what e.g. the
                         // macro parser did with the input.
@@ -593,7 +593,7 @@ bool CustomToolChainConfigWidget::isDirtyImpl() const
             || m_headerDetails->entries() != tc->headerPathsList()
             || m_cxx11Flags->text().split(QLatin1Char(',')) != tc->cxx11Flags()
             || m_mkspecs->text() != tc->mkspecs()
-            || Core::Id::fromSetting(m_errorParserComboBox->currentData()) == tc->outputParserId();
+            || Utils::Id::fromSetting(m_errorParserComboBox->currentData()) == tc->outputParserId();
 }
 
 void CustomToolChainConfigWidget::makeReadOnlyImpl()
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index 382cb3ebca..fafa9f58c7 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -60,7 +60,7 @@ class PROJECTEXPLORER_EXPORT CustomToolChain : public ToolChain
 public:
     class Parser {
     public:
-        Core::Id parserId;   ///< A unique id identifying a parser
+        Utils::Id parserId;   ///< A unique id identifying a parser
         QString displayName; ///< A translateable name to show in the user interface
     };
 
@@ -105,8 +105,8 @@ public:
     void setMkspecs(const QString &);
     QString mkspecs() const;
 
-    Core::Id outputParserId() const;
-    void setOutputParserId(Core::Id parserId);
+    Utils::Id outputParserId() const;
+    void setOutputParserId(Utils::Id parserId);
     static QList<CustomToolChain::Parser> parsers();
 
 private:
@@ -123,7 +123,7 @@ private:
     QStringList m_cxx11Flags;
     QStringList m_mkspecs;
 
-    Core::Id m_outputParserId;
+    Utils::Id m_outputParserId;
 
     friend class Internal::CustomToolChainFactory;
     friend class ToolChainFactory;
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 538dfbfa61..f13b9dd0cf 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -148,7 +148,7 @@ void CustomWizard::setParameters(const CustomWizardParametersPtr &p)
 
     setId(p->id);
     setSupportedProjectTypes((p->kind == Core::IWizardFactory::FileWizard)
-                             ?  QSet<Core::Id>() : QSet<Core::Id>() << "UNKNOWN_PROJECT");
+                             ?  QSet<Utils::Id>() : QSet<Utils::Id>() << "UNKNOWN_PROJECT");
     setIcon(p->icon);
     setDescription(p->description);
     setDisplayName(p->displayName);
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index da071f1192..f6af2ca02c 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -51,6 +51,7 @@
 enum { debug = 0 };
 
 using namespace Core;
+using namespace Utils;
 
 static const char customWizardElementC[] = "wizard";
 static const char iconElementC[] = "icon";
@@ -572,7 +573,7 @@ CustomWizardParameters::parse(QIODevice &device, const QString &configFileFullPa
                     {
                         const QString idString = attributeValue(reader, idAttributeC);
                         if (!idString.isEmpty())
-                            id = Core::Id::fromString(idString);
+                            id = Utils::Id::fromString(idString);
                     }
                     category = attributeValue(reader, categoryAttributeC);
                     kind = kindAttribute(reader);
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
index bb697d10b0..884834a818 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
@@ -109,7 +109,7 @@ public:
                       QString *errorMessage);
     ParseResult parse(const QString &configFileFullPath, QString *errorMessage);
 
-    Core::Id id;
+    Utils::Id id;
     QString directory;
     QString klass;
     QList<CustomWizardFile> files;
@@ -129,7 +129,7 @@ public:
     QString displayName;
     QString category;
     QString displayCategory;
-    QSet<Core::Id> requiredFeatures;
+    QSet<Utils::Id> requiredFeatures;
     Core::IWizardFactory::WizardFlags flags;
 };
 
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index e5469e9e3b..d4187da115 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -42,7 +42,7 @@ const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildS
 const char USES_DEPLOYMENT_DATA[] = "ProjectExplorer.DeployConfiguration.CustomDataEnabled";
 const char DEPLOYMENT_DATA[] = "ProjectExplorer.DeployConfiguration.CustomData";
 
-DeployConfiguration::DeployConfiguration(Target *target, Core::Id id)
+DeployConfiguration::DeployConfiguration(Target *target, Utils::Id id)
     : ProjectConfiguration(target, id),
       m_stepList(this, Constants::BUILDSTEPS_DEPLOY)
 {
@@ -133,7 +133,7 @@ DeployConfigurationFactory::~DeployConfigurationFactory()
     g_deployConfigurationFactories.removeOne(this);
 }
 
-Core::Id DeployConfigurationFactory::creationId() const
+Utils::Id DeployConfigurationFactory::creationId() const
 {
     return m_deployConfigBaseId;
 }
@@ -174,7 +174,7 @@ void DeployConfigurationFactory::setUseDeploymentDataView()
     };
 }
 
-void DeployConfigurationFactory::setConfigBaseId(Core::Id deployConfigBaseId)
+void DeployConfigurationFactory::setConfigBaseId(Utils::Id deployConfigBaseId)
 {
     m_deployConfigBaseId = deployConfigBaseId;
 }
@@ -208,7 +208,7 @@ DeployConfiguration *DeployConfigurationFactory::clone(Target *parent,
 
 DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const QVariantMap &map)
 {
-    const Core::Id id = idFromMap(map);
+    const Utils::Id id = idFromMap(map);
     DeployConfigurationFactory *factory = Utils::findOrDefault(g_deployConfigurationFactories,
         [parent, id](DeployConfigurationFactory *f) {
             if (!f->canHandle(parent))
@@ -237,7 +237,7 @@ const QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Targe
         });
 }
 
-void DeployConfigurationFactory::addSupportedTargetDeviceType(Core::Id id)
+void DeployConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id)
 {
     m_supportedTargetDeviceTypes.append(id);
 }
@@ -247,12 +247,12 @@ void DeployConfigurationFactory::setDefaultDisplayName(const QString &defaultDis
     m_defaultDisplayName = defaultDisplayName;
 }
 
-void DeployConfigurationFactory::setSupportedProjectType(Core::Id id)
+void DeployConfigurationFactory::setSupportedProjectType(Utils::Id id)
 {
     m_supportedProjectType = id;
 }
 
-void DeployConfigurationFactory::addInitialStep(Core::Id stepId, const std::function<bool (Target *)> &condition)
+void DeployConfigurationFactory::addInitialStep(Utils::Id stepId, const std::function<bool (Target *)> &condition)
 {
     m_initialSteps.append({stepId, condition});
 }
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index 6cd85b62a3..24b68687dc 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -43,7 +43,7 @@ class PROJECTEXPLORER_EXPORT DeployConfiguration final : public ProjectConfigura
 
 private:
     friend class DeployConfigurationFactory;
-    explicit DeployConfiguration(Target *target, Core::Id id);
+    explicit DeployConfiguration(Target *target, Utils::Id id);
 
 public:
     ~DeployConfiguration() override = default;
@@ -81,7 +81,7 @@ public:
     virtual ~DeployConfigurationFactory();
 
     // return possible addition to a target, invalid if there is none
-    Core::Id creationId() const;
+    Utils::Id creationId() const;
     // the name to display to the user
     QString defaultDisplayName() const;
 
@@ -91,12 +91,12 @@ public:
     static DeployConfiguration *restore(Target *parent, const QVariantMap &map);
     static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc);
 
-    void addSupportedTargetDeviceType(Core::Id id);
+    void addSupportedTargetDeviceType(Utils::Id id);
     void setDefaultDisplayName(const QString &defaultDisplayName);
-    void setSupportedProjectType(Core::Id id);
+    void setSupportedProjectType(Utils::Id id);
 
     // Step is only added if condition is not set, or returns true when called.
-    void addInitialStep(Core::Id stepId, const std::function<bool(Target *)> &condition = {});
+    void addInitialStep(Utils::Id stepId, const std::function<bool(Target *)> &condition = {});
 
     bool canHandle(ProjectExplorer::Target *target) const;
 
@@ -109,13 +109,13 @@ public:
 
 protected:
     using DeployConfigurationCreator = std::function<DeployConfiguration *(Target *)>;
-    void setConfigBaseId(Core::Id deployConfigBaseId);
+    void setConfigBaseId(Utils::Id deployConfigBaseId);
 
 private:
     DeployConfiguration *createDeployConfiguration(Target *target);
-    Core::Id m_deployConfigBaseId;
-    Core::Id m_supportedProjectType;
-    QList<Core::Id> m_supportedTargetDeviceTypes;
+    Utils::Id m_deployConfigBaseId;
+    Utils::Id m_supportedProjectType;
+    QList<Utils::Id> m_supportedTargetDeviceTypes;
     QList<BuildStepList::StepCreationInfo> m_initialSteps;
     QString m_defaultDisplayName;
     DeployConfiguration::WidgetCreator m_configWidgetCreator;
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
index 75df893db3..a37817e108 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
@@ -54,7 +54,7 @@ class DesktopRunConfiguration : public RunConfiguration
 protected:
     enum Kind { Qmake, Qbs, CMake }; // FIXME: Remove
 
-    DesktopRunConfiguration(Target *target, Core::Id id, Kind kind);
+    DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind);
 
 private:
     void updateTargetInformation();
@@ -64,7 +64,7 @@ private:
     const Kind m_kind;
 };
 
-DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Core::Id id, Kind kind)
+DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind)
     : RunConfiguration(target, id), m_kind(kind)
 {
     auto envAspect = addAspect<LocalEnvironmentAspect>(target);
@@ -168,7 +168,7 @@ Utils::FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo &
 class DesktopQmakeRunConfiguration final : public DesktopRunConfiguration
 {
 public:
-    DesktopQmakeRunConfiguration(Target *target, Core::Id id)
+    DesktopQmakeRunConfiguration(Target *target, Utils::Id id)
         : DesktopRunConfiguration(target, id, Qmake)
     {}
 };
@@ -176,7 +176,7 @@ public:
 class QbsRunConfiguration final : public DesktopRunConfiguration
 {
 public:
-    QbsRunConfiguration(Target *target, Core::Id id)
+    QbsRunConfiguration(Target *target, Utils::Id id)
         : DesktopRunConfiguration(target, id, Qbs)
     {}
 };
@@ -184,7 +184,7 @@ public:
 class CMakeRunConfiguration final : public DesktopRunConfiguration
 {
 public:
-    CMakeRunConfiguration(Target *target, Core::Id id)
+    CMakeRunConfiguration(Target *target, Utils::Id id)
         : DesktopRunConfiguration(target, id, CMake)
     {}
 };
diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
index 8d8a61d285..a5fa7c933e 100644
--- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
@@ -35,7 +35,7 @@
 
 using namespace ProjectExplorer;
 
-DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id)
+DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id)
     : BuildStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
@@ -46,7 +46,7 @@ bool DeviceCheckBuildStep::init()
 {
     IDevice::ConstPtr device = DeviceKitAspect::device(target()->kit());
     if (!device) {
-        Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+        Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target()->kit());
         IDeviceFactory *factory = IDeviceFactory::find(deviceTypeId);
         if (!factory || !factory->canCreate()) {
             emit addOutput(tr("No device configured."), BuildStep::OutputFormat::ErrorMessage);
@@ -82,7 +82,7 @@ void DeviceCheckBuildStep::doRun()
     emit finished(true);
 }
 
-Core::Id DeviceCheckBuildStep::stepId()
+Utils::Id DeviceCheckBuildStep::stepId()
 {
     return "ProjectExplorer.DeviceCheckBuildStep";
 }
diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
index ff4dd8aeb8..c3ef9c213d 100644
--- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
+++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
@@ -35,12 +35,12 @@ class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
     Q_OBJECT
 
 public:
-    DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id);
+    DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id);
 
     bool init() override;
     void doRun() override;
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
index 55915d3289..f2e9688df1 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
@@ -29,8 +29,6 @@
 #include "idevice.h"
 #include "idevicefactory.h"
 
-#include <coreplugin/id.h>
-
 #include <QPushButton>
 
 namespace ProjectExplorer {
@@ -73,12 +71,12 @@ void DeviceFactorySelectionDialog::handleItemDoubleClicked()
     accept();
 }
 
-Core::Id DeviceFactorySelectionDialog::selectedId() const
+Utils::Id DeviceFactorySelectionDialog::selectedId() const
 {
     QList<QListWidgetItem *> selected = ui->listWidget->selectedItems();
     if (selected.isEmpty())
-        return Core::Id();
-    return selected.at(0)->data(Qt::UserRole).value<Core::Id>();
+        return Utils::Id();
+    return selected.at(0)->data(Qt::UserRole).value<Utils::Id>();
 }
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
index feda2dfc6d..4b8f40bcf9 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
+++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QDialog>
 
@@ -42,7 +42,7 @@ class DeviceFactorySelectionDialog : public QDialog
 public:
     explicit DeviceFactorySelectionDialog(QWidget *parent = nullptr);
     ~DeviceFactorySelectionDialog() override;
-    Core::Id selectedId() const;
+    Utils::Id selectedId() const;
 
 private:
     void handleItemSelectionChanged();
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 6b274f2a55..bbf6e4bcd8 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -61,7 +61,7 @@ class DeviceManagerPrivate
 public:
     DeviceManagerPrivate() = default;
 
-    int indexForId(Core::Id id) const
+    int indexForId(Utils::Id id) const
     {
         for (int i = 0; i < devices.count(); ++i) {
             if (devices.at(i)->id() == id)
@@ -72,7 +72,7 @@ public:
 
     static DeviceManager *clonedInstance;
     QList<IDevice::Ptr> devices;
-    QHash<Core::Id, Core::Id> defaultDevices;
+    QHash<Utils::Id, Utils::Id> defaultDevices;
 
     Utils::PersistentSettingsWriter *writer = nullptr;
 };
@@ -147,7 +147,7 @@ void DeviceManager::load()
 
     Utils::PersistentSettingsReader reader;
     // read devices file from global settings path
-    QHash<Core::Id, Core::Id> defaultDevices;
+    QHash<Utils::Id, Utils::Id> defaultDevices;
     QList<IDevice::Ptr> sdkDevices;
     if (reader.load(systemSettingsFilePath(QLatin1String("/devices.xml"))))
         sdkDevices = fromMap(reader.restoreValues().value(DeviceManagerKey).toMap(), &defaultDevices);
@@ -183,14 +183,14 @@ void DeviceManager::load()
 }
 
 QList<IDevice::Ptr> DeviceManager::fromMap(const QVariantMap &map,
-                                           QHash<Core::Id, Core::Id> *defaultDevices)
+                                           QHash<Utils::Id, Utils::Id> *defaultDevices)
 {
     QList<IDevice::Ptr> devices;
 
     if (defaultDevices) {
         const QVariantMap defaultDevsMap = map.value(DefaultDevicesKey).toMap();
         for (auto it = defaultDevsMap.constBegin(); it != defaultDevsMap.constEnd(); ++it)
-            defaultDevices->insert(Core::Id::fromString(it.key()), Core::Id::fromSetting(it.value()));
+            defaultDevices->insert(Utils::Id::fromString(it.key()), Utils::Id::fromSetting(it.value()));
     }
     const QVariantList deviceList = map.value(QLatin1String(DeviceListKey)).toList();
     foreach (const QVariant &v, deviceList) {
@@ -210,7 +210,7 @@ QVariantMap DeviceManager::toMap() const
 {
     QVariantMap map;
     QVariantMap defaultDeviceMap;
-    using TypeIdHash = QHash<Core::Id, Core::Id>;
+    using TypeIdHash = QHash<Utils::Id, Utils::Id>;
     for (TypeIdHash::ConstIterator it = d->defaultDevices.constBegin();
              it != d->defaultDevices.constEnd(); ++it) {
         defaultDeviceMap.insert(it.key().toString(), it.value().toSetting());
@@ -264,14 +264,14 @@ void DeviceManager::addDevice(const IDevice::ConstPtr &_device)
     emit updated();
 }
 
-void DeviceManager::removeDevice(Core::Id id)
+void DeviceManager::removeDevice(Utils::Id id)
 {
     const IDevice::Ptr device = mutableDevice(id);
     QTC_ASSERT(device, return);
     QTC_ASSERT(this != instance() || device->isAutoDetected(), return);
 
     const bool wasDefault = d->defaultDevices.value(device->type()) == device->id();
-    const Core::Id deviceType = device->type();
+    const Utils::Id deviceType = device->type();
     d->devices.removeAt(d->indexForId(id));
     emit deviceRemoved(device->id());
 
@@ -290,7 +290,7 @@ void DeviceManager::removeDevice(Core::Id id)
     emit updated();
 }
 
-void DeviceManager::setDeviceState(Core::Id deviceId, IDevice::DeviceState deviceState)
+void DeviceManager::setDeviceState(Utils::Id deviceId, IDevice::DeviceState deviceState)
 {
     // To see the state change in the DeviceSettingsWidget. This has to happen before
     // the pos check below, in case the device is only present in the cloned instance.
@@ -314,7 +314,7 @@ bool DeviceManager::isLoaded() const
     return d->writer;
 }
 
-void DeviceManager::setDefaultDevice(Core::Id id)
+void DeviceManager::setDefaultDevice(Utils::Id id)
 {
     QTC_ASSERT(this != instance(), return);
 
@@ -332,7 +332,7 @@ void DeviceManager::setDefaultDevice(Core::Id id)
 
 const IDeviceFactory *DeviceManager::restoreFactory(const QVariantMap &map)
 {
-    const Core::Id deviceType = IDevice::typeFromMap(map);
+    const Utils::Id deviceType = IDevice::typeFromMap(map);
     IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(),
         [&map, deviceType](IDeviceFactory *factory) {
             return factory->canRestore(map) && factory->deviceType() == deviceType;
@@ -368,7 +368,7 @@ IDevice::ConstPtr DeviceManager::deviceAt(int idx) const
     return d->devices.at(idx);
 }
 
-IDevice::Ptr DeviceManager::mutableDevice(Core::Id id) const
+IDevice::Ptr DeviceManager::mutableDevice(Utils::Id id) const
 {
     const int index = d->indexForId(id);
     return index == -1 ? IDevice::Ptr() : d->devices.at(index);
@@ -381,15 +381,15 @@ bool DeviceManager::hasDevice(const QString &name) const
     });
 }
 
-IDevice::ConstPtr DeviceManager::find(Core::Id id) const
+IDevice::ConstPtr DeviceManager::find(Utils::Id id) const
 {
     const int index = d->indexForId(id);
     return index == -1 ? IDevice::ConstPtr() : deviceAt(index);
 }
 
-IDevice::ConstPtr DeviceManager::defaultDevice(Core::Id deviceType) const
+IDevice::ConstPtr DeviceManager::defaultDevice(Utils::Id deviceType) const
 {
-    const Core::Id id = d->defaultDevices.value(deviceType);
+    const Utils::Id id = d->defaultDevices.value(deviceType);
     return id.isValid() ? find(id) : IDevice::ConstPtr();
 }
 
@@ -409,14 +409,14 @@ class TestDevice : public IDevice
 public:
     TestDevice()
     {
-        setupId(AutoDetected, Core::Id::fromString(QUuid::createUuid().toString()));
+        setupId(AutoDetected, Utils::Id::fromString(QUuid::createUuid().toString()));
         setType(testTypeId());
         setMachineType(Hardware);
         setOsType(HostOsInfo::hostOs());
         setDisplayType("blubb");
     }
 
-    static Core::Id testTypeId() { return "TestType"; }
+    static Utils::Id testTypeId() { return "TestType"; }
 private:
     IDeviceWidget *createWidget() override { return nullptr; }
     DeviceProcessSignalOperation::Ptr signalOperation() const override
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h
index 6f286845dd..0f9c036248 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h
@@ -60,20 +60,20 @@ public:
     int deviceCount() const;
     IDevice::ConstPtr deviceAt(int index) const;
 
-    IDevice::ConstPtr find(Core::Id id) const;
-    IDevice::ConstPtr defaultDevice(Core::Id deviceType) const;
+    IDevice::ConstPtr find(Utils::Id id) const;
+    IDevice::ConstPtr defaultDevice(Utils::Id deviceType) const;
     bool hasDevice(const QString &name) const;
 
     void addDevice(const IDevice::ConstPtr &device);
-    void removeDevice(Core::Id id);
-    void setDeviceState(Core::Id deviceId, IDevice::DeviceState deviceState);
+    void removeDevice(Utils::Id id);
+    void setDeviceState(Utils::Id deviceId, IDevice::DeviceState deviceState);
 
     bool isLoaded() const;
 
 signals:
-    void deviceAdded(Core::Id id);
-    void deviceRemoved(Core::Id id);
-    void deviceUpdated(Core::Id id);
+    void deviceAdded(Utils::Id id);
+    void deviceRemoved(Utils::Id id);
+    void deviceUpdated(Utils::Id id);
     void deviceListReplaced(); // For bulk changes via the settings dialog.
     void updated(); // Emitted for all of the above.
 
@@ -86,12 +86,12 @@ private:
 
     void load();
     static const IDeviceFactory *restoreFactory(const QVariantMap &map);
-    QList<IDevice::Ptr> fromMap(const QVariantMap &map, QHash<Core::Id, Core::Id> *defaultDevices);
+    QList<IDevice::Ptr> fromMap(const QVariantMap &map, QHash<Utils::Id, Utils::Id> *defaultDevices);
     QVariantMap toMap() const;
 
     // For SettingsWidget.
-    IDevice::Ptr mutableDevice(Core::Id id) const;
-    void setDefaultDevice(Core::Id id);
+    IDevice::Ptr mutableDevice(Utils::Id id) const;
+    void setDefaultDevice(Utils::Id id);
     static DeviceManager *cloneInstance();
     static void replaceInstance();
     static void removeClonedInstance();
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
index b5ff411f4f..6f01cc8749 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
@@ -38,8 +38,8 @@ class DeviceManagerModelPrivate
 public:
     const DeviceManager *deviceManager;
     QList<IDevice::ConstPtr> devices;
-    QList<Core::Id> filter;
-    Core::Id typeToKeep;
+    QList<Utils::Id> filter;
+    Utils::Id typeToKeep;
 };
 } // namespace Internal
 
@@ -60,13 +60,13 @@ DeviceManagerModel::DeviceManagerModel(const DeviceManager *deviceManager, QObje
 
 DeviceManagerModel::~DeviceManagerModel() = default;
 
-void DeviceManagerModel::setFilter(const QList<Core::Id> &filter)
+void DeviceManagerModel::setFilter(const QList<Utils::Id> &filter)
 {
     d->filter = filter;
     handleDeviceListChanged();
 }
 
-void DeviceManagerModel::setTypeFilter(Core::Id type)
+void DeviceManagerModel::setTypeFilter(Utils::Id type)
 {
     if (d->typeToKeep == type)
         return;
@@ -74,7 +74,7 @@ void DeviceManagerModel::setTypeFilter(Core::Id type)
     handleDeviceListChanged();
 }
 
-void DeviceManagerModel::updateDevice(Core::Id id)
+void DeviceManagerModel::updateDevice(Utils::Id id)
 {
     handleDeviceUpdated(id);
 }
@@ -86,10 +86,10 @@ IDevice::ConstPtr DeviceManagerModel::device(int pos) const
     return d->devices.at(pos);
 }
 
-Core::Id DeviceManagerModel::deviceId(int pos) const
+Utils::Id DeviceManagerModel::deviceId(int pos) const
 {
     IDevice::ConstPtr dev = device(pos);
-    return dev ? dev->id() : Core::Id();
+    return dev ? dev->id() : Utils::Id();
 }
 
 int DeviceManagerModel::indexOf(IDevice::ConstPtr dev) const
@@ -104,7 +104,7 @@ int DeviceManagerModel::indexOf(IDevice::ConstPtr dev) const
     return -1;
 }
 
-void DeviceManagerModel::handleDeviceAdded(Core::Id id)
+void DeviceManagerModel::handleDeviceAdded(Utils::Id id)
 {
     if (d->filter.contains(id))
         return;
@@ -117,7 +117,7 @@ void DeviceManagerModel::handleDeviceAdded(Core::Id id)
     endInsertRows();
 }
 
-void DeviceManagerModel::handleDeviceRemoved(Core::Id id)
+void DeviceManagerModel::handleDeviceRemoved(Utils::Id id)
 {
     const int idx = indexForId(id);
     QTC_ASSERT(idx != -1, return);
@@ -126,7 +126,7 @@ void DeviceManagerModel::handleDeviceRemoved(Core::Id id)
     endRemoveRows();
 }
 
-void DeviceManagerModel::handleDeviceUpdated(Core::Id id)
+void DeviceManagerModel::handleDeviceUpdated(Utils::Id id)
 {
     const int idx = indexForId(id);
     if (idx < 0) // This occurs when a device not matching the type filter is updated
@@ -180,7 +180,7 @@ bool DeviceManagerModel::matchesTypeFilter(const IDevice::ConstPtr &dev) const
     return !d->typeToKeep.isValid() || dev->type() == d->typeToKeep;
 }
 
-int DeviceManagerModel::indexForId(Core::Id id) const
+int DeviceManagerModel::indexForId(Utils::Id id) const
 {
     for (int i = 0; i < d->devices.count(); ++i) {
         if (d->devices.at(i)->id() == id)
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
index c7544cdf68..3144896cda 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
@@ -44,21 +44,21 @@ public:
     explicit DeviceManagerModel(const DeviceManager *deviceManager, QObject *parent = nullptr);
     ~DeviceManagerModel() override;
 
-    void setFilter(const QList<Core::Id> &filter);
-    void setTypeFilter(Core::Id type);
+    void setFilter(const QList<Utils::Id> &filter);
+    void setTypeFilter(Utils::Id type);
 
     IDevice::ConstPtr device(int pos) const;
-    Core::Id deviceId(int pos) const;
+    Utils::Id deviceId(int pos) const;
     int indexOf(IDevice::ConstPtr dev) const;
-    int indexForId(Core::Id id) const;
+    int indexForId(Utils::Id id) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    void updateDevice(Core::Id id);
+    void updateDevice(Utils::Id id);
 
 private:
-    void handleDeviceAdded(Core::Id id);
-    void handleDeviceRemoved(Core::Id id);
-    void handleDeviceUpdated(Core::Id id);
+    void handleDeviceAdded(Utils::Id id);
+    void handleDeviceRemoved(Utils::Id id);
+    void handleDeviceUpdated(Utils::Id id);
     void handleDeviceListChanged();
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
index 66e22c7e8f..4514d624f0 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
@@ -59,7 +59,7 @@ private:
 
     void saveSettings();
 
-    void handleDeviceUpdated(Core::Id id);
+    void handleDeviceUpdated(Utils::Id id);
     void currentDeviceChanged(int index);
     void addDevice();
     void removeDevice();
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index b1685a2791..f4c4904efb 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -70,7 +70,7 @@
  */
 
 /*!
- * \fn Core::Id ProjectExplorer::IDevice::invalidId()
+ * \fn Utils::Id ProjectExplorer::IDevice::invalidId()
  * A value that no device can ever have as its internal id.
  */
 
@@ -98,9 +98,9 @@
  */
 
 
-static Core::Id newId()
+static Utils::Id newId()
 {
-    return Core::Id::fromString(QUuid::createUuid().toString());
+    return Utils::Id::fromString(QUuid::createUuid().toString());
 }
 
 namespace ProjectExplorer {
@@ -140,9 +140,9 @@ public:
 
     Utils::DisplayName displayName;
     QString displayType;
-    Core::Id type;
+    Utils::Id type;
     IDevice::Origin origin = IDevice::AutoDetected;
-    Core::Id id;
+    Utils::Id id;
     IDevice::DeviceState deviceState = IDevice::DeviceStateUnknown;
     IDevice::MachineType machineType = IDevice::Hardware;
     Utils::OsType osType = Utils::OsTypeOther;
@@ -171,7 +171,7 @@ void IDevice::setOpenTerminal(const IDevice::OpenTerminal &openTerminal)
     d->openTerminal = openTerminal;
 }
 
-void IDevice::setupId(Origin origin, Core::Id id)
+void IDevice::setupId(Origin origin, Utils::Id id)
 {
     d->origin = origin;
     QTC_CHECK(origin == ManuallyAdded || id.isValid());
@@ -238,12 +238,12 @@ IDevice::DeviceInfo IDevice::deviceInformation() const
     \sa ProjectExplorer::IDeviceFactory
  */
 
-Core::Id IDevice::type() const
+Utils::Id IDevice::type() const
 {
     return d->type;
 }
 
-void IDevice::setType(Core::Id type)
+void IDevice::setType(Utils::Id type)
 {
     d->type = type;
 }
@@ -269,7 +269,7 @@ bool IDevice::isAutoDetected() const
     \sa ProjectExplorer::DeviceManager::findInactiveAutoDetectedDevice()
 */
 
-Core::Id IDevice::id() const
+Utils::Id IDevice::id() const
 {
     return d->id;
 }
@@ -340,14 +340,14 @@ void IDevice::setDeviceState(const IDevice::DeviceState state)
     d->deviceState = state;
 }
 
-Core::Id IDevice::typeFromMap(const QVariantMap &map)
+Utils::Id IDevice::typeFromMap(const QVariantMap &map)
 {
-    return Core::Id::fromSetting(map.value(QLatin1String(TypeKey)));
+    return Utils::Id::fromSetting(map.value(QLatin1String(TypeKey)));
 }
 
-Core::Id IDevice::idFromMap(const QVariantMap &map)
+Utils::Id IDevice::idFromMap(const QVariantMap &map)
 {
-    return Core::Id::fromSetting(map.value(QLatin1String(IdKey)));
+    return Utils::Id::fromSetting(map.value(QLatin1String(IdKey)));
 }
 
 /*!
@@ -360,7 +360,7 @@ void IDevice::fromMap(const QVariantMap &map)
 {
     d->type = typeFromMap(map);
     d->displayName.fromMap(map, DisplayNameKey);
-    d->id = Core::Id::fromSetting(map.value(QLatin1String(IdKey)));
+    d->id = Utils::Id::fromSetting(map.value(QLatin1String(IdKey)));
     if (!d->id.isValid())
         d->id = newId();
     d->origin = static_cast<Origin>(map.value(QLatin1String(OriginKey), ManuallyAdded).toInt());
@@ -514,12 +514,12 @@ void IDevice::setQmlsceneCommand(const QString &path)
     d->qmlsceneCommand = path;
 }
 
-void IDevice::setExtraData(Core::Id kind, const QVariant &data)
+void IDevice::setExtraData(Utils::Id kind, const QVariant &data)
 {
     d->extraData.insert(kind.toString(), data);
 }
 
-QVariant IDevice::extraData(Core::Id kind) const
+QVariant IDevice::extraData(Utils::Id kind) const
 {
     return d->extraData.value(kind.toString());
 }
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 9a59f10672..c3caaa617f 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -27,7 +27,7 @@
 
 #include "../projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/hostosinfo.h>
 
 #include <QAbstractSocket>
@@ -147,11 +147,11 @@ public:
     using DeviceInfo = QList<DeviceInfoItem>;
     virtual DeviceInfo deviceInformation() const;
 
-    Core::Id type() const;
-    void setType(Core::Id type);
+    Utils::Id type() const;
+    void setType(Utils::Id type);
 
     bool isAutoDetected() const;
-    Core::Id id() const;
+    Utils::Id id() const;
 
     virtual bool isCompatibleWith(const Kit *k) const;
 
@@ -189,8 +189,8 @@ public:
     virtual void fromMap(const QVariantMap &map);
     virtual QVariantMap toMap() const;
 
-    static Core::Id typeFromMap(const QVariantMap &map);
-    static Core::Id idFromMap(const QVariantMap &map);
+    static Utils::Id typeFromMap(const QVariantMap &map);
+    static Utils::Id idFromMap(const QVariantMap &map);
 
     static QString defaultPrivateKeyFilePath();
     static QString defaultPublicKeyFilePath();
@@ -213,10 +213,10 @@ public:
     QString qmlsceneCommand() const;
     void setQmlsceneCommand(const QString &path);
 
-    void setExtraData(Core::Id kind, const QVariant &data);
-    QVariant extraData(Core::Id kind) const;
+    void setExtraData(Utils::Id kind, const QVariant &data);
+    QVariant extraData(Utils::Id kind) const;
 
-    void setupId(Origin origin, Core::Id id = Core::Id());
+    void setupId(Origin origin, Utils::Id id = Utils::Id());
 
     bool canOpenTerminal() const;
     void openTerminal(const Utils::Environment &env, const QString &workingDir) const;
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
index 9f0cb7a55b..9281e8b739 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
@@ -86,7 +86,7 @@ IDevice::Ptr IDeviceFactory::construct() const
 
 static QList<IDeviceFactory *> g_deviceFactories;
 
-IDeviceFactory *IDeviceFactory::find(Core::Id type)
+IDeviceFactory *IDeviceFactory::find(Utils::Id type)
 {
     return Utils::findOrDefault(g_deviceFactories,
         [&type](IDeviceFactory *factory) {
@@ -94,7 +94,7 @@ IDeviceFactory *IDeviceFactory::find(Core::Id type)
         });
 }
 
-IDeviceFactory::IDeviceFactory(Core::Id deviceType)
+IDeviceFactory::IDeviceFactory(Utils::Id deviceType)
     : m_deviceType(deviceType)
 {
     g_deviceFactories.append(this);
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
index 1cf49385ba..36ba7bf7d1 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
@@ -39,7 +39,7 @@ public:
     virtual ~IDeviceFactory();
     static const QList<IDeviceFactory *> allDeviceFactories();
 
-    Core::Id deviceType() const { return m_deviceType; }
+    Utils::Id deviceType() const { return m_deviceType; }
     QString displayName() const { return m_displayName; }
     QIcon icon() const { return m_icon; }
     bool canCreate() const;
@@ -49,10 +49,10 @@ public:
 
     virtual bool canRestore(const QVariantMap &) const { return true; }
 
-    static IDeviceFactory *find(Core::Id type);
+    static IDeviceFactory *find(Utils::Id type);
 
 protected:
-    explicit IDeviceFactory(Core::Id deviceType);
+    explicit IDeviceFactory(Utils::Id deviceType);
     IDeviceFactory(const IDeviceFactory &) = delete;
     IDeviceFactory &operator=(const IDeviceFactory &) = delete;
 
@@ -63,7 +63,7 @@ protected:
     void setConstructionFunction(const std::function<IDevice::Ptr ()> &constructor);
 
 private:
-    const Core::Id m_deviceType;
+    const Utils::Id m_deviceType;
     QString m_displayName;
     QIcon m_icon;
     bool m_canCreate = false;
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 1bb2d4f27c..50c5503c93 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -30,7 +30,6 @@
 
 #include <utils/algorithm.h>
 
-#include <coreplugin/id.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditor.h>
@@ -79,16 +78,16 @@ struct EditorConfigurationPrivate
     MarginSettings m_marginSettings;
     QTextCodec *m_textCodec;
 
-    QMap<Core::Id, ICodeStylePreferences *> m_languageCodeStylePreferences;
+    QMap<Utils::Id, ICodeStylePreferences *> m_languageCodeStylePreferences;
     QList<BaseTextEditor *> m_editors;
 };
 
 EditorConfiguration::EditorConfiguration() : d(std::make_unique<EditorConfigurationPrivate>())
 {
-    const QMap<Core::Id, ICodeStylePreferences *> languageCodeStylePreferences = TextEditorSettings::codeStyles();
+    const QMap<Utils::Id, ICodeStylePreferences *> languageCodeStylePreferences = TextEditorSettings::codeStyles();
     for (auto itCodeStyle = languageCodeStylePreferences.cbegin(), end = languageCodeStylePreferences.cend();
             itCodeStyle != end; ++itCodeStyle) {
-        Core::Id languageId = itCodeStyle.key();
+        Utils::Id languageId = itCodeStyle.key();
         // global prefs for language
         ICodeStylePreferences *originalPreferences = itCodeStyle.value();
         ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId);
@@ -171,12 +170,12 @@ ICodeStylePreferences *EditorConfiguration::codeStyle() const
     return d->m_defaultCodeStyle;
 }
 
-ICodeStylePreferences *EditorConfiguration::codeStyle(Core::Id languageId) const
+ICodeStylePreferences *EditorConfiguration::codeStyle(Utils::Id languageId) const
 {
     return d->m_languageCodeStylePreferences.value(languageId, codeStyle());
 }
 
-QMap<Core::Id, ICodeStylePreferences *> EditorConfiguration::codeStyles() const
+QMap<Utils::Id, ICodeStylePreferences *> EditorConfiguration::codeStyles() const
 {
     return d->m_languageCodeStylePreferences;
 }
@@ -226,7 +225,7 @@ void EditorConfiguration::fromMap(const QVariantMap &map)
             qWarning() << "No data for code style settings list" << i << "found!";
             continue;
         }
-        Core::Id languageId = Core::Id::fromSetting(settingsIdMap.value(QLatin1String("language")));
+        Utils::Id languageId = Utils::Id::fromSetting(settingsIdMap.value(QLatin1String("language")));
         QVariantMap value = settingsIdMap.value(QLatin1String("value")).toMap();
         ICodeStylePreferences *preferences = d->m_languageCodeStylePreferences.value(languageId);
         if (preferences)
diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h
index 59f7c4733d..60e72dfb61 100644
--- a/src/plugins/projectexplorer/editorconfiguration.h
+++ b/src/plugins/projectexplorer/editorconfiguration.h
@@ -27,7 +27,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QVariantMap>
@@ -78,8 +78,8 @@ public:
     const TextEditor::MarginSettings &marginSettings() const;
 
     TextEditor::ICodeStylePreferences *codeStyle() const;
-    TextEditor::ICodeStylePreferences *codeStyle(Core::Id languageId) const;
-    QMap<Core::Id, TextEditor::ICodeStylePreferences *> codeStyles() const;
+    TextEditor::ICodeStylePreferences *codeStyle(Utils::Id languageId) const;
+    QMap<Utils::Id, TextEditor::ICodeStylePreferences *> codeStyles() const;
 
     void configureEditor(TextEditor::BaseTextEditor *textEditor) const;
     void deconfigureEditor(TextEditor::BaseTextEditor *textEditor) const;
diff --git a/src/plugins/projectexplorer/filterkitaspectsdialog.cpp b/src/plugins/projectexplorer/filterkitaspectsdialog.cpp
index 12bd7ccf13..976420ffd3 100644
--- a/src/plugins/projectexplorer/filterkitaspectsdialog.cpp
+++ b/src/plugins/projectexplorer/filterkitaspectsdialog.cpp
@@ -48,7 +48,7 @@ public:
     { }
 
     QString displayName() const { return m_aspect->displayName(); }
-    Core::Id id() const { return m_aspect->id(); }
+    Utils::Id id() const { return m_aspect->id(); }
     bool enabled() const { return m_enabled; }
 
 private:
@@ -96,7 +96,7 @@ public:
         for (const KitAspect * const aspect : KitManager::kitAspects()) {
             if (kit && !aspect->isApplicableToKit(kit))
                 continue;
-            const QSet<Core::Id> irrelevantAspects = kit ? kit->irrelevantAspects()
+            const QSet<Utils::Id> irrelevantAspects = kit ? kit->irrelevantAspects()
                                                          : KitManager::irrelevantAspects();
             auto * const item = new FilterTreeItem(aspect,
                                                    !irrelevantAspects.contains(aspect->id()));
@@ -109,9 +109,9 @@ public:
         rootItem()->sortChildren(cmp);
     }
 
-    QSet<Core::Id> disabledItems() const
+    QSet<Utils::Id> disabledItems() const
     {
-        QSet<Core::Id> ids;
+        QSet<Utils::Id> ids;
         for (int i = 0; i < rootItem()->childCount(); ++i) {
             const FilterTreeItem * const item
                     = static_cast<FilterTreeItem *>(rootItem()->childAt(i));
@@ -154,7 +154,7 @@ FilterKitAspectsDialog::FilterKitAspectsDialog(const Kit *kit, QWidget *parent)
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 }
 
-QSet<Core::Id> FilterKitAspectsDialog::irrelevantAspects() const
+QSet<Utils::Id> FilterKitAspectsDialog::irrelevantAspects() const
 {
     return static_cast<FilterKitAspectsModel *>(m_model)->disabledItems();
 }
diff --git a/src/plugins/projectexplorer/filterkitaspectsdialog.h b/src/plugins/projectexplorer/filterkitaspectsdialog.h
index f59a58f683..12ba775220 100644
--- a/src/plugins/projectexplorer/filterkitaspectsdialog.h
+++ b/src/plugins/projectexplorer/filterkitaspectsdialog.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QDialog>
 
@@ -40,7 +40,7 @@ class FilterKitAspectsDialog : public QDialog
     Q_OBJECT
 public:
     FilterKitAspectsDialog(const Kit *kit, QWidget *parent);
-    QSet<Core::Id> irrelevantAspects() const;
+    QSet<Utils::Id> irrelevantAspects() const;
 
 private:
     Utils::BaseTreeModel * const m_model;
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 9a55283b97..e4ea4a94cc 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -61,9 +61,9 @@ GccParser::GccParser()
     QTC_CHECK(m_regExpGccNames.isValid());
 }
 
-Core::Id GccParser::id()
+Utils::Id GccParser::id()
 {
-    return Core::Id("ProjectExplorer.OutputParser.Gcc");
+    return Utils::Id("ProjectExplorer.OutputParser.Gcc");
 }
 
 QList<OutputLineParser *> GccParser::gccParserSuite()
diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h
index 346ddd8ede..9186998cd4 100644
--- a/src/plugins/projectexplorer/gccparser.h
+++ b/src/plugins/projectexplorer/gccparser.h
@@ -40,7 +40,7 @@ class PROJECTEXPLORER_EXPORT GccParser : public ProjectExplorer::OutputTaskParse
 public:
     GccParser();
 
-    static Core::Id id();
+    static Utils::Id id();
 
     static QList<OutputLineParser *> gccParserSuite();
 
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 8a85edeada..e4ea036d77 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -262,7 +262,7 @@ static Utils::FilePath gccInstallDir(const FilePath &path, const QStringList &en
 // GccToolChain
 // --------------------------------------------------------------------------
 
-GccToolChain::GccToolChain(Core::Id typeId) :
+GccToolChain::GccToolChain(Utils::Id typeId) :
     ToolChain(typeId)
 {
     setTypeDisplayName(tr("GCC"));
@@ -448,7 +448,7 @@ ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() con
     OptionsReinterpreter reinterpretOptions = m_optionsReinterpreter;
     QTC_CHECK(reinterpretOptions);
     MacrosCache macroCache = predefinedMacrosCache();
-    Core::Id lang = language();
+    Utils::Id lang = language();
 
     // This runner must be thread-safe!
     return [env, compilerCommand, platformCodeGenFlags, reinterpretOptions, macroCache, lang]
@@ -567,7 +567,7 @@ WarningFlags GccToolChain::warningFlags(const QStringList &cflags) const
 QStringList GccToolChain::gccPrepareArguments(const QStringList &flags,
                                               const QString &sysRoot,
                                               const QStringList &platformCodeGenFlags,
-                                              Core::Id languageId,
+                                              Utils::Id languageId,
                                               OptionsReinterpreter reinterpretOptions)
 {
     QStringList arguments;
@@ -595,7 +595,7 @@ HeaderPaths GccToolChain::builtInHeaderPaths(const Utils::Environment &env,
                                              const QStringList &platformCodeGenFlags,
                                              OptionsReinterpreter reinterpretOptions,
                                              HeaderPathsCache headerCache,
-                                             Core::Id languageId,
+                                             Utils::Id languageId,
                                              ExtraHeaderPathsFunction extraHeaderPathsFunction,
                                              const QStringList &flags,
                                              const QString &sysRoot,
@@ -1087,8 +1087,8 @@ QList<ToolChain *> GccToolChainFactory::detectForImport(const ToolChainDescripti
 }
 
 QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(
-        const QString &compilerName, DetectVariants detectVariants, Core::Id language,
-        const Core::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown,
+        const QString &compilerName, DetectVariants detectVariants, Utils::Id language,
+        const Utils::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown,
         const ToolchainChecker &checker)
 {
     FilePaths compilerPaths;
@@ -1455,7 +1455,7 @@ ClangToolChain::ClangToolChain() :
 {
 }
 
-ClangToolChain::ClangToolChain(Core::Id typeId) :
+ClangToolChain::ClangToolChain(Utils::Id typeId) :
     GccToolChain(typeId)
 {
     setTypeDisplayName(tr("Clang"));
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 72c693ea2c..1de34ce655 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -52,14 +52,14 @@ class LinuxIccToolChainFactory;
 // GccToolChain
 // --------------------------------------------------------------------------
 
-inline const QStringList languageOption(Core::Id languageId)
+inline const QStringList languageOption(Utils::Id languageId)
 {
     if (languageId == Constants::C_LANGUAGE_ID)
         return {"-x", "c"};
     return {"-x", "c++"};
 }
 
-inline const QStringList gccPredefinedMacrosOptions(Core::Id languageId)
+inline const QStringList gccPredefinedMacrosOptions(Utils::Id languageId)
 {
     return languageOption(languageId) + QStringList({"-E", "-dM"});
 }
@@ -69,7 +69,7 @@ class PROJECTEXPLORER_EXPORT GccToolChain : public ToolChain
     Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::GccToolChain)
 
 public:
-    GccToolChain(Core::Id typeId);
+    GccToolChain(Utils::Id typeId);
 
     Abi targetAbi() const override;
     QString originalTargetTriple() const override;
@@ -156,7 +156,7 @@ protected:
                                           const QStringList &platformCodeGenFlags,
                                           OptionsReinterpreter reinterpretOptions,
                                           HeaderPathsCache headerCache,
-                                          Core::Id languageId,
+                                          Utils::Id languageId,
                                           ExtraHeaderPathsFunction extraHeaderPathsFunction,
                                           const QStringList &flags,
                                           const QString &sysRoot,
@@ -184,7 +184,7 @@ private:
     static QStringList gccPrepareArguments(const QStringList &flags,
                                            const QString &sysRoot,
                                            const QStringList &platformCodeGenFlags,
-                                           Core::Id languageId,
+                                           Utils::Id languageId,
                                            OptionsReinterpreter reinterpretOptions);
 
 protected:
@@ -218,7 +218,7 @@ class PROJECTEXPLORER_EXPORT ClangToolChain : public GccToolChain
 
 public:
     ClangToolChain();
-    explicit ClangToolChain(Core::Id typeId);
+    explicit ClangToolChain(Utils::Id typeId);
     ~ClangToolChain() override;
 
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h
index 9708596834..8e3350e411 100644
--- a/src/plugins/projectexplorer/gcctoolchainfactories.h
+++ b/src/plugins/projectexplorer/gcctoolchainfactories.h
@@ -59,8 +59,8 @@ protected:
     enum class DetectVariants { Yes, No };
     using ToolchainChecker = std::function<bool(const ToolChain *)>;
     QList<ToolChain *> autoDetectToolchains(
-            const QString &compilerName, DetectVariants detectVariants, Core::Id language,
-            const Core::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown,
+            const QString &compilerName, DetectVariants detectVariants, Utils::Id language,
+            const Utils::Id requiredTypeId, const QList<ToolChain *> &alreadyKnown,
             const ToolchainChecker &checker = {});
     QList<ToolChain *> autoDetectToolChain(
             const ToolChainDescription &tcd,
diff --git a/src/plugins/projectexplorer/itaskhandler.h b/src/plugins/projectexplorer/itaskhandler.h
index 89f8eda738..199e243988 100644
--- a/src/plugins/projectexplorer/itaskhandler.h
+++ b/src/plugins/projectexplorer/itaskhandler.h
@@ -27,7 +27,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QString>
@@ -50,7 +50,7 @@ public:
     virtual bool isDefaultHandler() const { return false; }
     virtual bool canHandle(const Task &) const = 0;
     virtual void handle(const Task &) = 0;
-    virtual Core::Id actionManagerId() const { return Core::Id(); }
+    virtual Utils::Id actionManagerId() const { return Utils::Id(); }
     virtual QAction *createAction(QObject *parent) const = 0;
 };
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
index d4ca71687b..75c2daf716 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
@@ -39,6 +39,7 @@
 #include <utils/qtcassert.h>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
index a81aa6871d..a509721ad4 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
@@ -69,7 +69,7 @@ private:
     QVector<ConditionalFeature> m_requiredFeatures;
     QVector<ConditionalFeature> m_preferredFeatures;
 
-    QSet<Core::Id> evaluate(const QVector<ConditionalFeature> &list, const QVariant &defaultSet,
+    QSet<Utils::Id> evaluate(const QVector<ConditionalFeature> &list, const QVariant &defaultSet,
                             JsonWizard *wiz);
 };
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp
index 073432ab26..0669f9584b 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard_test.cpp
@@ -39,6 +39,9 @@
 #include <QListView>
 
 #include <functional>
+
+using namespace Utils;
+
 namespace {
 QJsonObject createWidget(const QString &type, const QString& nameSuffix, const QJsonObject &data)
 {
@@ -173,7 +176,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsCheckBox()
     const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage));
     QVERIFY2(factory, qPrintable(errorMessage));
 
-    Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap());
+    Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap());
 
     QVERIFY(!findCheckBox(wizard, "Default")->isChecked());
     QCOMPARE(wizard->field("DefaultCheckBox"), QVariant(false));
@@ -205,7 +208,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsLineEdit()
     const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage));
     QVERIFY2(factory, qPrintable(errorMessage));
 
-    Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap());
+    Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap());
     QVERIFY(findLineEdit(wizard, "Default"));
     QVERIFY(findLineEdit(wizard, "Default")->text().isEmpty());
     QCOMPARE(qPrintable(findLineEdit(wizard, "WithText")->text()), "some text");
@@ -233,7 +236,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsComboBox()
     const QJsonObject wizardObject = createGeneralWizard(pages);
     const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage));
     QVERIFY2(factory, qPrintable(errorMessage));
-    Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap());
+    Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap());
 
     QComboBox *defaultComboBox = findComboBox(wizard, "Default");
     QVERIFY(defaultComboBox);
@@ -291,7 +294,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testJsonWizardsIconList()
     const QJsonObject wizardObject = createGeneralWizard(pages);
     const FactoryPtr factory(JsonWizardFactory::createWizardFactory(wizardObject.toVariantMap(), QDir(), &errorMessage));
     QVERIFY2(factory, qPrintable(errorMessage));
-    Utils::Wizard *wizard = factory->runWizard(QString(), &parent, Core::Id(), QVariantMap());
+    Wizard *wizard = factory->runWizard(QString(), &parent, Id(), QVariantMap());
 
     auto view = wizard->findChild<QListView *>("FancyIconList");
     QCOMPARE(view->model()->rowCount(), 2);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 0d46128e12..6c446201a9 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -106,7 +106,7 @@ static QString supportedTypeIds(const QList<T *> &factories)
 {
     QStringList tmp;
     foreach (const T*f, factories) {
-        foreach (Core::Id i, f->supportedIds())
+        foreach (Utils::Id i, f->supportedIds())
             tmp.append(i.toString());
     }
     return tmp.join(QLatin1String("', '"));
@@ -127,7 +127,7 @@ static JsonWizardFactory::Generator parseGenerator(const QVariant &value, QStrin
         *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Generator has no typeId set.");
         return gen;
     }
-    Core::Id typeId = Core::Id::fromString(QLatin1String(Constants::GENERATOR_ID_PREFIX) + strVal);
+    Utils::Id typeId = Utils::Id::fromString(QLatin1String(Constants::GENERATOR_ID_PREFIX) + strVal);
     JsonWizardGeneratorFactory *factory
             = Utils::findOr(s_generatorFactories, nullptr, [typeId](JsonWizardGeneratorFactory *f) { return f->canCreate(typeId); });
     if (!factory) {
@@ -163,7 +163,7 @@ static JsonWizardFactory::Page parsePage(const QVariant &value, QString *errorMe
         *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page has no typeId set.");
         return p;
     }
-    Core::Id typeId = Core::Id::fromString(QLatin1String(Constants::PAGE_ID_PREFIX) + strVal);
+    Utils::Id typeId = Utils::Id::fromString(QLatin1String(Constants::PAGE_ID_PREFIX) + strVal);
 
     JsonWizardPageFactory *factory
             = Utils::findOr(s_pageFactories, nullptr, [typeId](JsonWizardPageFactory *f) { return f->canCreate(typeId); });
@@ -375,7 +375,7 @@ void JsonWizardFactory::registerGeneratorFactory(JsonWizardGeneratorFactory *fac
 }
 
 Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *parent,
-                                                Core::Id platform,
+                                                Utils::Id platform,
                                                 const QVariantMap &variables)
 {
     auto wizard = new JsonWizard(parent);
@@ -383,15 +383,15 @@ Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *pa
     wizard->setWindowTitle(displayName());
 
     wizard->setValue(QStringLiteral("WizardDir"), m_wizardDir);
-    QSet<Core::Id> tmp = requiredFeatures();
+    QSet<Utils::Id> tmp = requiredFeatures();
     tmp.subtract(pluginFeatures());
-    wizard->setValue(QStringLiteral("RequiredFeatures"), Core::Id::toStringList(tmp));
+    wizard->setValue(QStringLiteral("RequiredFeatures"), Utils::Id::toStringList(tmp));
     tmp = m_preferredFeatures;
     tmp.subtract(pluginFeatures());
-    wizard->setValue(QStringLiteral("PreferredFeatures"), Core::Id::toStringList(tmp));
+    wizard->setValue(QStringLiteral("PreferredFeatures"), Utils::Id::toStringList(tmp));
 
-    wizard->setValue(QStringLiteral("Features"), Core::Id::toStringList(availableFeatures(platform)));
-    wizard->setValue(QStringLiteral("Plugins"), Core::Id::toStringList(pluginFeatures()));
+    wizard->setValue(QStringLiteral("Features"), Utils::Id::toStringList(availableFeatures(platform)));
+    wizard->setValue(QStringLiteral("Plugins"), Utils::Id::toStringList(pluginFeatures()));
 
     // Add data to wizard:
     for (auto i = variables.constBegin(); i != variables.constEnd(); ++i)
@@ -504,7 +504,7 @@ QString JsonWizardFactory::localizedString(const QVariant &value)
     return QCoreApplication::translate("ProjectExplorer::JsonWizard", value.toByteArray());
 }
 
-bool JsonWizardFactory::isAvailable(Core::Id platformId) const
+bool JsonWizardFactory::isAvailable(Utils::Id platformId) const
 {
     if (!IWizardFactory::isAvailable(platformId)) // check for required features
         return false;
@@ -514,9 +514,9 @@ bool JsonWizardFactory::isAvailable(Core::Id platformId) const
     expander.registerVariable("Platform", tr("The platform selected for the wizard."),
                               [platformId]() { return platformId.toString(); });
     expander.registerVariable("Features", tr("The features available to this wizard."),
-                              [this, e, platformId]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(availableFeatures(platformId)), e); });
+                              [this, e, platformId]() { return JsonWizard::stringListToArrayString(Utils::Id::toStringList(availableFeatures(platformId)), e); });
     expander.registerVariable("Plugins", tr("The plugins loaded."), [this, e]() {
-        return JsonWizard::stringListToArrayString(Core::Id::toStringList(pluginFeatures()), e);
+        return JsonWizard::stringListToArrayString(Utils::Id::toStringList(pluginFeatures()), e);
     });
     Core::JsExpander jsExpander;
     jsExpander.registerObject("Wizard",
@@ -547,7 +547,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
 
     m_enabledExpression = data.value(QLatin1String(ENABLED_EXPRESSION_KEY), true);
 
-    QSet<Core::Id> projectTypes = Core::Id::fromStringList(data.value(QLatin1String(SUPPORTED_PROJECTS)).toStringList());
+    QSet<Utils::Id> projectTypes = Utils::Id::fromStringList(data.value(QLatin1String(SUPPORTED_PROJECTS)).toStringList());
     // FIXME: "kind" was relevant up to and including Qt Creator 3.6:
     const QString unsetKind = QUuid::createUuid().toString();
     QString strVal = data.value(QLatin1String(KIND_KEY), unsetKind).toString();
@@ -572,7 +572,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
         *errorMessage = tr("No id set.");
         return false;
     }
-    setId(Core::Id::fromString(strVal));
+    setId(Utils::Id::fromString(strVal));
 
     strVal = data.value(QLatin1String(CATEGORY_KEY)).toString();
     if (strVal.isEmpty()) {
@@ -605,8 +605,8 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
         setDescriptionImage(strVal);
     }
 
-    setRequiredFeatures(Core::Id::fromStringList(data.value(QLatin1String(REQUIRED_FEATURES_KEY)).toStringList()));
-    m_preferredFeatures = Core::Id::fromStringList(data.value(QLatin1String(SUGGESTED_FEATURES_KEY)).toStringList());
+    setRequiredFeatures(Utils::Id::fromStringList(data.value(QLatin1String(REQUIRED_FEATURES_KEY)).toStringList()));
+    m_preferredFeatures = Utils::Id::fromStringList(data.value(QLatin1String(SUGGESTED_FEATURES_KEY)).toStringList());
     m_preferredFeatures.unite(requiredFeatures());
 
     strVal = localizedString(data.value(QLatin1String(DISPLAY_NAME_KEY)));
@@ -672,9 +672,9 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir,
 
 namespace Internal {
 
-JsonWizardFactoryJsExtension::JsonWizardFactoryJsExtension(Core::Id platformId,
-                                                           const QSet<Core::Id> &availableFeatures,
-                                                           const QSet<Core::Id> &pluginFeatures)
+JsonWizardFactoryJsExtension::JsonWizardFactoryJsExtension(Utils::Id platformId,
+                                                           const QSet<Utils::Id> &availableFeatures,
+                                                           const QSet<Utils::Id> &pluginFeatures)
     : m_platformId(platformId)
     , m_availableFeatures(availableFeatures)
     , m_pluginFeatures(pluginFeatures)
@@ -685,9 +685,9 @@ QVariant JsonWizardFactoryJsExtension::value(const QString &name) const
     if (name == "Platform")
         return m_platformId.toString();
     if (name == "Features")
-        return Core::Id::toStringList(m_availableFeatures);
+        return Utils::Id::toStringList(m_availableFeatures);
     if (name == "Plugins")
-        return Core::Id::toStringList(m_pluginFeatures);
+        return Utils::Id::toStringList(m_pluginFeatures);
     return QVariant();
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
index 8cb3273356..4d4ce62aa7 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
@@ -62,7 +62,7 @@ public:
     public:
         bool isValid() const { return typeId.isValid(); }
 
-        Core::Id typeId;
+        Utils::Id typeId;
         QVariant data;
     };
 
@@ -73,7 +73,7 @@ public:
         QString subTitle;
         QString shortTitle;
         int index = -1; // page index in the wizard
-        Core::Id typeId;
+        Utils::Id typeId;
         QVariant enabled;
         QVariant data;
     };
@@ -85,10 +85,10 @@ public:
 
     static QString localizedString(const QVariant &value);
 
-    bool isAvailable(Core::Id platformId) const override;
+    bool isAvailable(Utils::Id platformId) const override;
 
 private:
-    Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Core::Id platform,
+    Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform,
                                  const QVariantMap &variables) override;
 
     // Create all wizards. As other plugins might register factories for derived
@@ -111,7 +111,7 @@ private:
     QList<Page> m_pages;
     QList<JsonWizard::OptionDefinition> m_options;
 
-    QSet<Core::Id> m_preferredFeatures;
+    QSet<Utils::Id> m_preferredFeatures;
 
     static int m_verbose;
 
@@ -125,16 +125,16 @@ class JsonWizardFactoryJsExtension : public QObject
 {
     Q_OBJECT
 public:
-    JsonWizardFactoryJsExtension(Core::Id platformId,
-                                 const QSet<Core::Id> &availableFeatures,
-                                 const QSet<Core::Id> &pluginFeatures);
+    JsonWizardFactoryJsExtension(Utils::Id platformId,
+                                 const QSet<Utils::Id> &availableFeatures,
+                                 const QSet<Utils::Id> &pluginFeatures);
 
     Q_INVOKABLE QVariant value(const QString &name) const;
 
 private:
-    Core::Id m_platformId;
-    QSet<Core::Id> m_availableFeatures;
-    QSet<Core::Id> m_pluginFeatures;
+    Utils::Id m_platformId;
+    QSet<Utils::Id> m_availableFeatures;
+    QSet<Utils::Id> m_pluginFeatures;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
index 5d9a7e19ef..9e873e6b41 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
@@ -56,6 +56,7 @@
 
 using namespace Core;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h
index 28311711e8..37266a8e4c 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h
@@ -29,7 +29,7 @@
 
 #include "jsonwizard.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QList>
 #include <QObject>
@@ -69,15 +69,15 @@ class JsonWizardGeneratorFactory : public QObject
     Q_OBJECT
 
 public:
-    bool canCreate(Core::Id typeId) const { return m_typeIds.contains(typeId); }
-    QList<Core::Id> supportedIds() const { return m_typeIds; }
+    bool canCreate(Utils::Id typeId) const { return m_typeIds.contains(typeId); }
+    QList<Utils::Id> supportedIds() const { return m_typeIds; }
 
-    virtual JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
-                                        const QString &path, Core::Id platform,
+    virtual JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data,
+                                        const QString &path, Utils::Id platform,
                                         const QVariantMap &variables) = 0;
 
     // Basic syntax check for the data taken from the wizard.json file:
-    virtual bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) = 0;
+    virtual bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) = 0;
 
 protected:
     // This will add "PE.Wizard.Generator." in front of the suffixes and set those as supported typeIds
@@ -85,7 +85,7 @@ protected:
     void setTypeIdsSuffix(const QString &suffix);
 
 private:
-    QList<Core::Id> m_typeIds;
+    QList<Utils::Id> m_typeIds;
 };
 
 namespace Internal {
@@ -97,10 +97,10 @@ class FileGeneratorFactory : public JsonWizardGeneratorFactory
 public:
     FileGeneratorFactory();
 
-    JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
-                                const QString &path, Core::Id platform,
+    JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data,
+                                const QString &path, Utils::Id platform,
                                 const QVariantMap &variables) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class ScannerGeneratorFactory : public JsonWizardGeneratorFactory
@@ -110,10 +110,10 @@ class ScannerGeneratorFactory : public JsonWizardGeneratorFactory
 public:
     ScannerGeneratorFactory();
 
-    JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
-                                const QString &path, Core::Id platform,
+    JsonWizardGenerator *create(Utils::Id typeId, const QVariant &data,
+                                const QString &path, Utils::Id platform,
                                 const QVariantMap &variables) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp
index c2c49b61ed..93f192fa2b 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.cpp
@@ -40,7 +40,7 @@ JsonWizardPageFactory::~JsonWizardPageFactory() = default;
 void JsonWizardPageFactory::setTypeIdsSuffixes(const QStringList &suffixes)
 {
     m_typeIds = Utils::transform(suffixes, [](const QString &suffix) {
-        return Core::Id::fromString(QString::fromLatin1(Constants::PAGE_ID_PREFIX) + suffix);});
+        return Utils::Id::fromString(QString::fromLatin1(Constants::PAGE_ID_PREFIX) + suffix);});
 }
 
 void JsonWizardPageFactory::setTypeIdsSuffix(const QString &suffix)
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h
index 5752b3b4cb..81484db21b 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h
@@ -27,7 +27,7 @@
 
 #include "../projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QVariant>
 #include <QStringList>
@@ -42,13 +42,13 @@ class PROJECTEXPLORER_EXPORT JsonWizardPageFactory
 public:
     virtual ~JsonWizardPageFactory();
 
-    bool canCreate(Core::Id typeId) const { return m_typeIds.contains(typeId); }
-    QList<Core::Id> supportedIds() const { return m_typeIds; }
+    bool canCreate(Utils::Id typeId) const { return m_typeIds.contains(typeId); }
+    QList<Utils::Id> supportedIds() const { return m_typeIds; }
 
-    virtual Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) = 0;
+    virtual Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) = 0;
 
     // Basic syntax check for the data taken from the wizard.json file:
-    virtual bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) = 0;
+    virtual bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) = 0;
 
 protected:
     // This will add "PE.Wizard.Page." in front of the suffixes and set those as supported typeIds
@@ -56,7 +56,7 @@ protected:
     void setTypeIdsSuffix(const QString &suffix);
 
 private:
-    QList<Core::Id> m_typeIds;
+    QList<Utils::Id> m_typeIds;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
index 774b63376e..dad6e9539e 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
@@ -60,7 +60,7 @@ FieldPageFactory::FieldPageFactory()
     JsonFieldPage::registerFieldFactory(QLatin1String("IconList"), []() { return new IconListField; });
 }
 
-Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
+Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data)
 {
     Q_UNUSED(wizard)
 
@@ -76,7 +76,7 @@ Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId,
     return page;
 }
 
-bool FieldPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool FieldPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
 
@@ -107,7 +107,7 @@ FilePageFactory::FilePageFactory()
     setTypeIdsSuffix(QLatin1String("File"));
 }
 
-Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
+Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data)
 {
     Q_UNUSED(wizard)
     Q_UNUSED(data)
@@ -116,7 +116,7 @@ Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId,
     return new JsonFilePage;
 }
 
-bool FilePageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool FilePageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
     if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) {
@@ -141,7 +141,7 @@ KitsPageFactory::KitsPageFactory()
     setTypeIdsSuffix(QLatin1String("Kits"));
 }
 
-Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
+Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data)
 {
     Q_UNUSED(wizard)
     QTC_ASSERT(canCreate(typeId), return nullptr);
@@ -168,7 +168,7 @@ static bool validateFeatureList(const QVariantMap &data, const QByteArray &key,
     return true;
 }
 
-bool KitsPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool KitsPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
 
@@ -201,7 +201,7 @@ ProjectPageFactory::ProjectPageFactory()
     setTypeIdsSuffix(QLatin1String("Project"));
 }
 
-Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
+Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data)
 {
     Q_UNUSED(wizard)
     Q_UNUSED(data)
@@ -224,7 +224,7 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeI
     return page;
 }
 
-bool ProjectPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool ProjectPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
 
@@ -261,7 +261,7 @@ SummaryPageFactory::SummaryPageFactory()
     setTypeIdsSuffix(QLatin1String("Summary"));
 }
 
-Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
+Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data)
 {
     Q_UNUSED(wizard)
     Q_UNUSED(data)
@@ -273,7 +273,7 @@ Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeI
     return page;
 }
 
-bool SummaryPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
+bool SummaryPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
     if (!data.isNull() && (data.type() != QVariant::Map)) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h
index 447842a889..6431a8280d 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h
@@ -35,8 +35,8 @@ class FieldPageFactory : public JsonWizardPageFactory
 public:
     FieldPageFactory();
 
-    Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class FilePageFactory : public JsonWizardPageFactory
@@ -44,8 +44,8 @@ class FilePageFactory : public JsonWizardPageFactory
 public:
     FilePageFactory();
 
-    Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class KitsPageFactory : public JsonWizardPageFactory
@@ -53,8 +53,8 @@ class KitsPageFactory : public JsonWizardPageFactory
 public:
     KitsPageFactory();
 
-    Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class ProjectPageFactory : public JsonWizardPageFactory
@@ -62,8 +62,8 @@ class ProjectPageFactory : public JsonWizardPageFactory
 public:
     ProjectPageFactory();
 
-    Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class SummaryPageFactory : public JsonWizardPageFactory
@@ -71,8 +71,8 @@ class SummaryPageFactory : public JsonWizardPageFactory
 public:
     SummaryPageFactory();
 
-    Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    Utils::WizardPage *create(JsonWizard *wizard, Utils::Id typeId, const QVariant &data) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index e8ff3cab48..e38c78fbc8 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -372,7 +372,7 @@ int Kit::weight() const
     });
 }
 
-static QIcon iconForDeviceType(Core::Id deviceType)
+static QIcon iconForDeviceType(Utils::Id deviceType)
 {
     const IDeviceFactory *factory = Utils::findOrDefault(IDeviceFactory::allDeviceFactories(),
         [&deviceType](const IDeviceFactory *factory) {
@@ -391,7 +391,7 @@ QIcon Kit::icon() const
         return d->m_cachedIcon;
     }
 
-    const Core::Id deviceType = d->m_deviceTypeForIcon.isValid()
+    const Utils::Id deviceType = d->m_deviceTypeForIcon.isValid()
             ? d->m_deviceTypeForIcon : DeviceTypeKitAspect::deviceTypeId(this);
     const QIcon deviceTypeIcon = iconForDeviceType(deviceType);
     if (!deviceTypeIcon.isNull()) {
diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h
index 871e226568..24d16b3ed9 100644
--- a/src/plugins/projectexplorer/kit.h
+++ b/src/plugins/projectexplorer/kit.h
@@ -61,7 +61,7 @@ public:
     using Predicate = std::function<bool(const Kit *)>;
     static Predicate defaultPredicate();
 
-    explicit Kit(Core::Id id = Core::Id());
+    explicit Kit(Utils::Id id = Utils::Id());
     explicit Kit(const QVariantMap &data);
     ~Kit();
 
@@ -89,7 +89,7 @@ public:
     bool isAutoDetected() const;
     QString autoDetectionSource() const;
     bool isSdkProvided() const;
-    Core::Id id() const;
+    Utils::Id id() const;
 
     // The higher the weight, the more aspects have sensible values for this kit.
     // For instance, a kit where a matching debugger was found for the toolchain will have a
@@ -101,16 +101,16 @@ public:
     QIcon displayIcon() const; // Error or warning or device icon.
     Utils::FilePath iconPath() const;
     void setIconPath(const Utils::FilePath &path);
-    void setDeviceTypeForIcon(Core::Id deviceType);
+    void setDeviceTypeForIcon(Utils::Id deviceType);
 
-    QList<Core::Id> allKeys() const;
-    QVariant value(Core::Id key, const QVariant &unset = QVariant()) const;
-    bool hasValue(Core::Id key) const;
-    void setValue(Core::Id key, const QVariant &value);
-    void setValueSilently(Core::Id key, const QVariant &value);
-    void removeKey(Core::Id key);
-    void removeKeySilently(Core::Id key);
-    bool isSticky(Core::Id id) const;
+    QList<Utils::Id> allKeys() const;
+    QVariant value(Utils::Id key, const QVariant &unset = QVariant()) const;
+    bool hasValue(Utils::Id key) const;
+    void setValue(Utils::Id key, const QVariant &value);
+    void setValueSilently(Utils::Id key, const QVariant &value);
+    void removeKey(Utils::Id key);
+    void removeKeySilently(Utils::Id key);
+    bool isSticky(Utils::Id id) const;
 
     bool isDataEqual(const Kit *other) const;
     bool isEqual(const Kit *other) const;
@@ -126,18 +126,18 @@ public:
     void setAutoDetected(bool detected);
     void setAutoDetectionSource(const QString &autoDetectionSource);
     void makeSticky();
-    void setSticky(Core::Id id, bool b);
+    void setSticky(Utils::Id id, bool b);
     void makeUnSticky();
 
-    void setMutable(Core::Id id, bool b);
-    bool isMutable(Core::Id id) const;
+    void setMutable(Utils::Id id, bool b);
+    bool isMutable(Utils::Id id) const;
 
-    void setIrrelevantAspects(const QSet<Core::Id> &irrelevant);
-    QSet<Core::Id> irrelevantAspects() const;
+    void setIrrelevantAspects(const QSet<Utils::Id> &irrelevant);
+    QSet<Utils::Id> irrelevantAspects() const;
 
-    QSet<Core::Id> supportedPlatforms() const;
-    QSet<Core::Id> availableFeatures() const;
-    bool hasFeatures(const QSet<Core::Id> &features) const;
+    QSet<Utils::Id> supportedPlatforms() const;
+    QSet<Utils::Id> availableFeatures() const;
+    bool hasFeatures(const QSet<Utils::Id> &features) const;
     Utils::MacroExpander *macroExpander() const;
 
     QString newKitName(const QList<Kit *> &allKits) const;
diff --git a/src/plugins/projectexplorer/kitchooser.cpp b/src/plugins/projectexplorer/kitchooser.cpp
index 58f6ff62fb..469dc9cf71 100644
--- a/src/plugins/projectexplorer/kitchooser.cpp
+++ b/src/plugins/projectexplorer/kitchooser.cpp
@@ -40,6 +40,7 @@
 #include <QSettings>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ProjectExplorer {
 
@@ -157,7 +158,7 @@ Kit *KitChooser::currentKit() const
     return KitManager::kit(id);
 }
 
-void KitChooser::setCurrentKitId(Core::Id id)
+void KitChooser::setCurrentKitId(Utils::Id id)
 {
     QVariant v = id.toSetting();
     for (int i = 0, n = m_chooser->count(); i != n; ++i) {
@@ -168,10 +169,10 @@ void KitChooser::setCurrentKitId(Core::Id id)
     }
 }
 
-Core::Id KitChooser::currentKitId() const
+Utils::Id KitChooser::currentKitId() const
 {
     Kit *kit = currentKit();
-    return kit ? kit->id() : Core::Id();
+    return kit ? kit->id() : Utils::Id();
 }
 
 void KitChooser::setKitPredicate(const Kit::Predicate &predicate)
diff --git a/src/plugins/projectexplorer/kitchooser.h b/src/plugins/projectexplorer/kitchooser.h
index 06c346f55a..5670be650b 100644
--- a/src/plugins/projectexplorer/kitchooser.h
+++ b/src/plugins/projectexplorer/kitchooser.h
@@ -48,8 +48,8 @@ class PROJECTEXPLORER_EXPORT KitChooser : public QWidget
 public:
     explicit KitChooser(QWidget *parent = nullptr);
 
-    void setCurrentKitId(Core::Id id);
-    Core::Id currentKitId() const;
+    void setCurrentKitId(Utils::Id id);
+    Utils::Id currentKitId() const;
 
     void setKitPredicate(const Kit::Predicate &predicate);
     void setShowIcons(bool showIcons);
diff --git a/src/plugins/projectexplorer/kitfeatureprovider.h b/src/plugins/projectexplorer/kitfeatureprovider.h
index 69a8feee60..bb74e7a5ea 100644
--- a/src/plugins/projectexplorer/kitfeatureprovider.h
+++ b/src/plugins/projectexplorer/kitfeatureprovider.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <coreplugin/featureprovider.h>
 
 namespace ProjectExplorer {
@@ -34,9 +33,9 @@ namespace Internal {
 class KitFeatureProvider : public Core::IFeatureProvider
 {
 public:
-    QSet<Core::Id> availableFeatures(Core::Id id) const override;
-    QSet<Core::Id> availablePlatforms() const override;
-    QString displayNameForPlatform(Core::Id id) const override;
+    QSet<Utils::Id> availableFeatures(Utils::Id id) const override;
+    QSet<Utils::Id> availablePlatforms() const override;
+    QString displayNameForPlatform(Utils::Id id) const override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 6dd4d8fae2..9d14a93638 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -163,7 +163,7 @@ void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expand
     });
 }
 
-Core::Id SysRootKitAspect::id()
+Utils::Id SysRootKitAspect::id()
 {
     return "PE.Profile.SysRoot";
 }
@@ -221,14 +221,14 @@ public:
         layout->setContentsMargins(0, 0, 0, 0);
         layout->setColumnStretch(1, 2);
 
-        QList<Core::Id> languageList = Utils::toList(ToolChainManager::allLanguages());
-        Utils::sort(languageList, [](Core::Id l1, Core::Id l2) {
+        QList<Utils::Id> languageList = Utils::toList(ToolChainManager::allLanguages());
+        Utils::sort(languageList, [](Utils::Id l1, Utils::Id l2) {
             return ToolChainManager::displayNameOfLanguageId(l1)
                     < ToolChainManager::displayNameOfLanguageId(l2);
         });
         QTC_ASSERT(!languageList.isEmpty(), return);
         int row = 0;
-        for (Core::Id l : qAsConst(languageList)) {
+        for (Utils::Id l : qAsConst(languageList)) {
             layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0);
             auto cb = new QComboBox;
             cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy());
@@ -263,7 +263,7 @@ private:
     void refresh() override
     {
         m_ignoreChanges = true;
-        foreach (Core::Id l, m_languageComboboxMap.keys()) {
+        foreach (Utils::Id l, m_languageComboboxMap.keys()) {
             const QList<ToolChain *> ltcList
                     = ToolChainManager::toolChains(Utils::equal(&ToolChain::language, l));
 
@@ -284,7 +284,7 @@ private:
     void makeReadOnly() override
     {
         m_isReadOnly = true;
-        foreach (Core::Id l, m_languageComboboxMap.keys()) {
+        foreach (Utils::Id l, m_languageComboboxMap.keys()) {
             m_languageComboboxMap.value(l)->setEnabled(false);
         }
     }
@@ -294,7 +294,7 @@ private:
         Core::ICore::showOptionsDialog(Constants::TOOLCHAIN_SETTINGS_PAGE_ID, buttonWidget());
     }
 
-    void currentToolChainChanged(Core::Id language, int idx)
+    void currentToolChainChanged(Utils::Id language, int idx)
     {
         if (m_ignoreChanges || idx < 0)
             return;
@@ -320,7 +320,7 @@ private:
 
     QWidget *m_mainWidget = nullptr;
     QPushButton *m_manageButton = nullptr;
-    QHash<Core::Id, QComboBox *> m_languageComboboxMap;
+    QHash<Utils::Id, QComboBox *> m_languageComboboxMap;
     bool m_ignoreChanges = false;
     bool m_isReadOnly = false;
 };
@@ -341,12 +341,12 @@ ToolChainKitAspect::ToolChainKitAspect()
 }
 
 // language id -> tool chain id
-static QMap<Core::Id, QByteArray> defaultToolChainIds()
+static QMap<Utils::Id, QByteArray> defaultToolChainIds()
 {
-    QMap<Core::Id, QByteArray> toolChains;
+    QMap<Utils::Id, QByteArray> toolChains;
     const Abi abi = Abi::hostAbi();
     QList<ToolChain *> tcList = ToolChainManager::toolChains(Utils::equal(&ToolChain::targetAbi, abi));
-    foreach (Core::Id l, ToolChainManager::allLanguages()) {
+    foreach (Utils::Id l, ToolChainManager::allLanguages()) {
         ToolChain *tc = Utils::findOrDefault(tcList, Utils::equal(&ToolChain::language, l));
         toolChains.insert(l, tc ? tc->id() : QByteArray());
     }
@@ -355,7 +355,7 @@ static QMap<Core::Id, QByteArray> defaultToolChainIds()
 
 static QVariant defaultToolChainValue()
 {
-    const QMap<Core::Id, QByteArray> toolChains = defaultToolChainIds();
+    const QMap<Utils::Id, QByteArray> toolChains = defaultToolChainIds();
     QVariantMap result;
     auto end = toolChains.end();
     for (auto it = toolChains.begin(); it != end; ++it) {
@@ -390,8 +390,8 @@ void ToolChainKitAspect::upgrade(Kit *k)
 {
     QTC_ASSERT(k, return);
 
-    const Core::Id oldIdV1 = KITINFORMATION_ID_V1;
-    const Core::Id oldIdV2 = KITINFORMATION_ID_V2;
+    const Utils::Id oldIdV1 = KITINFORMATION_ID_V1;
+    const Utils::Id oldIdV2 = KITINFORMATION_ID_V2;
 
     // upgrade <=4.1 to 4.2 (keep old settings around for now)
     {
@@ -406,11 +406,11 @@ void ToolChainKitAspect::upgrade(Kit *k)
                 // Used up to 4.1:
                 newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx), oldValue.toString());
 
-                const Core::Id typeId = DeviceTypeKitAspect::deviceTypeId(k);
+                const Utils::Id typeId = DeviceTypeKitAspect::deviceTypeId(k);
                 if (typeId == Constants::DESKTOP_DEVICE_TYPE) {
                     // insert default C compiler which did not exist before
                     newValue.insert(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C),
-                                    defaultToolChainIds().value(Core::Id(Constants::C_LANGUAGE_ID)));
+                                    defaultToolChainIds().value(Utils::Id(Constants::C_LANGUAGE_ID)));
                 }
             }
             k->setValue(oldIdV2, newValue);
@@ -426,10 +426,10 @@ void ToolChainKitAspect::upgrade(Kit *k)
             QVariantMap newValue = oldValue.toMap();
             QVariantMap::iterator it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::C));
             if (it != newValue.end())
-                newValue.insert(Core::Id(Constants::C_LANGUAGE_ID).toString(), it.value());
+                newValue.insert(Utils::Id(Constants::C_LANGUAGE_ID).toString(), it.value());
             it = newValue.find(Deprecated::Toolchain::languageId(Deprecated::Toolchain::Cxx));
             if (it != newValue.end())
-                newValue.insert(Core::Id(Constants::CXX_LANGUAGE_ID).toString(), it.value());
+                newValue.insert(Utils::Id(Constants::CXX_LANGUAGE_ID).toString(), it.value());
             k->setValue(ToolChainKitAspect::id(), newValue);
             k->setSticky(ToolChainKitAspect::id(), k->isSticky(oldIdV2));
         }
@@ -453,7 +453,7 @@ void ToolChainKitAspect::upgrade(Kit *k)
 void ToolChainKitAspect::fix(Kit *k)
 {
     QTC_ASSERT(ToolChainManager::isLoaded(), return);
-    foreach (const Core::Id& l, ToolChainManager::allLanguages()) {
+    foreach (const Utils::Id& l, ToolChainManager::allLanguages()) {
         const QByteArray tcId = toolChainId(k, l);
         if (!tcId.isEmpty() && !ToolChainManager::findToolChain(tcId)) {
             qWarning("Tool chain set up in kit \"%s\" for \"%s\" not found.",
@@ -464,11 +464,11 @@ void ToolChainKitAspect::fix(Kit *k)
     }
 }
 
-static Core::Id findLanguage(const QString &ls)
+static Utils::Id findLanguage(const QString &ls)
 {
     QString lsUpper = ls.toUpper();
     return Utils::findOrDefault(ToolChainManager::allLanguages(),
-                         [lsUpper](Core::Id l) { return lsUpper == l.toString().toUpper(); });
+                         [lsUpper](Utils::Id l) { return lsUpper == l.toString().toUpper(); });
 }
 
 void ToolChainKitAspect::setup(Kit *k)
@@ -481,7 +481,7 @@ void ToolChainKitAspect::setup(Kit *k)
         value = defaultToolChainValue().toMap();
 
     for (auto i = value.constBegin(); i != value.constEnd(); ++i) {
-        Core::Id l = findLanguage(i.key());
+        Utils::Id l = findLanguage(i.key());
 
         if (!l.isValid())
             continue;
@@ -559,27 +559,27 @@ void ToolChainKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expa
 
 QList<Utils::OutputLineParser *> ToolChainKitAspect::createOutputParsers(const Kit *k) const
 {
-    for (const Core::Id langId : {Constants::CXX_LANGUAGE_ID, Constants::C_LANGUAGE_ID}) {
+    for (const Utils::Id langId : {Constants::CXX_LANGUAGE_ID, Constants::C_LANGUAGE_ID}) {
         if (const ToolChain * const tc = toolChain(k, langId))
             return tc->createOutputParsers();
     }
     return {};
 }
 
-QSet<Core::Id> ToolChainKitAspect::availableFeatures(const Kit *k) const
+QSet<Utils::Id> ToolChainKitAspect::availableFeatures(const Kit *k) const
 {
-    QSet<Core::Id> result;
+    QSet<Utils::Id> result;
     for (ToolChain *tc : toolChains(k))
         result.insert(tc->typeId().withPrefix("ToolChain."));
     return result;
 }
 
-Core::Id ToolChainKitAspect::id()
+Utils::Id ToolChainKitAspect::id()
 {
     return KITINFORMATION_ID_V3;
 }
 
-QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Core::Id language)
+QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Utils::Id language)
 {
     QTC_ASSERT(ToolChainManager::isLoaded(), return nullptr);
     if (!k)
@@ -588,7 +588,7 @@ QByteArray ToolChainKitAspect::toolChainId(const Kit *k, Core::Id language)
     return value.value(language.toString(), QByteArray()).toByteArray();
 }
 
-ToolChain *ToolChainKitAspect::toolChain(const Kit *k, Core::Id language)
+ToolChain *ToolChainKitAspect::toolChain(const Kit *k, Utils::Id language)
 {
     return ToolChainManager::findToolChain(toolChainId(k, language));
 }
@@ -611,7 +611,7 @@ QList<ToolChain *> ToolChainKitAspect::toolChains(const Kit *k)
     const QVariantMap value = k->value(ToolChainKitAspect::id()).toMap();
     const QList<ToolChain *> tcList
             = Utils::transform<QList>(ToolChainManager::allLanguages(),
-                               [&value](Core::Id l) -> ToolChain * {
+                               [&value](Utils::Id l) -> ToolChain * {
                                    return ToolChainManager::findToolChain(value.value(l.toString()).toByteArray());
                                });
     return Utils::filtered(tcList, [](ToolChain *tc) { return tc; });
@@ -648,7 +648,7 @@ void ToolChainKitAspect::setAllToolChainsToMatch(Kit *k, ToolChain *tc)
     QVariantMap result = k->value(ToolChainKitAspect::id()).toMap();
     result.insert(tc->language().toString(), tc->id());
 
-    for (Core::Id l : ToolChainManager::allLanguages()) {
+    for (Utils::Id l : ToolChainManager::allLanguages()) {
         if (l == tc->language())
             continue;
 
@@ -676,7 +676,7 @@ void ToolChainKitAspect::setAllToolChainsToMatch(Kit *k, ToolChain *tc)
     k->setValue(id(), result);
 }
 
-void ToolChainKitAspect::clearToolChain(Kit *k, Core::Id language)
+void ToolChainKitAspect::clearToolChain(Kit *k, Utils::Id language)
 {
     QTC_ASSERT(language.isValid(), return);
     QTC_ASSERT(k, return);
@@ -694,7 +694,7 @@ Abi ToolChainKitAspect::targetAbi(const Kit *k)
     QHash<Abi, int> abiCount;
     foreach (ToolChain *tc, tcList) {
         Abi ta = tc->targetAbi();
-        if (tc->language() == Core::Id(Constants::CXX_LANGUAGE_ID))
+        if (tc->language() == Utils::Id(Constants::CXX_LANGUAGE_ID))
             cxxAbi = tc->targetAbi();
         abiCount[ta] = (abiCount.contains(ta) ? abiCount[ta] + 1 : 1);
     }
@@ -778,7 +778,7 @@ private:
 
     void refresh() override
     {
-        Core::Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit);
+        Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(m_kit);
         if (!devType.isValid())
             m_comboBox->setCurrentIndex(-1);
         for (int i = 0; i < m_comboBox->count(); ++i) {
@@ -791,7 +791,7 @@ private:
 
     void currentTypeChanged(int idx)
     {
-        Core::Id type = idx < 0 ? Core::Id() : Core::Id::fromSetting(m_comboBox->itemData(idx));
+        Utils::Id type = idx < 0 ? Utils::Id() : Utils::Id::fromSetting(m_comboBox->itemData(idx));
         DeviceTypeKitAspect::setDeviceTypeId(m_kit, type);
     }
 
@@ -830,7 +830,7 @@ KitAspectWidget *DeviceTypeKitAspect::createConfigWidget(Kit *k) const
 KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const
 {
     QTC_ASSERT(k, return {});
-    Core::Id type = deviceTypeId(k);
+    Utils::Id type = deviceTypeId(k);
     QString typeDisplayName = tr("Unknown device type");
     if (type.isValid()) {
         if (IDeviceFactory *factory = IDeviceFactory::find(type))
@@ -839,33 +839,33 @@ KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const
     return {{tr("Device type"), typeDisplayName}};
 }
 
-const Core::Id DeviceTypeKitAspect::id()
+const Utils::Id DeviceTypeKitAspect::id()
 {
     return "PE.Profile.DeviceType";
 }
 
-const Core::Id DeviceTypeKitAspect::deviceTypeId(const Kit *k)
+const Utils::Id DeviceTypeKitAspect::deviceTypeId(const Kit *k)
 {
-    return k ? Core::Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Core::Id();
+    return k ? Utils::Id::fromSetting(k->value(DeviceTypeKitAspect::id())) : Utils::Id();
 }
 
-void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Core::Id type)
+void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Utils::Id type)
 {
     QTC_ASSERT(k, return);
     k->setValue(DeviceTypeKitAspect::id(), type.toSetting());
 }
 
-QSet<Core::Id> DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const
+QSet<Utils::Id> DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const
 {
     return {deviceTypeId(k)};
 }
 
-QSet<Core::Id> DeviceTypeKitAspect::availableFeatures(const Kit *k) const
+QSet<Utils::Id> DeviceTypeKitAspect::availableFeatures(const Kit *k) const
 {
-    Core::Id id = DeviceTypeKitAspect::deviceTypeId(k);
+    Utils::Id id = DeviceTypeKitAspect::deviceTypeId(k);
     if (id.isValid())
         return {id.withPrefix("DeviceType.")};
-    return QSet<Core::Id>();
+    return QSet<Utils::Id>();
 }
 
 // --------------------------------------------------------------------------
@@ -943,7 +943,7 @@ private:
     QComboBox *m_comboBox;
     QPushButton *m_manageButton;
     DeviceManagerModel *m_model;
-    Core::Id m_selectedId;
+    Utils::Id m_selectedId;
 };
 } // namespace Internal
 
@@ -961,7 +961,7 @@ DeviceKitAspect::DeviceKitAspect()
 
 QVariant DeviceKitAspect::defaultValue(const Kit *k) const
 {
-    Core::Id type = DeviceTypeKitAspect::deviceTypeId(k);
+    Utils::Id type = DeviceTypeKitAspect::deviceTypeId(k);
     // Use default device if that is compatible:
     IDevice::ConstPtr dev = DeviceManager::instance()->defaultDevice(type);
     if (dev && dev->isCompatibleWith(k))
@@ -994,7 +994,7 @@ void DeviceKitAspect::fix(Kit *k)
     if (!dev.isNull() && !dev->isCompatibleWith(k)) {
         qWarning("Device is no longer compatible with kit \"%s\", removing it.",
                  qPrintable(k->displayName()));
-        setDeviceId(k, Core::Id());
+        setDeviceId(k, Utils::Id());
     }
 }
 
@@ -1005,7 +1005,7 @@ void DeviceKitAspect::setup(Kit *k)
     if (!dev.isNull() && dev->isCompatibleWith(k))
         return;
 
-    setDeviceId(k, Core::Id::fromSetting(defaultValue(k)));
+    setDeviceId(k, Utils::Id::fromSetting(defaultValue(k)));
 }
 
 KitAspectWidget *DeviceKitAspect::createConfigWidget(Kit *k) const
@@ -1056,7 +1056,7 @@ void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expande
     });
 }
 
-Core::Id DeviceKitAspect::id()
+Utils::Id DeviceKitAspect::id()
 {
     return "PE.Profile.Device";
 }
@@ -1067,17 +1067,17 @@ IDevice::ConstPtr DeviceKitAspect::device(const Kit *k)
     return DeviceManager::instance()->find(deviceId(k));
 }
 
-Core::Id DeviceKitAspect::deviceId(const Kit *k)
+Utils::Id DeviceKitAspect::deviceId(const Kit *k)
 {
-    return k ? Core::Id::fromSetting(k->value(DeviceKitAspect::id())) : Core::Id();
+    return k ? Utils::Id::fromSetting(k->value(DeviceKitAspect::id())) : Utils::Id();
 }
 
 void DeviceKitAspect::setDevice(Kit *k, IDevice::ConstPtr dev)
 {
-    setDeviceId(k, dev ? dev->id() : Core::Id());
+    setDeviceId(k, dev ? dev->id() : Utils::Id());
 }
 
-void DeviceKitAspect::setDeviceId(Kit *k, Core::Id id)
+void DeviceKitAspect::setDeviceId(Kit *k, Utils::Id id)
 {
     QTC_ASSERT(k, return);
     k->setValue(DeviceKitAspect::id(), id.toSetting());
@@ -1100,7 +1100,7 @@ void DeviceKitAspect::kitsWereLoaded()
             this, &DeviceKitAspect::kitUpdated);
 }
 
-void DeviceKitAspect::deviceUpdated(Core::Id id)
+void DeviceKitAspect::deviceUpdated(Utils::Id id)
 {
     foreach (Kit *k, KitManager::kits()) {
         if (deviceId(k) == id)
@@ -1274,7 +1274,7 @@ KitAspect::ItemList EnvironmentKitAspect::toUserOutput(const Kit *k) const
              Utils::EnvironmentItem::toStringList(environmentChanges(k)).join("<br>")) };
 }
 
-Core::Id EnvironmentKitAspect::id()
+Utils::Id EnvironmentKitAspect::id()
 {
     return "PE.Profile.Environment";
 }
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index d8558b8861..4e5708eeca 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -56,7 +56,7 @@ public:
     ItemList toUserOutput(const Kit *k) const override;
     void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static Utils::FilePath sysRoot(const Kit *k);
     static void setSysRoot(Kit *k, const Utils::FilePath &v);
 };
@@ -86,17 +86,17 @@ public:
     void addToEnvironment(const Kit *k, Utils::Environment &env) const override;
     void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
     QList<Utils::OutputLineParser *> createOutputParsers(const Kit *k) const override;
-    QSet<Core::Id> availableFeatures(const Kit *k) const override;
+    QSet<Utils::Id> availableFeatures(const Kit *k) const override;
 
-    static Core::Id id();
-    static QByteArray toolChainId(const Kit *k, Core::Id language);
-    static ToolChain *toolChain(const Kit *k, Core::Id language);
+    static Utils::Id id();
+    static QByteArray toolChainId(const Kit *k, Utils::Id language);
+    static ToolChain *toolChain(const Kit *k, Utils::Id language);
     static ToolChain *cToolChain(const Kit *k);
     static ToolChain *cxxToolChain(const Kit *k);
     static QList<ToolChain *> toolChains(const Kit *k);
     static void setToolChain(Kit *k, ToolChain *tc);
     static void setAllToolChainsToMatch(Kit *k, ToolChain *tc);
-    static void clearToolChain(Kit *k, Core::Id language);
+    static void clearToolChain(Kit *k, Utils::Id language);
     static Abi targetAbi(const Kit *k);
 
     static QString msgNoToolChainInTarget();
@@ -123,12 +123,12 @@ public:
     KitAspectWidget *createConfigWidget(Kit *k) const override;
     ItemList toUserOutput(const Kit *k) const override;
 
-    static const Core::Id id();
-    static const Core::Id deviceTypeId(const Kit *k);
-    static void setDeviceTypeId(Kit *k, Core::Id type);
+    static const Utils::Id id();
+    static const Utils::Id deviceTypeId(const Kit *k);
+    static void setDeviceTypeId(Kit *k, Utils::Id type);
 
-    QSet<Core::Id> supportedPlatforms(const Kit *k) const override;
-    QSet<Core::Id> availableFeatures(const Kit *k) const override;
+    QSet<Utils::Id> supportedPlatforms(const Kit *k) const override;
+    QSet<Utils::Id> availableFeatures(const Kit *k) const override;
 };
 
 // --------------------------------------------------------------------------
@@ -154,17 +154,17 @@ public:
 
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static IDevice::ConstPtr device(const Kit *k);
-    static Core::Id deviceId(const Kit *k);
+    static Utils::Id deviceId(const Kit *k);
     static void setDevice(Kit *k, IDevice::ConstPtr dev);
-    static void setDeviceId(Kit *k, Core::Id dataId);
+    static void setDeviceId(Kit *k, Utils::Id dataId);
 
 private:
     QVariant defaultValue(const Kit *k) const;
 
     void kitsWereLoaded();
-    void deviceUpdated(Core::Id dataId);
+    void deviceUpdated(Utils::Id dataId);
     void devicesChanged();
     void kitUpdated(ProjectExplorer::Kit *k);
 };
@@ -188,7 +188,7 @@ public:
 
     ItemList toUserOutput(const Kit *k) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static Utils::EnvironmentItems environmentChanges(const Kit *k);
     static void setEnvironmentChanges(Kit *k, const Utils::EnvironmentItems &changes);
 };
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 79f4654caa..14288d7bb2 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -62,7 +62,7 @@ namespace ProjectExplorer {
 class KitList
 {
 public:
-    Core::Id defaultKit;
+    Utils::Id defaultKit;
     std::vector<std::unique_ptr<Kit>> kits;
 };
 
@@ -175,7 +175,7 @@ void KitManager::restoreKits()
     std::vector<std::unique_ptr<Kit>> resultList;
 
     // read all kits from user file
-    Core::Id defaultUserKit;
+    Utils::Id defaultUserKit;
     std::vector<std::unique_ptr<Kit>> kitsToCheck;
     {
         KitList userKits = restoreKitsHelper(settingsFileName());
@@ -262,7 +262,7 @@ void KitManager::restoreKits()
 
     if (resultList.empty() || !haveKitForBinary) {
         // No kits exist yet, so let's try to autoconfigure some from the toolchains we know.
-        QHash<Abi, QHash<Core::Id, ToolChain *>> uniqueToolchains;
+        QHash<Abi, QHash<Utils::Id, ToolChain *>> uniqueToolchains;
 
         // On Linux systems, we usually detect a plethora of same-ish toolchains. The following
         // algorithm gives precedence to icecc and ccache and otherwise simply chooses the one with
@@ -594,7 +594,7 @@ void KitManager::notifyAboutUpdate(Kit *k)
         emit m_instance->unmanagedKitUpdated(k);
 }
 
-Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Core::Id id)
+Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Utils::Id id)
 {
     QTC_ASSERT(isLoaded(), return nullptr);
 
@@ -717,7 +717,7 @@ KitAspectWidget::KitAspectWidget(Kit *kit, const KitAspect *ki) : m_kit(kit),
     m_kitInformation(ki), m_isSticky(kit->isSticky(ki->id()))
 { }
 
-Core::Id KitAspectWidget::kitInformationId() const
+Utils::Id KitAspectWidget::kitInformationId() const
 {
     return m_kitInformation->id();
 }
diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index f55380c573..ecf542e851 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -30,7 +30,6 @@
 #include "kit.h"
 
 #include <coreplugin/featureprovider.h>
-#include <coreplugin/id.h>
 
 #include <QObject>
 #include <QPair>
@@ -69,7 +68,7 @@ public:
     using Item = QPair<QString, QString>;
     using ItemList = QList<Item>;
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     int priority() const { return m_priority; }
     QString displayName() const { return m_displayName; }
     QString description() const { return m_description; }
@@ -95,8 +94,8 @@ public:
 
     virtual QString displayNamePostfix(const Kit *k) const;
 
-    virtual QSet<Core::Id> supportedPlatforms(const Kit *k) const;
-    virtual QSet<Core::Id> availableFeatures(const Kit *k) const;
+    virtual QSet<Utils::Id> supportedPlatforms(const Kit *k) const;
+    virtual QSet<Utils::Id> availableFeatures(const Kit *k) const;
 
     virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const;
 
@@ -106,7 +105,7 @@ protected:
     KitAspect();
     ~KitAspect();
 
-    void setId(Core::Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &name) { m_displayName = name; }
     void setDescription(const QString &desc) { m_description = desc; }
     void makeEssential() { m_essential = true; }
@@ -116,7 +115,7 @@ protected:
 private:
     QString m_displayName;
     QString m_description;
-    Core::Id m_id;
+    Utils::Id m_id;
     int m_priority = 0; // The higher the closer to the top.
     bool m_essential = false;
 };
@@ -128,7 +127,7 @@ class PROJECTEXPLORER_EXPORT KitAspectWidget : public QObject
 public:
     KitAspectWidget(Kit *kit, const KitAspect *ki);
 
-    Core::Id kitInformationId() const;
+    Utils::Id kitInformationId() const;
 
     virtual void makeReadOnly() = 0;
     virtual void refresh() = 0;
@@ -162,14 +161,14 @@ public:
 
     static const QList<Kit *> kits();
     static Kit *kit(const Kit::Predicate &predicate);
-    static Kit *kit(Core::Id id);
+    static Kit *kit(Utils::Id id);
     static Kit *defaultKit();
 
     static const QList<KitAspect *> kitAspects();
-    static const QSet<Core::Id> irrelevantAspects();
-    static void setIrrelevantAspects(const QSet<Core::Id> &aspects);
+    static const QSet<Utils::Id> irrelevantAspects();
+    static void setIrrelevantAspects(const QSet<Utils::Id> &aspects);
 
-    static Kit *registerKit(const std::function<void(Kit *)> &init, Core::Id id = {});
+    static Kit *registerKit(const std::function<void(Kit *)> &init, Utils::Id id = {});
     static void deregisterKit(Kit *k);
     static void setDefaultKit(Kit *k);
 
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index 9862fab3d1..5dfda59f93 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -67,7 +67,7 @@ KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) :
     m_nameEdit(new QLineEdit),
     m_fileSystemFriendlyNameLineEdit(new QLineEdit),
     m_kit(k),
-    m_modifiedKit(std::make_unique<Kit>(Core::Id(WORKING_COPY_KIT_ID)))
+    m_modifiedKit(std::make_unique<Kit>(Utils::Id(WORKING_COPY_KIT_ID)))
 {
     static auto alignment
             = static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment));
@@ -146,7 +146,7 @@ KitManagerConfigWidget::~KitManagerConfigWidget()
 
     // Make sure our workingCopy did not get registered somehow:
     QTC_CHECK(!Utils::contains(KitManager::kits(),
-                               Utils::equal(&Kit::id, Core::Id(WORKING_COPY_KIT_ID))));
+                               Utils::equal(&Kit::id, Utils::Id(WORKING_COPY_KIT_ID))));
 }
 
 QString KitManagerConfigWidget::displayName() const
@@ -316,7 +316,7 @@ void KitManagerConfigWidget::removeKit()
 
 void KitManagerConfigWidget::setIcon()
 {
-    const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get());
+    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(m_modifiedKit.get());
     QList<IDeviceFactory *> allDeviceFactories = IDeviceFactory::allDeviceFactories();
     if (deviceType.isValid()) {
         const auto less = [deviceType](const IDeviceFactory *f1, const IDeviceFactory *f2) {
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp
index 59f149c26f..82799fecd6 100644
--- a/src/plugins/projectexplorer/linuxiccparser.cpp
+++ b/src/plugins/projectexplorer/linuxiccparser.cpp
@@ -110,9 +110,9 @@ OutputLineParser::Result LinuxIccParser::handleLine(const QString &line, OutputF
     return Status::NotHandled;
 }
 
-Core::Id LinuxIccParser::id()
+Utils::Id LinuxIccParser::id()
 {
-    return Core::Id("ProjectExplorer.OutputParser.Icc");
+    return Utils::Id("ProjectExplorer.OutputParser.Icc");
 }
 
 QList<OutputLineParser *> LinuxIccParser::iccParserSuite()
diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h
index 2075ecfbbf..f6aaca4f9a 100644
--- a/src/plugins/projectexplorer/linuxiccparser.h
+++ b/src/plugins/projectexplorer/linuxiccparser.h
@@ -39,7 +39,7 @@ class LinuxIccParser : public ProjectExplorer::OutputTaskParser
 public:
     LinuxIccParser();
 
-    static Core::Id id();
+    static Utils::Id id();
 
     static QList<Utils::OutputLineParser *> iccParserSuite();
 
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index ec5cafe662..fef7acd52d 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -36,7 +36,6 @@
 #include "target.h"
 #include "toolchain.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/variablechooser.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
@@ -60,7 +59,7 @@ const char MAKEFLAGS[] = "MAKEFLAGS";
 
 namespace ProjectExplorer {
 
-MakeStep::MakeStep(BuildStepList *parent, Core::Id id)
+MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)
     : AbstractProcessStep(parent, id),
       m_userJobCount(defaultJobCount())
 {
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index decc0b0fcc..8c58748e61 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -48,7 +48,7 @@ public:
         Display,
         Execution
     };
-    explicit MakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
+    explicit MakeStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
 
     void setBuildTarget(const QString &buildTarget);
     void setAvailableBuildTargets(const QStringList &buildTargets);
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 38187fd128..f83fc077e5 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -611,10 +611,10 @@ private:
             return;
 
         bool addedMutables = false;
-        QList<Core::Id> knownIdList = Utils::transform(m_widgets, &KitAspectWidget::kitInformationId);
+        QList<Utils::Id> knownIdList = Utils::transform(m_widgets, &KitAspectWidget::kitInformationId);
 
         for (KitAspect *aspect : KitManager::kitAspects()) {
-            const Core::Id currentId = aspect->id();
+            const Utils::Id currentId = aspect->id();
             if (m_kit->isMutable(currentId) && !knownIdList.removeOne(currentId)) {
                 addedMutables = true;
                 break;
diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp
index 8cd6c447bd..cd0dd41fc2 100644
--- a/src/plugins/projectexplorer/msvcparser.cpp
+++ b/src/plugins/projectexplorer/msvcparser.cpp
@@ -100,9 +100,9 @@ MsvcParser::MsvcParser()
     QTC_CHECK(m_additionalInfoRegExp.isValid());
 }
 
-Core::Id MsvcParser::id()
+Utils::Id MsvcParser::id()
 {
-    return Core::Id("ProjectExplorer.OutputParser.Msvc");
+    return Utils::Id("ProjectExplorer.OutputParser.Msvc");
 }
 
 OutputLineParser::Result MsvcParser::handleLine(const QString &line, OutputFormat type)
diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h
index f2b8d47d97..c1007fa4b9 100644
--- a/src/plugins/projectexplorer/msvcparser.h
+++ b/src/plugins/projectexplorer/msvcparser.h
@@ -40,7 +40,7 @@ class PROJECTEXPLORER_EXPORT MsvcParser :  public ProjectExplorer::OutputTaskPar
 public:
     MsvcParser();
 
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 4b2027896f..2b46aaff67 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -652,7 +652,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
 // For _MSV_VER values, see https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2017.
 //
 Utils::LanguageVersion MsvcToolChain::msvcLanguageVersion(const QStringList & /*cxxflags*/,
-                                                          const Core::Id &language,
+                                                          const Utils::Id &language,
                                                           const Macros &macros) const
 {
     using Utils::LanguageVersion;
@@ -808,7 +808,7 @@ static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain)
         g_availableMsvcToolchains.push_back(toolchain);
 }
 
-MsvcToolChain::MsvcToolChain(Core::Id typeId)
+MsvcToolChain::MsvcToolChain(Utils::Id typeId)
     : ToolChain(typeId)
 {
     setDisplayName("Microsoft Visual C++ Compiler");
@@ -981,7 +981,7 @@ ToolChain::MacroInspectionRunner MsvcToolChain::createMacroInspectionRunner() co
     Utils::Environment env(m_lastEnvironment);
     addToEnvironment(env);
     MacrosCache macroCache = predefinedMacrosCache();
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
 
     // This runner must be thread-safe!
     return [this, env, macroCache, lang](const QStringList &cxxflags) {
@@ -1728,7 +1728,7 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
 }
 
 Utils::LanguageVersion ClangClToolChain::msvcLanguageVersion(const QStringList &cxxflags,
-                                                             const Core::Id &language,
+                                                             const Utils::Id &language,
                                                              const Macros &macros) const
 {
     if (cxxflags.contains("--driver-mode=g++"))
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index 7731598cb1..149e5d37b8 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -59,7 +59,7 @@ public:
     enum Type { WindowsSDK, VS };
     enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 };
 
-    explicit MsvcToolChain(Core::Id typeId);
+    explicit MsvcToolChain(Utils::Id typeId);
     ~MsvcToolChain() override;
 
     Abi targetAbi() const override;
@@ -127,7 +127,7 @@ protected:
     virtual Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                         const Utils::Environment &env) const;
     virtual Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
-                                                       const Core::Id &language,
+                                                       const Utils::Id &language,
                                                        const Macros &macros) const;
 
     struct GenerateEnvResult
@@ -188,7 +188,7 @@ public:
     Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                 const Utils::Environment &env) const override;
     Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
-                                               const Core::Id &language,
+                                               const Utils::Id &language,
                                                const Macros &macros) const override;
 
     bool operator==(const ToolChain &) const override;
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 035b816ff0..08a784f28e 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -51,7 +51,7 @@ class ProcessStep final : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ProcessStep)
 
 public:
-    ProcessStep(BuildStepList *bsl, Core::Id id);
+    ProcessStep(BuildStepList *bsl, Utils::Id id);
 
     bool init() final;
     void setupOutputFormatter(Utils::OutputFormatter *formatter);
@@ -62,7 +62,7 @@ public:
     BaseStringAspect *m_workingDirectory;
 };
 
-ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id)
+ProcessStep::ProcessStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     //: Default ProcessStep display name
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index fafa0cc010..d808ca8d7f 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -181,7 +181,7 @@ class ProjectPrivate
 public:
     ~ProjectPrivate();
 
-    Core::Id m_id;
+    Utils::Id m_id;
     bool m_needsInitialExpansion = false;
     bool m_canBuildProducts = false;
     bool m_knowsAllBuildExecutables = true;
@@ -241,7 +241,7 @@ QString Project::displayName() const
     return d->m_displayName;
 }
 
-Core::Id Project::id() const
+Utils::Id Project::id() const
 {
     QTC_CHECK(d->m_id.isValid());
     return d->m_id;
@@ -377,7 +377,7 @@ void Project::setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentP
     }
 }
 
-Target *Project::target(Core::Id id) const
+Target *Project::target(Utils::Id id) const
 {
     return Utils::findOrDefault(d->m_targets, Utils::equal(&Target::id, id));
 }
@@ -529,7 +529,7 @@ void Project::setDisplayName(const QString &name)
     emit displayNameChanged();
 }
 
-void Project::setId(Core::Id id)
+void Project::setId(Utils::Id id)
 {
     QTC_ASSERT(!d->m_id.isValid(), return); // Id may not change ever!
     d->m_id = id;
@@ -751,7 +751,7 @@ void Project::createTargetFromMap(const QVariantMap &map, int index)
 
     const QVariantMap targetMap = map.value(key).toMap();
 
-    Core::Id id = idFromMap(targetMap);
+    Utils::Id id = idFromMap(targetMap);
     if (target(id)) {
         qWarning("Warning: Duplicated target id found, not restoring second target with id '%s'. Continuing.",
                  qPrintable(id.toString()));
@@ -760,7 +760,7 @@ void Project::createTargetFromMap(const QVariantMap &map, int index)
 
     Kit *k = KitManager::kit(id);
     if (!k) {
-        Core::Id deviceTypeId = Core::Id::fromSetting(targetMap.value(Target::deviceTypeKey()));
+        Utils::Id deviceTypeId = Utils::Id::fromSetting(targetMap.value(Target::deviceTypeKey()));
         if (!deviceTypeId.isValid())
             deviceTypeId = Constants::DESKTOP_DEVICE_TYPE;
         const QString formerKitName = targetMap.value(Target::displayNameKey()).toString();
@@ -810,7 +810,7 @@ void Project::setProjectLanguages(Core::Context language)
     emit projectLanguagesUpdated();
 }
 
-void Project::addProjectLanguage(Core::Id id)
+void Project::addProjectLanguage(Utils::Id id)
 {
     Core::Context lang = projectLanguages();
     int pos = lang.indexOf(id);
@@ -819,7 +819,7 @@ void Project::addProjectLanguage(Core::Id id)
     setProjectLanguages(lang);
 }
 
-void Project::removeProjectLanguage(Core::Id id)
+void Project::removeProjectLanguage(Utils::Id id)
 {
     Core::Context lang = projectLanguages();
     int pos = lang.indexOf(id);
@@ -828,7 +828,7 @@ void Project::removeProjectLanguage(Core::Id id)
     setProjectLanguages(lang);
 }
 
-void Project::setProjectLanguage(Core::Id id, bool enabled)
+void Project::setProjectLanguage(Utils::Id id, bool enabled)
 {
     if (enabled)
         addProjectLanguage(id);
@@ -858,7 +858,7 @@ void Project::setNeedsDeployConfigurations(bool value)
 
 Task Project::createProjectTask(Task::TaskType type, const QString &description)
 {
-    return Task(type, description, Utils::FilePath(), -1, Core::Id());
+    return Task(type, description, Utils::FilePath(), -1, Utils::Id());
 }
 
 void Project::setBuildSystemCreator(const std::function<BuildSystem *(Target *)> &creator)
@@ -1077,7 +1077,7 @@ void ProjectExplorerPlugin::testProject_setup()
     QCOMPARE(project.files(Project::AllFiles), {TEST_PROJECT_PATH});
     QCOMPARE(project.files(Project::GeneratedFiles), {});
 
-    QCOMPARE(project.id(), Core::Id(TEST_PROJECT_ID));
+    QCOMPARE(project.id(), Utils::Id(TEST_PROJECT_ID));
 
     QVERIFY(!project.target->buildSystem()->isParsing());
     QVERIFY(!project.target->buildSystem()->hasParsingData());
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 534d75e65b..f03fe6c7c9 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -30,7 +30,6 @@
 #include "deploymentdata.h"
 #include "kit.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 
 #include <utils/environmentfwd.h>
@@ -78,7 +77,7 @@ public:
     ~Project() override;
 
     QString displayName() const;
-    Core::Id id() const;
+    Utils::Id id() const;
 
     QString mimeType() const;
     bool canBuildProducts() const;
@@ -107,7 +106,7 @@ public:
     const QList<Target *> targets() const;
     // Note: activeTarget can be 0 (if no targets are defined).
     Target *activeTarget() const;
-    Target *target(Core::Id id) const;
+    Target *target(Utils::Id id) const;
     Target *target(Kit *k) const;
     virtual Tasks projectIssues(const Kit *k) const;
 
@@ -165,8 +164,8 @@ public:
     void setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentPaths);
 
     void setDisplayName(const QString &name);
-    void setProjectLanguage(Core::Id id, bool enabled);
-    void addProjectLanguage(Core::Id id);
+    void setProjectLanguage(Utils::Id id, bool enabled);
+    void addProjectLanguage(Utils::Id id);
 
     void setExtraData(const QString &key, const QVariant &data);
     QVariant extraData(const QString &key) const;
@@ -202,9 +201,9 @@ protected:
 
     void setCanBuildProducts();
 
-    void setId(Core::Id id);
+    void setId(Utils::Id id);
     void setProjectLanguages(Core::Context language);
-    void removeProjectLanguage(Core::Id id);
+    void removeProjectLanguage(Utils::Id id);
     void setHasMakeInstallEquivalent(bool enabled);
 
     void setKnowsAllBuildExecutables(bool value);
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index 2d8ea701c7..490d9f4ffe 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -151,7 +151,7 @@ ProjectConfigurationAspects::~ProjectConfigurationAspects()
     qDeleteAll(base());
 }
 
-ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Core::Id id) const
+ProjectConfigurationAspect *ProjectConfigurationAspects::aspect(Utils::Id id) const
 {
     return Utils::findOrDefault(base(), Utils::equal(&ProjectConfigurationAspect::id, id));
 }
@@ -171,7 +171,7 @@ void ProjectConfigurationAspects::toMap(QVariantMap &map) const
 
 // ProjectConfiguration
 
-ProjectConfiguration::ProjectConfiguration(QObject *parent, Core::Id id)
+ProjectConfiguration::ProjectConfiguration(QObject *parent, Utils::Id id)
     : QObject(parent)
     , m_id(id)
 {
@@ -194,7 +194,7 @@ Project *ProjectConfiguration::project() const
     return m_target->project();
 }
 
-Core::Id ProjectConfiguration::id() const
+Utils::Id ProjectConfiguration::id() const
 {
     return m_id;
 }
@@ -246,7 +246,7 @@ Target *ProjectConfiguration::target() const
 
 bool ProjectConfiguration::fromMap(const QVariantMap &map)
 {
-    Core::Id id = Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
+    Utils::Id id = Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
     // Note: This is only "startsWith", not ==, as RunConfigurations currently still
     // mangle in their build keys.
     QTC_ASSERT(id.toString().startsWith(m_id.toString()), return false);
@@ -256,7 +256,7 @@ bool ProjectConfiguration::fromMap(const QVariantMap &map)
     return true;
 }
 
-ProjectConfigurationAspect *ProjectConfiguration::aspect(Core::Id id) const
+ProjectConfigurationAspect *ProjectConfiguration::aspect(Utils::Id id) const
 {
     return m_aspects.aspect(id);
 }
@@ -267,7 +267,7 @@ void ProjectConfiguration::acquaintAspects()
         aspect->acquaintSiblings(m_aspects);
 }
 
-Core::Id ProjectExplorer::idFromMap(const QVariantMap &map)
+Utils::Id ProjectExplorer::idFromMap(const QVariantMap &map)
 {
-    return Core::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
+    return Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
 }
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index 0aa0e9f85e..8c8ab9bf2b 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -27,8 +27,8 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
 #include <utils/displayname.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QPointer>
@@ -86,11 +86,11 @@ public:
     ProjectConfigurationAspect();
     ~ProjectConfigurationAspect() override;
 
-    void setId(Core::Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
     void setSettingsKey(const QString &settingsKey) { m_settingsKey = settingsKey; }
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const { return m_displayName; }
     QString settingsKey() const { return  m_settingsKey; }
 
@@ -113,7 +113,7 @@ signals:
 protected:
     virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow?
 
-    Core::Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     QString m_settingsKey; // Name of data in settings.
     bool m_visible = true;
@@ -139,7 +139,7 @@ public:
         return aspect;
     }
 
-    ProjectConfigurationAspect *aspect(Core::Id id) const;
+    ProjectConfigurationAspect *aspect(Utils::Id id) const;
 
     template <typename T> T *aspect() const
     {
@@ -166,12 +166,12 @@ class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject
     Q_OBJECT
 
 protected:
-    explicit ProjectConfiguration(QObject *parent, Core::Id id);
+    explicit ProjectConfiguration(QObject *parent, Utils::Id id);
 
 public:
     ~ProjectConfiguration() override;
 
-    Core::Id id() const;
+    Utils::Id id() const;
 
     QString displayName() const { return m_displayName.value(); }
     bool usesDefaultDisplayName() const { return m_displayName.usesDefaultValue(); }
@@ -200,7 +200,7 @@ public:
 
     const ProjectConfigurationAspects &aspects() const { return m_aspects; }
 
-    ProjectConfigurationAspect *aspect(Core::Id id) const;
+    ProjectConfigurationAspect *aspect(Utils::Id id) const;
     template <typename T> T *aspect() const { return m_aspects.aspect<T>(); }
 
     void acquaintAspects();
@@ -214,12 +214,12 @@ protected:
 
 private:
     QPointer<Target> m_target;
-    const Core::Id m_id;
+    const Utils::Id m_id;
     Utils::DisplayName m_displayName;
     QString m_toolTip;
 };
 
 // helper function:
-PROJECTEXPLORER_EXPORT Core::Id idFromMap(const QVariantMap &map);
+PROJECTEXPLORER_EXPORT Utils::Id idFromMap(const QVariantMap &map);
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index dd3dec673e..8a7d3238ef 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -119,7 +119,6 @@
 #include <coreplugin/fileutils.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/idocumentfactory.h>
 #include <coreplugin/imode.h>
@@ -184,6 +183,7 @@
 
 using namespace Core;
 using namespace ProjectExplorer::Internal;
+using namespace Utils;
 
 namespace ProjectExplorer {
 
@@ -395,7 +395,7 @@ public:
 
     void updateContextMenuActions();
     void updateLocationSubMenus();
-    void executeRunConfiguration(RunConfiguration *, Core::Id mode);
+    void executeRunConfiguration(RunConfiguration *, Utils::Id mode);
     QPair<bool, QString> buildSettingsEnabledForSession();
     QPair<bool, QString> buildSettingsEnabled(const Project *pro);
 
@@ -457,7 +457,7 @@ public:
 
     void doUpdateRunActions();
 
-    void currentModeChanged(Core::Id mode, Core::Id oldMode);
+    void currentModeChanged(Utils::Id mode, Utils::Id oldMode);
 
     void updateWelcomePage();
 
@@ -558,7 +558,7 @@ public:
     QList<Internal::CustomParserSettings> m_customParsers;
     bool m_shouldHaveRunConfiguration = false;
     bool m_shuttingDown = false;
-    Core::Id m_runMode = Constants::NO_RUN_MODE;
+    Utils::Id m_runMode = Constants::NO_RUN_MODE;
 
     ToolChainManager *m_toolChainManager = nullptr;
     QStringList m_arguments;
@@ -940,7 +940,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             ActionManager::createMenu(ProjectExplorer::Constants::M_OPENTERMINALCONTEXT);
     openTerminal->setOnAllDisabledBehavior(ActionContainer::Show);
     dd->m_openTerminalMenu = openTerminal->menu();
-    dd->m_openTerminalMenu->setTitle(FileUtils::msgTerminalWithAction());
+    dd->m_openTerminalMenu->setTitle(Core::FileUtils::msgTerminalWithAction());
 
     // "open with" submenu
     ActionContainer * const openWith =
@@ -994,7 +994,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
                        projectTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
 
-    dd->m_searchOnFileSystem = new QAction(FileUtils::msgFindInDirectory(), this);
+    dd->m_searchOnFileSystem = new QAction(Core::FileUtils::msgFindInDirectory(), this);
     cmd = ActionManager::registerAction(dd->m_searchOnFileSystem, Constants::SEARCHONFILESYSTEM, projectTreeContext);
 
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER);
@@ -1002,14 +1002,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST);
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST);
 
-    dd->m_showInGraphicalShell = new QAction(FileUtils::msgGraphicalShellAction(), this);
+    dd->m_showInGraphicalShell = new QAction(Core::FileUtils::msgGraphicalShellAction(), this);
     cmd = ActionManager::registerAction(dd->m_showInGraphicalShell, Constants::SHOWINGRAPHICALSHELL,
                        projectTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
     mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_FILES);
 
     // Open Terminal Here menu
-    dd->m_openTerminalHere = new QAction(FileUtils::msgTerminalHereAction(), this);
+    dd->m_openTerminalHere = new QAction(Core::FileUtils::msgTerminalHereAction(), this);
     cmd = ActionManager::registerAction(dd->m_openTerminalHere, Constants::OPENTERMINALHERE,
                                         projectTreeContext);
 
@@ -2454,7 +2454,7 @@ void ProjectExplorerPluginPrivate::restoreSession()
     updateActions();
 }
 
-void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *runConfiguration, Core::Id runMode)
+void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *runConfiguration, Utils::Id runMode)
 {
     const Tasks runConfigIssues = runConfiguration->checkForIssues();
     if (!runConfigIssues.isEmpty()) {
@@ -2493,7 +2493,7 @@ void ProjectExplorerPluginPrivate::startRunControl(RunControl *runControl)
     m_outputPane.createNewOutputWindow(runControl);
     m_outputPane.flash(); // one flash for starting
     m_outputPane.showTabFor(runControl);
-    Core::Id runMode = runControl->runMode();
+    Utils::Id runMode = runControl->runMode();
     const auto popupMode = runMode == Constants::NORMAL_RUN_MODE
             ? m_outputPane.settings().runOutputMode
             : runMode == Constants::DEBUG_RUN_MODE
@@ -2873,7 +2873,7 @@ static bool hasDeploySettings(Project *pro)
     });
 }
 
-void ProjectExplorerPlugin::runProject(Project *pro, Core::Id mode, const bool forceSkipDeploy)
+void ProjectExplorerPlugin::runProject(Project *pro, Utils::Id mode, const bool forceSkipDeploy)
 {
     if (!pro)
         return;
@@ -2883,13 +2883,13 @@ void ProjectExplorerPlugin::runProject(Project *pro, Core::Id mode, const bool f
             runRunConfiguration(rc, mode, forceSkipDeploy);
 }
 
-void ProjectExplorerPlugin::runStartupProject(Core::Id runMode, bool forceSkipDeploy)
+void ProjectExplorerPlugin::runStartupProject(Utils::Id runMode, bool forceSkipDeploy)
 {
     runProject(SessionManager::startupProject(), runMode, forceSkipDeploy);
 }
 
 void ProjectExplorerPlugin::runRunConfiguration(RunConfiguration *rc,
-                                                Core::Id runMode,
+                                                Utils::Id runMode,
                                                 const bool forceSkipDeploy)
 {
     if (!rc->isEnabled())
@@ -2999,7 +2999,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions()
     doUpdateRunActions();
 }
 
-bool ProjectExplorerPlugin::canRunStartupProject(Core::Id runMode, QString *whyNot)
+bool ProjectExplorerPlugin::canRunStartupProject(Utils::Id runMode, QString *whyNot)
 {
     Project *project = SessionManager::startupProject();
     if (!project) {
@@ -3427,7 +3427,7 @@ void ProjectExplorerPluginPrivate::addNewSubproject()
         QVariantMap map;
         map.insert(QLatin1String(Constants::PREFERRED_PROJECT_NODE), QVariant::fromValue(currentNode));
         Project *project = ProjectTree::currentProject();
-        Core::Id projectType;
+        Utils::Id projectType;
         if (project) {
             const QStringList profileIds = Utils::transform(ProjectTree::currentProject()->targets(),
                                                             [](const Target *t) {
@@ -3574,7 +3574,7 @@ void ProjectExplorerPluginPrivate::showInGraphicalShell()
 {
     Node *currentNode = ProjectTree::currentNode();
     QTC_ASSERT(currentNode, return);
-    FileUtils::showInGraphicalShell(ICore::dialogParent(), currentNode->path());
+    Core::FileUtils::showInGraphicalShell(ICore::dialogParent(), currentNode->path());
 }
 
 void ProjectExplorerPluginPrivate::openTerminalHere(const EnvironmentGetter &env)
@@ -3586,7 +3586,7 @@ void ProjectExplorerPluginPrivate::openTerminalHere(const EnvironmentGetter &env
     if (!environment)
         return;
 
-    FileUtils::openTerminal(currentNode->directory(), environment.value());
+    Core::FileUtils::openTerminal(currentNode->directory(), environment.value());
 }
 
 void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv()
@@ -3666,7 +3666,7 @@ void ProjectExplorerPluginPrivate::removeFile()
                 continue;
         }
         FileChangeBlocker changeGuard(filePath.toString());
-        FileUtils::removeFile(filePath.toString(), deleteFile);
+        Core::FileUtils::removeFile(filePath.toString(), deleteFile);
     }
 }
 
@@ -3779,13 +3779,13 @@ void ProjectExplorerPlugin::renameFile(Node *node, const QString &newFilePath)
                                             .arg(QDir::toNativeSeparators(oldFilePath))
                                             .arg(QDir::toNativeSeparators(newFilePath)));
             if (res == QMessageBox::Yes) {
-                QTC_CHECK(FileUtils::renameFile(oldFilePath, newFilePath));
+                QTC_CHECK(Core::FileUtils::renameFile(oldFilePath, newFilePath));
             }
         });
         return;
     }
 
-    if (FileUtils::renameFile(oldFilePath, newFilePath)) {
+    if (Core::FileUtils::renameFile(oldFilePath, newFilePath)) {
         // Tell the project plugin about rename
         if (!folderNode->renameFile(oldFilePath, newFilePath)) {
             const QString renameFileError
@@ -3953,7 +3953,7 @@ void ProjectExplorerPlugin::updateActions()
     dd->updateActions();
 }
 
-void ProjectExplorerPlugin::activateProjectPanel(Core::Id panelId)
+void ProjectExplorerPlugin::activateProjectPanel(Utils::Id panelId)
 {
     Core::ModeManager::activateMode(Constants::MODE_SESSION);
     dd->m_proWindow->activateProjectPanel(panelId);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index f5b300ed48..a8eef60e43 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -153,10 +153,10 @@ public:
     static bool isProjectFile(const Utils::FilePath &filePath);
     static QList<QPair<QString, QString> > recentProjects();
 
-    static bool canRunStartupProject(Core::Id runMode, QString *whyNot = nullptr);
-    static void runProject(Project *pro, Core::Id, const bool forceSkipDeploy = false);
-    static void runStartupProject(Core::Id runMode, bool forceSkipDeploy = false);
-    static void runRunConfiguration(RunConfiguration *rc, Core::Id runMode,
+    static bool canRunStartupProject(Utils::Id runMode, QString *whyNot = nullptr);
+    static void runProject(Project *pro, Utils::Id, const bool forceSkipDeploy = false);
+    static void runStartupProject(Utils::Id runMode, bool forceSkipDeploy = false);
+    static void runRunConfiguration(RunConfiguration *rc, Utils::Id runMode,
                              const bool forceSkipDeploy = false);
     static QList<QPair<Runnable, Utils::ProcessHandle>> runningRunControlProcesses();
     static QList<RunControl *> allRunControls();
@@ -179,7 +179,7 @@ public:
 
     static void updateActions();
 
-    static void activateProjectPanel(Core::Id panelId);
+    static void activateProjectPanel(Utils::Id panelId);
     static void clearRecentProjects();
     static void removeFromRecentProjects(const QString &fileName, const QString &displayName);
 
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 1edde713de..54b011ee81 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -45,7 +45,7 @@
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/textindenter.h>
 #include <utils/mimetypes/mimedatabase.h>
-#
+
 #include <QPointer>
 #include <QDebug>
 #include <QFileInfo>
@@ -55,6 +55,7 @@
 
 using namespace TextEditor;
 using namespace Core;
+using namespace Utils;
 
 /*!
     \class ProjectExplorer::Internal::ProjectFileWizardExtension
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index d2c065585d..73fe4d1c0b 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -46,22 +46,22 @@
 
 namespace ProjectExplorer {
 
-static const Core::Id KIT_IS_TEMPORARY("PE.tmp.isTemporary");
-static const Core::Id KIT_TEMPORARY_NAME("PE.tmp.Name");
-static const Core::Id KIT_FINAL_NAME("PE.tmp.FinalName");
-static const Core::Id TEMPORARY_OF_PROJECTS("PE.tmp.ForProjects");
+static const Utils::Id KIT_IS_TEMPORARY("PE.tmp.isTemporary");
+static const Utils::Id KIT_TEMPORARY_NAME("PE.tmp.Name");
+static const Utils::Id KIT_FINAL_NAME("PE.tmp.FinalName");
+static const Utils::Id TEMPORARY_OF_PROJECTS("PE.tmp.ForProjects");
 
-static Core::Id fullId(Core::Id id)
+static Utils::Id fullId(Utils::Id id)
 {
     const QString prefix = "PE.tmp.";
 
     const QString idStr = id.toString();
-    QTC_ASSERT(!idStr.startsWith(prefix), return Core::Id::fromString(idStr));
+    QTC_ASSERT(!idStr.startsWith(prefix), return Utils::Id::fromString(idStr));
 
-    return Core::Id::fromString(prefix + idStr);
+    return Utils::Id::fromString(prefix + idStr);
 }
 
-static bool hasOtherUsers(Core::Id id, const QVariant &v, Kit *k)
+static bool hasOtherUsers(Utils::Id id, const QVariant &v, Kit *k)
 {
     return Utils::contains(KitManager::kits(), [id, v, k](Kit *in) -> bool {
         if (in == k)
@@ -217,7 +217,7 @@ void ProjectImporter::makePersistent(Kit *k) const
     k->removeKey(KIT_FINAL_NAME);
 
     foreach (const TemporaryInformationHandler &tih, m_temporaryHandlers) {
-        const Core::Id fid = fullId(tih.id);
+        const Utils::Id fid = fullId(tih.id);
         const QVariantList temporaryValues = k->value(fid).toList();
 
         // Mark permanent in all other kits:
@@ -241,7 +241,7 @@ void ProjectImporter::cleanupKit(Kit *k) const
 {
     QTC_ASSERT(k, return);
     foreach (const TemporaryInformationHandler &tih, m_temporaryHandlers) {
-        const Core::Id fid = fullId(tih.id);
+        const Utils::Id fid = fullId(tih.id);
         const QVariantList temporaryValues
                 = Utils::filtered(k->value(fid).toList(), [fid, k](const QVariant &v) {
            return !hasOtherUsers(fid, v, k);
@@ -309,7 +309,7 @@ Kit *ProjectImporter::createTemporaryKit(const KitSetupFunction &setup) const
     return KitManager::registerKit(init); // potentially adds kits to other targetsetuppages
 }
 
-bool ProjectImporter::findTemporaryHandler(Core::Id id) const
+bool ProjectImporter::findTemporaryHandler(Utils::Id id) const
 {
     return Utils::contains(m_temporaryHandlers, [id](const TemporaryInformationHandler &ch) { return ch.id == id; });
 }
@@ -341,7 +341,7 @@ void ProjectImporter::persistTemporaryToolChains(Kit *k, const QVariantList &vl)
     }
 }
 
-void ProjectImporter::useTemporaryKitAspect(Core::Id id,
+void ProjectImporter::useTemporaryKitAspect(Utils::Id id,
                                                  ProjectImporter::CleanupFunction cleanup,
                                                  ProjectImporter::PersistFunction persist)
 {
@@ -349,11 +349,11 @@ void ProjectImporter::useTemporaryKitAspect(Core::Id id,
     m_temporaryHandlers.append({id, cleanup, persist});
 }
 
-void ProjectImporter::addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const
+void ProjectImporter::addTemporaryData(Utils::Id id, const QVariant &cleanupData, Kit *k) const
 {
     QTC_ASSERT(k, return);
     QTC_ASSERT(findTemporaryHandler(id), return);
-    const Core::Id fid = fullId(id);
+    const Utils::Id fid = fullId(id);
 
     KitGuard guard(k);
     QVariantList tmp = k->value(fid).toList();
@@ -362,9 +362,9 @@ void ProjectImporter::addTemporaryData(Core::Id id, const QVariant &cleanupData,
     k->setValue(fid, tmp);
 }
 
-bool ProjectImporter::hasKitWithTemporaryData(Core::Id id, const QVariant &data) const
+bool ProjectImporter::hasKitWithTemporaryData(Utils::Id id, const QVariant &data) const
 {
-    Core::Id fid = fullId(id);
+    Utils::Id fid = fullId(id);
     return Utils::contains(KitManager::kits(), [data, fid](Kit *k) {
         return k->value(fid).toList().contains(data);
     });
diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h
index 62851c95b4..8460361120 100644
--- a/src/plugins/projectexplorer/projectimporter.h
+++ b/src/plugins/projectexplorer/projectimporter.h
@@ -102,17 +102,17 @@ protected:
     // Handle temporary additions to Kits (Qt Versions, ToolChains, etc.)
     using CleanupFunction = std::function<void(Kit *, const QVariantList &)>;
     using PersistFunction = std::function<void(Kit *, const QVariantList &)>;
-    void useTemporaryKitAspect(Core::Id id,
+    void useTemporaryKitAspect(Utils::Id id,
                                     CleanupFunction cleanup, PersistFunction persist);
-    void addTemporaryData(Core::Id id, const QVariant &cleanupData, Kit *k) const;
+    void addTemporaryData(Utils::Id id, const QVariant &cleanupData, Kit *k) const;
     // Does *any* kit feature the requested data yet?
-    bool hasKitWithTemporaryData(Core::Id id, const QVariant &data) const;
+    bool hasKitWithTemporaryData(Utils::Id id, const QVariant &data) const;
 
     ToolChainData findOrCreateToolChains(const ToolChainDescription &tcd) const;
 
 private:
     void markKitAsTemporary(Kit *k) const;
-    bool findTemporaryHandler(Core::Id id) const;
+    bool findTemporaryHandler(Utils::Id id) const;
 
     void cleanupTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl);
     void persistTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl);
@@ -122,7 +122,7 @@ private:
 
     class TemporaryInformationHandler {
     public:
-        Core::Id id;
+        Utils::Id id;
         CleanupFunction cleanup;
         PersistFunction persist;
     };
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 173f4bb8fa..b1fcb5104f 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -970,19 +970,19 @@ ProjectNode *ProjectNode::projectNode(const Utils::FilePath &file) const
     return nullptr;
 }
 
-QVariant ProjectNode::data(Core::Id role) const
+QVariant ProjectNode::data(Utils::Id role) const
 {
     return m_fallbackData.value(role);
 }
 
-bool ProjectNode::setData(Core::Id role, const QVariant &value) const
+bool ProjectNode::setData(Utils::Id role, const QVariant &value) const
 {
     Q_UNUSED(role)
     Q_UNUSED(value)
     return false;
 }
 
-void ProjectNode::setFallbackData(Core::Id key, const QVariant &value)
+void ProjectNode::setFallbackData(Utils::Id key, const QVariant &value)
 {
     m_fallbackData.insert(key, value);
 }
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 02697324f6..c5eea63374 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -31,9 +31,8 @@
 #include <QIcon>
 #include <QStringList>
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/optional.h>
 
 #include <functional>
@@ -381,8 +380,8 @@ public:
     virtual bool parseInProgress() const { return false; }
 
     virtual bool validParse() const { return false; }
-    virtual QVariant data(Core::Id role) const;
-    virtual bool setData(Core::Id role, const QVariant &value) const;
+    virtual QVariant data(Utils::Id role) const;
+    virtual bool setData(Utils::Id role, const QVariant &value) const;
 
     bool isProduct() const { return m_productType != ProductType::None; }
     ProductType productType() const { return m_productType; }
@@ -394,7 +393,7 @@ public:
     //       "build single file" case.
     virtual void build() {}
 
-    void setFallbackData(Core::Id key, const QVariant &value);
+    void setFallbackData(Utils::Id key, const QVariant &value);
 
 protected:
     void setProductType(ProductType type) { m_productType = type; }
@@ -404,7 +403,7 @@ protected:
 private:
     BuildSystem *buildSystem() const;
 
-    QHash<Core::Id, QVariant> m_fallbackData; // Used in data(), unless overridden.
+    QHash<Utils::Id, QVariant> m_fallbackData; // Used in data(), unless overridden.
     ProductType m_productType = ProductType::None;
 };
 
diff --git a/src/plugins/projectexplorer/projectpanelfactory.cpp b/src/plugins/projectexplorer/projectpanelfactory.cpp
index c4eaef05b4..376cd7acd1 100644
--- a/src/plugins/projectexplorer/projectpanelfactory.cpp
+++ b/src/plugins/projectexplorer/projectpanelfactory.cpp
@@ -80,12 +80,12 @@ void ProjectPanelFactory::destroyFactories()
     s_factories.clear();
 }
 
-Core::Id ProjectPanelFactory::id() const
+Utils::Id ProjectPanelFactory::id() const
 {
     return m_id;
 }
 
-void ProjectPanelFactory::setId(Core::Id id)
+void ProjectPanelFactory::setId(Utils::Id id)
 {
     m_id = id;
 }
diff --git a/src/plugins/projectexplorer/projectpanelfactory.h b/src/plugins/projectexplorer/projectpanelfactory.h
index 6d03125398..3a6adfc0f1 100644
--- a/src/plugins/projectexplorer/projectpanelfactory.h
+++ b/src/plugins/projectexplorer/projectpanelfactory.h
@@ -30,8 +30,7 @@
 #include "panelswidget.h"
 #include "projectwindow.h"
 
-#include <coreplugin/id.h>
-
+#include <utils/id.h>
 #include <utils/treemodel.h>
 
 #include <functional>
@@ -46,8 +45,8 @@ class PROJECTEXPLORER_EXPORT ProjectPanelFactory
 public:
     ProjectPanelFactory();
 
-    Core::Id id() const;
-    void setId(Core::Id id);
+    Utils::Id id() const;
+    void setId(Utils::Id id);
 
     // simple properties
     QString displayName() const;
@@ -83,7 +82,7 @@ private:
     friend class ProjectExplorerPlugin;
     static void destroyFactories();
 
-    Core::Id m_id;
+    Utils::Id m_id;
     int m_priority = 0;
     QString m_displayName;
     SupportsFunction m_supportsFunction;
diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index f17e02ac8b..01cb2f0ca6 100644
--- a/src/plugins/projectexplorer/projecttree.cpp
+++ b/src/plugins/projectexplorer/projecttree.cpp
@@ -315,7 +315,7 @@ void ProjectTree::updateExternalFileWarning()
     if (!document || document->filePath().isEmpty())
         return;
     Utils::InfoBar *infoBar = document->infoBar();
-    Core::Id externalFileId(EXTERNAL_FILE_WARNING);
+    Utils::Id externalFileId(EXTERNAL_FILE_WARNING);
     if (!document->isModified()) {
         infoBar->removeInfo(externalFileId);
         return;
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 5c9d6a1815..9858cb48f3 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -144,7 +144,7 @@ ProjectWelcomePage::ProjectWelcomePage()
     }
 }
 
-Core::Id ProjectWelcomePage::id() const
+Utils::Id ProjectWelcomePage::id() const
 {
     return "Develop";
 }
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 68f2ca3a0a..a24d833328 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -59,7 +59,7 @@ public:
 
     QString title() const override { return tr("Projects"); }
     int priority() const override { return 20; }
-    Core::Id id() const override;
+    Utils::Id id() const override;
     QWidget *createWidget() const override;
 
     void reloadWelcomeScreenData() const;
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index e5ddfc4233..ce7a2db229 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -288,7 +288,7 @@ public:
         return activeItem ? activeItem->index() : QModelIndex();
     }
 
-    TreeItem *itemForProjectPanel(Core::Id panelId)
+    TreeItem *itemForProjectPanel(Utils::Id panelId)
     {
         return m_miscItem->findChildAtLevel(1, [panelId](const TreeItem *item){
             return static_cast<const MiscSettingsPanelItem *>(item)->factory()->id() == panelId;
@@ -539,7 +539,7 @@ public:
             item->setData(0, QVariant(), ItemActivatedDirectlyRole);
     }
 
-    void activateProjectPanel(Core::Id panelId)
+    void activateProjectPanel(Utils::Id panelId)
     {
         if (ProjectItem *projectItem = m_projectsModel.rootItem()->childAt(0)) {
             if (TreeItem *item = projectItem->itemForProjectPanel(panelId))
@@ -656,7 +656,7 @@ ProjectWindow::ProjectWindow()
     setContextMenuPolicy(Qt::CustomContextMenu);
 }
 
-void ProjectWindow::activateProjectPanel(Core::Id panelId)
+void ProjectWindow::activateProjectPanel(Utils::Id panelId)
 {
     d->activateProjectPanel(panelId);
 }
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index 00c5e0a6c9..09c242034c 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -27,9 +27,8 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/fancymainwindow.h>
+#include <utils/id.h>
 
 #include <memory>
 
@@ -62,7 +61,7 @@ public:
     ProjectWindow();
     ~ProjectWindow() override;
 
-    void activateProjectPanel(Core::Id panelId);
+    void activateProjectPanel(Utils::Id panelId);
 
 private:
     const std::unique_ptr<ProjectWindowPrivate> d;
diff --git a/src/plugins/projectexplorer/rawprojectpart.h b/src/plugins/projectexplorer/rawprojectpart.h
index 95f18a7583..ee79b91952 100644
--- a/src/plugins/projectexplorer/rawprojectpart.h
+++ b/src/plugins/projectexplorer/rawprojectpart.h
@@ -148,7 +148,7 @@ public:
     bool isValid() const { return type.isValid(); }
 
 public:
-    Core::Id type;
+    Utils::Id type;
     bool isMsvc2015ToolChain = false;
     unsigned wordWidth = 0;
     QString targetTriple;
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 43cfbaf2c6..596852d4bd 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -164,7 +164,7 @@ void GlobalOrProjectAspect::resetProjectToGlobalSettings()
 
 static std::vector<RunConfiguration::AspectFactory> theAspectFactories;
 
-RunConfiguration::RunConfiguration(Target *target, Core::Id id)
+RunConfiguration::RunConfiguration(Target *target, Utils::Id id)
     : ProjectConfiguration(target, id)
 {
     QTC_CHECK(target && target == this->target());
@@ -242,9 +242,9 @@ void RunConfiguration::addAspectFactory(const AspectFactory &aspectFactory)
     theAspectFactories.push_back(aspectFactory);
 }
 
-QMap<Core::Id, QVariantMap> RunConfiguration::aspectData() const
+QMap<Utils::Id, QVariantMap> RunConfiguration::aspectData() const
 {
-    QMap<Core::Id, QVariantMap> data;
+    QMap<Utils::Id, QVariantMap> data;
     for (ProjectConfigurationAspect *aspect : m_aspects)
         aspect->toMap(data[aspect->id()]);
     return data;
@@ -273,7 +273,7 @@ QVariantMap RunConfiguration::toMap() const
 
     // FIXME: Remove this id mangling, e.g. by using a separate entry for the build key.
     if (!m_buildKey.isEmpty()) {
-        const Core::Id mangled = id().withSuffix(m_buildKey);
+        const Utils::Id mangled = id().withSuffix(m_buildKey);
         map.insert(settingsIdKey(), mangled.toSetting());
     }
 
@@ -325,7 +325,7 @@ bool RunConfiguration::fromMap(const QVariantMap &map)
     m_buildKey = map.value(BUILD_KEY).toString();
 
     if (m_buildKey.isEmpty()) {
-        const Core::Id mangledId = Core::Id::fromSetting(map.value(settingsIdKey()));
+        const Utils::Id mangledId = Utils::Id::fromSetting(map.value(settingsIdKey()));
         m_buildKey = mangledId.suffixAfter(id());
 
         // Hack for cmake projects 4.10 -> 4.11.
@@ -435,7 +435,7 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName,
     QString displayName;
     if (!targetName.isEmpty())
         displayName = QFileInfo(targetName).completeBaseName();
-    Core::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit());
+    Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit());
     if (devType != Constants::DESKTOP_DEVICE_TYPE) {
         if (IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit())) {
             if (displayName.isEmpty()) {
@@ -489,7 +489,7 @@ RunConfigurationFactory::availableCreators(Target *target) const
     \sa addSupportedProjectType()
 */
 
-void RunConfigurationFactory::addSupportedTargetDeviceType(Core::Id id)
+void RunConfigurationFactory::addSupportedTargetDeviceType(Utils::Id id)
 {
     m_supportedTargetDeviceTypes.append(id);
 }
@@ -511,7 +511,7 @@ void RunConfigurationFactory::setDecorateDisplayNames(bool on)
     \sa addSupportedTargetDeviceType()
 */
 
-void RunConfigurationFactory::addSupportedProjectType(Core::Id id)
+void RunConfigurationFactory::addSupportedProjectType(Utils::Id id)
 {
     m_supportedProjectTypes.append(id);
 }
@@ -569,7 +569,7 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian
 {
     for (RunConfigurationFactory *factory : g_runConfigurationFactories) {
         if (factory->canHandle(parent)) {
-            const Core::Id id = idFromMap(map);
+            const Utils::Id id = idFromMap(map);
             if (id.name().startsWith(factory->m_runConfigurationId.name())) {
                 RunConfiguration *rc = factory->create(parent);
                 if (rc->fromMap(map)) {
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 20fa04b647..8e906e1d02 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -150,7 +150,7 @@ public:
 
     ProjectExplorer::ProjectNode *productNode() const;
 
-    template <class T = ISettingsAspect> T *currentSettings(Core::Id id) const
+    template <class T = ISettingsAspect> T *currentSettings(Utils::Id id) const
     {
         if (auto a = qobject_cast<GlobalOrProjectAspect *>(aspect(id)))
             return qobject_cast<T *>(a->currentSettings());
@@ -163,7 +163,7 @@ public:
         addAspectFactory([](Target *target) { return new T(target); });
     }
 
-    QMap<Core::Id, QVariantMap> aspectData() const;
+    QMap<Utils::Id, QVariantMap> aspectData() const;
 
     void update();
 
@@ -173,7 +173,7 @@ signals:
     void enabledChanged();
 
 protected:
-    RunConfiguration(Target *target, Core::Id id);
+    RunConfiguration(Target *target, Utils::Id id);
 
     /// convenience function to get current build system. Try to avoid.
     BuildSystem *activeBuildSystem() const;
@@ -227,7 +227,7 @@ public:
     static RunConfiguration *clone(Target *parent, RunConfiguration *source);
     static const QList<RunConfigurationCreationInfo> creatorsForTarget(Target *parent);
 
-    Core::Id runConfigurationId() const { return m_runConfigurationId; }
+    Utils::Id runConfigurationId() const { return m_runConfigurationId; }
 
     static QString decoratedTargetName(const QString &targetName, Target *kit);
 
@@ -237,7 +237,7 @@ protected:
     using RunConfigurationCreator = std::function<RunConfiguration *(Target *)>;
 
     template <class RunConfig>
-    void registerRunConfiguration(Core::Id runConfigurationId)
+    void registerRunConfiguration(Utils::Id runConfigurationId)
     {
         m_creator = [runConfigurationId](Target *t) -> RunConfiguration * {
             return new RunConfig(t, runConfigurationId);
@@ -245,8 +245,8 @@ protected:
         m_runConfigurationId = runConfigurationId;
     }
 
-    void addSupportedProjectType(Core::Id projectTypeId);
-    void addSupportedTargetDeviceType(Core::Id deviceTypeId);
+    void addSupportedProjectType(Utils::Id projectTypeId);
+    void addSupportedTargetDeviceType(Utils::Id deviceTypeId);
     void setDecorateDisplayNames(bool on);
 
 private:
@@ -255,9 +255,9 @@ private:
 
     friend class RunConfigurationCreationInfo;
     RunConfigurationCreator m_creator;
-    Core::Id m_runConfigurationId;
-    QList<Core::Id> m_supportedProjectTypes;
-    QList<Core::Id> m_supportedTargetDeviceTypes;
+    Utils::Id m_runConfigurationId;
+    QList<Utils::Id> m_supportedProjectTypes;
+    QList<Utils::Id> m_supportedTargetDeviceTypes;
     bool m_decorateDisplayNames = false;
 };
 
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index c5c57e7011..a7d3a075fa 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -74,13 +74,13 @@ namespace ProjectExplorer {
 
 static QList<RunWorkerFactory *> g_runWorkerFactories;
 
-static QSet<Core::Id> g_runModes;
-static QSet<Core::Id> g_runConfigs;
+static QSet<Utils::Id> g_runModes;
+static QSet<Utils::Id> g_runConfigs;
 
 RunWorkerFactory::RunWorkerFactory(const WorkerCreator &producer,
-                                   const QList<Core::Id> &runModes,
-                                   const QList<Core::Id> &runConfigs,
-                                   const QList<Core::Id> &deviceTypes)
+                                   const QList<Utils::Id> &runModes,
+                                   const QList<Utils::Id> &runConfigs,
+                                   const QList<Utils::Id> &deviceTypes)
         : m_producer(producer),
           m_supportedRunModes(runModes),
           m_supportedRunConfigurations(runConfigs),
@@ -89,9 +89,9 @@ RunWorkerFactory::RunWorkerFactory(const WorkerCreator &producer,
     g_runWorkerFactories.append(this);
 
     // Debugging only.
-    for (Core::Id runMode : runModes)
+    for (Utils::Id runMode : runModes)
         g_runModes.insert(runMode);
-    for (Core::Id runConfig : runConfigs)
+    for (Utils::Id runConfig : runConfigs)
         g_runConfigs.insert(runConfig);
 }
 
@@ -100,8 +100,8 @@ RunWorkerFactory::~RunWorkerFactory()
     g_runWorkerFactories.removeOne(this);
 }
 
-bool RunWorkerFactory::canRun(Core::Id runMode,
-                              Core::Id deviceType,
+bool RunWorkerFactory::canRun(Utils::Id runMode,
+                              Utils::Id deviceType,
                               const QString &runConfigId) const
 {
     if (!m_supportedRunModes.contains(runMode))
@@ -112,7 +112,7 @@ bool RunWorkerFactory::canRun(Core::Id runMode,
         //if (!m_supportedRunConfigurations.contains(runConfigId)
         // return false;
         bool ok = false;
-        for (const Core::Id &id : m_supportedRunConfigurations) {
+        for (const Utils::Id &id : m_supportedRunConfigurations) {
             if (runConfigId.startsWith(id.toString())) {
                 ok = true;
                 break;
@@ -131,13 +131,13 @@ bool RunWorkerFactory::canRun(Core::Id runMode,
 
 void RunWorkerFactory::dumpAll()
 {
-    const QList<Core::Id> devices =
+    const QList<Utils::Id> devices =
             Utils::transform(IDeviceFactory::allDeviceFactories(), &IDeviceFactory::deviceType);
 
-    for (Core::Id runMode : qAsConst(g_runModes)) {
+    for (Utils::Id runMode : qAsConst(g_runModes)) {
         qDebug() << "";
-        for (Core::Id device : devices) {
-            for (Core::Id runConfig : qAsConst(g_runConfigs)) {
+        for (Utils::Id device : devices) {
+            for (Utils::Id runConfig : qAsConst(g_runConfigs)) {
                 const auto check = std::bind(&RunWorkerFactory::canRun,
                                              std::placeholders::_1,
                                              runMode,
@@ -276,7 +276,7 @@ static QString stateName(RunControlState s)
 class RunControlPrivate : public QObject
 {
 public:
-    RunControlPrivate(RunControl *parent, Core::Id mode)
+    RunControlPrivate(RunControl *parent, Utils::Id mode)
         : q(parent), runMode(mode)
     {
         icon = Icons::RUN_SMALL_TOOLBAR;
@@ -319,13 +319,13 @@ public:
     QString displayName;
     Runnable runnable;
     IDevice::ConstPtr device;
-    Core::Id runMode;
+    Utils::Id runMode;
     Utils::Icon icon;
     const MacroExpander *macroExpander;
     QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
     QString buildKey;
-    QMap<Core::Id, QVariantMap> settingsData;
-    Core::Id runConfigId;
+    QMap<Utils::Id, QVariantMap> settingsData;
+    Utils::Id runConfigId;
     BuildTargetInfo buildTargetInfo;
     BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
     FilePath buildDirectory;
@@ -348,7 +348,7 @@ public:
 
 using namespace Internal;
 
-RunControl::RunControl(Core::Id mode) :
+RunControl::RunControl(Utils::Id mode) :
     d(std::make_unique<RunControlPrivate>(this,  mode))
 {
 }
@@ -459,7 +459,7 @@ void RunControl::initiateFinish()
     QTimer::singleShot(0, d.get(), &RunControlPrivate::initiateFinish);
 }
 
-RunWorker *RunControl::createWorker(Core::Id workerId)
+RunWorker *RunControl::createWorker(Utils::Id workerId)
 {
     const auto check = std::bind(&RunWorkerFactory::canRun,
                                  std::placeholders::_1,
@@ -489,7 +489,7 @@ bool RunControl::createMainWorker()
     return candidates.front()->producer()(this) != nullptr;
 }
 
-bool RunControl::canRun(Core::Id runMode, Core::Id deviceType, Core::Id runConfigId)
+bool RunControl::canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId)
 {
     const auto check = std::bind(&RunWorkerFactory::canRun,
                                  std::placeholders::_1,
@@ -829,7 +829,7 @@ QList<Utils::OutputLineParser *> RunControl::createOutputParsers() const
     QList<Utils::OutputLineParser *> parsers = OutputFormatterFactory::createFormatters(target());
     if (const auto customParsersAspect
             = (runConfiguration() ? runConfiguration()->aspect<CustomParsersAspect>() : nullptr)) {
-        for (const Core::Id id : customParsersAspect->parsers()) {
+        for (const Utils::Id id : customParsersAspect->parsers()) {
             if (CustomParser * const parser = CustomParser::createFromId(id))
                 parsers << parser;
         }
@@ -837,7 +837,7 @@ QList<Utils::OutputLineParser *> RunControl::createOutputParsers() const
     return parsers;
 }
 
-Core::Id RunControl::runMode() const
+Utils::Id RunControl::runMode() const
 {
     return d->runMode;
 }
@@ -902,12 +902,12 @@ const MacroExpander *RunControl::macroExpander() const
     return d->macroExpander;
 }
 
-ProjectConfigurationAspect *RunControl::aspect(Core::Id id) const
+ProjectConfigurationAspect *RunControl::aspect(Utils::Id id) const
 {
     return d->runConfiguration ? d->runConfiguration->aspect(id) : nullptr;
 }
 
-QVariantMap RunControl::settingsData(Core::Id id) const
+QVariantMap RunControl::settingsData(Utils::Id id) const
 {
     return d->settingsData.value(id);
 }
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index 242f3b3b15..6926ec4c58 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -74,7 +74,7 @@ public:
     QString workingDirectory;
     Utils::Environment environment;
     IDevice::ConstPtr device; // Override the kit's device. Keep unset by default.
-    QHash<Core::Id, QVariant> extraData;
+    QHash<Utils::Id, QVariant> extraData;
 
     // FIXME: Not necessarily a display name
     QString displayName() const { return executable.toString(); }
@@ -146,13 +146,13 @@ public:
     using WorkerCreator = std::function<RunWorker *(RunControl *)>;
 
     RunWorkerFactory(const WorkerCreator &producer,
-                     const QList<Core::Id> &runModes,
-                     const QList<Core::Id> &runConfigs = {},
-                     const QList<Core::Id> &deviceTypes = {});
+                     const QList<Utils::Id> &runModes,
+                     const QList<Utils::Id> &runConfigs = {},
+                     const QList<Utils::Id> &deviceTypes = {});
 
     ~RunWorkerFactory();
 
-    bool canRun(Core::Id runMode, Core::Id deviceType, const QString &runConfigId) const;
+    bool canRun(Utils::Id runMode, Utils::Id deviceType, const QString &runConfigId) const;
     WorkerCreator producer() const { return m_producer; }
 
     template <typename Worker>
@@ -166,9 +166,9 @@ public:
 
 private:
     WorkerCreator m_producer;
-    QList<Core::Id> m_supportedRunModes;
-    QList<Core::Id> m_supportedRunConfigurations;
-    QList<Core::Id> m_supportedDeviceTypes;
+    QList<Utils::Id> m_supportedRunModes;
+    QList<Utils::Id> m_supportedRunConfigurations;
+    QList<Utils::Id> m_supportedDeviceTypes;
 };
 
 /**
@@ -184,7 +184,7 @@ class PROJECTEXPLORER_EXPORT RunControl : public QObject
     Q_OBJECT
 
 public:
-    explicit RunControl(Core::Id mode);
+    explicit RunControl(Utils::Id mode);
     ~RunControl() override;
 
     void setRunConfiguration(RunConfiguration *runConfig);
@@ -223,7 +223,7 @@ public:
     Project *project() const;
     Kit *kit() const;
     const Utils::MacroExpander *macroExpander() const;
-    ProjectConfigurationAspect *aspect(Core::Id id) const;
+    ProjectConfigurationAspect *aspect(Utils::Id id) const;
     template <typename T> T *aspect() const {
         return runConfiguration() ? runConfiguration()->aspect<T>() : nullptr;
     }
@@ -233,13 +233,13 @@ public:
     Utils::FilePath buildDirectory() const;
     Utils::Environment buildEnvironment() const;
 
-    QVariantMap settingsData(Core::Id id) const;
+    QVariantMap settingsData(Utils::Id id) const;
 
     Utils::FilePath targetFilePath() const;
     Utils::FilePath projectFilePath() const;
 
     QList<Utils::OutputLineParser *> createOutputParsers() const;
-    Core::Id runMode() const;
+    Utils::Id runMode() const;
 
     const Runnable &runnable() const;
     void setRunnable(const Runnable &runnable);
@@ -249,10 +249,10 @@ public:
                                        const QString &cancelButtonText = QString(),
                                        bool *prompt = nullptr);
 
-    RunWorker *createWorker(Core::Id workerId);
+    RunWorker *createWorker(Utils::Id workerId);
 
     bool createMainWorker();
-    static bool canRun(Core::Id runMode, Core::Id deviceType, Core::Id runConfigId);
+    static bool canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId);
 
 signals:
     void appendMessage(const QString &msg, Utils::OutputFormat format);
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 542912e1de..be1cf2c1e7 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -294,7 +294,7 @@ void SessionManager::setActiveTarget(Project *project, Target *target, SetActive
     if (cascade != SetActive::Cascade || !d->m_casadeSetActive)
         return;
 
-    Core::Id kitId = target->kit()->id();
+    Utils::Id kitId = target->kit()->id();
     for (Project *otherProject : SessionManager::projects()) {
         if (otherProject == project)
             continue;
@@ -314,7 +314,7 @@ void SessionManager::setActiveBuildConfiguration(Target *target, BuildConfigurat
     if (cascade != SetActive::Cascade || !d->m_casadeSetActive)
         return;
 
-    Core::Id kitId = target->kit()->id();
+    Utils::Id kitId = target->kit()->id();
     QString name = bc->displayName(); // We match on displayname
     for (Project *otherProject : SessionManager::projects()) {
         if (otherProject == target->project())
@@ -342,7 +342,7 @@ void SessionManager::setActiveDeployConfiguration(Target *target, DeployConfigur
     if (cascade != SetActive::Cascade || !d->m_casadeSetActive)
         return;
 
-    Core::Id kitId = target->kit()->id();
+    Utils::Id kitId = target->kit()->id();
     QString name = dc->displayName(); // We match on displayname
     for (Project *otherProject : SessionManager::projects()) {
         if (otherProject == target->project())
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index 290946f9d7..b05f090005 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -27,8 +27,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
-
+#include <utils/id.h>
 #include <utils/persistentsettings.h>
 
 #include <QDateTime>
@@ -145,7 +144,7 @@ signals: // for tests only
     void projectFinishedParsing(ProjectExplorer::Project *project);
 
 private:
-    static void saveActiveMode(Core::Id mode);
+    static void saveActiveMode(Utils::Id mode);
     static void configureEditor(Core::IEditor *editor, const QString &fileName);
     static void markSessionFileDirty();
     static void configureEditors(Project *project);
diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp
index 5ba79dbf80..b0d847e7df 100644
--- a/src/plugins/projectexplorer/sessionmodel.cpp
+++ b/src/plugins/projectexplorer/sessionmodel.cpp
@@ -29,7 +29,6 @@
 #include "sessiondialog.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/id.h>
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
@@ -39,6 +38,7 @@
 #include <QDir>
 
 using namespace Core;
+using namespace Utils;
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index c7d07b0238..6f898598d6 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -247,7 +247,7 @@ QString Target::activeBuildKey() const
     return d->m_activeRunConfiguration->buildKey();
 }
 
-Core::Id Target::id() const
+Utils::Id Target::id() const
 {
     return d->m_kit->id();
 }
@@ -568,12 +568,12 @@ void Target::updateDefaultDeployConfigurations()
         return;
     }
 
-    QList<Core::Id> dcIds;
+    QList<Utils::Id> dcIds;
     foreach (DeployConfigurationFactory *dcFactory, dcFactories)
         dcIds.append(dcFactory->creationId());
 
     QList<DeployConfiguration *> dcList = deployConfigurations();
-    QList<Core::Id> toCreate = dcIds;
+    QList<Utils::Id> toCreate = dcIds;
 
     foreach (DeployConfiguration *dc, dcList) {
         if (dcIds.contains(dc->id()))
@@ -582,7 +582,7 @@ void Target::updateDefaultDeployConfigurations()
             removeDeployConfiguration(dc);
     }
 
-    foreach (Core::Id id, toCreate) {
+    foreach (Utils::Id id, toCreate) {
         foreach (DeployConfigurationFactory *dcFactory, dcFactories) {
             if (dcFactory->creationId() == id) {
                 DeployConfiguration *dc = dcFactory->create(this);
@@ -736,7 +736,7 @@ void Target::setNamedSettings(const QString &name, const QVariant &value)
         d->m_pluginSettings.insert(name, value);
 }
 
-QVariant Target::additionalData(Core::Id id) const
+QVariant Target::additionalData(Utils::Id id) const
 {
     return buildSystem()->additionalData(id);
 }
@@ -848,7 +848,7 @@ bool Target::fromMap(const QVariantMap &map)
         QVariantMap valueMap = map.value(key).toMap();
         DeployConfiguration *dc = DeployConfigurationFactory::restore(this, valueMap);
         if (!dc) {
-            Core::Id id = idFromMap(valueMap);
+            Utils::Id id = idFromMap(valueMap);
             qWarning("No factory found to restore deployment configuration of id '%s'!",
                      id.isValid() ? qPrintable(id.toString()) : "UNKNOWN");
             continue;
@@ -878,7 +878,7 @@ bool Target::fromMap(const QVariantMap &map)
         RunConfiguration *rc = RunConfigurationFactory::restore(this, valueMap);
         if (!rc)
             continue;
-        const Core::Id theIdFromMap = ProjectExplorer::idFromMap(valueMap);
+        const Utils::Id theIdFromMap = ProjectExplorer::idFromMap(valueMap);
         if (!theIdFromMap.toString().contains("///::///")) { // Hack for cmake 4.10 -> 4.11
             QTC_CHECK(rc->id().withSuffix(rc->buildKey()) == theIdFromMap);
         }
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index 26be1fb988..8de1d9168d 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -65,7 +65,7 @@ public:
     Kit *kit() const;
     BuildSystem *buildSystem() const;
 
-    Core::Id id() const;
+    Utils::Id id() const;
     QString displayName() const;
     QString toolTip() const;
 
@@ -108,7 +108,7 @@ public:
     QVariant namedSettings(const QString &name) const;
     void setNamedSettings(const QString &name, const QVariant &value);
 
-    QVariant additionalData(Core::Id id) const;
+    QVariant additionalData(Utils::Id id) const;
     MakeInstallCommand makeInstallCommand(const QString &installRoot) const;
 
     Utils::MacroExpander *macroExpander() const;
diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h
index 2a6cb04461..1cdc92852c 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.h
+++ b/src/plugins/projectexplorer/targetsettingspanel.h
@@ -27,8 +27,6 @@
 
 #include "projectpanelfactory.h"
 
-#include <coreplugin/id.h>
-
 #include <QCoreApplication>
 
 #include <memory>
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index 20297313ac..b0735c9677 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -239,9 +239,9 @@ void TargetSetupPage::setTasksGenerator(const TasksGenerator &tasksGenerator)
     m_tasksGenerator = defaultTasksGenerator(tasksGenerator);
 }
 
-QList<Core::Id> TargetSetupPage::selectedKits() const
+QList<Utils::Id> TargetSetupPage::selectedKits() const
 {
-    QList<Core::Id> result;
+    QList<Utils::Id> result;
     for (TargetSetupWidget *w : m_widgets) {
         if (w->isKitSelected())
             result.append(w->kit()->id());
@@ -303,7 +303,7 @@ void TargetSetupPage::reset()
     m_ui->allKitsCheckBox->setChecked(false);
 }
 
-TargetSetupWidget *TargetSetupPage::widget(const Core::Id kitId,
+TargetSetupWidget *TargetSetupPage::widget(const Utils::Id kitId,
                                            TargetSetupWidget *fallback) const
 {
     return findOr(m_widgets, fallback, [kitId](const TargetSetupWidget *w) {
@@ -515,7 +515,7 @@ void TargetSetupPage::kitFilterChanged(const QString &filterText)
     // Remember selected kits:
     const std::vector<TargetSetupWidget *> selectedWidgets
         = filtered(m_widgets, &TargetSetupWidget::isKitSelected);
-    const QVector<Core::Id> selectedKitIds = transform<QVector>(selectedWidgets,
+    const QVector<Utils::Id> selectedKitIds = transform<QVector>(selectedWidgets,
                                                                 [](const TargetSetupWidget *w) {
                                                                     return w->kit()->id();
                                                                 });
diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h
index f5baa14ed3..e962d8fde3 100644
--- a/src/plugins/projectexplorer/targetsetuppage.h
+++ b/src/plugins/projectexplorer/targetsetuppage.h
@@ -78,7 +78,7 @@ public:
 
     bool isComplete() const override;
     bool setupProject(Project *project);
-    QList<Core::Id> selectedKits() const;
+    QList<Utils::Id> selectedKits() const;
 
     void openOptions();
     void changeAllKitsSelections();
@@ -121,7 +121,7 @@ private:
     {
         return k ? widget(k->id(), fallback) : fallback;
     }
-    Internal::TargetSetupWidget *widget(const Core::Id kitId,
+    Internal::TargetSetupWidget *widget(const Utils::Id kitId,
                                         Internal::TargetSetupWidget *fallback = nullptr) const;
 
     TasksGenerator m_tasksGenerator;
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index 1e68e747d3..045e461d43 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -63,7 +63,7 @@ unsigned int Task::s_nextId = 1;
 */
 
 Task::Task(TaskType type_, const QString &description,
-           const Utils::FilePath &file_, int line_, Core::Id category_,
+           const Utils::FilePath &file_, int line_, Utils::Id category_,
            const QIcon &icon, Options options) :
     taskId(s_nextId), type(type_), options(options), summary(description),
     line(line_), movedLine(line_), category(category_),
@@ -107,7 +107,7 @@ void Task::clear()
     file = Utils::FilePath();
     line = -1;
     movedLine = -1;
-    category = Core::Id();
+    category = Utils::Id();
     icon = QIcon();
     formats.clear();
     m_mark.clear();
diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h
index d609a13584..9c99117977 100644
--- a/src/plugins/projectexplorer/task.h
+++ b/src/plugins/projectexplorer/task.h
@@ -27,7 +27,7 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/fileutils.h>
 
 #include <QIcon>
@@ -64,7 +64,7 @@ public:
 
     Task() = default;
     Task(TaskType type, const QString &description,
-         const Utils::FilePath &file, int line, Core::Id category,
+         const Utils::FilePath &file, int line, Utils::Id category,
          const QIcon &icon = QIcon(),
          Options options = AddTextMark | FlashWorthy);
 
@@ -84,7 +84,7 @@ public:
     Utils::FilePaths fileCandidates;
     int line = -1;
     int movedLine = -1; // contains a line number if the line was moved in the editor
-    Core::Id category;
+    Utils::Id category;
     QIcon icon;
 
     // Having a container of QTextLayout::FormatRange in Task isn't that great
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index cb41d8fafe..d2528d955c 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -44,9 +44,9 @@ const char TASK_MARK_WARNING[] = "Task.Mark.Warning";
 const char TASK_MARK_ERROR[] = "Task.Mark.Error";
 
 static TaskHub *m_instance = nullptr;
-QVector<Core::Id> TaskHub::m_registeredCategories;
+QVector<Utils::Id> TaskHub::m_registeredCategories;
 
-static Core::Id categoryForType(Task::TaskType type)
+static Utils::Id categoryForType(Task::TaskType type)
 {
     switch (type) {
     case Task::Error:
@@ -54,7 +54,7 @@ static Core::Id categoryForType(Task::TaskType type)
     case Task::Warning:
         return TASK_MARK_WARNING;
     default:
-        return Core::Id();
+        return Utils::Id();
     }
 }
 
@@ -131,7 +131,7 @@ TaskHub::~TaskHub()
     m_instance = nullptr;
 }
 
-void TaskHub::addCategory(Core::Id categoryId, const QString &displayName, bool visible)
+void TaskHub::addCategory(Utils::Id categoryId, const QString &displayName, bool visible)
 {
     QTC_CHECK(!displayName.isEmpty());
     QTC_ASSERT(!m_registeredCategories.contains(categoryId), return);
@@ -144,7 +144,7 @@ TaskHub *TaskHub::instance()
     return m_instance;
 }
 
-void TaskHub::addTask(Task::TaskType type, const QString &description, Core::Id category)
+void TaskHub::addTask(Task::TaskType type, const QString &description, Utils::Id category)
 {
     addTask(Task(type, description, {}, -1, category));
 }
@@ -165,7 +165,7 @@ void TaskHub::addTask(Task task)
     emit m_instance->taskAdded(task);
 }
 
-void TaskHub::clearTasks(Core::Id categoryId)
+void TaskHub::clearTasks(Utils::Id categoryId)
 {
     QTC_ASSERT(!categoryId.isValid() || m_registeredCategories.contains(categoryId), return);
     emit m_instance->tasksCleared(categoryId);
@@ -196,7 +196,7 @@ void TaskHub::showTaskInEditor(unsigned int id)
     emit m_instance->openTask(id);
 }
 
-void TaskHub::setCategoryVisibility(Core::Id categoryId, bool visible)
+void TaskHub::setCategoryVisibility(Utils::Id categoryId, bool visible)
 {
     QTC_ASSERT(m_registeredCategories.contains(categoryId), return);
     emit m_instance->categoryVisibilityChanged(categoryId, visible);
diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h
index d98d4010d0..b6696fa511 100644
--- a/src/plugins/projectexplorer/taskhub.h
+++ b/src/plugins/projectexplorer/taskhub.h
@@ -42,31 +42,31 @@ public:
 
     // Convenience overload
     static void addTask(Task::TaskType type, const QString &description,
-                        Core::Id category);
+                        Utils::Id category);
 
 public slots:
     static void addTask(ProjectExplorer::Task task);
-    static void clearTasks(Core::Id categoryId = Core::Id());
+    static void clearTasks(Utils::Id categoryId = Utils::Id());
     static void removeTask(const ProjectExplorer::Task &task);
 
 public:
-    static void addCategory(Core::Id categoryId, const QString &displayName, bool visible = true);
+    static void addCategory(Utils::Id categoryId, const QString &displayName, bool visible = true);
     static void updateTaskFileName(unsigned int id, const QString &fileName);
     static void updateTaskLineNumber(unsigned int id, int line);
     static void taskMarkClicked(unsigned int id);
     static void showTaskInEditor(unsigned int id);
-    static void setCategoryVisibility(Core::Id categoryId, bool visible);
+    static void setCategoryVisibility(Utils::Id categoryId, bool visible);
 
     static void requestPopup();
 
 signals:
-    void categoryAdded(Core::Id categoryId, const QString &displayName, bool visible);
+    void categoryAdded(Utils::Id categoryId, const QString &displayName, bool visible);
     void taskAdded(const ProjectExplorer::Task &task);
     void taskRemoved(const ProjectExplorer::Task &task);
-    void tasksCleared(Core::Id categoryId);
+    void tasksCleared(Utils::Id categoryId);
     void taskFileNameUpdated(unsigned int id, const QString &fileName);
     void taskLineNumberUpdated(unsigned int id, int line);
-    void categoryVisibilityChanged(Core::Id categoryId, bool visible);
+    void categoryVisibilityChanged(Utils::Id categoryId, bool visible);
     void popupRequested(int);
     void showTask(unsigned int id);
     void openTask(unsigned int id);
@@ -75,7 +75,7 @@ private:
     TaskHub();
     ~TaskHub() override;
 
-    static QVector<Core::Id> m_registeredCategories;
+    static QVector<Utils::Id> m_registeredCategories;
 
     friend class ProjectExplorerPluginPrivate;
 };
diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp
index abcbc6732b..7dc9f66b53 100644
--- a/src/plugins/projectexplorer/taskmodel.cpp
+++ b/src/plugins/projectexplorer/taskmodel.cpp
@@ -45,25 +45,25 @@ namespace Internal {
 
 TaskModel::TaskModel(QObject *parent) : QAbstractItemModel(parent)
 {
-    m_categories.insert(Core::Id(), CategoryData());
+    m_categories.insert(Utils::Id(), CategoryData());
 }
 
-int TaskModel::taskCount(Core::Id categoryId)
+int TaskModel::taskCount(Utils::Id categoryId)
 {
     return m_categories.value(categoryId).count;
 }
 
-int TaskModel::errorTaskCount(Core::Id categoryId)
+int TaskModel::errorTaskCount(Utils::Id categoryId)
 {
     return m_categories.value(categoryId).errors;
 }
 
-int TaskModel::warningTaskCount(Core::Id categoryId)
+int TaskModel::warningTaskCount(Utils::Id categoryId)
 {
     return m_categories.value(categoryId).warnings;
 }
 
-int TaskModel::unknownTaskCount(Core::Id categoryId)
+int TaskModel::unknownTaskCount(Utils::Id categoryId)
 {
     return m_categories.value(categoryId).count
             - m_categories.value(categoryId).errors
@@ -78,7 +78,7 @@ bool TaskModel::hasFile(const QModelIndex &index) const
     return !m_tasks.at(row).file.isEmpty();
 }
 
-void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName)
+void TaskModel::addCategory(Utils::Id categoryId, const QString &categoryName)
 {
     QTC_ASSERT(categoryId.isValid(), return);
     CategoryData data;
@@ -86,7 +86,7 @@ void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName)
     m_categories.insert(categoryId, data);
 }
 
-Tasks TaskModel::tasks(Core::Id categoryId) const
+Tasks TaskModel::tasks(Utils::Id categoryId) const
 {
     if (!categoryId.isValid())
         return m_tasks;
@@ -108,7 +108,7 @@ void TaskModel::addTask(const Task &task)
 {
     Q_ASSERT(m_categories.keys().contains(task.category));
     CategoryData &data = m_categories[task.category];
-    CategoryData &global = m_categories[Core::Id()];
+    CategoryData &global = m_categories[Utils::Id()];
 
     auto it = std::lower_bound(m_tasks.begin(), m_tasks.end(),task.taskId, sortById);
     int i = it - m_tasks.begin();
@@ -127,7 +127,7 @@ void TaskModel::removeTask(unsigned int id)
         const Task &t = m_tasks.at(index);
         beginRemoveRows(QModelIndex(), index, index);
         m_categories[t.category].removeTask(t);
-        m_categories[Core::Id()].removeTask(t);
+        m_categories[Utils::Id()].removeTask(t);
         m_tasks.removeAt(index);
         endRemoveRows();
         break;
@@ -164,9 +164,9 @@ void TaskModel::updateTaskLineNumber(unsigned int id, int line)
     }
 }
 
-void TaskModel::clearTasks(Core::Id categoryId)
+void TaskModel::clearTasks(Utils::Id categoryId)
 {
-    using IdCategoryConstIt = QHash<Core::Id,CategoryData>::ConstIterator;
+    using IdCategoryConstIt = QHash<Utils::Id,CategoryData>::ConstIterator;
 
     if (!categoryId.isValid()) {
         if (m_tasks.isEmpty())
@@ -180,7 +180,7 @@ void TaskModel::clearTasks(Core::Id categoryId)
     } else {
         int index = 0;
         int start = 0;
-        CategoryData &global = m_categories[Core::Id()];
+        CategoryData &global = m_categories[Utils::Id()];
         CategoryData &cat = m_categories[categoryId];
 
         while (index < m_tasks.count()) {
@@ -269,14 +269,14 @@ Task TaskModel::task(const QModelIndex &index) const
     return m_tasks.at(row);
 }
 
-QList<Core::Id> TaskModel::categoryIds() const
+QList<Utils::Id> TaskModel::categoryIds() const
 {
-    QList<Core::Id> categories = m_categories.keys();
-    categories.removeAll(Core::Id()); // remove global category we added for bookkeeping
+    QList<Utils::Id> categories = m_categories.keys();
+    categories.removeAll(Utils::Id()); // remove global category we added for bookkeeping
     return categories;
 }
 
-QString TaskModel::categoryDisplayName(Core::Id categoryId) const
+QString TaskModel::categoryDisplayName(Utils::Id categoryId) const
 {
     return m_categories.value(categoryId).displayName;
 }
diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h
index b027532e2b..bb3cb2c2a4 100644
--- a/src/plugins/projectexplorer/taskmodel.h
+++ b/src/plugins/projectexplorer/taskmodel.h
@@ -50,14 +50,14 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     Task task(const QModelIndex &index) const;
 
-    QList<Core::Id> categoryIds() const;
-    QString categoryDisplayName(Core::Id categoryId) const;
-    void addCategory(Core::Id categoryId, const QString &categoryName);
+    QList<Utils::Id> categoryIds() const;
+    QString categoryDisplayName(Utils::Id categoryId) const;
+    void addCategory(Utils::Id categoryId, const QString &categoryName);
 
-    Tasks tasks(Core::Id categoryId = Core::Id()) const;
+    Tasks tasks(Utils::Id categoryId = Utils::Id()) const;
     void addTask(const Task &t);
     void removeTask(unsigned int id);
-    void clearTasks(Core::Id categoryId = Core::Id());
+    void clearTasks(Utils::Id categoryId = Utils::Id());
     void updateTaskFileName(unsigned int id, const QString &fileName);
     void updateTaskLineNumber(unsigned int id, int line);
 
@@ -67,10 +67,10 @@ public:
 
     enum Roles { File = Qt::UserRole, Line, MovedLine, Description, FileNotFound, Type, Category, Icon, Task_t };
 
-    int taskCount(Core::Id categoryId);
-    int errorTaskCount(Core::Id categoryId);
-    int warningTaskCount(Core::Id categoryId);
-    int unknownTaskCount(Core::Id categoryId);
+    int taskCount(Utils::Id categoryId);
+    int errorTaskCount(Utils::Id categoryId);
+    int warningTaskCount(Utils::Id categoryId);
+    int unknownTaskCount(Utils::Id categoryId);
 
     bool hasFile(const QModelIndex &index) const;
 
@@ -110,7 +110,7 @@ private:
         int errors = 0;
     };
 
-    QHash<Core::Id,CategoryData> m_categories; // category id to data
+    QHash<Utils::Id,CategoryData> m_categories; // category id to data
     Tasks m_tasks;   // all tasks (in order of id)
 
     QHash<QString,bool> m_fileNotFound;
@@ -136,8 +136,8 @@ public:
     bool filterIncludesErrors() const { return m_includeErrors; }
     void setFilterIncludesErrors(bool b) { m_includeErrors = b; invalidateFilter(); }
 
-    QList<Core::Id> filteredCategories() const { return m_categoryIds; }
-    void setFilteredCategories(const QList<Core::Id> &categoryIds) { m_categoryIds = categoryIds; invalidateFilter(); }
+    QList<Utils::Id> filteredCategories() const { return m_categoryIds; }
+    void setFilteredCategories(const QList<Utils::Id> &categoryIds) { m_categoryIds = categoryIds; invalidateFilter(); }
 
     Task task(const QModelIndex &index) const { return taskModel()->task(mapToSource(index)); }
     int issuesCount(int startRow, int endRow) const;
@@ -162,7 +162,7 @@ private:
     bool m_filterStringIsRegexp = false;
     bool m_filterIsInverted = false;
     Qt::CaseSensitivity m_filterCaseSensitivity = Qt::CaseInsensitive;
-    QList<Core::Id> m_categoryIds;
+    QList<Utils::Id> m_categoryIds;
     QString m_filterText;
     QRegularExpression m_filterRegexp;
 };
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 64ccf82754..22c19dd304 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -419,7 +419,7 @@ void TaskWindow::delayedInitialization()
         connect(action, &QAction::triggered, this, &TaskWindow::actionTriggered);
         d->m_actions << action;
 
-        Core::Id id = h->actionManagerId();
+        Utils::Id id = h->actionManagerId();
         if (id.isValid()) {
             Core::Command *cmd =
                 Core::ActionManager::registerAction(action, id, d->m_taskWindowContext->context(), true);
@@ -442,7 +442,7 @@ QWidget *TaskWindow::outputWidget(QWidget *)
     return d->m_listview;
 }
 
-void TaskWindow::clearTasks(Core::Id categoryId)
+void TaskWindow::clearTasks(Utils::Id categoryId)
 {
     d->m_model->clearTasks(categoryId);
 
@@ -450,12 +450,12 @@ void TaskWindow::clearTasks(Core::Id categoryId)
     navigateStateChanged();
 }
 
-void TaskWindow::setCategoryVisibility(Core::Id categoryId, bool visible)
+void TaskWindow::setCategoryVisibility(Utils::Id categoryId, bool visible)
 {
     if (!categoryId.isValid())
         return;
 
-    QList<Core::Id> categories = d->m_filter->filteredCategories();
+    QList<Utils::Id> categories = d->m_filter->filteredCategories();
 
     if (visible)
         categories.removeOne(categoryId);
@@ -476,7 +476,7 @@ void TaskWindow::currentChanged(const QModelIndex &index)
 
 void TaskWindow::saveSettings()
 {
-    QStringList categories = Utils::transform(d->m_filter->filteredCategories(), &Core::Id::toString);
+    QStringList categories = Utils::transform(d->m_filter->filteredCategories(), &Utils::Id::toString);
     SessionManager::setValue(QLatin1String(SESSION_FILTER_CATEGORIES), categories);
     SessionManager::setValue(QLatin1String(SESSION_FILTER_WARNINGS), d->m_filter->filterIncludesWarnings());
 }
@@ -485,8 +485,8 @@ void TaskWindow::loadSettings()
 {
     QVariant value = SessionManager::value(QLatin1String(SESSION_FILTER_CATEGORIES));
     if (value.isValid()) {
-        QList<Core::Id> categories
-                = Utils::transform(value.toStringList(), &Core::Id::fromString);
+        QList<Utils::Id> categories
+                = Utils::transform(value.toStringList(), &Utils::Id::fromString);
         d->m_filter->setFilteredCategories(categories);
     }
     value = SessionManager::value(QLatin1String(SESSION_FILTER_WARNINGS));
@@ -503,11 +503,11 @@ void TaskWindow::visibilityChanged(bool visible)
         delayedInitialization();
 }
 
-void TaskWindow::addCategory(Core::Id categoryId, const QString &displayName, bool visible)
+void TaskWindow::addCategory(Utils::Id categoryId, const QString &displayName, bool visible)
 {
     d->m_model->addCategory(categoryId, displayName);
     if (!visible) {
-        QList<Core::Id> filters = d->m_filter->filteredCategories();
+        QList<Utils::Id> filters = d->m_filter->filteredCategories();
         filters += categoryId;
         d->m_filter->setFilteredCategories(filters);
     }
@@ -615,20 +615,20 @@ void TaskWindow::setShowWarnings(bool show)
 
 void TaskWindow::updateCategoriesMenu()
 {
-    using NameToIdsConstIt = QMap<QString, Core::Id>::ConstIterator;
+    using NameToIdsConstIt = QMap<QString, Utils::Id>::ConstIterator;
 
     d->m_categoriesMenu->clear();
 
-    const QList<Core::Id> filteredCategories = d->m_filter->filteredCategories();
+    const QList<Utils::Id> filteredCategories = d->m_filter->filteredCategories();
 
-    QMap<QString, Core::Id> nameToIds;
-    foreach (Core::Id categoryId, d->m_model->categoryIds())
+    QMap<QString, Utils::Id> nameToIds;
+    foreach (Utils::Id categoryId, d->m_model->categoryIds())
         nameToIds.insert(d->m_model->categoryDisplayName(categoryId), categoryId);
 
     const NameToIdsConstIt cend = nameToIds.constEnd();
     for (NameToIdsConstIt it = nameToIds.constBegin(); it != cend; ++it) {
         const QString &displayName = it.key();
-        const Core::Id categoryId = it.value();
+        const Utils::Id categoryId = it.value();
         auto action = new QAction(d->m_categoriesMenu);
         action->setCheckable(true);
         action->setText(displayName);
@@ -640,17 +640,17 @@ void TaskWindow::updateCategoriesMenu()
     }
 }
 
-int TaskWindow::taskCount(Core::Id category) const
+int TaskWindow::taskCount(Utils::Id category) const
 {
     return d->m_model->taskCount(category);
 }
 
-int TaskWindow::errorTaskCount(Core::Id category) const
+int TaskWindow::errorTaskCount(Utils::Id category) const
 {
     return d->m_model->errorTaskCount(category);
 }
 
-int TaskWindow::warningTaskCount(Core::Id category) const
+int TaskWindow::warningTaskCount(Utils::Id category) const
 {
     return d->m_model->warningTaskCount(category);
 }
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 7f11ca1fb1..9887715795 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <coreplugin/ioutputpane.h>
 
 #include <memory>
@@ -54,9 +53,9 @@ public:
 
     void delayedInitialization();
 
-    int taskCount(Core::Id category = Core::Id()) const;
-    int warningTaskCount(Core::Id category = Core::Id()) const;
-    int errorTaskCount(Core::Id category = Core::Id()) const;
+    int taskCount(Utils::Id category = Utils::Id()) const;
+    int warningTaskCount(Utils::Id category = Utils::Id()) const;
+    int errorTaskCount(Utils::Id category = Utils::Id()) const;
 
     // IOutputPane
     QWidget *outputWidget(QWidget *) override;
@@ -83,15 +82,15 @@ signals:
 private:
     void updateFilter() override;
 
-    void addCategory(Core::Id categoryId, const QString &displayName, bool visible);
+    void addCategory(Utils::Id categoryId, const QString &displayName, bool visible);
     void addTask(const ProjectExplorer::Task &task);
     void removeTask(const ProjectExplorer::Task &task);
     void updatedTaskFileName(unsigned int id, const QString &fileName);
     void updatedTaskLineNumber(unsigned int id, int line);
     void showTask(unsigned int id);
     void openTask(unsigned int id);
-    void clearTasks(Core::Id categoryId);
-    void setCategoryVisibility(Core::Id categoryId, bool visible);
+    void clearTasks(Utils::Id categoryId);
+    void setCategoryVisibility(Utils::Id categoryId, bool visible);
     void currentChanged(const QModelIndex &index);
     void saveSettings();
     void loadSettings();
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 2728df11c7..54bf8bf40a 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -57,7 +57,7 @@ class ToolChainPrivate
 public:
     using Detection = ToolChain::Detection;
 
-    explicit ToolChainPrivate(Core::Id typeId) :
+    explicit ToolChainPrivate(Utils::Id typeId) :
         m_id(QUuid::createUuid().toByteArray()),
         m_typeId(typeId),
         m_predefinedMacrosCache(new ToolChain::MacrosCache::element_type()),
@@ -68,11 +68,11 @@ public:
     }
 
     QByteArray m_id;
-    QSet<Core::Id> m_supportedLanguages;
+    QSet<Utils::Id> m_supportedLanguages;
     mutable QString m_displayName;
     QString m_typeDisplayName;
-    Core::Id m_typeId;
-    Core::Id m_language;
+    Utils::Id m_typeId;
+    Utils::Id m_language;
     Detection m_detection = ToolChain::UninitializedDetection;
 
     ToolChain::MacrosCache m_predefinedMacrosCache;
@@ -82,17 +82,17 @@ public:
 
 // Deprecated used from QtCreator <= 4.2
 
-Core::Id fromLanguageV1(int language)
+Utils::Id fromLanguageV1(int language)
 {
     switch (language)
     {
     case Deprecated::Toolchain::C :
-        return Core::Id(Constants::C_LANGUAGE_ID);
+        return Utils::Id(Constants::C_LANGUAGE_ID);
     case Deprecated::Toolchain::Cxx:
-        return Core::Id(Constants::CXX_LANGUAGE_ID);
+        return Utils::Id(Constants::CXX_LANGUAGE_ID);
     case Deprecated::Toolchain::None:
     default:
-        return Core::Id();
+        return Utils::Id();
     }
 }
 
@@ -123,12 +123,12 @@ QString languageId(Language l)
 
 // --------------------------------------------------------------------------
 
-ToolChain::ToolChain(Core::Id typeId) :
+ToolChain::ToolChain(Utils::Id typeId) :
     d(std::make_unique<Internal::ToolChainPrivate>(typeId))
 {
 }
 
-void ToolChain::setLanguage(Core::Id language)
+void ToolChain::setLanguage(Utils::Id language)
 {
     QTC_ASSERT(!d->m_language.isValid() || isAutoDetected(), return);
     QTC_ASSERT(language.isValid(), return);
@@ -170,7 +170,7 @@ QStringList ToolChain::suggestedMkspecList() const
     return {};
 }
 
-Core::Id ToolChain::typeId() const
+Utils::Id ToolChain::typeId() const
 {
     return d->m_typeId;
 }
@@ -180,7 +180,7 @@ Abis ToolChain::supportedAbis() const
     return {targetAbi()};
 }
 
-Core::Id ToolChain::language() const
+Utils::Id ToolChain::language() const
 {
     return d->m_language;
 }
@@ -282,7 +282,7 @@ bool ToolChain::fromMap(const QVariantMap &data)
     const QString id = data.value(QLatin1String(ID_KEY)).toString();
     int pos = id.indexOf(QLatin1Char(':'));
     QTC_ASSERT(pos > 0, return false);
-    d->m_typeId = Core::Id::fromString(id.left(pos));
+    d->m_typeId = Utils::Id::fromString(id.left(pos));
     d->m_id = id.mid(pos + 1).toUtf8();
 
     const bool autoDetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool();
@@ -294,15 +294,15 @@ bool ToolChain::fromMap(const QVariantMap &data)
         const QString langId = data.value(QLatin1String(LANGUAGE_KEY_V2)).toString();
         const int pos = langId.lastIndexOf('.');
         if (pos >= 0)
-            d->m_language = Core::Id::fromString(langId.mid(pos + 1));
+            d->m_language = Utils::Id::fromString(langId.mid(pos + 1));
         else
-            d->m_language = Core::Id::fromString(langId);
+            d->m_language = Utils::Id::fromString(langId);
     } else if (data.contains(LANGUAGE_KEY_V1)) { // Import from old settings
         d->m_language = Internal::fromLanguageV1(data.value(QLatin1String(LANGUAGE_KEY_V1)).toInt());
     }
 
     if (!d->m_language.isValid())
-        d->m_language = Core::Id(Constants::CXX_LANGUAGE_ID);
+        d->m_language = Utils::Id(Constants::CXX_LANGUAGE_ID);
 
     return true;
 }
@@ -345,7 +345,7 @@ Utils::LanguageVersion ToolChain::cxxLanguageVersion(const QByteArray &cplusplus
     return LanguageVersion::CXX03;
 }
 
-Utils::LanguageVersion ToolChain::languageVersion(const Core::Id &language, const Macros &macros)
+Utils::LanguageVersion ToolChain::languageVersion(const Utils::Id &language, const Macros &macros)
 {
     using Utils::LanguageVersion;
 
@@ -486,9 +486,9 @@ QByteArray ToolChainFactory::idFromMap(const QVariantMap &data)
     return rawIdData(data).second.toUtf8();
 }
 
-Core::Id ToolChainFactory::typeIdFromMap(const QVariantMap &data)
+Utils::Id ToolChainFactory::typeIdFromMap(const QVariantMap &data)
 {
-    return Core::Id::fromString(rawIdData(data).first);
+    return Utils::Id::fromString(rawIdData(data).first);
 }
 
 void ToolChainFactory::autoDetectionToMap(QVariantMap &data, bool detected)
@@ -496,7 +496,7 @@ void ToolChainFactory::autoDetectionToMap(QVariantMap &data, bool detected)
     data.insert(QLatin1String(AUTODETECT_KEY), detected);
 }
 
-ToolChain *ToolChainFactory::createToolChain(Core::Id toolChainType)
+ToolChain *ToolChainFactory::createToolChain(Utils::Id toolChainType)
 {
     for (ToolChainFactory *factory : qAsConst(Internal::g_toolChainFactories)) {
         if (factory->m_supportedToolChainType == toolChainType) {
@@ -509,22 +509,22 @@ ToolChain *ToolChainFactory::createToolChain(Core::Id toolChainType)
     return nullptr;
 }
 
-QSet<Core::Id> ToolChainFactory::supportedLanguages() const
+QSet<Utils::Id> ToolChainFactory::supportedLanguages() const
 {
     return m_supportsAllLanguages ? ToolChainManager::allLanguages() : m_supportedLanguages;
 }
 
-Core::Id ToolChainFactory::supportedToolChainType() const
+Utils::Id ToolChainFactory::supportedToolChainType() const
 {
     return m_supportedToolChainType;
 }
 
-void ToolChainFactory::setSupportedToolChainType(const Core::Id &supportedToolChain)
+void ToolChainFactory::setSupportedToolChainType(const Utils::Id &supportedToolChain)
 {
     m_supportedToolChainType = supportedToolChain;
 }
 
-void ToolChainFactory::setSupportedLanguages(const QSet<Core::Id> &supportedLanguages)
+void ToolChainFactory::setSupportedLanguages(const QSet<Utils::Id> &supportedLanguages)
 {
     m_supportedLanguages = supportedLanguages;
 }
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index b2dbc7ca9a..e4ca6f9dde 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -33,11 +33,10 @@
 #include "task.h"
 #include "toolchaincache.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/cpplanguage_details.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QSet>
@@ -76,7 +75,7 @@ class PROJECTEXPLORER_EXPORT ToolChainDescription
 {
 public:
     Utils::FilePath compilerPath;
-    Core::Id language;
+    Utils::Id language;
 };
 
 // --------------------------------------------------------------------------
@@ -107,7 +106,7 @@ public:
 
     virtual QStringList suggestedMkspecList() const;
 
-    Core::Id typeId() const;
+    Utils::Id typeId() const;
     QString typeDisplayName() const;
 
     virtual Abi targetAbi() const = 0;
@@ -148,7 +147,7 @@ public:
     virtual void addToEnvironment(Utils::Environment &env) const = 0;
     virtual Utils::FilePath makeCommand(const Utils::Environment &env) const = 0;
 
-    Core::Id language() const;
+    Utils::Id language() const;
 
     virtual Utils::FilePath compilerCommand() const = 0;
     virtual QList<Utils::OutputLineParser *> createOutputParsers() const = 0;
@@ -165,14 +164,14 @@ public:
 
     virtual bool isJobCountSupported() const { return true; }
 
-    void setLanguage(Core::Id language);
+    void setLanguage(Utils::Id language);
     void setDetection(Detection d);
 
     static Utils::LanguageVersion cxxLanguageVersion(const QByteArray &cplusplusMacroValue);
-    static Utils::LanguageVersion languageVersion(const Core::Id &language, const Macros &macros);
+    static Utils::LanguageVersion languageVersion(const Utils::Id &language, const Macros &macros);
 
 protected:
-    explicit ToolChain(Core::Id typeId);
+    explicit ToolChain(Utils::Id typeId);
 
     void setTypeDisplayName(const QString &typeName);
 
@@ -206,7 +205,7 @@ public:
     static const QList<ToolChainFactory *> allToolChainFactories();
 
     QString displayName() const { return m_displayName; }
-    Core::Id supportedToolChainType() const;
+    Utils::Id supportedToolChainType() const;
 
     virtual QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown);
     virtual QList<ToolChain *> detectForImport(const ToolChainDescription &tcd);
@@ -217,19 +216,19 @@ public:
     ToolChain *restore(const QVariantMap &data);
 
     static QByteArray idFromMap(const QVariantMap &data);
-    static Core::Id typeIdFromMap(const QVariantMap &data);
+    static Utils::Id typeIdFromMap(const QVariantMap &data);
     static void autoDetectionToMap(QVariantMap &data, bool detected);
 
-    static ToolChain *createToolChain(Core::Id toolChainType);
+    static ToolChain *createToolChain(Utils::Id toolChainType);
 
-    QSet<Core::Id> supportedLanguages() const;
+    QSet<Utils::Id> supportedLanguages() const;
 
     void setUserCreatable(bool userCreatable);
 
 protected:
     void setDisplayName(const QString &name) { m_displayName = name; }
-    void setSupportedToolChainType(const Core::Id &supportedToolChainType);
-    void setSupportedLanguages(const QSet<Core::Id> &supportedLanguages);
+    void setSupportedToolChainType(const Utils::Id &supportedToolChainType);
+    void setSupportedLanguages(const QSet<Utils::Id> &supportedLanguages);
     void setSupportsAllLanguages(bool supportsAllLanguages);
     void setToolchainConstructor(const std::function<ToolChain *()> &constructor);
 
@@ -248,8 +247,8 @@ protected:
 
 private:
     QString m_displayName;
-    Core::Id m_supportedToolChainType;
-    QSet<Core::Id> m_supportedLanguages;
+    Utils::Id m_supportedToolChainType;
+    QSet<Utils::Id> m_supportedLanguages;
     bool m_supportsAllLanguages = false;
     bool m_userCreatable = false;
     std::function<ToolChain *()> m_toolchainConstructor;
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index b3ac697bb2..0a2936fc4b 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -54,7 +54,7 @@ namespace Internal {
 
 struct LanguageDisplayPair
 {
-    Core::Id id;
+    Utils::Id id;
     QString displayName;
 };
 
@@ -225,12 +225,12 @@ void ToolChainManager::deregisterToolChain(ToolChain *tc)
     delete tc;
 }
 
-QSet<Core::Id> ToolChainManager::allLanguages()
+QSet<Utils::Id> ToolChainManager::allLanguages()
 {
     return Utils::transform<QSet>(d->m_languages, &LanguageDisplayPair::id);
 }
 
-bool ToolChainManager::registerLanguage(const Core::Id &language, const QString &displayName)
+bool ToolChainManager::registerLanguage(const Utils::Id &language, const QString &displayName)
 {
     QTC_ASSERT(language.isValid(), return false);
     QTC_ASSERT(!isLanguageSupported(language), return false);
@@ -239,7 +239,7 @@ bool ToolChainManager::registerLanguage(const Core::Id &language, const QString
     return true;
 }
 
-QString ToolChainManager::displayNameOfLanguageId(const Core::Id &id)
+QString ToolChainManager::displayNameOfLanguageId(const Utils::Id &id)
 {
     QTC_ASSERT(id.isValid(), return tr("None"));
     auto entry = Utils::findOrDefault(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id));
@@ -247,7 +247,7 @@ QString ToolChainManager::displayNameOfLanguageId(const Core::Id &id)
     return entry.displayName;
 }
 
-bool ToolChainManager::isLanguageSupported(const Core::Id &id)
+bool ToolChainManager::isLanguageSupported(const Utils::Id &id)
 {
     return Utils::contains(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id));
 }
diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h
index 894ec71da2..aa875092bb 100644
--- a/src/plugins/projectexplorer/toolchainmanager.h
+++ b/src/plugins/projectexplorer/toolchainmanager.h
@@ -29,8 +29,6 @@
 
 #include "toolchain.h"
 
-#include <coreplugin/id.h>
-
 #include <QList>
 #include <QObject>
 #include <QSet>
@@ -73,10 +71,10 @@ public:
     static bool registerToolChain(ToolChain *tc);
     static void deregisterToolChain(ToolChain *tc);
 
-    static QSet<Core::Id> allLanguages();
-    static bool registerLanguage(const Core::Id &language, const QString &displayName);
-    static QString displayNameOfLanguageId(const Core::Id &id);
-    static bool isLanguageSupported(const Core::Id &id);
+    static QSet<Utils::Id> allLanguages();
+    static bool registerLanguage(const Utils::Id &language, const QString &displayName);
+    static QString displayNameOfLanguageId(const Utils::Id &id);
+    static bool isLanguageSupported(const Utils::Id &id);
 
     static void aboutToShutdown();
 
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index b2f2b2764b..8557c1106a 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -163,7 +163,7 @@ public:
         auto autoRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Auto-detected"));
         auto manualRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Manual"));
 
-        foreach (const Core::Id &l, ToolChainManager::allLanguages()) {
+        foreach (const Utils::Id &l, ToolChainManager::allLanguages()) {
             const QString dn = ToolChainManager::displayNameOfLanguageId(l);
             auto autoNode = new StaticTreeItem(dn);
             auto manualNode = new StaticTreeItem(dn);
@@ -190,18 +190,18 @@ public:
         m_addButton = new QPushButton(ToolChainOptionsPage::tr("Add"), this);
         auto addMenu = new QMenu;
         foreach (ToolChainFactory *factory, m_factories) {
-            QList<Core::Id> languages = Utils::toList(factory->supportedLanguages());
+            QList<Utils::Id> languages = Utils::toList(factory->supportedLanguages());
             if (languages.isEmpty())
                 continue;
 
             if (languages.count() == 1) {
                 addMenu->addAction(createAction(factory->displayName(), factory, languages.at(0)));
             } else {
-                Utils::sort(languages, [](const Core::Id &l1, const Core::Id &l2) {
+                Utils::sort(languages, [](const Utils::Id &l1, const Utils::Id &l2) {
                                 return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2);
                             });
                 auto subMenu = addMenu->addMenu(factory->displayName());
-                foreach (const Core::Id &l, languages)
+                foreach (const Utils::Id &l, languages)
                     subMenu->addAction(createAction(ToolChainManager::displayNameOfLanguageId(l), factory, l));
             }
         }
@@ -289,7 +289,7 @@ public:
 
     void toolChainSelectionChanged();
     void updateState();
-    void createToolChain(ToolChainFactory *factory, const Core::Id &language);
+    void createToolChain(ToolChainFactory *factory, const Utils::Id &language);
     void cloneToolChain();
     ToolChainTreeItem *currentTreeItem();
 
@@ -299,7 +299,7 @@ public:
     void removeToolChain(ProjectExplorer::ToolChain *);
 
     StaticTreeItem *parentForToolChain(ToolChain *tc);
-    QAction *createAction(const QString &name, ToolChainFactory *factory, Core::Id language)
+    QAction *createAction(const QString &name, ToolChainFactory *factory, Utils::Id language)
     {
         auto action = new QAction(name, nullptr);
         connect(action, &QAction::triggered, [this, factory, language] { createToolChain(factory, language); });
@@ -323,7 +323,7 @@ public:
     QPushButton *m_redetectButton;
     QPushButton *m_detectionSettingsButton;
 
-    QHash<Core::Id, QPair<StaticTreeItem *, StaticTreeItem *>> m_languageMap;
+    QHash<Utils::Id, QPair<StaticTreeItem *, StaticTreeItem *>> m_languageMap;
 
     QList<ToolChainTreeItem *> m_toAddList;
     QList<ToolChainTreeItem *> m_toRemoveList;
@@ -458,7 +458,7 @@ void ToolChainOptionsWidget::apply()
     Q_ASSERT(m_toRemoveList.isEmpty());
 
     // Update tool chains:
-    foreach (const Core::Id &l, m_languageMap.keys()) {
+    foreach (const Utils::Id &l, m_languageMap.keys()) {
         const QPair<StaticTreeItem *, StaticTreeItem *> autoAndManual = m_languageMap.value(l);
         for (StaticTreeItem *parent : {autoAndManual.first, autoAndManual.second}) {
             for (TreeItem *item : *parent) {
@@ -504,7 +504,7 @@ void ToolChainOptionsWidget::apply()
     ToolChainManager::setDetectionSettings(m_detectionSettings);
 }
 
-void ToolChainOptionsWidget::createToolChain(ToolChainFactory *factory, const Core::Id &language)
+void ToolChainOptionsWidget::createToolChain(ToolChainFactory *factory, const Utils::Id &language)
 {
     QTC_ASSERT(factory, return);
     QTC_ASSERT(factory->canCreate(), return);
diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
index dd6e540b1a..da8851a9c2 100644
--- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
+++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
@@ -253,7 +253,7 @@ QList<ToolChain *> ToolChainSettingsAccessor::toolChains(const QVariantMap &data
         const QVariantMap tcMap = data.value(key).toMap();
 
         bool restored = false;
-        const Core::Id tcType = ToolChainFactory::typeIdFromMap(tcMap);
+        const Utils::Id tcType = ToolChainFactory::typeIdFromMap(tcMap);
         if (tcType.isValid()) {
             for (ToolChainFactory *f : factories) {
                 if (f->supportedToolChainType() == tcType) {
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 273f079feb..b136fa6174 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -589,7 +589,7 @@ QVariantMap UserFileVersion16Upgrader::insertSteps(QVariantMap buildConfiguratio
         QString defaultDisplayName = oldStepMap.androidPackageInstall.value(defaultDisplayNameKey).toString();
         bool enabled = oldStepMap.androidPackageInstall.value(enabledKey).toBool();
 
-        androidPackageInstallStep.insert(idKey, Core::Id("Qt4ProjectManager.AndroidPackageInstallationStep").toSetting());
+        androidPackageInstallStep.insert(idKey, Utils::Id("Qt4ProjectManager.AndroidPackageInstallationStep").toSetting());
         androidPackageInstallStep.insert(displayNameKey, displayName);
         androidPackageInstallStep.insert(defaultDisplayNameKey, defaultDisplayName);
         androidPackageInstallStep.insert(enabledKey, enabled);
@@ -598,7 +598,7 @@ QVariantMap UserFileVersion16Upgrader::insertSteps(QVariantMap buildConfiguratio
         defaultDisplayName = oldStepMap.androidDeployQt.value(defaultDisplayNameKey).toString();
         enabled = oldStepMap.androidDeployQt.value(enabledKey).toBool();
 
-        androidBuildApkStep.insert(idKey, Core::Id("QmakeProjectManager.AndroidBuildApkStep").toSetting());
+        androidBuildApkStep.insert(idKey, Utils::Id("QmakeProjectManager.AndroidBuildApkStep").toSetting());
         androidBuildApkStep.insert(displayNameKey, displayName);
         androidBuildApkStep.insert(defaultDisplayNameKey, defaultDisplayName);
         androidBuildApkStep.insert(enabledKey, enabled);
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 4a8b2dbd22..4d9b12cdc8 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -81,7 +81,7 @@ private:
             return Status::NotHandled;
         }
 
-        const Core::Id category(PythonErrorTaskCategory);
+        const Utils::Id category(PythonErrorTaskCategory);
         const QRegularExpressionMatch match = filePattern.match(text);
         if (match.hasMatch()) {
             const LinkSpec link(match.capturedStart(2), match.capturedLength(2), match.captured(2));
@@ -233,7 +233,7 @@ public:
     MainScriptAspect() = default;
 };
 
-PythonRunConfiguration::PythonRunConfiguration(Target *target, Core::Id id)
+PythonRunConfiguration::PythonRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto interpreterAspect = addAspect<InterpreterAspect>();
diff --git a/src/plugins/python/pythonrunconfiguration.h b/src/plugins/python/pythonrunconfiguration.h
index ba3611bf6b..ffdf4a4d27 100644
--- a/src/plugins/python/pythonrunconfiguration.h
+++ b/src/plugins/python/pythonrunconfiguration.h
@@ -41,7 +41,7 @@ class PythonRunConfiguration : public ProjectExplorer::RunConfiguration
     Q_PROPERTY(QString arguments READ arguments)
 
 public:
-    PythonRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    PythonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
     QString interpreter() const;
 
 private:
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 5e94dee80c..6a6fa4564e 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -81,7 +81,7 @@ static QString extractToolchainPrefix(QString *compilerName)
 
 static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k)
 {
-    const Core::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
     switch (abi.os()) {
     case ProjectExplorer::Abi::WindowsOS:
         return QLatin1String("windows");
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.cpp b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
index fa0cc6469d..3167d77e74 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
@@ -101,7 +101,7 @@ void QbsKitAspect::setProperties(Kit *kit, const QVariantMap &properties)
     kit->setValue(id(), properties);
 }
 
-Core::Id QbsKitAspect::id()
+Utils::Id QbsKitAspect::id()
 {
     return "Qbs.KitInformation";
 }
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.h b/src/plugins/qbsprojectmanager/qbskitinformation.h
index 1113f2ce01..50cbd80e77 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.h
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.h
@@ -42,7 +42,7 @@ public:
     static void setProperties(ProjectExplorer::Kit *kit, const QVariantMap &properties);
 
 private:
-    static Core::Id id();
+    static Utils::Id id();
 
     ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
     ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.h b/src/plugins/qbsprojectmanager/qbsnodes.h
index f5a752ad3c..f5131e0f73 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.h
+++ b/src/plugins/qbsprojectmanager/qbsnodes.h
@@ -47,7 +47,7 @@ public:
 private:
     friend class QbsBuildSystem;
     AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
-    QVariant data(Core::Id role) const override;
+    QVariant data(Utils::Id role) const override;
 
     const QJsonObject m_groupData;
 };
@@ -67,7 +67,7 @@ public:
 
     const QJsonObject productData() const { return m_productData; }
     QJsonObject mainGroup() const;
-    QVariant data(Core::Id role) const override;
+    QVariant data(Utils::Id role) const override;
 
 private:
     const QJsonObject m_productData;
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp
index bbcc87e4fe..7db24b732e 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.cpp
+++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp
@@ -97,7 +97,7 @@ static const char designerDisplayName[] = QT_TRANSLATE_NOOP("OpenWith::Editors",
 static const char linguistDisplayName[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Qt Linguist");
 
 // -------------- ExternalQtEditor
-ExternalQtEditor::ExternalQtEditor(Core::Id id,
+ExternalQtEditor::ExternalQtEditor(Utils::Id id,
                                    const QString &displayName,
                                    const QString &mimetype,
                                    const CommandForQtVersion &commandForQtVersion) :
@@ -133,7 +133,7 @@ QStringList ExternalQtEditor::mimeTypes() const
     return m_mimeTypes;
 }
 
-Core::Id ExternalQtEditor::id() const
+Utils::Id ExternalQtEditor::id() const
 {
     return m_id;
 }
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h
index 422b0ca31d..cea0b62a7f 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.h
+++ b/src/plugins/qmakeprojectmanager/externaleditors.h
@@ -26,12 +26,12 @@
 #pragma once
 
 #include <coreplugin/editormanager/iexternaleditor.h>
-#include <coreplugin/id.h>
-#include <functional>
 
 #include <QStringList>
 #include <QMap>
 
+#include <functional>
+
 QT_BEGIN_NAMESPACE
 class QTcpSocket;
 QT_END_NAMESPACE
@@ -59,7 +59,7 @@ public:
     static ExternalQtEditor *createDesignerEditor();
 
     QStringList mimeTypes() const override;
-    Core::Id id() const override;
+    Utils::Id id() const override;
     QString displayName() const override;
 
     bool startEditor(const QString &fileName, QString *errorMessage) override;
@@ -72,7 +72,7 @@ public:
     };
 
 protected:
-    ExternalQtEditor(Core::Id id,
+    ExternalQtEditor(Utils::Id id,
                      const QString &displayName,
                      const QString &mimetype,
                      const CommandForQtVersion &commandForQtVersion);
@@ -89,7 +89,7 @@ protected:
 
 private:
     const QStringList m_mimeTypes;
-    const Core::Id m_id;
+    const Utils::Id m_id;
     const QString m_displayName;
     const CommandForQtVersion m_commandForQtVersion;
 };
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 6cf2179015..b8ec73c314 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -103,7 +103,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
 
 const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration";
 
-QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
+QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     setConfigWidgetDisplayName(tr("General"));
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
index 058af3e796..d9b4e0fc20 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
@@ -45,7 +45,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplore
     Q_OBJECT
 
 public:
-    QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    QmakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
     ~QmakeBuildConfiguration() override;
 
     ProjectExplorer::BuildSystem *buildSystem() const final;
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
index 9333f75330..07dc1d66b1 100644
--- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
@@ -124,7 +124,7 @@ void QmakeKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
                 });
 }
 
-Core::Id QmakeKitAspect::id()
+Utils::Id QmakeKitAspect::id()
 {
     return Constants::KIT_INFORMATION_ID;
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h
index ebedf85ef0..86d59219c6 100644
--- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h
+++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h
@@ -45,7 +45,7 @@ public:
 
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     enum class MkspecSource { User, Code };
     static void setMkspec(ProjectExplorer::Kit *k, const QString &mkspec, MkspecSource source);
     static QString mkspec(const ProjectExplorer::Kit *k);
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index 8a105d6666..7d003a157f 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -52,7 +52,7 @@ using namespace ProjectExplorer;
 using namespace QmakeProjectManager;
 using namespace QmakeProjectManager::Internal;
 
-QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Core::Id id)
+QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Utils::Id id)
     : MakeStep(bsl, id)
 {
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h
index ea4fc72b66..ae589ebe15 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.h
@@ -47,7 +47,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeMakeStep : public ProjectExplorer::MakeSte
     Q_OBJECT
 
 public:
-    QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
 private:
     void finish(bool success) override;
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 557ded347a..06f9cb4502 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -358,7 +358,7 @@ QStringList QmakeProFileNode::targetApplications() const
     return apps;
 }
 
-QVariant QmakeProFileNode::data(Core::Id role) const
+QVariant QmakeProFileNode::data(Utils::Id role) const
 {
     if (role == Android::Constants::AndroidPackageSourceDir)
         return singleVariableValue(Variable::AndroidPackageSourceDir);
@@ -412,7 +412,7 @@ QVariant QmakeProFileNode::data(Core::Id role) const
     return {};
 }
 
-bool QmakeProFileNode::setData(Core::Id role, const QVariant &value) const
+bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const
 {
     QmakeProFile *pro = proFile();
     if (!pro)
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index c6793dea0d..3195ce2291 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -94,8 +94,8 @@ public:
 
     QStringList targetApplications() const override;
     AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
-    QVariant data(Core::Id role) const override;
-    bool setData(Core::Id role, const QVariant &value) const override;
+    QVariant data(Utils::Id role) const override;
+    bool setData(Utils::Id role, const QVariant &value) const override;
 
     QmakeProjectManager::ProjectType projectType() const;
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 4b39dbbd8d..7a5eb09c4d 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -1393,7 +1393,7 @@ QStringList QmakeBuildSystem::filesGeneratedFrom(const QString &input) const
     return {};
 }
 
-QVariant QmakeBuildSystem::additionalData(Core::Id id) const
+QVariant QmakeBuildSystem::additionalData(Utils::Id id) const
 {
     if (id == "QmlDesignerImportPath")
         return m_rootProFile->variableValue(Variable::QmlDesignerImportPath);
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h
index a267b76ed8..93044db96b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -107,7 +107,7 @@ public:
     void triggerParsing() final;
 
     QStringList filesGeneratedFrom(const QString &file) const final;
-    QVariant additionalData(Core::Id id) const final;
+    QVariant additionalData(Utils::Id id) const final;
 
     void asyncUpdate();
     void buildFinished(bool success);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
index c4ef9ce815..ba4b9d8601 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
@@ -80,7 +80,7 @@ struct DirectoryData
 namespace QmakeProjectManager {
 namespace Internal {
 
-const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
+const Utils::Id QT_IS_TEMPORARY("Qmake.TempQt");
 const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // ugly
 
 QmakeProjectImporter::QmakeProjectImporter(const FilePath &path) :
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 769499b06d..376d5d81f8 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -75,7 +75,7 @@ const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
 const char QMAKE_SELECTED_ABIS_KEY[] = "QtProjectManager.QMakeBuildStep.SelectedAbis";
 }
 
-QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id)
+QMakeStep::QMakeStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     //: QMakeStep default display name
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index 05710e1083..f493212879 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -116,7 +116,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
     friend class Internal::QMakeStepFactory;
 
 public:
-    QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
+    QMakeStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
 
     QmakeBuildConfiguration *qmakeBuildConfiguration() const;
     QmakeBuildSystem *qmakeBuildSystem() const;
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
index f9d66de3ed..659d3f1899 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
@@ -147,7 +147,7 @@ BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(
     m_profileIds = Utils::transform(parameters.extraValues()
                                         .value(ProjectExplorer::Constants::PROJECT_KIT_IDS)
                                         .toStringList(),
-                                    &Core::Id::fromString);
+                                    &Utils::Id::fromString);
 
     connect(this, &BaseProjectWizardDialog::projectParametersChanged,
             this, &BaseQmakeProjectWizardDialog::generateProfileName);
@@ -164,7 +164,7 @@ BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(
     m_profileIds = Utils::transform(parameters.extraValues()
                                         .value(ProjectExplorer::Constants::PROJECT_KIT_IDS)
                                         .toStringList(),
-                                    &Core::Id::fromString);
+                                    &Utils::Id::fromString);
     connect(this, &BaseProjectWizardDialog::projectParametersChanged,
             this, &BaseQmakeProjectWizardDialog::generateProfileName);
 }
@@ -184,12 +184,12 @@ int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id)
             return {
                 ProjectExplorer::CompileTask(Task::Error, tr("Required Qt features not present."))};
 
-        const Core::Id platform = selectedPlatform();
+        const Utils::Id platform = selectedPlatform();
         if (platform.isValid() && !QtKitAspect::platformPredicate(platform)(k))
             return {ProjectExplorer::CompileTask(
                 ProjectExplorer::Task::Warning,
                 tr("Qt version does not target the expected platform."))};
-        QSet<Core::Id> features = {QtSupport::Constants::FEATURE_DESKTOP};
+        QSet<Utils::Id> features = {QtSupport::Constants::FEATURE_DESKTOP};
         if (!QtKitAspect::qtVersionPredicate(features)(k))
             return {ProjectExplorer::CompileTask(ProjectExplorer::Task::Unknown,
                                                  tr("Qt version does not provide all features."))};
@@ -218,7 +218,7 @@ bool BaseQmakeProjectWizardDialog::writeUserFile(const QString &proFileName) con
     return success;
 }
 
-QList<Core::Id> BaseQmakeProjectWizardDialog::selectedKits() const
+QList<Utils::Id> BaseQmakeProjectWizardDialog::selectedKits() const
 {
     if (!m_targetSetupPage)
         return m_profileIds;
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
index d58f8ccf85..e620d8b2bd 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
@@ -114,13 +114,13 @@ public:
     int addTargetSetupPage(int id = -1);
 
     bool writeUserFile(const QString &proFileName) const;
-    QList<Core::Id> selectedKits() const;
+    QList<Utils::Id> selectedKits() const;
 
 private:
     void generateProfileName(const QString &name, const QString &path);
 
     ProjectExplorer::TargetSetupPage *m_targetSetupPage = nullptr;
-    QList<Core::Id> m_profileIds;
+    QList<Utils::Id> m_profileIds;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
index 7c2f57420a..dc7fc17908 100644
--- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
@@ -90,7 +90,7 @@ bool SubdirsProjectWizard::postGenerateFiles(const QWizard *w, const Core::Gener
         QVariantMap map;
         map.insert(QLatin1String(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE), profileName);
         map.insert(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS),
-                   Utils::transform<QStringList>(wizard->selectedKits(), &Core::Id::toString));
+                   Utils::transform<QStringList>(wizard->selectedKits(), &Utils::Id::toString));
         IWizardFactory::requestNewItemDialog(tr("New Subproject", "Title of dialog"),
                                              Utils::filtered(Core::IWizardFactory::allWizardFactories(),
                                                              [](Core::IWizardFactory *f) {
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index fcd5e88404..c74c41b323 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -91,7 +91,7 @@ public:
     }
 };
 
-QHash<Core::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPuppetHash;
+QHash<Utils::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPuppetHash;
 
 QByteArray PuppetCreator::qtHash() const
 {
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h
index bafea8fa3e..00b5a0e921 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h
@@ -107,7 +107,7 @@ private:
     mutable QString m_compileLog;
     ProjectExplorer::Target *m_target = nullptr;
     PuppetType m_availablePuppetType;
-    static QHash<Core::Id, PuppetType> m_qml2PuppetForKitPuppetHash;
+    static QHash<Utils::Id, PuppetType> m_qml2PuppetForKitPuppetHash;
     const Model *m_model = nullptr;
 #ifndef QMLDESIGNER_TEST
     const DesignerSettings m_designerSettings;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index f2de0347b8..5cc23f7e6b 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -54,7 +54,6 @@
 #include <coreplugin/designmode.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/modemanager.h>
 
 #include <extensionsystem/pluginmanager.h>
@@ -102,6 +101,7 @@ using namespace QmlJS;
 using namespace QmlJS::AST;
 using namespace QmlJSTools;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace QmlJSEditor {
 
@@ -1075,7 +1075,7 @@ QmlJSEditorFactory::QmlJSEditorFactory()
     : QmlJSEditorFactory(Constants::C_QMLJSEDITOR_ID)
 {}
 
-QmlJSEditorFactory::QmlJSEditorFactory(Core::Id _id)
+QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
 {
     setId(_id);
     setDisplayName(QCoreApplication::translate("OpenWith::Editors", "QMLJS Editor"));
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index f13415f7f4..50b25c2d28 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -146,7 +146,7 @@ class QMLJSEDITOR_EXPORT QmlJSEditorFactory : public TextEditor::TextEditorFacto
 {
 public:
     QmlJSEditorFactory();
-    QmlJSEditorFactory(Core::Id id);
+    QmlJSEditorFactory(Utils::Id id);
 
     static void decorateEditor(TextEditor::TextEditorWidget *editor);
 };
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index b6edc2fd89..d9f99eca86 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -648,7 +648,7 @@ void QmlJSEditorDocumentPrivate::cleanSemanticMarks()
 
 } // Internal
 
-QmlJSEditorDocument::QmlJSEditorDocument(Core::Id id)
+QmlJSEditorDocument::QmlJSEditorDocument(Utils::Id id)
     : d(new Internal::QmlJSEditorDocumentPrivate(this))
 {
     setId(id);
diff --git a/src/plugins/qmljseditor/qmljseditordocument.h b/src/plugins/qmljseditor/qmljseditordocument.h
index 0b5c6e34a8..a42b367885 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.h
+++ b/src/plugins/qmljseditor/qmljseditordocument.h
@@ -43,7 +43,7 @@ class QMLJSEDITOR_EXPORT QmlJSEditorDocument : public TextEditor::TextDocument
 {
     Q_OBJECT
 public:
-    QmlJSEditorDocument(Core::Id id);
+    QmlJSEditorDocument(Utils::Id id);
     ~QmlJSEditorDocument() override;
 
     const QmlJSTools::SemanticInfo &semanticInfo() const;
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 83e7e2ef48..9e82914fb8 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -41,7 +41,6 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -64,6 +63,7 @@
 using namespace QmlJSEditor::Constants;
 using namespace ProjectExplorer;
 using namespace Core;
+using namespace Utils;
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljstextmark.cpp b/src/plugins/qmljseditor/qmljstextmark.cpp
index 4ef80eb7a2..8f3a33dedc 100644
--- a/src/plugins/qmljseditor/qmljstextmark.cpp
+++ b/src/plugins/qmljseditor/qmljstextmark.cpp
@@ -54,7 +54,7 @@ static bool isWarning(QmlJS::Severity::Enum kind)
     return false;
 }
 
-static Core::Id cartegoryForSeverity(QmlJS::Severity::Enum kind)
+static Utils::Id cartegoryForSeverity(QmlJS::Severity::Enum kind)
 {
     return isWarning(kind) ? QMLJS_WARNING : QMLJS_ERROR;
 }
diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp
index c9b5b83b24..366702f801 100644
--- a/src/plugins/qmljseditor/qmltaskmanager.cpp
+++ b/src/plugins/qmljseditor/qmltaskmanager.cpp
@@ -60,7 +60,7 @@ QmlTaskManager::QmlTaskManager()
     connect(&m_updateDelay, &QTimer::timeout, this, [this] { updateMessagesNow(); });
 }
 
-static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const FilePath &fileName, Core::Id category)
+static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const FilePath &fileName, Utils::Id category)
 {
     Tasks result;
     foreach (const DiagnosticMessage &msg, messages) {
@@ -71,7 +71,7 @@ static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const File
     return result;
 }
 
-static Tasks convertToTasks(const QList<StaticAnalysis::Message> &messages, const FilePath &fileName, Core::Id category)
+static Tasks convertToTasks(const QList<StaticAnalysis::Message> &messages, const FilePath &fileName, Utils::Id category)
 {
     QList<DiagnosticMessage> diagnostics;
     foreach (const StaticAnalysis::Message &msg, messages)
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
index c822e27410..f47833d49e 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
@@ -56,7 +56,7 @@ static const char *defaultPreviewText =
 
 QmlJSCodeStylePreferencesFactory::QmlJSCodeStylePreferencesFactory() = default;
 
-Core::Id QmlJSCodeStylePreferencesFactory::languageId()
+Utils::Id QmlJSCodeStylePreferencesFactory::languageId()
 {
     return Constants::QML_JS_SETTINGS_ID;
 }
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
index 111103f243..42f904be7c 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
@@ -34,7 +34,7 @@ class QmlJSCodeStylePreferencesFactory : public TextEditor::ICodeStylePreference
 public:
     QmlJSCodeStylePreferencesFactory();
 
-    Core::Id languageId() override;
+    Utils::Id languageId() override;
     QString displayName() override;
     TextEditor::ICodeStylePreferences *createCodeStyle() const override;
     QWidget *createEditor(TextEditor::ICodeStylePreferences *settings,
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp
index b66e98500d..fcf5103624 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.cpp
+++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp
@@ -105,13 +105,13 @@ QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate()
 
     // Watch task progress
     connect(ProgressManager::instance(), &ProgressManager::taskStarted, this,
-            [this](Core::Id type) {
+            [this](Utils::Id type) {
                   if (type == QmlJS::Constants::TASK_INDEX)
                       resetCodeModelAction.setEnabled(false);
             });
 
     connect(ProgressManager::instance(), &ProgressManager::allTasksFinished,
-            [this](Core::Id type) {
+            [this](Utils::Id type) {
                   if (type == QmlJS::Constants::TASK_INDEX)
                       resetCodeModelAction.setEnabled(true);
             });
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
index 1762c4a85c..b356ac07ea 100644
--- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp
@@ -27,7 +27,6 @@
 
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
-#include <coreplugin/id.h>
 
 #include <QDialogButtonBox>
 #include <QFormLayout>
@@ -108,7 +107,7 @@ Kit *QmlProfilerAttachDialog::kit() const
     return d->kitChooser->currentKit();
 }
 
-void QmlProfilerAttachDialog::setKitId(Core::Id id)
+void QmlProfilerAttachDialog::setKitId(Utils::Id id)
 {
     d->kitChooser->setCurrentKitId(id);
 }
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
index 48e6fed4d6..abee7c7ccd 100644
--- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
+++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QDialog>
 
@@ -47,7 +47,7 @@ public:
     void setPort(const int port);
 
     ProjectExplorer::Kit *kit() const;
-    void setKitId(Core::Id id);
+    void setKitId(Utils::Id id);
 
 private:
     QmlProfilerAttachDialogPrivate *d;
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index bbd77dae27..4f8adf13c6 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -92,6 +92,7 @@ using namespace Debugger;
 using namespace Debugger::Constants;
 using namespace QmlProfiler::Constants;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QmlProfiler {
 namespace Internal {
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index fe7542e8cb..7d6297db94 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -62,6 +62,7 @@
 using namespace Core;
 using namespace ProjectExplorer;
 using namespace QmlProjectManager::Internal;
+using namespace Utils;
 
 namespace {
 Q_LOGGING_CATEGORY(infoLogger, "QmlProjectManager.QmlBuildSystem", QtInfoMsg)
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index acd8bc1094..ad79351f54 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -62,7 +62,7 @@ public:
 
     QmlProject *qmlProject() const;
 
-    QVariant additionalData(Core::Id id) const override;
+    QVariant additionalData(Utils::Id id) const override;
 
     enum RefreshOption {
         ProjectFile   = 0x01,
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 8ec0c29246..a0b77fffb7 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -69,7 +69,7 @@ class QmlProjectRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration)
 
 public:
-    QmlProjectRunConfiguration(Target *target, Core::Id id);
+    QmlProjectRunConfiguration(Target *target, Utils::Id id);
 
 private:
     Runnable runnable() const final;
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index c127fb58a0..da71045d20 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -70,8 +70,8 @@ namespace Internal {
 class QnxUploadStep : public RemoteLinux::GenericDirectUploadStep
 {
 public:
-    QnxUploadStep(BuildStepList *bsl, Core::Id id) : GenericDirectUploadStep(bsl, id, false) {}
-    static Core::Id stepId() { return "Qnx.DirectUploadStep"; }
+    QnxUploadStep(BuildStepList *bsl, Utils::Id id) : GenericDirectUploadStep(bsl, id, false) {}
+    static Utils::Id stepId() { return "Qnx.DirectUploadStep"; }
 };
 
 template <class Step>
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 1f134feb15..271f5ef8d7 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -53,16 +53,16 @@ QString QnxQtVersion::description() const
             .arg(QnxUtils::cpuDirShortDescription(cpuDir()));
 }
 
-QSet<Core::Id> QnxQtVersion::availableFeatures() const
+QSet<Utils::Id> QnxQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(Constants::QNX_QNX_FEATURE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> QnxQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> QnxQtVersion::targetDeviceTypes() const
 {
     return {Constants::QNX_QNX_OS_TYPE};
 }
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index c12da8b566..0b86963c0b 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -43,8 +43,8 @@ public:
 
     QString description() const override;
 
-    QSet<Core::Id> availableFeatures() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> availableFeatures() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 
     QString qnxHost() const;
     Utils::FilePath qnxTarget() const;
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 7e948bc49b..6725c28fbe 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -44,7 +44,7 @@ using namespace Utils;
 namespace Qnx {
 namespace Internal {
 
-QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
+QnxRunConfiguration::QnxRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h
index 75ec72a66c..154e2b32e1 100644
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -44,7 +44,7 @@ class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration
     Q_OBJECT
 
 public:
-    QnxRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     ProjectExplorer::Runnable runnable() const override;
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index f6731839c4..46ac87c90c 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -221,7 +221,7 @@ public:
     bool m_qmakeIsExecutable = true;
 
     QString m_autodetectionSource;
-    QSet<Core::Id> m_overrideFeatures;
+    QSet<Utils::Id> m_overrideFeatures;
 
     FilePath m_mkspec;
     FilePath m_mkspecFullPath;
@@ -695,7 +695,7 @@ void BaseQtVersion::fromMap(const QVariantMap &map)
     d->m_data.unexpandedDisplayName.fromMap(map, Constants::QTVERSIONNAME);
     d->m_isAutodetected = map.value(QTVERSIONAUTODETECTED).toBool();
     d->m_autodetectionSource = map.value(QTVERSIONAUTODETECTIONSOURCE).toString();
-    d->m_overrideFeatures = Core::Id::fromStringList(map.value(QTVERSION_OVERRIDE_FEATURES).toStringList());
+    d->m_overrideFeatures = Utils::Id::fromStringList(map.value(QTVERSION_OVERRIDE_FEATURES).toStringList());
     QString string = map.value(QTVERSIONQMAKEPATH).toString();
     if (string.startsWith('~'))
         string.remove(0, 1).prepend(QDir::homePath());
@@ -732,7 +732,7 @@ QVariantMap BaseQtVersion::toMap() const
     result.insert(QTVERSIONAUTODETECTED, isAutodetected());
     result.insert(QTVERSIONAUTODETECTIONSOURCE, autodetectionSource());
     if (!d->m_overrideFeatures.isEmpty())
-        result.insert(QTVERSION_OVERRIDE_FEATURES, Core::Id::toStringList(d->m_overrideFeatures));
+        result.insert(QTVERSION_OVERRIDE_FEATURES, Utils::Id::toStringList(d->m_overrideFeatures));
 
     result.insert(QTVERSIONQMAKEPATH, qmakeCommand().toString());
     return result;
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 8d61c21492..436a6e0387 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -64,7 +64,7 @@ public:
     QtVersionNumber(int ma = -1, int mi = -1, int p = -1);
     QtVersionNumber(const QString &versionString);
 
-    QSet<Core::Id> features() const;
+    QSet<Utils::Id> features() const;
 
     int majorVersion;
     int minorVersion;
@@ -190,7 +190,7 @@ public:
 
     QString defaultUnexpandedDisplayName() const;
 
-    virtual QSet<Core::Id> targetDeviceTypes() const = 0;
+    virtual QSet<Utils::Id> targetDeviceTypes() const = 0;
 
     virtual ProjectExplorer::Tasks validateKit(const ProjectExplorer::Kit *k);
 
@@ -233,13 +233,13 @@ public:
     static void populateQmlFileFinder(Utils::FileInProjectFinder *finder,
                                       const ProjectExplorer::Target *target);
 
-    QSet<Core::Id> features() const;
+    QSet<Utils::Id> features() const;
 
 protected:
     BaseQtVersion();
     BaseQtVersion(const BaseQtVersion &other) = delete;
 
-    virtual QSet<Core::Id> availableFeatures() const;
+    virtual QSet<Utils::Id> availableFeatures() const;
     virtual ProjectExplorer::Tasks reportIssuesImpl(const QString &proFile, const QString &buildDir) const;
 
     virtual ProjectExplorer::Abis detectQtAbis() const;
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index 3c63791a84..68e61a8bb8 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -219,7 +219,7 @@ int ExampleSetModel::getQtId(int i) const
     return variant.toInt();
 }
 
-bool ExampleSetModel::selectedQtSupports(const Core::Id &target) const
+bool ExampleSetModel::selectedQtSupports(const Utils::Id &target) const
 {
     return m_selectedQtTypes.contains(target);
 }
diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h
index a371e8bc0b..0e3dd48617 100644
--- a/src/plugins/qtsupport/exampleslistmodel.h
+++ b/src/plugins/qtsupport/exampleslistmodel.h
@@ -58,7 +58,7 @@ public:
     int selectedExampleSet() const { return m_selectedExampleSetIndex; }
     void selectExampleSet(int index);
     QStringList exampleSources(QString *examplesInstallPath, QString *demosInstallPath);
-    bool selectedQtSupports(const Core::Id &target) const;
+    bool selectedQtSupports(const Utils::Id &target) const;
 
 signals:
     void selectedExampleSetChanged(int);
@@ -92,7 +92,7 @@ private:
 
     QVector<ExtraExampleSet> m_extraExampleSets;
     int m_selectedExampleSetIndex = -1;
-    QSet<Core::Id> m_selectedQtTypes;
+    QSet<Utils::Id> m_selectedQtTypes;
 
     bool m_qtVersionManagerInitialized = false;
     bool m_helpManagerInitialized = false;
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h
index fe0b05bfdf..213292dc75 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.h
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h
@@ -46,7 +46,7 @@ public:
 
     QString title() const final;
     int priority() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
     QWidget *createWidget() const final;
 
     static void openProject(const ExampleItem *item);
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index bc3d0f9e39..2b94066158 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -166,7 +166,7 @@ void QtKitAspect::setup(ProjectExplorer::Kit *k)
     if (!k || k->hasValue(id()))
         return;
     const Abi tcAbi = ToolChainKitAspect::targetAbi(k);
-    const Core::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k);
 
     const QList<BaseQtVersion *> matches
             = QtVersionManager::versions([&tcAbi, &deviceType](const BaseQtVersion *qt) {
@@ -224,7 +224,7 @@ void QtKitAspect::fix(ProjectExplorer::Kit *k)
     QList<ToolChain *> possibleTcs = ToolChainManager::toolChains(
                 [version](const ToolChain *t) {
         return t->isValid()
-                && t->language() == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)
+                && t->language() == Utils::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID)
                 && contains(version->qtAbis(), [t](const Abi &qtAbi) {
                        return qtAbi.isFullyCompatibleWith(t->targetAbi());
                    });
@@ -326,7 +326,7 @@ void QtKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
                 });
 }
 
-Core::Id QtKitAspect::id()
+Utils::Id QtKitAspect::id()
 {
     return "QtSupport.QtInformation";
 }
@@ -394,7 +394,7 @@ void QtKitAspect::kitsWereLoaded()
             this, &QtKitAspect::qtVersionsChanged);
 }
 
-Kit::Predicate QtKitAspect::platformPredicate(Core::Id platform)
+Kit::Predicate QtKitAspect::platformPredicate(Utils::Id platform)
 {
     return [platform](const Kit *kit) -> bool {
         BaseQtVersion *version = QtKitAspect::qtVersion(kit);
@@ -402,7 +402,7 @@ Kit::Predicate QtKitAspect::platformPredicate(Core::Id platform)
     };
 }
 
-Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Core::Id> &required,
+Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Utils::Id> &required,
                                                     const QtVersionNumber &min,
                                                     const QtVersionNumber &max)
 {
@@ -419,16 +419,16 @@ Kit::Predicate QtKitAspect::qtVersionPredicate(const QSet<Core::Id> &required,
     };
 }
 
-QSet<Core::Id> QtKitAspect::supportedPlatforms(const Kit *k) const
+QSet<Utils::Id> QtKitAspect::supportedPlatforms(const Kit *k) const
 {
     BaseQtVersion *version = QtKitAspect::qtVersion(k);
-    return version ? version->targetDeviceTypes() : QSet<Core::Id>();
+    return version ? version->targetDeviceTypes() : QSet<Utils::Id>();
 }
 
-QSet<Core::Id> QtKitAspect::availableFeatures(const Kit *k) const
+QSet<Utils::Id> QtKitAspect::availableFeatures(const Kit *k) const
 {
     BaseQtVersion *version = QtKitAspect::qtVersion(k);
-    return version ? version->features() : QSet<Core::Id>();
+    return version ? version->features() : QSet<Utils::Id>();
 }
 
 int QtKitAspect::weight(const Kit *k) const
diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h
index b494ec09a4..66b9f9df5d 100644
--- a/src/plugins/qtsupport/qtkitinformation.h
+++ b/src/plugins/qtsupport/qtkitinformation.h
@@ -57,20 +57,20 @@ public:
     QList<Utils::OutputLineParser *> createOutputParsers(const ProjectExplorer::Kit *k) const override;
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static int qtVersionId(const ProjectExplorer::Kit *k);
     static void setQtVersionId(ProjectExplorer::Kit *k, const int id);
     static BaseQtVersion *qtVersion(const ProjectExplorer::Kit *k);
     static void setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v);
 
-    static ProjectExplorer::Kit::Predicate platformPredicate(Core::Id availablePlatforms);
+    static ProjectExplorer::Kit::Predicate platformPredicate(Utils::Id availablePlatforms);
     static ProjectExplorer::Kit::Predicate
-    qtVersionPredicate(const QSet<Core::Id> &required = QSet<Core::Id>(),
+    qtVersionPredicate(const QSet<Utils::Id> &required = QSet<Utils::Id>(),
                        const QtVersionNumber &min = QtVersionNumber(0, 0, 0),
                        const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX));
 
-    QSet<Core::Id> supportedPlatforms(const ProjectExplorer::Kit *k) const override;
-    QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const override;
+    QSet<Utils::Id> supportedPlatforms(const ProjectExplorer::Kit *k) const override;
+    QSet<Utils::Id> availableFeatures(const ProjectExplorer::Kit *k) const override;
 
 private:
     int weight(const ProjectExplorer::Kit *k) const override;
diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp
index 8a695d2466..bbab05c046 100644
--- a/src/plugins/qtsupport/qtprojectimporter.cpp
+++ b/src/plugins/qtsupport/qtprojectimporter.cpp
@@ -29,7 +29,6 @@
 #include "qtversionfactory.h"
 #include "qtversionmanager.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
@@ -229,8 +228,8 @@ Kit *TestQtProjectImporter::createKit(void *directoryData) const
     return createTemporaryKit(findOrCreateQtVersion(dd->qmakePath),
                               [dd](Kit *k) {
         BaseQtVersion *qt = QtKitAspect::qtVersion(k);
-        QMap<Core::Id, QVariant> toKeep;
-        for (const Core::Id &key : k->allKeys()) {
+        QMap<Utils::Id, QVariant> toKeep;
+        for (const Utils::Id &key : k->allKeys()) {
             if (key.toString().startsWith("PE.tmp."))
                 toKeep.insert(key, k->value(key));
         }
@@ -458,15 +457,15 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
         QCOMPARE(dd->qmakePath, newQt->qmakeCommand());
 
         // VALIDATE: All keys are unchanged:
-        QList<Core::Id> newKitKeys = newKit->allKeys();
-        const QList<Core::Id> templateKeys = dd->kit->allKeys();
+        QList<Utils::Id> newKitKeys = newKit->allKeys();
+        const QList<Utils::Id> templateKeys = dd->kit->allKeys();
 
         if (dd->isNewKit)
             QVERIFY(templateKeys.count() < newKitKeys.count()); // new kit will have extra keys!
         else
             QCOMPARE(templateKeys.count(), newKitKeys.count()); // existing kit needs to be unchanged!
 
-        for (Core::Id id : templateKeys) {
+        for (Utils::Id id : templateKeys) {
             if (id == QtKitAspect::id())
                 continue; // with the exception of the Qt one...
             QVERIFY(newKit->hasValue(id));
@@ -498,12 +497,12 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
             templateKit = dd->kit->clone(true);
             QtKitAspect::setQtVersionId(templateKit, QtKitAspect::qtVersionId(newKit));
         }
-        const QList<Core::Id> templateKitKeys = templateKit->allKeys();
+        const QList<Utils::Id> templateKitKeys = templateKit->allKeys();
 
         if (newKit != defaultKit)
             toUnregisterLater.append(newKit);
 
-        const Core::Id newKitIdAfterImport = newKit->id();
+        const Utils::Id newKitIdAfterImport = newKit->id();
 
         if (toPersist) {
             // --------------------------------------------------------------------
@@ -519,8 +518,8 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
             importer.cleanupKit(newKit);
         }
 
-        const QList<Core::Id> newKitKeys = newKit->allKeys();
-        const Core::Id newKitId = newKit->id();
+        const QList<Utils::Id> newKitKeys = newKit->allKeys();
+        const Utils::Id newKitId = newKit->id();
         const int qtId = QtKitAspect::qtVersionId(newKit);
 
         // VALIDATE: Kit Id has not changed
@@ -537,7 +536,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
 
             // VALIDATE: All the kit values are as set up in the template before
             QCOMPARE(newKitKeys.count(), templateKitKeys.count());
-            for (Core::Id id : templateKitKeys) {
+            for (Utils::Id id : templateKitKeys) {
                 if (id == QtKitAspect::id())
                     continue;
                 QVERIFY(newKit->hasValue(id));
@@ -551,7 +550,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
 
             // VALIDATE: All keys that got added during import are gone
             QCOMPARE(newKitKeys.count(), templateKitKeys.count());
-            for (Core::Id id : newKitKeys) {
+            for (Utils::Id id : newKitKeys) {
                 if (id == QtKitAspect::id())
                     continue; // Will be checked by Qt version later
                 QVERIFY(templateKit->hasValue(id));
diff --git a/src/plugins/qtsupport/qtversions.cpp b/src/plugins/qtsupport/qtversions.cpp
index 03825f2822..1426a61c63 100644
--- a/src/plugins/qtsupport/qtversions.cpp
+++ b/src/plugins/qtsupport/qtversions.cpp
@@ -54,8 +54,8 @@ public:
 
     QString description() const override;
 
-    QSet<Core::Id> availableFeatures() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> availableFeatures() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 };
 
 QStringList DesktopQtVersion::warningReason() const
@@ -73,17 +73,17 @@ QString DesktopQtVersion::description() const
     return QCoreApplication::translate("QtVersion", "Desktop", "Qt Version is meant for the desktop");
 }
 
-QSet<Core::Id> DesktopQtVersion::availableFeatures() const
+QSet<Utils::Id> DesktopQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = BaseQtVersion::availableFeatures();
     features.insert(Constants::FEATURE_DESKTOP);
     features.insert(Constants::FEATURE_QMLPROJECT);
     return features;
 }
 
-QSet<Core::Id> DesktopQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> DesktopQtVersion::targetDeviceTypes() const
 {
-    QSet<Core::Id> result = {ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE};
+    QSet<Utils::Id> result = {ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE};
     if (Utils::contains(qtAbis(), [](const ProjectExplorer::Abi a) { return a.os() == ProjectExplorer::Abi::LinuxOS; }))
         result.insert(RemoteLinux::Constants::GenericLinuxOsType);
     return result;
@@ -115,7 +115,7 @@ public:
                                            "Qt Version is used for embedded Linux development");
     }
 
-    QSet<Core::Id> targetDeviceTypes() const override
+    QSet<Utils::Id> targetDeviceTypes() const override
     {
         return {RemoteLinux::Constants::GenericLinuxOsType};
     }
diff --git a/src/plugins/qtsupport/translationwizardpage.h b/src/plugins/qtsupport/translationwizardpage.h
index 726f64857a..452890043f 100644
--- a/src/plugins/qtsupport/translationwizardpage.h
+++ b/src/plugins/qtsupport/translationwizardpage.h
@@ -36,9 +36,9 @@ public:
     TranslationWizardPageFactory();
 
 private:
-    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
                               const QVariant &data) override;
-    bool validateData(Core::Id, const QVariant &, QString *) override { return true; }
+    bool validateData(Utils::Id, const QVariant &, QString *) override { return true; }
 };
 
 } // namespace Internal
diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp
index b9221460c4..de41be4da5 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.cpp
+++ b/src/plugins/remotelinux/abstractpackagingstep.cpp
@@ -49,7 +49,7 @@ public:
 
 } // namespace Internal
 
-AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, Core::Id id)
+AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, Utils::Id id)
     : BuildStep(bsl, id)
 {
     d = new Internal::AbstractPackagingStepPrivate;
diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h
index 616c76d921..f7b2bef28d 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.h
+++ b/src/plugins/remotelinux/abstractpackagingstep.h
@@ -38,7 +38,7 @@ class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildSt
     Q_OBJECT
 
 public:
-    explicit AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    explicit AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ~AbstractPackagingStep() override;
 
     QString packageFilePath() const;
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 7d24e38fb6..424ec99bdc 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -47,7 +47,7 @@ public:
 
 } // namespace Internal
 
-AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, Core::Id id)
+AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, Utils::Id id)
     : BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
 {
 }
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index e15cef3706..14d84a4f59 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -49,7 +49,7 @@ protected:
     void doRun() final;
     void doCancel() override;
 
-    explicit AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    explicit AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
     void setInternalInitializer(const std::function<CheckResult()> &init);
     void setRunPreparer(const std::function<void()> &prep);
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index cd3ab65546..3a686e8a66 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -36,7 +36,7 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 
-GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Core::Id id,
+GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Utils::Id id,
                                                  bool offerIncrementalDeployment)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
@@ -78,7 +78,7 @@ GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Core::Id id
 
 GenericDirectUploadStep::~GenericDirectUploadStep() = default;
 
-Core::Id GenericDirectUploadStep::stepId()
+Utils::Id GenericDirectUploadStep::stepId()
 {
     return Constants::DirectUploadStepId;
 }
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index 4db719be76..ef5e429fb8 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -35,11 +35,11 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep
     Q_OBJECT
 
 public:
-    GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id,
+    GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id,
                             bool offerIncrementalDeployment = true);
     ~GenericDirectUploadStep() override;
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index 913097a335..e4c7565b03 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -63,7 +63,7 @@ GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard(QWi
     setPage(Internal::FinalPageId, &d->finalPage);
     d->finalPage.setCommitPage(true);
     d->device = LinuxDevice::create();
-    d->device->setupId(IDevice::ManuallyAdded, Core::Id());
+    d->device->setupId(IDevice::ManuallyAdded, Utils::Id());
     d->device->setType(Constants::GenericLinuxOsType);
     d->device->setMachineType(IDevice::Hardware);
     d->device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index c4e6cf41e0..ce3b731cbc 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -35,7 +35,6 @@
 #include "remotelinuxenvironmentreader.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index b4ce1b5632..18ad426e67 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -55,7 +55,7 @@ const char CleanInstallRootAspectId[] = "RemoteLinux.MakeInstall.CleanInstallRoo
 const char FullCommandLineAspectId[] = "RemoteLinux.MakeInstall.FullCommandLine";
 const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandLine";
 
-MakeInstallStep::MakeInstallStep(BuildStepList *parent, Core::Id id) : MakeStep(parent, id)
+MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep(parent, id)
 {
     setDefaultDisplayName(displayName());
 
@@ -112,7 +112,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Core::Id id) : MakeStep(
     makeAspect->setExecutable(cmd.command);
 }
 
-Core::Id MakeInstallStep::stepId()
+Utils::Id MakeInstallStep::stepId()
 {
     return Constants::MakeInstallStepId;
 }
diff --git a/src/plugins/remotelinux/makeinstallstep.h b/src/plugins/remotelinux/makeinstallstep.h
index 76176299cc..9233fa76ba 100644
--- a/src/plugins/remotelinux/makeinstallstep.h
+++ b/src/plugins/remotelinux/makeinstallstep.h
@@ -39,9 +39,9 @@ class REMOTELINUX_EXPORT MakeInstallStep : public ProjectExplorer::MakeStep
 {
     Q_OBJECT
 public:
-    MakeInstallStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
+    MakeInstallStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 
 private:
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
index 50271123e9..712ac584d1 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
@@ -36,7 +36,7 @@ using namespace ProjectExplorer;
 namespace RemoteLinux {
 
 RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep
-    (BuildStepList *bsl, Core::Id id)
+    (BuildStepList *bsl, Utils::Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
@@ -66,7 +66,7 @@ RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep
 
 RemoteLinuxCheckForFreeDiskSpaceStep::~RemoteLinuxCheckForFreeDiskSpaceStep() = default;
 
-Core::Id RemoteLinuxCheckForFreeDiskSpaceStep::stepId()
+Utils::Id RemoteLinuxCheckForFreeDiskSpaceStep::stepId()
 {
     return "RemoteLinux.CheckForFreeDiskSpaceStep";
 }
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
index dbdd8bb8e6..723b4f19b3 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
@@ -34,10 +34,10 @@ class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceStep : public AbstractR
     Q_OBJECT
 
 public:
-    RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ~RemoteLinuxCheckForFreeDiskSpaceStep() override;
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
index 4f8da7de07..932bec5f74 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -33,7 +33,7 @@ using namespace ProjectExplorer;
 namespace RemoteLinux {
 
 RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep
-        (BuildStepList *bsl, Core::Id id)
+        (BuildStepList *bsl, Utils::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<RemoteLinuxCustomCommandDeployService>();
@@ -53,7 +53,7 @@ RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep
 
 RemoteLinuxCustomCommandDeploymentStep::~RemoteLinuxCustomCommandDeploymentStep() = default;
 
-Core::Id RemoteLinuxCustomCommandDeploymentStep::stepId()
+Utils::Id RemoteLinuxCustomCommandDeploymentStep::stepId()
 {
     return "RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep";
 }
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
index d438ccea4d..7200c201a0 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
@@ -35,10 +35,10 @@ class REMOTELINUX_EXPORT RemoteLinuxCustomCommandDeploymentStep
     Q_OBJECT
 
 public:
-    RemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    RemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ~RemoteLinuxCustomCommandDeploymentStep() override;
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 8a87b97c8d..b03da8477c 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -41,7 +41,7 @@ using namespace Utils;
 namespace RemoteLinux {
 namespace Internal {
 
-RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *target, Core::Id id)
+RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
index 6eeb7b44f0..9cd0385b31 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
@@ -35,7 +35,7 @@ class RemoteLinuxCustomRunConfiguration : public ProjectExplorer::RunConfigurati
     Q_OBJECT
 
 public:
-    RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
     QString runConfigDefaultDisplayName();
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 294328a4d8..9a54527eba 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -45,7 +45,7 @@ namespace RemoteLinux {
 
 using namespace Internal;
 
-Core::Id genericDeployConfigurationId()
+Utils::Id genericDeployConfigurationId()
 {
     return "DeployToGenericLinux";
 }
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index d3c5974df6..723c6b3038 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -32,7 +32,7 @@
 
 namespace RemoteLinux {
 
-Core::Id genericDeployConfigurationId();
+Utils::Id genericDeployConfigurationId();
 
 namespace Internal {
 
diff --git a/src/plugins/remotelinux/remotelinuxkillappstep.cpp b/src/plugins/remotelinux/remotelinuxkillappstep.cpp
index c9a9025979..0ec931ca75 100644
--- a/src/plugins/remotelinux/remotelinuxkillappstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxkillappstep.cpp
@@ -35,7 +35,7 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 
-RemoteLinuxKillAppStep::RemoteLinuxKillAppStep(BuildStepList *bsl, Core::Id id)
+RemoteLinuxKillAppStep::RemoteLinuxKillAppStep(BuildStepList *bsl, Utils::Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<RemoteLinuxKillAppService>();
@@ -53,7 +53,7 @@ RemoteLinuxKillAppStep::RemoteLinuxKillAppStep(BuildStepList *bsl, Core::Id id)
     });
 }
 
-Core::Id RemoteLinuxKillAppStep::stepId()
+Utils::Id RemoteLinuxKillAppStep::stepId()
 {
     return "RemoteLinux.KillAppStep";
 }
diff --git a/src/plugins/remotelinux/remotelinuxkillappstep.h b/src/plugins/remotelinux/remotelinuxkillappstep.h
index 7aec59acd9..506bc99d81 100644
--- a/src/plugins/remotelinux/remotelinuxkillappstep.h
+++ b/src/plugins/remotelinux/remotelinuxkillappstep.h
@@ -34,9 +34,9 @@ class REMOTELINUX_EXPORT RemoteLinuxKillAppStep : public AbstractRemoteLinuxDepl
     Q_OBJECT
 public:
     explicit RemoteLinuxKillAppStep(ProjectExplorer::BuildStepList *bsl,
-            Core::Id id = stepId());
+            Utils::Id id = stepId());
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index cc0ebf3406..d8ce5cdd11 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -82,7 +82,7 @@ public:
     GenericDeployStepFactory<RemoteLinuxKillAppStep> remoteLinuxKillAppStepFactory;
     GenericDeployStepFactory<MakeInstallStep> makeInstallStepFactory;
 
-    const QList<Core::Id> supportedRunConfigs {
+    const QList<Utils::Id> supportedRunConfigs {
         runConfigurationFactory.runConfigurationId(),
         customRunConfigurationFactory.runConfigurationId(),
         "QmlProjectManager.QmlRunConfiguration"
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 65d0dc3436..9b1773d56a 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -46,7 +46,7 @@ using namespace Utils;
 namespace RemoteLinux {
 namespace Internal {
 
-RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::Id id)
+RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index b854184b35..4cd0a5f976 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -37,7 +37,7 @@ class RemoteLinuxRunConfiguration final : public ProjectExplorer::RunConfigurati
     Q_OBJECT
 
 public:
-    RemoteLinuxRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    RemoteLinuxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     ProjectExplorer::Runnable runnable() const override;
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index 10869fcca9..f77b09a523 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -177,7 +177,7 @@ void RsyncDeployService::setFinished()
 
 } // namespace Internal
 
-RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Core::Id id)
+RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Utils::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<Internal::RsyncDeployService>();
@@ -209,7 +209,7 @@ RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Core::Id id)
 
 RsyncDeployStep::~RsyncDeployStep() = default;
 
-Core::Id RsyncDeployStep::stepId()
+Utils::Id RsyncDeployStep::stepId()
 {
     return "RemoteLinux.RsyncDeployStep";
 }
diff --git a/src/plugins/remotelinux/rsyncdeploystep.h b/src/plugins/remotelinux/rsyncdeploystep.h
index d8d5c7b45c..0dd0f5484f 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.h
+++ b/src/plugins/remotelinux/rsyncdeploystep.h
@@ -45,10 +45,10 @@ class REMOTELINUX_EXPORT RsyncDeployStep : public AbstractRemoteLinuxDeployStep
     Q_OBJECT
 
 public:
-    RsyncDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    RsyncDeployStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ~RsyncDeployStep() override;
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 
     static QString defaultFlags();
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index 40710efb44..901325f3a1 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -70,7 +70,7 @@ struct TarFileHeader {
 
 } // Anonymous namespace.
 
-TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Core::Id id)
+TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Utils::Id id)
     : AbstractPackagingStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
@@ -380,7 +380,7 @@ QVariantMap TarPackageCreationStep::toMap() const
     return map;
 }
 
-Core::Id TarPackageCreationStep::stepId()
+Utils::Id TarPackageCreationStep::stepId()
 {
     return "MaemoTarPackageCreationStep";
 }
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h
index 8a93192d69..bff5fc1405 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.h
+++ b/src/plugins/remotelinux/tarpackagecreationstep.h
@@ -43,9 +43,9 @@ class REMOTELINUX_EXPORT TarPackageCreationStep : public AbstractPackagingStep
 {
     Q_OBJECT
 public:
-    TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 
     void setIgnoreMissingFiles(bool ignoreMissingFiles);
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index 86a9d608fa..315da09e02 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -99,7 +99,7 @@ IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig(
     return IDevice::ConstPtr();
 }
 
-IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) const
+IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Utils::Id id) const
 {
     const IDevice::ConstPtr &device = DeviceManager::instance()->find(id);
     if (deviceMatches(device))
@@ -107,7 +107,7 @@ IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) co
     return defaultDeviceConfig();
 }
 
-int TypeSpecificDeviceConfigurationListModel::indexForId(Core::Id id) const
+int TypeSpecificDeviceConfigurationListModel::indexForId(Utils::Id id) const
 {
     const int count = rowCount();
     for (int i = 0; i < count; ++i) {
@@ -126,7 +126,7 @@ bool TypeSpecificDeviceConfigurationListModel::deviceMatches(IDevice::ConstPtr d
 {
     if (dev.isNull())
         return false;
-    Core::Id typeId = DeviceTypeKitAspect::deviceTypeId(target()->kit());
+    Utils::Id typeId = DeviceTypeKitAspect::deviceTypeId(target()->kit());
     return dev->type() == typeId;
 }
 
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
index d1b54844a9..00e3168c77 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
@@ -45,10 +45,10 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
-    int indexForId(Core::Id id) const;
+    int indexForId(Utils::Id id) const;
     ProjectExplorer::IDevice::ConstPtr deviceAt(int idx) const;
     ProjectExplorer::IDevice::ConstPtr defaultDeviceConfig() const;
-    ProjectExplorer::IDevice::ConstPtr find(Core::Id id) const;
+    ProjectExplorer::IDevice::ConstPtr find(Utils::Id id) const;
     ProjectExplorer::Target *target() const;
     bool deviceMatches(ProjectExplorer::IDevice::ConstPtr dev) const;
 };
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index bdbf3ff901..e979649ce8 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -60,7 +60,7 @@ AbstractRemoteLinuxPackageInstaller *UploadAndInstallTarPackageService::packageI
 }
 
 
-UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl, Core::Id id)
+UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl, Utils::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<UploadAndInstallTarPackageService>();
@@ -85,7 +85,7 @@ UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bs
     });
 }
 
-Core::Id UploadAndInstallTarPackageStep::stepId()
+Utils::Id UploadAndInstallTarPackageStep::stepId()
 {
     return "MaemoUploadAndInstallTarPackageStep";
 }
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
index 7055d7bbef..f67e768baf 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
@@ -53,9 +53,9 @@ class REMOTELINUX_EXPORT UploadAndInstallTarPackageStep : public AbstractRemoteL
     Q_OBJECT
 
 public:
-    UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
-    static Core::Id stepId();
+    static Utils::Id stepId();
     static QString displayName();
 };
 
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index eb5fb48edb..c317f7627a 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -32,7 +32,6 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp
index ae7379a3e1..7f82309307 100644
--- a/src/plugins/scxmleditor/scxmleditordata.cpp
+++ b/src/plugins/scxmleditor/scxmleditordata.cpp
@@ -51,6 +51,7 @@
 
 using namespace ScxmlEditor::Common;
 using namespace ScxmlEditor::PluginInterface;
+using namespace Utils;
 
 namespace ScxmlEditor {
 
diff --git a/src/plugins/scxmleditor/scxmleditordocument.cpp b/src/plugins/scxmleditor/scxmleditordocument.cpp
index 3f74d97a0c..5c2a072326 100644
--- a/src/plugins/scxmleditor/scxmleditordocument.cpp
+++ b/src/plugins/scxmleditor/scxmleditordocument.cpp
@@ -48,7 +48,7 @@ ScxmlEditorDocument::ScxmlEditorDocument(MainWidget *designWidget, QObject *pare
 {
     setMimeType(QLatin1String(ProjectExplorer::Constants::SCXML_MIMETYPE));
     setParent(parent);
-    setId(Core::Id(ScxmlEditor::Constants::K_SCXML_EDITOR_ID));
+    setId(Utils::Id(ScxmlEditor::Constants::K_SCXML_EDITOR_ID));
 
     // Designer needs UTF-8 regardless of settings.
     setCodec(QTextCodec::codecForName("UTF-8"));
diff --git a/src/plugins/scxmleditor/scxmleditorstack.cpp b/src/plugins/scxmleditor/scxmleditorstack.cpp
index 2861f24b50..eb66134e8a 100644
--- a/src/plugins/scxmleditor/scxmleditorstack.cpp
+++ b/src/plugins/scxmleditor/scxmleditorstack.cpp
@@ -85,7 +85,7 @@ QWidget *ScxmlEditorStack::widgetForEditor(ScxmlTextEditor *xmlEditor)
     return widget(i);
 }
 
-void ScxmlEditorStack::modeAboutToChange(Core::Id m)
+void ScxmlEditorStack::modeAboutToChange(Utils::Id m)
 {
     // Sync the editor when entering edit mode
     if (m == Core::Constants::MODE_EDIT) {
diff --git a/src/plugins/scxmleditor/scxmleditorstack.h b/src/plugins/scxmleditor/scxmleditorstack.h
index 3fc228313a..bcdf5abd62 100644
--- a/src/plugins/scxmleditor/scxmleditorstack.h
+++ b/src/plugins/scxmleditor/scxmleditorstack.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QStackedWidget>
 
@@ -52,7 +52,7 @@ public:
     bool setVisibleEditor(Core::IEditor *xmlEditor);
 
 private:
-    void modeAboutToChange(Core::Id m);
+    void modeAboutToChange(Utils::Id m);
 
     QVector<ScxmlTextEditor*> m_editors;
 };
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp
index 5941cf38f1..0ef4a3544a 100644
--- a/src/plugins/serialterminal/serialoutputpane.cpp
+++ b/src/plugins/serialterminal/serialoutputpane.cpp
@@ -303,7 +303,7 @@ void SerialOutputPane::createNewOutputWindow(SerialControl *rc)
 
     // Create new
     static int counter = 0;
-    Core::Id contextId = Core::Id(Constants::C_SERIAL_OUTPUT).withSuffix(counter++);
+    Utils::Id contextId = Utils::Id(Constants::C_SERIAL_OUTPUT).withSuffix(counter++);
     Core::Context context(contextId);
     auto ow = new Core::OutputWindow(context, QString(), m_tabWidget);
     using TextEditor::TextEditorSettings;
diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h
index 5af77fcd1d..705efbc273 100644
--- a/src/plugins/subversion/subversionclient.h
+++ b/src/plugins/subversion/subversionclient.h
@@ -72,7 +72,7 @@ public:
     static QStringList escapeFiles(const QStringList &files);
 
 protected:
-    Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
+    Utils::Id vcsEditorKind(VcsCommandTag cmd) const override;
 
 private:
     SubversionDiffEditorController *findOrCreateDiffEditor(const QString &documentId, const QString &source,
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index ab7cf17285..60754a8c33 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -50,7 +50,6 @@
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/messagemanager.h>
 
@@ -207,7 +206,7 @@ public:
 
     // IVersionControl
     QString displayName() const final;
-    Core::Id id() const final;
+    Utils::Id id() const final;
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
     bool managesDirectory(const QString &directory, QString *topLevel) const final;
@@ -281,7 +280,7 @@ private:
 
     inline bool isCommitEditorOpen() const;
     Core::IEditor *showOutputInEditor(const QString &title, const QString &output,
-                                      Core::Id id, const QString &source,
+                                      Utils::Id id, const QString &source,
                                       QTextCodec *codec);
 
     void filelog(const QString &workingDir,
@@ -1209,9 +1208,9 @@ QString SubversionPluginPrivate::displayName() const
     return QLatin1String("subversion");
 }
 
-Core::Id SubversionPluginPrivate::id() const
+Utils::Id SubversionPluginPrivate::id() const
 {
-    return Core::Id(VcsBase::Constants::VCS_ID_SUBVERSION);
+    return Utils::Id(VcsBase::Constants::VCS_ID_SUBVERSION);
 }
 
 bool SubversionPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
diff --git a/src/plugins/texteditor/codeassist/iassistprovider.cpp b/src/plugins/texteditor/codeassist/iassistprovider.cpp
index 9c6192f1a5..abbd9d1106 100644
--- a/src/plugins/texteditor/codeassist/iassistprovider.cpp
+++ b/src/plugins/texteditor/codeassist/iassistprovider.cpp
@@ -52,7 +52,7 @@ using namespace TextEditor;
 */
 
 /*!
-    \fn bool TextEditor::IAssistProvider::supportsEditor(Core::Id editorId) const
+    \fn bool TextEditor::IAssistProvider::supportsEditor(Utils::Id editorId) const
 
     Returns whether this provider supports the editor which has the \a editorId.
 */
diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h
index d611024626..ab95039da3 100644
--- a/src/plugins/texteditor/icodestylepreferencesfactory.h
+++ b/src/plugins/texteditor/icodestylepreferencesfactory.h
@@ -29,7 +29,7 @@
 
 #include "indenter.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QWidget>
 
@@ -58,7 +58,7 @@ public:
 
     virtual CodeStyleEditorWidget *createCodeStyleEditor(ICodeStylePreferences *codeStyle,
                                                          QWidget *parent = nullptr);
-    virtual Core::Id languageId() = 0;
+    virtual Utils::Id languageId() = 0;
     virtual QString displayName() = 0;
     virtual ICodeStylePreferences *createCodeStyle() const = 0;
     virtual QWidget *createEditor(ICodeStylePreferences *preferences, QWidget *parent) const = 0;
diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp
index b0747d7874..2906ef045c 100644
--- a/src/plugins/texteditor/refactoroverlay.cpp
+++ b/src/plugins/texteditor/refactoroverlay.cpp
@@ -97,7 +97,7 @@ void RefactorOverlay::paintMarker(const RefactorMarker& marker, QPainter *painte
     m_maxWidth = qMax(m_maxWidth, x + actualIconSize.width() - int(offset.x()));
 }
 
-RefactorMarkers RefactorMarker::filterOutType(const RefactorMarkers &markers, const Core::Id &type)
+RefactorMarkers RefactorMarker::filterOutType(const RefactorMarkers &markers, const Utils::Id &type)
 {
     return Utils::filtered(markers, [type](const RefactorMarker &marker) {
         return marker.type != type;
diff --git a/src/plugins/texteditor/refactoroverlay.h b/src/plugins/texteditor/refactoroverlay.h
index e6ed0655b6..ec3d342f0c 100644
--- a/src/plugins/texteditor/refactoroverlay.h
+++ b/src/plugins/texteditor/refactoroverlay.h
@@ -27,7 +27,7 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QTextCursor>
 #include <QIcon>
@@ -45,10 +45,10 @@ struct TEXTEDITOR_EXPORT RefactorMarker {
     QIcon icon;
     mutable QRect rect; // used to cache last drawing positin in document coordinates
     std::function<void(TextEditor::TextEditorWidget *)> callback;
-    Core::Id type;
+    Utils::Id type;
     QVariant data;
 
-    static RefactorMarkers filterOutType(const RefactorMarkers &markers, const Core::Id &type);
+    static RefactorMarkers filterOutType(const RefactorMarkers &markers, const Utils::Id &type);
 };
 
 
diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index 356ca7e1a8..97d658a07f 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -25,12 +25,8 @@
 
 #include "snippet.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/templateengine.h>
 
-#include <QLatin1Char>
-#include <QLatin1String>
 #include <QTextDocument>
 
 using namespace TextEditor;
@@ -48,21 +44,21 @@ NameMangler::~NameMangler() = default;
 class UppercaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const final { return UCMANGLER_ID; }
+    Utils::Id id() const final { return UCMANGLER_ID; }
     QString mangle(const QString &unmangled) const final { return unmangled.toUpper(); }
 };
 
 class LowercaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const final { return LCMANGLER_ID; }
+    Utils::Id id() const final { return LCMANGLER_ID; }
     QString mangle(const QString &unmangled) const final { return unmangled.toLower(); }
 };
 
 class TitlecaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const final { return TCMANGLER_ID; }
+    Utils::Id id() const final { return TCMANGLER_ID; }
     QString mangle(const QString &unmangled) const final
     {
         QString result = unmangled;
@@ -283,63 +279,63 @@ void Internal::TextEditorPlugin::testSnippetParsing_data()
     QTest::addColumn<bool>("success");
     QTest::addColumn<QList<int> >("ranges_start");
     QTest::addColumn<QList<int> >("ranges_length");
-    QTest::addColumn<QList<Core::Id> >("ranges_mangler");
+    QTest::addColumn<QList<Utils::Id> >("ranges_mangler");
 
     QTest::newRow("no input")
             << QString() << QString() << true
-            << (QList<int>()) << (QList<int>()) << (QList<Core::Id>());
+            << (QList<int>()) << (QList<int>()) << (QList<Utils::Id>());
     QTest::newRow("empty input")
             << QString::fromLatin1("") << QString::fromLatin1("") << true
-            << (QList<int>()) << (QList<int>()) << (QList<Core::Id>());
+            << (QList<int>()) << (QList<int>()) << (QList<Utils::Id>());
     QTest::newRow("newline only")
             << QString::fromLatin1("\n") << QString::fromLatin1("\n") << true
-            << (QList<int>()) << (QList<int>()) << (QList<Core::Id>());
+            << (QList<int>()) << (QList<int>()) << (QList<Utils::Id>());
 
     QTest::newRow("simple identifier")
             << QString::fromLatin1("$tESt$") << QString::fromLatin1("tESt") << true
             << (QList<int>() << 0) << (QList<int>() << 4)
-            << (QList<Core::Id>() << NOMANGLER_ID);
+            << (QList<Utils::Id>() << NOMANGLER_ID);
     QTest::newRow("simple identifier with lc")
             << QString::fromLatin1("$tESt:l$") << QString::fromLatin1("tESt") << true
             << (QList<int>() << 0) << (QList<int>() << 4)
-            << (QList<Core::Id>() << LCMANGLER_ID);
+            << (QList<Utils::Id>() << LCMANGLER_ID);
     QTest::newRow("simple identifier with uc")
             << QString::fromLatin1("$tESt:u$") << QString::fromLatin1("tESt") << true
             << (QList<int>() << 0) << (QList<int>() << 4)
-            << (QList<Core::Id>() << UCMANGLER_ID);
+            << (QList<Utils::Id>() << UCMANGLER_ID);
     QTest::newRow("simple identifier with tc")
             << QString::fromLatin1("$tESt:c$") << QString::fromLatin1("tESt") << true
             << (QList<int>() << 0) << (QList<int>() << 4)
-            << (QList<Core::Id>() << TCMANGLER_ID);
+            << (QList<Utils::Id>() << TCMANGLER_ID);
 
     QTest::newRow("escaped string")
             << QString::fromLatin1("\\\\$test\\\\$") << QString::fromLatin1("$test$") << true
             << (QList<int>()) << (QList<int>())
-            << (QList<Core::Id>());
+            << (QList<Utils::Id>());
     QTest::newRow("escaped escape")
             << QString::fromLatin1("\\\\\\\\$test$\\\\\\\\") << QString::fromLatin1("\\test\\") << true
             << (QList<int>() << 1) << (QList<int>() << 4)
-            << (QList<Core::Id>() << NOMANGLER_ID);
+            << (QList<Utils::Id>() << NOMANGLER_ID);
     QTest::newRow("broken escape")
             << QString::fromLatin1("\\\\$test\\\\\\\\$\\\\") << QString::fromLatin1("\\$test\\\\$\\") << false
             << (QList<int>()) << (QList<int>())
-            << (QList<Core::Id>());
+            << (QList<Utils::Id>());
 
     QTest::newRow("Q_PROPERTY")
             << QString::fromLatin1("Q_PROPERTY($type$ $name$ READ $name$ WRITE set$name:c$ NOTIFY $name$Changed)")
             << QString::fromLatin1("Q_PROPERTY(type name READ name WRITE setname NOTIFY nameChanged)") << true
             << (QList<int>() << 11 << 16 << 26 << 40 << 52)
             << (QList<int>() << 4 << 4 << 4 << 4 << 4)
-            << (QList<Core::Id>() << NOMANGLER_ID << NOMANGLER_ID << NOMANGLER_ID << TCMANGLER_ID << NOMANGLER_ID);
+            << (QList<Utils::Id>() << NOMANGLER_ID << NOMANGLER_ID << NOMANGLER_ID << TCMANGLER_ID << NOMANGLER_ID);
 
     QTest::newRow("open identifier")
             << QString::fromLatin1("$test") << QString::fromLatin1("$test") << false
             << (QList<int>()) << (QList<int>())
-            << (QList<Core::Id>());
+            << (QList<Utils::Id>());
     QTest::newRow("wrong mangler")
             << QString::fromLatin1("$test:X$") << QString::fromLatin1("$test:X$") << false
             << (QList<int>()) << (QList<int>())
-            << (QList<Core::Id>());
+            << (QList<Utils::Id>());
 
     QTest::newRow("multiline with :")
             << QString::fromLatin1("class $name$\n"
@@ -355,7 +351,7 @@ void Internal::TextEditorPlugin::testSnippetParsing_data()
             << true
             << (QList<int>() << 6 << 25)
             << (QList<int>() << 4 << 4)
-            << (QList<Core::Id>() << NOMANGLER_ID << NOMANGLER_ID);
+            << (QList<Utils::Id>() << NOMANGLER_ID << NOMANGLER_ID);
 
     QTest::newRow("escape sequences")
             << QString::fromLatin1("class $name$\\n"
@@ -371,7 +367,7 @@ void Internal::TextEditorPlugin::testSnippetParsing_data()
             << true
             << (QList<int>() << 6 << 23)
             << (QList<int>() << 4 << 4)
-            << (QList<Core::Id>() << NOMANGLER_ID << NOMANGLER_ID);
+            << (QList<Utils::Id>() << NOMANGLER_ID << NOMANGLER_ID);
 
 }
 
@@ -382,7 +378,7 @@ void Internal::TextEditorPlugin::testSnippetParsing()
     QFETCH(bool, success);
     QFETCH(QList<int>, ranges_start);
     QFETCH(QList<int>, ranges_length);
-    QFETCH(QList<Core::Id>, ranges_mangler);
+    QFETCH(QList<Utils::Id>, ranges_mangler);
     Q_ASSERT(ranges_start.count() == ranges_length.count()); // sanity check for the test data
     Q_ASSERT(ranges_start.count() == ranges_mangler.count()); // sanity check for the test data
 
@@ -394,7 +390,7 @@ void Internal::TextEditorPlugin::testSnippetParsing()
     for (int i = 0; i < ranges_start.count(); ++i) {
         QCOMPARE(result.ranges.at(i).start, ranges_start.at(i));
         QCOMPARE(result.ranges.at(i).length, ranges_length.at(i));
-        Core::Id id = NOMANGLER_ID;
+        Utils::Id id = NOMANGLER_ID;
         if (result.ranges.at(i).mangler)
             id = result.ranges.at(i).mangler->id();
         QCOMPARE(id, ranges_mangler.at(i));
diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h
index 620b1f0911..a1bb210745 100644
--- a/src/plugins/texteditor/snippets/snippet.h
+++ b/src/plugins/texteditor/snippets/snippet.h
@@ -27,7 +27,7 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QChar>
 #include <QList>
@@ -40,7 +40,7 @@ class TEXTEDITOR_EXPORT NameMangler
 public:
     virtual ~NameMangler();
 
-    virtual Core::Id id() const = 0;
+    virtual Utils::Id id() const = 0;
     virtual QString mangle(const QString &unmangled) const = 0;
 };
 
diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp
index 0f3ef7a05f..ee8d95736c 100644
--- a/src/plugins/texteditor/textdocument.cpp
+++ b/src/plugins/texteditor/textdocument.cpp
@@ -59,6 +59,7 @@
 #include <utils/qtcassert.h>
 
 using namespace Core;
+using namespace Utils;
 
 /*!
     \class TextEditor::BaseTextDocument
diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h
index 35e6b334ef..d91390869c 100644
--- a/src/plugins/texteditor/textdocument.h
+++ b/src/plugins/texteditor/textdocument.h
@@ -29,8 +29,9 @@
 #include "formatter.h"
 #include "indenter.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/textdocument.h>
+
+#include <utils/id.h>
 #include <utils/link.h>
 
 #include <QList>
@@ -65,7 +66,7 @@ class TEXTEDITOR_EXPORT TextDocument : public Core::BaseTextDocument
     Q_OBJECT
 
 public:
-    explicit TextDocument(Core::Id id = Core::Id());
+    explicit TextDocument(Utils::Id id = Utils::Id());
     ~TextDocument() override;
 
     static QMap<QString, QString> openedTextDocumentContents();
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 1b59aff6a0..fb5673aea3 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -707,8 +707,8 @@ public:
     void highlightSearchResults(const QTextBlock &block, const PaintEventData &data) const;
     QTimer m_delayedUpdateTimer;
 
-    void setExtraSelections(Core::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
-    QHash<Core::Id, QList<QTextEdit::ExtraSelection>> m_extraSelections;
+    void setExtraSelections(Utils::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
+    QHash<Utils::Id, QList<QTextEdit::ExtraSelection>> m_extraSelections;
 
     // block selection mode
     bool m_inBlockSelectionMode = false;
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index 599671003b..6a7aa5ec93 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -122,7 +122,7 @@ public:
     QChar characterAt(int pos) const;
     QString textAt(int from, int to) const;
 
-    void addContext(Core::Id id);
+    void addContext(Utils::Id id);
 
     // IEditor
     Core::IDocument *document() const override;
@@ -302,8 +302,8 @@ public:
     virtual void extraAreaMouseEvent(QMouseEvent *);
     void updateFoldingHighlight(const QPoint &pos);
 
-    void setLanguageSettingsId(Core::Id settingsId);
-    Core::Id languageSettingsId() const;
+    void setLanguageSettingsId(Utils::Id settingsId);
+    Utils::Id languageSettingsId() const;
 
     void setCodeStyle(ICodeStylePreferences *settings);
 
@@ -314,21 +314,21 @@ public:
     void ensureCursorVisible();
     void ensureBlockIsUnfolded(QTextBlock block);
 
-    static Core::Id FakeVimSelection;
-    static Core::Id SnippetPlaceholderSelection;
-    static Core::Id CurrentLineSelection;
-    static Core::Id ParenthesesMatchingSelection;
-    static Core::Id AutoCompleteSelection;
-    static Core::Id CodeWarningsSelection;
-    static Core::Id CodeSemanticsSelection;
-    static Core::Id UndefinedSymbolSelection;
-    static Core::Id UnusedSymbolSelection;
-    static Core::Id OtherSelection;
-    static Core::Id ObjCSelection;
-    static Core::Id DebuggerExceptionSelection;
-
-    void setExtraSelections(Core::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
-    QList<QTextEdit::ExtraSelection> extraSelections(Core::Id kind) const;
+    static Utils::Id FakeVimSelection;
+    static Utils::Id SnippetPlaceholderSelection;
+    static Utils::Id CurrentLineSelection;
+    static Utils::Id ParenthesesMatchingSelection;
+    static Utils::Id AutoCompleteSelection;
+    static Utils::Id CodeWarningsSelection;
+    static Utils::Id CodeSemanticsSelection;
+    static Utils::Id UndefinedSymbolSelection;
+    static Utils::Id UnusedSymbolSelection;
+    static Utils::Id OtherSelection;
+    static Utils::Id ObjCSelection;
+    static Utils::Id DebuggerExceptionSelection;
+
+    void setExtraSelections(Utils::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
+    QList<QTextEdit::ExtraSelection> extraSelections(Utils::Id kind) const;
     QString extraSelectionTooltip(int pos) const;
 
     RefactorMarkers refactorMarkers() const;
@@ -543,7 +543,7 @@ protected:
     virtual void triggerPendingUpdates();
     virtual void applyFontSettings();
 
-    void showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId);
+    void showDefaultContextMenu(QContextMenuEvent *e, Utils::Id menuContextId);
     virtual void finalizeInitialization() {}
     virtual void finalizeInitializationAfterDuplication(TextEditorWidget *) {}
     static QTextCursor flippedCursor(const QTextCursor &cursor);
@@ -552,7 +552,7 @@ public:
     QString selectedText() const;
 
     void setupGenericHighlighter();
-    void setupFallBackEditor(Core::Id id);
+    void setupFallBackEditor(Utils::Id id);
 
     void remove(int length);
     void replace(int length, const QString &string);
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index e1c037fa1e..e6ac56e085 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -56,10 +56,10 @@ class TextEditorActionHandlerPrivate : public QObject
     Q_DECLARE_TR_FUNCTIONS(TextEditor::Internal::TextEditorActionHandler)
 
 public:
-    TextEditorActionHandlerPrivate(Core::Id editorId, Core::Id contextId, uint optionalActions);
+    TextEditorActionHandlerPrivate(Utils::Id editorId, Utils::Id contextId, uint optionalActions);
 
-    QAction *registerActionHelper(Core::Id id, bool scriptable, const QString &title,
-                            const QKeySequence &keySequence, Core::Id menueGroup,
+    QAction *registerActionHelper(Utils::Id id, bool scriptable, const QString &title,
+                            const QKeySequence &keySequence, Utils::Id menueGroup,
                             Core::ActionContainer *container,
                             std::function<void(bool)> slot)
     {
@@ -75,36 +75,36 @@ public:
         return result;
     }
 
-    QAction *registerAction(Core::Id id,
+    QAction *registerAction(Utils::Id id,
                             std::function<void(TextEditorWidget *)> slot,
                             bool scriptable = false,
                             const QString &title = QString(),
                             const QKeySequence &keySequence = QKeySequence(),
-                            Core::Id menueGroup = Core::Id(),
+                            Utils::Id menueGroup = Utils::Id(),
                             Core::ActionContainer *container = nullptr)
     {
         return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
             [this, slot](bool) { if (m_currentEditorWidget) slot(m_currentEditorWidget); });
     }
 
-    QAction *registerBoolAction(Core::Id id,
+    QAction *registerBoolAction(Utils::Id id,
                             std::function<void(TextEditorWidget *, bool)> slot,
                             bool scriptable = false,
                             const QString &title = QString(),
                             const QKeySequence &keySequence = QKeySequence(),
-                            Core::Id menueGroup = Core::Id(),
+                            Utils::Id menueGroup = Utils::Id(),
                             Core::ActionContainer *container = nullptr)
     {
         return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
             [this, slot](bool on) { if (m_currentEditorWidget) slot(m_currentEditorWidget, on); });
     }
 
-    QAction *registerIntAction(Core::Id id,
+    QAction *registerIntAction(Utils::Id id,
                             std::function<void(TextEditorWidget *, int)> slot,
                             bool scriptable = false,
                             const QString &title = QString(),
                             const QKeySequence &keySequence = QKeySequence(),
-                            Core::Id menueGroup = Core::Id(),
+                            Utils::Id menueGroup = Utils::Id(),
                             Core::ActionContainer *container = nullptr)
     {
         return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
@@ -190,12 +190,12 @@ public:
 
     uint m_optionalActions = TextEditorActionHandler::None;
     QPointer<TextEditorWidget> m_currentEditorWidget;
-    Core::Id m_editorId;
-    Core::Id m_contextId;
+    Utils::Id m_editorId;
+    Utils::Id m_contextId;
 };
 
 TextEditorActionHandlerPrivate::TextEditorActionHandlerPrivate
-    (Core::Id editorId, Core::Id contextId, uint optionalActions)
+    (Utils::Id editorId, Utils::Id contextId, uint optionalActions)
   : m_optionalActions(optionalActions)
   , m_editorId(editorId)
   , m_contextId(contextId)
@@ -609,8 +609,8 @@ void TextEditorActionHandlerPrivate::updateCurrentEditor(Core::IEditor *editor)
 
 } // namespace Internal
 
-TextEditorActionHandler::TextEditorActionHandler(Core::Id editorId,
-                                                 Core::Id contextId,
+TextEditorActionHandler::TextEditorActionHandler(Utils::Id editorId,
+                                                 Utils::Id contextId,
                                                  uint optionalActions,
                                                  const TextEditorWidgetResolver &resolver)
     : d(new Internal::TextEditorActionHandlerPrivate(editorId, contextId, optionalActions))
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index e32c3ae0b0..755e909c83 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -27,7 +27,7 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -61,8 +61,8 @@ public:
     };
     using TextEditorWidgetResolver = std::function<TextEditorWidget *(Core::IEditor *)>;
 
-    TextEditorActionHandler(Core::Id editorId,
-                            Core::Id contextId,
+    TextEditorActionHandler(Utils::Id editorId,
+                            Utils::Id contextId,
                             uint optionalActions = None,
                             const TextEditorWidgetResolver &resolver = {});
 
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index fd361b0748..392a5062b6 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -56,6 +56,7 @@
 #include <QDir>
 
 using namespace Core;
+using namespace Utils;
 
 namespace TextEditor {
 namespace Internal {
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 92b722bf3e..49a44639a9 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -72,11 +72,11 @@ public:
     SnippetsSettingsPage m_snippetsSettingsPage;
     CompletionSettingsPage m_completionSettingsPage;
 
-    QMap<Core::Id, ICodeStylePreferencesFactory *> m_languageToFactory;
+    QMap<Utils::Id, ICodeStylePreferencesFactory *> m_languageToFactory;
 
-    QMap<Core::Id, ICodeStylePreferences *> m_languageToCodeStyle;
-    QMap<Core::Id, CodeStylePool *> m_languageToCodeStylePool;
-    QMap<QString, Core::Id> m_mimeTypeToLanguage;
+    QMap<Utils::Id, ICodeStylePreferences *> m_languageToCodeStyle;
+    QMap<Utils::Id, CodeStylePool *> m_languageToCodeStylePool;
+    QMap<QString, Utils::Id> m_mimeTypeToLanguage;
 
 private:
     static std::vector<FormatDescription> initialFormats();
@@ -458,17 +458,17 @@ void TextEditorSettings::registerCodeStyleFactory(ICodeStylePreferencesFactory *
     d->m_languageToFactory.insert(factory->languageId(), factory);
 }
 
-void TextEditorSettings::unregisterCodeStyleFactory(Core::Id languageId)
+void TextEditorSettings::unregisterCodeStyleFactory(Utils::Id languageId)
 {
     d->m_languageToFactory.remove(languageId);
 }
 
-const QMap<Core::Id, ICodeStylePreferencesFactory *> &TextEditorSettings::codeStyleFactories()
+const QMap<Utils::Id, ICodeStylePreferencesFactory *> &TextEditorSettings::codeStyleFactories()
 {
     return d->m_languageToFactory;
 }
 
-ICodeStylePreferencesFactory *TextEditorSettings::codeStyleFactory(Core::Id languageId)
+ICodeStylePreferencesFactory *TextEditorSettings::codeStyleFactory(Utils::Id languageId)
 {
     return d->m_languageToFactory.value(languageId);
 }
@@ -478,22 +478,22 @@ ICodeStylePreferences *TextEditorSettings::codeStyle()
     return d->m_behaviorSettingsPage.codeStyle();
 }
 
-ICodeStylePreferences *TextEditorSettings::codeStyle(Core::Id languageId)
+ICodeStylePreferences *TextEditorSettings::codeStyle(Utils::Id languageId)
 {
     return d->m_languageToCodeStyle.value(languageId, codeStyle());
 }
 
-QMap<Core::Id, ICodeStylePreferences *> TextEditorSettings::codeStyles()
+QMap<Utils::Id, ICodeStylePreferences *> TextEditorSettings::codeStyles()
 {
     return d->m_languageToCodeStyle;
 }
 
-void TextEditorSettings::registerCodeStyle(Core::Id languageId, ICodeStylePreferences *prefs)
+void TextEditorSettings::registerCodeStyle(Utils::Id languageId, ICodeStylePreferences *prefs)
 {
     d->m_languageToCodeStyle.insert(languageId, prefs);
 }
 
-void TextEditorSettings::unregisterCodeStyle(Core::Id languageId)
+void TextEditorSettings::unregisterCodeStyle(Utils::Id languageId)
 {
     d->m_languageToCodeStyle.remove(languageId);
 }
@@ -503,27 +503,27 @@ CodeStylePool *TextEditorSettings::codeStylePool()
     return d->m_behaviorSettingsPage.codeStylePool();
 }
 
-CodeStylePool *TextEditorSettings::codeStylePool(Core::Id languageId)
+CodeStylePool *TextEditorSettings::codeStylePool(Utils::Id languageId)
 {
     return d->m_languageToCodeStylePool.value(languageId);
 }
 
-void TextEditorSettings::registerCodeStylePool(Core::Id languageId, CodeStylePool *pool)
+void TextEditorSettings::registerCodeStylePool(Utils::Id languageId, CodeStylePool *pool)
 {
     d->m_languageToCodeStylePool.insert(languageId, pool);
 }
 
-void TextEditorSettings::unregisterCodeStylePool(Core::Id languageId)
+void TextEditorSettings::unregisterCodeStylePool(Utils::Id languageId)
 {
     d->m_languageToCodeStylePool.remove(languageId);
 }
 
-void TextEditorSettings::registerMimeTypeForLanguageId(const char *mimeType, Core::Id languageId)
+void TextEditorSettings::registerMimeTypeForLanguageId(const char *mimeType, Utils::Id languageId)
 {
     d->m_mimeTypeToLanguage.insert(QString::fromLatin1(mimeType), languageId);
 }
 
-Core::Id TextEditorSettings::languageId(const QString &mimeType)
+Utils::Id TextEditorSettings::languageId(const QString &mimeType)
 {
     return d->m_mimeTypeToLanguage.value(mimeType);
 }
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index 675c459d2e..c9c3bedf35 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -27,7 +27,7 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
+#include <utils/id.h>
 
 #include <QObject>
 
@@ -78,24 +78,24 @@ public:
     static const ExtraEncodingSettings &extraEncodingSettings();
     static const CommentsSettings &commentsSettings();
 
-    static ICodeStylePreferencesFactory *codeStyleFactory(Core::Id languageId);
-    static const QMap<Core::Id, ICodeStylePreferencesFactory *> &codeStyleFactories();
+    static ICodeStylePreferencesFactory *codeStyleFactory(Utils::Id languageId);
+    static const QMap<Utils::Id, ICodeStylePreferencesFactory *> &codeStyleFactories();
     static void registerCodeStyleFactory(ICodeStylePreferencesFactory *codeStyleFactory);
-    static void unregisterCodeStyleFactory(Core::Id languageId);
+    static void unregisterCodeStyleFactory(Utils::Id languageId);
 
     static CodeStylePool *codeStylePool();
-    static CodeStylePool *codeStylePool(Core::Id languageId);
-    static void registerCodeStylePool(Core::Id languageId, CodeStylePool *pool);
-    static void unregisterCodeStylePool(Core::Id languageId);
+    static CodeStylePool *codeStylePool(Utils::Id languageId);
+    static void registerCodeStylePool(Utils::Id languageId, CodeStylePool *pool);
+    static void unregisterCodeStylePool(Utils::Id languageId);
 
     static ICodeStylePreferences *codeStyle();
-    static ICodeStylePreferences *codeStyle(Core::Id languageId);
-    static QMap<Core::Id, ICodeStylePreferences *> codeStyles();
-    static void registerCodeStyle(Core::Id languageId, ICodeStylePreferences *prefs);
-    static void unregisterCodeStyle(Core::Id languageId);
+    static ICodeStylePreferences *codeStyle(Utils::Id languageId);
+    static QMap<Utils::Id, ICodeStylePreferences *> codeStyles();
+    static void registerCodeStyle(Utils::Id languageId, ICodeStylePreferences *prefs);
+    static void unregisterCodeStyle(Utils::Id languageId);
 
-    static void registerMimeTypeForLanguageId(const char *mimeType, Core::Id languageId);
-    static Core::Id languageId(const QString &mimeType);
+    static void registerMimeTypeForLanguageId(const char *mimeType, Utils::Id languageId);
+    static Utils::Id languageId(const QString &mimeType);
     static int increaseFontZoom(int step);
     static void resetFontZoom();
 
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index d8f0e3f740..971d8f22a6 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -27,10 +27,10 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
-#include <utils/theme/theme.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/optional.h>
+#include <utils/theme/theme.h>
 
 #include <QIcon>
 #include <QVector>
@@ -53,7 +53,7 @@ class TEXTEDITOR_EXPORT TextMark
 public:
     TextMark(const Utils::FilePath &fileName,
              int lineNumber,
-             Core::Id category,
+             Utils::Id category,
              double widthFactor = 1.0);
     TextMark() = delete;
     virtual ~TextMark();
@@ -105,7 +105,7 @@ public:
     void setPriority(Priority prioriy);
     bool isVisible() const;
     void setVisible(bool isVisible);
-    Core::Id category() const { return m_category; }
+    Utils::Id category() const { return m_category; }
     double widthFactor() const;
     void setWidthFactor(double factor);
 
@@ -137,7 +137,7 @@ private:
     QIcon m_icon;
     Utils::optional<Utils::Theme::Color> m_color;
     bool m_visible = false;
-    Core::Id m_category;
+    Utils::Id m_category;
     double m_widthFactor = 1.0;
     QString m_lineAnnotation;
     QString m_toolTip;
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 57f49dc08c..8c05223843 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -69,7 +69,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/modemanager.h>
 
 #include <ssh/sshconnection.h>
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index cfffd2003b..6b44848665 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -217,7 +217,7 @@ int VcsBaseClientImpl::vcsTimeoutS() const
     return m_clientSettings->vcsTimeoutS();
 }
 
-VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Core::Id kind, QString title,
+VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Utils::Id kind, QString title,
                                                         const QString &source, QTextCodec *codec,
                                                         const char *registerDynamicProperty,
                                                         const QString &dynamicPropertyValue) const
@@ -352,7 +352,7 @@ VcsBaseEditorWidget *VcsBaseClient::annotate(
     const QString vcsCmdString = vcsCommandString(AnnotateCommand);
     QStringList args;
     args << vcsCmdString << revisionSpec(revision) << extraOptions << file;
-    const Core::Id kind = vcsEditorKind(AnnotateCommand);
+    const Utils::Id kind = vcsEditorKind(AnnotateCommand);
     const QString id = VcsBaseEditor::getSource(workingDir, QStringList(file));
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBaseEditor::getSource(workingDir, file);
@@ -371,7 +371,7 @@ void VcsBaseClient::diff(const QString &workingDir, const QStringList &files,
                          const QStringList &extraOptions)
 {
     const QString vcsCmdString = vcsCommandString(DiffCommand);
-    const Core::Id kind = vcsEditorKind(DiffCommand);
+    const Utils::Id kind = vcsEditorKind(DiffCommand);
     const QString id = VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBaseEditor::getSource(workingDir, files);
@@ -413,7 +413,7 @@ void VcsBaseClient::log(const QString &workingDir, const QStringList &files,
                         bool enableAnnotationContextMenu)
 {
     const QString vcsCmdString = vcsCommandString(LogCommand);
-    const Core::Id kind = vcsEditorKind(LogCommand);
+    const Utils::Id kind = vcsEditorKind(LogCommand);
     const QString id = VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
     const QString source = VcsBaseEditor::getSource(workingDir, files);
@@ -543,7 +543,7 @@ void VcsBaseClient::view(const QString &source, const QString &id,
 {
     QStringList args;
     args << extraOptions << revisionSpec(id);
-    const Core::Id kind = vcsEditorKind(DiffCommand);
+    const Utils::Id kind = vcsEditorKind(DiffCommand);
     const QString title = vcsEditorTitle(vcsCommandString(LogCommand), id);
 
     VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index d5b43759ab..258a93cb57 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -27,9 +27,8 @@
 
 #include "vcsbase_global.h"
 
-#include <coreplugin/id.h>
-
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/synchronousprocess.h>
 
 #include <QObject>
@@ -71,7 +70,7 @@ public:
         VcsWindowOutputBind
     };
 
-    VcsBaseEditorWidget *createVcsEditor(Core::Id kind, QString title,
+    VcsBaseEditorWidget *createVcsEditor(Utils::Id kind, QString title,
                                          const QString &source, QTextCodec *codec,
                                          const char *registerDynamicProperty,
                                          const QString &dynamicPropertyValue) const;
@@ -221,7 +220,7 @@ public:
     };
 protected:
     virtual QString vcsCommandString(VcsCommandTag cmd) const;
-    virtual Core::Id vcsEditorKind(VcsCommandTag cmd) const = 0;
+    virtual Utils::Id vcsEditorKind(VcsCommandTag cmd) const = 0;
     virtual Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const;
 
     virtual QStringList revisionSpec(const QString &/*revision*/) const { return {}; }
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 5a64985678..713d15ac61 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -32,7 +32,6 @@
 
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/projecttree.h>
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
index 0e725e6ef2..e84745d6e0 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
@@ -25,7 +25,6 @@
 
 #include "vcscommandpage.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/shellcommand.h>
 #include <coreplugin/vcsmanager.h>
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.h b/src/plugins/vcsbase/wizard/vcscommandpage.h
index 1b51f4b8e2..b09af42b3d 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.h
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.h
@@ -43,9 +43,9 @@ class VcsCommandPageFactory : public ProjectExplorer::JsonWizardPageFactory
 public:
     VcsCommandPageFactory();
 
-    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
                               const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 class VcsCommandPage : public Utils::ShellCommandPage
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
index 2f6c1c3598..8dddc44bad 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
@@ -66,6 +66,7 @@
 
 using namespace Core;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace VcsBase {
 namespace Internal {
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.h b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
index d24898ea9d..53e0e61b73 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
@@ -43,9 +43,9 @@ class VcsConfigurationPageFactory : public ProjectExplorer::JsonWizardPageFactor
 public:
     VcsConfigurationPageFactory();
 
-    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+    Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
                               const QVariant &data) override;
-    bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+    bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/vcsbase/wizard/vcsjsextension.cpp b/src/plugins/vcsbase/wizard/vcsjsextension.cpp
index 35f73ae8a1..bd052db21a 100644
--- a/src/plugins/vcsbase/wizard/vcsjsextension.cpp
+++ b/src/plugins/vcsbase/wizard/vcsjsextension.cpp
@@ -29,6 +29,7 @@
 #include <coreplugin/vcsmanager.h>
 
 using namespace Core;
+using namespace Utils;
 
 namespace VcsBase {
 namespace Internal {
diff --git a/src/plugins/webassembly/webassemblyqtversion.cpp b/src/plugins/webassembly/webassemblyqtversion.cpp
index ba1b0a7699..f0d616a6e9 100644
--- a/src/plugins/webassembly/webassemblyqtversion.cpp
+++ b/src/plugins/webassembly/webassemblyqtversion.cpp
@@ -49,7 +49,7 @@ QString WebAssemblyQtVersion::description() const
                                        "Qt Version is meant for WebAssembly");
 }
 
-QSet<Core::Id> WebAssemblyQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> WebAssemblyQtVersion::targetDeviceTypes() const
 {
     return {Constants::WEBASSEMBLY_DEVICE_TYPE};
 }
diff --git a/src/plugins/webassembly/webassemblyqtversion.h b/src/plugins/webassembly/webassemblyqtversion.h
index 0b590e7f1c..529ff07a05 100644
--- a/src/plugins/webassembly/webassemblyqtversion.h
+++ b/src/plugins/webassembly/webassemblyqtversion.h
@@ -38,7 +38,7 @@ public:
 
     QString description() const override;
 
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 };
 
 class WebAssemblyQtVersionFactory : public QtSupport::QtVersionFactory
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 977e61b0fe..bdbd6a3299 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -63,7 +63,7 @@ static CommandLine emrunCommand(Target *target, const QString &browser, const QS
 class EmrunRunConfiguration : public ProjectExplorer::RunConfiguration
 {
 public:
-    EmrunRunConfiguration(Target *target, Core::Id id)
+    EmrunRunConfiguration(Target *target, Utils::Id id)
             : RunConfiguration(target, id)
     {
         auto webBrowserAspect = addAspect<WebBrowserSelectionAspect>(target);
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index b3f14a0d73..1a1b840f00 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -372,7 +372,7 @@ void WelcomeMode::initPlugins()
     if (!m_activePage.isValid() && !m_pageButtons.isEmpty()) {
         const int welcomeIndex = Utils::indexOf(m_pluginList,
                                                 Utils::equal(&IWelcomePage::id,
-                                                             Core::Id("Examples")));
+                                                             Utils::Id("Examples")));
         const int defaultIndex = welcomeIndex >= 0 ? welcomeIndex : 0;
         m_activePage = m_pluginList.at(defaultIndex)->id();
         m_pageButtons.at(defaultIndex)->click();
diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp
index ed33868491..1a77ca6846 100644
--- a/src/plugins/winrt/winrtdevice.cpp
+++ b/src/plugins/winrt/winrtdevice.cpp
@@ -98,7 +98,7 @@ QVariantMap WinRtDevice::toMap() const
     return map;
 }
 
-QString WinRtDevice::displayNameForType(Core::Id type)
+QString WinRtDevice::displayNameForType(Utils::Id type)
 {
     if (type == Constants::WINRT_DEVICE_TYPE_LOCAL)
         return QCoreApplication::translate("WinRt::Internal::WinRtDevice",
@@ -115,7 +115,7 @@ QString WinRtDevice::displayNameForType(Core::Id type)
 
 // Factory
 
-WinRtDeviceFactory::WinRtDeviceFactory(Core::Id deviceType)
+WinRtDeviceFactory::WinRtDeviceFactory(Utils::Id deviceType)
     : ProjectExplorer::IDeviceFactory(deviceType)
 {
     if (allPrerequisitesLoaded()) {
@@ -311,7 +311,7 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
             }
 
             const IDevice::MachineType machineType = machineTypeFromLine(line);
-            Core::Id deviceType;
+            Utils::Id deviceType;
             QString name;
             QString internalName = QStringLiteral("WinRT.");
             if (state == AppxState) {
@@ -334,7 +334,7 @@ void WinRtDeviceFactory::parseRunnerOutput(const QByteArray &output) const
                     deviceType = Constants::WINRT_DEVICE_TYPE_PHONE;
             }
             internalName += QString::number(deviceId);
-            const Core::Id internalId = Core::Id::fromString(internalName);
+            const Utils::Id internalId = Utils::Id::fromString(internalName);
             ++numFound;
             if (DeviceManager::instance()->find(internalId)) {
                 qCDebug(winrtDeviceLog) << __FUNCTION__ << "Skipping device with ID" << deviceId;
diff --git a/src/plugins/winrt/winrtdevice.h b/src/plugins/winrt/winrtdevice.h
index d6eeb4cba9..aeb77f64cc 100644
--- a/src/plugins/winrt/winrtdevice.h
+++ b/src/plugins/winrt/winrtdevice.h
@@ -46,7 +46,7 @@ public:
     void fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 
-    static QString displayNameForType(Core::Id type);
+    static QString displayNameForType(Utils::Id type);
     int deviceId() const { return m_deviceId; }
     void setDeviceId(int deviceId) { m_deviceId = deviceId; }
 
@@ -60,7 +60,7 @@ class WinRtDeviceFactory final : public QObject, public ProjectExplorer::IDevice
 {
     Q_OBJECT
 public:
-    explicit WinRtDeviceFactory(Core::Id deviceType);
+    explicit WinRtDeviceFactory(Utils::Id deviceType);
 
     void autoDetect();
     void onPrerequisitesLoaded();
diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
index 5c2759672a..1a45fb92a0 100644
--- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp
+++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
@@ -90,7 +90,7 @@ class WinRtPackageDeploymentStep final : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(WinRt::Internal::WinRtPackageDeploymentStep)
 
 public:
-    WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id);
+    WinRtPackageDeploymentStep(BuildStepList *bsl, Utils::Id id);
 
     QString defaultWinDeployQtArguments() const;
 
@@ -170,7 +170,7 @@ void WinRtArgumentsAspect::restoreDefaultValue()
     setValue(m_defaultValue);
 }
 
-WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id)
+WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDisplayName(tr("Run windeployqt"));
diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp
index dc696d41f6..868b93dc24 100644
--- a/src/plugins/winrt/winrtphoneqtversion.cpp
+++ b/src/plugins/winrt/winrtphoneqtversion.cpp
@@ -27,9 +27,10 @@
 
 #include "winrtconstants.h"
 
-#include <coreplugin/id.h>
 #include <qtsupport/qtsupportconstants.h>
 
+#include <utils/id.h>
+
 #include <QSet>
 
 namespace WinRt {
@@ -40,17 +41,17 @@ QString WinRtPhoneQtVersion::description() const
     return tr("Windows Phone");
 }
 
-QSet<Core::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
 {
     return {Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR};
 }
 
-QSet<Core::Id> WinRtPhoneQtVersion::availableFeatures() const
+QSet<Utils::Id> WinRtPhoneQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(QtSupport::Constants::FEATURE_MOBILE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
-    features.remove(Core::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
+    features.remove(Utils::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h
index a8f7062ae7..5133e84ba9 100644
--- a/src/plugins/winrt/winrtphoneqtversion.h
+++ b/src/plugins/winrt/winrtphoneqtversion.h
@@ -36,10 +36,10 @@ class WinRtPhoneQtVersion : public QtSupport::BaseQtVersion
 public:
     WinRtPhoneQtVersion() = default;
 
-    QSet<Core::Id> availableFeatures() const override;
+    QSet<Utils::Id> availableFeatures() const override;
 
     QString description() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 };
 
 class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp
index 33d6a32bdc..7bc66c3618 100644
--- a/src/plugins/winrt/winrtqtversion.cpp
+++ b/src/plugins/winrt/winrtqtversion.cpp
@@ -38,17 +38,17 @@ QString WinRtQtVersion::description() const
     return tr("Windows Runtime");
 }
 
-QSet<Core::Id> WinRtQtVersion::availableFeatures() const
+QSet<Utils::Id> WinRtQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(QtSupport::Constants::FEATURE_MOBILE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
-    features.remove(Core::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
+    features.remove(Utils::Id::versionedId(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1));
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> WinRtQtVersion::targetDeviceTypes() const
 {
     return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR};
 }
diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h
index 40030e4e6c..ffd36af268 100644
--- a/src/plugins/winrt/winrtqtversion.h
+++ b/src/plugins/winrt/winrtqtversion.h
@@ -38,9 +38,9 @@ public:
     WinRtQtVersion() = default;
 
     QString description() const override;
-    QSet<Core::Id> availableFeatures() const override;
+    QSet<Utils::Id> availableFeatures() const override;
 
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 };
 
 class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp
index 163fc2f5d9..b39468abe7 100644
--- a/src/plugins/winrt/winrtrunconfiguration.cpp
+++ b/src/plugins/winrt/winrtrunconfiguration.cpp
@@ -65,7 +65,7 @@ LoopbackExemptServerAspect::LoopbackExemptServerAspect()
 
 // WinRtRunConfiguration
 
-WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Core::Id id)
+WinRtRunConfiguration::WinRtRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     setDisplayName(tr("Run App Package"));
diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h
index 41621dbb36..3401651d99 100644
--- a/src/plugins/winrt/winrtrunconfiguration.h
+++ b/src/plugins/winrt/winrtrunconfiguration.h
@@ -59,7 +59,7 @@ class WinRtRunConfiguration : public ProjectExplorer::RunConfiguration
     Q_OBJECT
 
 public:
-    WinRtRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    WinRtRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 };
 
 class WinRtRunConfigurationFactory  : public ProjectExplorer::RunConfigurationFactory
diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp
index c5a365edef..53099cec5c 100644
--- a/src/plugins/winrt/winrtruncontrol.cpp
+++ b/src/plugins/winrt/winrtruncontrol.cpp
@@ -44,7 +44,7 @@
 using ProjectExplorer::DeviceKitAspect;
 using ProjectExplorer::IDevice;
 using ProjectExplorer::RunControl;
-using Core::Id;
+using Utils::Id;
 using ProjectExplorer::Target;
 
 namespace WinRt {
diff --git a/tests/unit/mockup/projectexplorer/taskhub.h b/tests/unit/mockup/projectexplorer/taskhub.h
index b172068c68..8e4b8dd585 100644
--- a/tests/unit/mockup/projectexplorer/taskhub.h
+++ b/tests/unit/mockup/projectexplorer/taskhub.h
@@ -38,8 +38,7 @@ public:
         return nullptr;
     }
 
-    static void addTask(Task::TaskType type, const QString &description,
-                        Core::Id category)
+    static void addTask(Task::TaskType type, const QString &description, Utils::Id category)
     {
     }
author	hjk <hjk@qt.io>	2020-06-26 13:59:38 +0200
committer	hjk <hjk@qt.io>	2020-07-06 11:15:18 +0000
commit	e1c88116b397ecac2ef0f0678a419790a3e40402 (patch)
tree	830be4b2f1aabad0522c7e01287ec9197b55e4cf
parent	c9eedbe0f387f33e5e455af03a795d2114528543 (diff)