diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 5fe93bcb651873f044010d6513ada291d66acdca..ccad6c2e108cf262e45b96bb4fd18d55005acf9a 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -155,7 +155,7 @@ FileManager::FileManager(QMainWindow *mw)
         this, SLOT(changedFile(QString)));
     connect(d->m_mainWindow, SIGNAL(windowActivated()),
         this, SLOT(mainWindowActivated()));
-    connect(core, SIGNAL(contextChanged(Core::IContext*,QList<int>)),
+    connect(core, SIGNAL(contextChanged(Core::IContext*,Core::Context)),
         this, SLOT(syncWithEditor(Core::IContext*)));
 
     const QSettings *s = core->settings();
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 545e213836cd47599bec0ca320e0ed50074b8fc0..414aa4bdb141e6fe0155e5b943a8e6fdf639692e 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -34,7 +34,6 @@
 
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QtCore/QList>
 #include <QtGui/QAbstractItemView>
 
 QT_BEGIN_NAMESPACE
@@ -91,8 +90,6 @@ class VCSBASE_EXPORT VCSBaseSubmitEditor : public Core::IEditor
     Q_PROPERTY(bool lineWrap READ lineWrap WRITE setLineWrap DESIGNABLE true)
     Q_PROPERTY(int lineWrapWidth READ lineWrapWidth WRITE setLineWrapWidth DESIGNABLE true)
     Q_PROPERTY(QString checkScriptWorkingDirectory READ checkScriptWorkingDirectory WRITE setCheckScriptWorkingDirectory DESIGNABLE true)
-public:
-    typedef QList<int> Context;
 
 protected:
     explicit VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters,