diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 7cbe350b370501d4775bd51ea14a4f5b313367bf..68b03c0a5d48f3df6384af1a58b7abd659abb469 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -41,7 +41,6 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/modemanager.h>
 
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 758f920f9b648ee54eb1154f6560504a0734ca28..d9cd741f90300f85072febbde4ae982cfec58907 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -34,7 +34,6 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/imode.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/mainwindow.h>
 
 #include <QtGui/QHBoxLayout>
diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp
index c8688acff9811f06b314f276be3700fe89f6fb3d..5af535789bba0498709fada6d6a5672c9e109ccd 100644
--- a/src/plugins/coreplugin/findplaceholder.cpp
+++ b/src/plugins/coreplugin/findplaceholder.cpp
@@ -28,7 +28,6 @@
 **************************************************************************/
 
 #include "findplaceholder.h"
-#include "modemanager.h"
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index c4d5e16e9e64ad0dba7d3579779331bb700f05a7..68ae83dca79cbda8a9e5c4c56f808e3e36fdf940 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -29,7 +29,6 @@
 
 #include "sidebar.h"
 #include "imode.h"
-#include "modemanager.h"
 
 #include "actionmanager/actionmanager.h"
 #include "actionmanager/command.h"
diff --git a/src/plugins/designer/designerxmleditor.cpp b/src/plugins/designer/designerxmleditor.cpp
index 562d87ddc58227020f157920998d530ef6b1ce46..adc039e131dd260aa869835cbf9e8edbe9927af3 100644
--- a/src/plugins/designer/designerxmleditor.cpp
+++ b/src/plugins/designer/designerxmleditor.cpp
@@ -31,14 +31,7 @@
 #include "formwindoweditor.h"
 #include "designerconstants.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/imode.h>
-#include <coreplugin/coreconstants.h>
-
 #include <QtDesigner/QDesignerFormWindowInterface>
-
 #include <QtCore/QDebug>
 
 namespace Designer {
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index f8770f5b48692d798093c3b8e9bb9e324e6ab485..94eeaea14a5f57f4909da4b5a23abe084afae77b 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -42,7 +42,6 @@
 #include <widgethost.h>
 
 #include <coreplugin/editortoolbar.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 760c3c491e44fe4437c761f96b17788b54e0a756..6f1f55e91d4534056b764e67fc8ee1ba64bce985 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -37,8 +37,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <texteditor/basetextdocument.h>
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 8310ef1999cabff710b47161f9775f2ac9c42519..10d9a5a21dc5aa19876132a1ef35aaa593b35390 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -45,7 +45,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/actionmanager/commandmappings.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp
index 448eba3ba5298f63f513ce30c0e38b5dc69ded74..728a73dec54a84594fc978ef7567d65f9c0cf4cb 100644
--- a/src/plugins/find/currentdocumentfind.cpp
+++ b/src/plugins/find/currentdocumentfind.cpp
@@ -31,7 +31,6 @@
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index aad01d9e63bf5408b88e75a0423a278f5d515bea..ff148efade60bec98f9ef250a2b35c48f6372a33 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -32,7 +32,6 @@
 
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
 
 #include <QtGui/QIcon>
 
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 1e4cc5da2f63c357431018b77828f55dfe97f2c9..abba36d1dd223db7a33dd74f393ae72c2c9379ea 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -46,7 +46,6 @@
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/filemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 47586cd58c92fb037dfa42c43d8b0f9a97b1bb25..35cd8925e8c2cd5ea221335ca7a74a9912ecc3f6 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -40,7 +40,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/openeditorsmodel.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 3e35b9ff338854bcb27f884b9c9e1ddc34736f25..8dd511f5031ff6a8aef32cdf876bbd5b016248a6 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -41,7 +41,6 @@
 #include <projectexplorer/cesdkhandler.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <help/helpmanager.h>
 #include <utils/qtcassert.h>