diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 1c2dc8e267e..2470c4f4d6a 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -31,7 +31,6 @@
 #include "editormanager.h"
 #include "coreconstants.h"
 #include "modemanager.h"
-#include "uniqueidmanager.h"
 #include "minisplitter.h"
 #include "findplaceholder.h"
 #include "outputpane.h"
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index ccf3409c507..53d3f95c11b 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -35,7 +35,6 @@
 #include "minisplitter.h"
 #include "openeditorswindow.h"
 #include "stackededitorgroup.h"
-#include "uniqueidmanager.h"
 #include "actionmanager/actionmanager.h"
 
 #include <utils/qtcassert.h>
@@ -62,9 +61,8 @@ EditorSplitter::~EditorSplitter()
 
 void EditorSplitter::registerActions()
 {
-    QList<int> gc = QList<int>() << Constants::C_GLOBAL_ID;
-    const QList<int> editorManagerContext =
-            QList<int>() << ICore::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER);
+    const Context gc(Constants::C_GLOBAL_ID);
+    const Context editorManagerContext(Constants::C_EDITORMANAGER);
 
     ActionManager *am = ICore::instance()->actionManager();
     ActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 4b854873824..022a8760e75 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -31,7 +31,6 @@
 #include "progressview.h"
 #include "coreconstants.h"
 #include "icore.h"
-#include "uniqueidmanager.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index 1849d81595e..d99dfa7e1d3 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -31,7 +31,6 @@
 
 #include "coreconstants.h"
 #include "mainwindow.h"
-#include "uniqueidmanager.h"
 #include "statusbarwidget.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index f9f1de8d40e..80daa5b0ea2 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -39,7 +39,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
-#include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>