2 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h
index 5af77fcd1d5..705efbc2731 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 ab7cf172851..60754a8c33c 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