Clean headers in Core-plugin.

Change-Id: Ie79d334765ca5c6a034fa2f5eccff5d45b481975
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

72 files changed, 20 insertions, 244 deletions

diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 0baef34386..1f60a533d9 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -28,11 +28,8 @@
 ****************************************************************************/
 
 #include "actioncontainer_p.h"
-#include "actionmanager_p.h"
 #include "actionmanager.h"
 
-#include "command_p.h"
-
 #include "coreconstants.h"
 #include "id.h"
 
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index 6eb9b0fddf..1f45dea7bc 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -30,7 +30,6 @@
 #ifndef ACTIONCONTAINER_H
 #define ACTIONCONTAINER_H
 
-#include "coreplugin/id.h"
 #include "coreplugin/icontext.h"
 
 #include <QObject>
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 591b6ea615..597bc66d28 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -34,13 +34,10 @@
 #include "command_p.h"
 #include "id.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QSettings>
-#include <QDesktopWidget>
 #include <QLabel>
 #include <QMenu>
 #include <QAction>
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index b9b666a14c..7a0a4c8faf 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -33,7 +33,6 @@
 #include "coreplugin/core_global.h"
 #include "coreplugin/id.h"
 #include <coreplugin/actionmanager/command.h>
-#include "coreplugin/icontext.h"
 
 #include <QObject>
 #include <QList>
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 87136bb196..b49eb5274e 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -29,7 +29,6 @@
 
 #include "command_p.h"
 
-#include "icore.h"
 #include "icontext.h"
 #include "id.h"
 
diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.cpp b/src/plugins/coreplugin/actionmanager/commandbutton.cpp
index c59f3e414b..7176751112 100644
--- a/src/plugins/coreplugin/actionmanager/commandbutton.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandbutton.cpp
@@ -30,7 +30,6 @@
 #include "commandbutton.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <utils/proxyaction.h>
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index 5f3a5724db..b3cb20f23f 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -31,20 +31,11 @@
 #include "shortcutsettings.h"
 #include "ui_commandmappings.h"
 #include "commandsfile.h"
-#include "coreconstants.h"
-#include "documentmanager.h"
-#include "icore.h"
-#include "id.h"
 
 #include <utils/hostosinfo.h>
 #include <utils/headerviewstretcher.h>
 
-#include <QKeyEvent>
-#include <QShortcut>
-#include <QHeaderView>
 #include <QTreeWidgetItem>
-#include <QFileDialog>
-#include <QCoreApplication>
 #include <QDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index 46bb4ad5fa..a75ce5c80e 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -33,12 +33,11 @@
 
 #include <app/app_version.h>
 
-#include <coreplugin/id.h>
-
 #include <utils/qtcassert.h>
 
 #include <utils/fileutils.h>
 
+#include <QKeySequence>
 #include <QFile>
 #include <QXmlStreamAttributes>
 #include <QXmlStreamWriter>
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h
index 2f05fd2656..f9a23da434 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.h
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.h
@@ -33,7 +33,8 @@
 #include <QObject>
 #include <QString>
 #include <QMap>
-#include <QKeySequence>
+
+QT_FORWARD_DECLARE_CLASS(QKeySequence)
 
 namespace Core {
 namespace Internal {
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index cfb292e7f6..737429ca9a 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 
 #include "basefilewizard.h"
-
-#include "coreconstants.h"
 #include "icore.h"
 #include "ifilewizardextension.h"
 #include "mimedatabase.h"
@@ -39,17 +37,13 @@
 #include <utils/filewizarddialog.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
-#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 
 #include <QDir>
-#include <QFile>
 #include <QFileInfo>
-#include <QVector>
 #include <QDebug>
 #include <QSharedData>
 #include <QEventLoop>
-#include <QSharedPointer>
 #include <QScopedPointer>
 
 #include <QMessageBox>
diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h
index 0e74de56c9..90a231e274 100644
--- a/src/plugins/coreplugin/basefilewizard.h
+++ b/src/plugins/coreplugin/basefilewizard.h
@@ -32,6 +32,7 @@
 
 #include "core_global.h"
 #include "generatedfile.h"
+#include "featureprovider.h"
 
 #include <coreplugin/dialogs/iwizard.h>
 
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index d170ddb648..31087af972 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -39,7 +39,6 @@
 #include "modemanager.h"
 #include "infobar.h"
 
-#include <extensionsystem/pluginmanager.h>
 #include <utils/savefile.h>
 
 #include <QtPlugin>
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index 4e7a5cdc80..47f1734954 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -32,24 +32,15 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/openeditorsmodel.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/icorelistener.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/qtcassert.h>
 
-#include <QPair>
-#include <QFileInfo>
 #include <QPointer>
 #include <QStringList>
 #include <QDebug>
 
-#include <QAction>
-#include <QPlainTextEdit>
 #include <QStackedWidget>
 
 static Core::DesignMode *m_instance = 0;
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index 7ae4dc801b..8a0f80f206 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -40,9 +40,7 @@
 #include <coreplugin/variablemanager.h>
 
 #include <QTextStream>
-#include <QFile>
 #include <QMimeData>
-#include <QMessageBox>
 #include <QMenu>
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/dialogs/iwizard.cpp b/src/plugins/coreplugin/dialogs/iwizard.cpp
index 68a1cec523..a7c905d665 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.cpp
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -29,6 +29,7 @@
 
 #include "iwizard.h"
 #include "icore.h"
+#include "featureprovider.h"
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h
index 38ddd1acb5..4618b7b03d 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.h
+++ b/src/plugins/coreplugin/dialogs/iwizard.h
@@ -31,7 +31,6 @@
 #define IWIZARD_H
 
 #include <coreplugin/core_global.h>
-#include <coreplugin/featureprovider.h>
 
 #include <QObject>
 #include <QVariantMap>
@@ -42,6 +41,8 @@ QT_END_NAMESPACE
 
 namespace Core {
 
+class FeatureSet;
+
 class CORE_EXPORT IWizard
     : public QObject
 {
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 260aa80525..3b0e5164b5 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -29,17 +29,12 @@
 
 #include "newdialog.h"
 #include "ui_newdialog.h"
-#include "basefilewizard.h"
-
-#include <utils/stylehelper.h>
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/featureprovider.h>
 
+#include <QModelIndex>
 #include <QAbstractProxyModel>
 #include <QSortFilterProxyModel>
-#include <QItemSelectionModel>
-#include <QHeaderView>
 #include <QPushButton>
 #include <QStandardItem>
 #include <QItemDelegate>
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index 6a2110d84c..304115a724 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -35,10 +35,10 @@
 #include <QDialog>
 #include <QIcon>
 #include <QList>
-#include <QModelIndex>
 
 QT_BEGIN_NAMESPACE
 class QAbstractProxyModel;
+class QModelIndex;
 class QSortFilterProxyModel;
 class QPushButton;
 class QStandardItem;
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index 90c5e40238..b0ca42fddd 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -29,7 +29,6 @@
 
 #include "openwithdialog.h"
 
-#include <QListWidget>
 #include <QPushButton>
 #include <QFileInfo>
 
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index 2fdd2a01c3..7595ca1946 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 
 #include "saveitemsdialog.h"
-#include "mainwindow.h"
-#include "vcsmanager.h"
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/idocument.h>
@@ -38,9 +36,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QPushButton>
-#include <QTreeWidget>
-#include <QHeaderView>
-#include <QCheckBox>
 #include <QDebug>
 
 Q_DECLARE_METATYPE(Core::IDocument*)
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index f123489035..eca479ee40 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -37,14 +37,10 @@
 
 #include <QApplication>
 #include <QDialogButtonBox>
-#include <QFrame>
 #include <QGridLayout>
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QIcon>
-#include <QItemSelectionModel>
 #include <QLabel>
-#include <QLineEdit>
 #include <QListView>
 #include <QPointer>
 #include <QPushButton>
@@ -55,8 +51,6 @@
 #include <QStackedLayout>
 #include <QStyle>
 #include <QStyledItemDelegate>
-#include <QToolBar>
-#include <QToolButton>
 
 static const char categoryKeyC[] = "General/LastPreferenceCategory";
 static const char pageKeyC[] = "General/LastPreferencePage";
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index 3fd145c290..b77c06c4ef 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -31,7 +31,6 @@
 #define SETTINGSDIALOG_H
 
 #include "coreplugin/dialogs/ioptionspage.h"
-#include "coreplugin/id.h"
 
 #include <QList>
 #include <QSet>
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 711d07797f..60fb4a89a6 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -37,14 +37,9 @@
 #include "icore.h"
 #include "id.h"
 
-#include <utils/headerviewstretcher.h>
-
 #include <QKeyEvent>
-#include <QShortcut>
-#include <QHeaderView>
 #include <QFileDialog>
 #include <QLineEdit>
-#include <QAction>
 #include <QTreeWidgetItem>
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 9e60f95d33..0bc28d2701 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -38,7 +38,6 @@
 #include "iversioncontrol.h"
 #include "mimedatabase.h"
 #include "saveitemsdialog.h"
-#include "vcsmanager.h"
 #include "coreconstants.h"
 
 #include <utils/hostosinfo.h>
@@ -46,12 +45,12 @@
 #include <utils/pathchooser.h>
 #include <utils/reloadpromptutils.h>
 
+#include <QStringList>
 #include <QDateTime>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QFileSystemWatcher>
-#include <QPair>
 #include <QSettings>
 #include <QTimer>
 #include <QAction>
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index 2a46c0897a..145218b5a3 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -33,11 +33,10 @@
 #include <coreplugin/id.h>
 
 #include <QObject>
-#include <QStringList>
 #include <QPair>
-#include <QVariant>
 
 QT_BEGIN_NAMESPACE
+class QStringList;
 class QAction;
 class QMainWindow;
 class QMenu;
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index c6737b1cb9..77ddd25ae7 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -32,17 +32,14 @@
 #include "coreconstants.h"
 #include "modemanager.h"
 #include "minisplitter.h"
-#include "findplaceholder.h"
 #include "outputpane.h"
 #include "navigationwidget.h"
 #include "rightpane.h"
 #include "ieditor.h"
-#include "idocument.h"
 
 #include <QLatin1String>
 #include <QHBoxLayout>
 #include <QWidget>
-#include <QSplitter>
 #include <QIcon>
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 091a21a965..d2bddb8a01 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -38,20 +38,16 @@
 #include "ieditor.h"
 #include "iversioncontrol.h"
 #include "mimedatabase.h"
-#include "tabpositionindicator.h"
 #include "vcsmanager.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 #include <coreplugin/editormanager/iexternaleditor.h>
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/fileutils.h>
 #include <coreplugin/icorelistener.h>
-#include <coreplugin/id.h>
-#include <coreplugin/imode.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/settingsdatabase.h>
@@ -59,7 +55,6 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <utils/consoleprocess.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
@@ -67,7 +62,6 @@
 #include <QDebug>
 #include <QFileInfo>
 #include <QMap>
-#include <QProcess>
 #include <QSet>
 #include <QSettings>
 #include <QTextCodec>
@@ -77,12 +71,10 @@
 #include <QShortcut>
 #include <QApplication>
 #include <QFileDialog>
-#include <QLayout>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSplitter>
-#include <QStackedLayout>
 
 enum { debugEditorManager=0 };
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index a4a9a7c870..1ee5bcbc18 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -36,30 +36,19 @@
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/infobar.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <coreplugin/findplaceholder.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QMimeData>
 
-#include <QApplication>
-#include <QComboBox>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QStackedWidget>
-#include <QStyle>
-#include <QStyleOption>
 #include <QToolButton>
-#include <QMenu>
-#include <QClipboard>
-#include <QAction>
 #include <QSplitter>
 #include <QStackedLayout>
 
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 2cd8871eb5..ad915eb02e 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -32,7 +32,6 @@
 
 #include <coreplugin/core_global.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/id.h>
 
 #include <QMetaType>
 
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index b65fe1c25f..9a46246846 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -29,28 +29,17 @@
 
 #include "openeditorsview.h"
 #include "editormanager.h"
-#include "editorview.h"
 #include "openeditorsmodel.h"
-#include "icore.h"
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/documentmanager.h>
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <utils/qtcassert.h>
 
 #include <QApplication>
-#include <QGridLayout>
-#include <QTimer>
 #include <QMenu>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOption>
 #include <QHeaderView>
 #include <QKeyEvent>
-#include <QTreeView>
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 5d7b006bdb..c738b98f62 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -32,36 +32,21 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/minisplitter.h>
-#include <coreplugin/sidebar.h>
-#include <coreplugin/id.h>
 
-#include <coreplugin/editormanager/editorview.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/openeditorsmodel.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 
 #include <utils/hostosinfo.h>
-#include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
-#include <utils/styledbar.h>
 
-#include <QSettings>
-#include <QEvent>
 #include <QDir>
-#include <QPointer>
 #include <QApplication>
 #include <QComboBox>
-#include <QPlainTextEdit>
 #include <QVBoxLayout>
-#include <QScrollArea>
-#include <QTabWidget>
 #include <QToolButton>
 #include <QMenu>
 #include <QClipboard>
-#include <QLabel>
-#include <QToolBar>
 
 enum {
     debug = false
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index d127b4e100..664cbef66f 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -41,8 +41,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <utils/qtcassert.h>
-#include <utils/stringutils.h>
-#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
 
@@ -50,9 +48,7 @@
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include <QDir>
-#include <QFile>
 #include <QDateTime>
-#include <QMenu>
 #include <QAction>
 
 #include <QDebug>
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 3c8e384e95..a5afc6d78a 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -36,21 +36,13 @@
 #include <utils/tooltip/tooltip.h>
 #include <utils/tooltip/tipcontents.h>
 
-#include <coreplugin/icore.h>
-#include <coreplugin/imode.h>
-
-#include <QHBoxLayout>
 #include <QPainter>
-#include <QPicture>
 #include <QVBoxLayout>
 #include <QAction>
-#include <QStatusBar>
 #include <QStyle>
 #include <QStyleOption>
 #include <QMouseEvent>
-#include <QApplication>
 #include <QEvent>
-#include <QAnimationGroup>
 #include <QPropertyAnimation>
 #include <QDebug>
 
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index dacd8f73e2..c4079e4d91 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -40,13 +40,9 @@
 #include <QMouseEvent>
 #include <QStyleFactory>
 #include <QPainter>
-#include <QSplitter>
 #include <QStackedLayout>
 #include <QStatusBar>
-#include <QToolButton>
 #include <QToolTip>
-#include <QAnimationGroup>
-#include <QPropertyAnimation>
 
 using namespace Core;
 using namespace Internal;
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index 774d06e1e7..143dfbbeaf 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -33,10 +33,8 @@
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
-#include <coreplugin/removefiledialog.h>
 #include <coreplugin/vcsmanager.h>
 #include <utils/consoleprocess.h>
-#include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
 #include <utils/unixutils.h>
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 556ec55eb0..66233f7aa6 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -35,7 +35,6 @@
 
 #include <utils/hostosinfo.h>
 #include <utils/stylehelper.h>
-#include <utils/qtcolorbutton.h>
 #include <utils/consoleprocess.h>
 #include <utils/unixutils.h>
 
diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp
index 53b06db275..407c9b801c 100644
--- a/src/plugins/coreplugin/id.cpp
+++ b/src/plugins/coreplugin/id.cpp
@@ -28,13 +28,12 @@
 ****************************************************************************/
 
 #include "id.h"
-#include "coreconstants.h"
 
 #include <utils/qtcassert.h>
 
 #include <QByteArray>
 #include <QHash>
-#include <QVector>
+#include <QVariant>
 
 #include <string.h>
 
diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h
index 552cc30f43..ee283a5f9a 100644
--- a/src/plugins/coreplugin/id.h
+++ b/src/plugins/coreplugin/id.h
@@ -34,7 +34,8 @@
 
 #include <QMetaType>
 #include <QString>
-#include <QVariant>
+
+QT_FORWARD_DECLARE_CLASS(QVariant)
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp
index 87e066b179..15512e8d0d 100644
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -35,9 +35,7 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QSettings>
 #include <QToolButton>
-#include <QVariant>
 
 static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings";
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 862e6e77d3..8891d9166c 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -35,7 +35,6 @@
 #include "icore.h"
 #include "coreconstants.h"
 #include "editormanager.h"
-#include "externaltool.h"
 #include "toolsettings.h"
 #include "mimetypesettings.h"
 #include "fancytabwidget.h"
@@ -52,10 +51,8 @@
 #include "outputpane.h"
 #include "plugindialog.h"
 #include "progressmanager_p.h"
-#include "progressview.h"
 #include "shortcutsettings.h"
 #include "vcsmanager.h"
-#include "variablechooser.h"
 #include "scriptmanager_p.h"
 #include "settingsdialog.h"
 #include "variablemanager.h"
@@ -67,8 +64,6 @@
 #include "rightpane.h"
 #include "editormanager/ieditorfactory.h"
 #include "statusbarwidget.h"
-#include "basefilewizard.h"
-#include "ioutputpane.h"
 #include "externaltoolmanager.h"
 #include "editormanager/systemeditor.h"
 
@@ -83,7 +78,6 @@
 #include <coreplugin/settingsdatabase.h>
 #include <utils/historycompleter.h>
 #include <utils/hostosinfo.h>
-#include <utils/pathchooser.h>
 #include <utils/stylehelper.h>
 #include <utils/stringutils.h>
 #include <extensionsystem/pluginmanager.h>
@@ -92,20 +86,16 @@
 #include <QFileInfo>
 #include <QSettings>
 #include <QTimer>
-#include <QtPlugin>
 #include <QUrl>
 #include <QDir>
-#include <QFile>
 #include <QMimeData>
 
 #include <QApplication>
 #include <QCloseEvent>
 #include <QMenu>
-#include <QPixmap>
 #include <QPrinter>
 #include <QShortcut>
 #include <QStatusBar>
-#include <QWizard>
 #include <QToolButton>
 #include <QMessageBox>
 #include <QMenuBar>
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 227cca85aa..a07dbac946 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -31,36 +31,26 @@
 
 #include "styleanimator.h"
 
-#include <QLibrary>
-
 #include <coreplugin/coreconstants.h>
 
 #include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 
 #include <utils/fancymainwindow.h>
 
 #include <QApplication>
 #include <QComboBox>
-#include <QDialogButtonBox>
 #include <QDockWidget>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenuBar>
 #include <QPainter>
 #include <QPixmap>
-#include <QPixmapCache>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QSplitter>
 #include <QStatusBar>
 #include <QStyleFactory>
 #include <QStyleOption>
 #include <QToolBar>
-#include <QTreeView>
 #include <QToolButton>
-#include <QAbstractItemView>
 
 // We define a currently unused state for indicating animations
 const QStyle::State State_Animating = QStyle::State(0x00000040);
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index badb485451..b4c653eee9 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -32,9 +32,6 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QStatusBar>
-#include <QApplication>
-
 using namespace Core;
 
 MessageManager *MessageManager::m_instance = 0;
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 58f01a287a..ebe261822e 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -32,8 +32,6 @@
 #include "icontext.h"
 #include "coreconstants.h"
 
-#include <QScrollBar>
-
 using namespace Core::Internal;
 
 MessageOutputWindow::MessageOutputWindow()
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index a16cbc8805..47d3b3ec19 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -40,7 +40,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QLocale>
-#include <QMap>
 #include <QHash>
 #include <QMultiHash>
 #include <QRegExp>
@@ -48,7 +47,6 @@
 #include <QSharedPointer>
 #include <QStringList>
 #include <QTextStream>
-#include <QMutexLocker>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp
index f3d3fe03f0..9444b9c744 100644
--- a/src/plugins/coreplugin/mimetypemagicdialog.cpp
+++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp
@@ -30,7 +30,6 @@
 #include "mimetypemagicdialog.h"
 #include "mimedatabase.h"
 
-#include <QLatin1String>
 #include <QMessageBox>
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index 11ac480ebb..8b1bf2f35e 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -37,8 +37,6 @@
 #include "ieditorfactory.h"
 #include "iexternaleditor.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <QCoreApplication>
 #include <QStringList>
 #include <QSet>
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index b0b10fc1cd..1925f58d47 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -34,20 +34,15 @@
 #include "icore.h"
 #include "mainwindow.h"
 
-#include <aggregation/aggregate.h>
-
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/imode.h>
-#include <coreplugin/id.h>
 
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QList>
 #include <QMap>
 #include <QVector>
 
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index 7f2e979532..bc8322ebf7 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -30,28 +30,18 @@
 #include "navigationsubwidget.h"
 #include "navigationwidget.h"
 
-#include "icore.h"
-#include "icontext.h"
 #include "coreconstants.h"
 #include "inavigationwidgetfactory.h"
-#include "modemanager.h"
-#include "actionmanager/actionmanager.h"
 #include "actionmanager/command.h"
 #include "id.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/styledbar.h>
 
 #include <QDebug>
-#include <QSettings>
 
-#include <QAction>
 #include <QHBoxLayout>
 #include <QResizeEvent>
 #include <QToolButton>
-#include <QShortcut>
-#include <QStandardItemModel>
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 70098f0727..c654f3ff13 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -29,7 +29,6 @@
 
 #include "navigationwidget.h"
 #include "navigationsubwidget.h"
-#include "icore.h"
 #include "icontext.h"
 #include "coreconstants.h"
 #include "inavigationwidgetfactory.h"
@@ -38,17 +37,12 @@
 #include "actionmanager/command.h"
 #include "id.h"
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <utils/styledbar.h>
-
 #include <QDebug>
 #include <QSettings>
 
 #include <QAction>
 #include <QHBoxLayout>
 #include <QResizeEvent>
-#include <QToolButton>
 #include <QShortcut>
 #include <QStandardItemModel>
 
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index e046878acf..f282a6c5b9 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -30,9 +30,6 @@
 #include "outputpane.h"
 #include "outputpanemanager.h"
 
-#include "coreconstants.h"
-#include "icore.h"
-#include "ioutputpane.h"
 #include "modemanager.h"
 
 #include <QSplitter>
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 39629d3bc5..55a4f220e1 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -34,14 +34,11 @@
 
 #include "icore.h"
 #include "ioutputpane.h"
-#include "mainwindow.h"
 #include "modemanager.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/findplaceholder.h>
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <extensionsystem/pluginmanager.h>
@@ -60,7 +57,6 @@
 #include <QLabel>
 #include <QMenu>
 #include <QPainter>
-#include <QSplitter>
 #include <QStyle>
 #include <QStackedWidget>
 #include <QToolButton>
diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h
index 45a2c6fa3f..7b42fe3b4d 100644
--- a/src/plugins/coreplugin/outputpanemanager.h
+++ b/src/plugins/coreplugin/outputpanemanager.h
@@ -32,7 +32,6 @@
 
 #include <coreplugin/id.h>
 
-#include <QMap>
 #include <QToolButton>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index 1ebada52a1..2c5499571e 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -30,13 +30,9 @@
 #include "outputwindow.h"
 
 #include "actionmanager/actionmanager.h"
-#include "actionmanager/command.h"
 #include "coreconstants.h"
 #include "icore.h"
 
-#include <utils/qtcassert.h>
-#include <utils/outputformatter.h>
-
 #include <QAction>
 #include <QScrollBar>
 
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index f227048db6..9db8c768f2 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -36,10 +36,7 @@
 #include <QPropertyAnimation>
 #include <QSequentialAnimationGroup>
 
-#include <QColor>
 #include <QVBoxLayout>
-#include <QMenu>
-#include <QProgressBar>
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QMouseEvent>
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp
index 19c6d70a93..d61b0e09a5 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp
@@ -34,7 +34,6 @@
 #include <QPropertyAnimation>
 #include <QPainter>
 #include <QFont>
-#include <QBrush>
 #include <QColor>
 #include <QMouseEvent>
 
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 4f170f41e1..94ee59406b 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -29,7 +29,6 @@
 
 #include "progressmanager_p.h"
 #include "progressview.h"
-#include "../coreconstants.h"
 #include "../icore.h"
 
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp
index b4a273d59a..f2a4a9e31c 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressview.cpp
@@ -32,7 +32,6 @@
 
 #include <utils/qtcassert.h>
 
-#include <QHBoxLayout>
 #include <QVBoxLayout>
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index bd90b80c8d..90ca7345e5 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -36,7 +36,6 @@
 #include <QVBoxLayout>
 #include <QSplitter>
 #include <QResizeEvent>
-#include <QTextEdit>
 
 
 using namespace Core;
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 71e6465a78..ad32725e53 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -42,7 +42,6 @@
 #include <QInputDialog>
 #include <QFileDialog>
 #include <QMainWindow>
-#include <QToolBar>
 #include <QStatusBar>
 
 // Script function template to pop up a message box
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index e6b9bd7f7c..f0859efe50 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -29,18 +29,10 @@
 
 #include "sidebar.h"
 #include "sidebarwidget.h"
-#include "imode.h"
 
-#include <coreplugin/coreconstants.h>
-
-#include "actionmanager/actionmanager.h"
 #include "actionmanager/command.h"
 
-#include <QEvent>
 #include <QSettings>
-#include <QLayout>
-#include <QToolBar>
-#include <QAction>
 #include <QPointer>
 #include <QToolButton>
 
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index 0ac1d01a9c..553d3f8f39 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -29,16 +29,11 @@
 
 #include "statusbarmanager.h"
 
-#include "coreconstants.h"
 #include "mainwindow.h"
 #include "statusbarwidget.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <aggregation/aggregate.h>
 #include <extensionsystem/pluginmanager.h>
 
-#include <QSettings>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QStatusBar>
diff --git a/src/plugins/coreplugin/statusbarwidget.cpp b/src/plugins/coreplugin/statusbarwidget.cpp
index e9e9bfe4d5..635ca6ae46 100644
--- a/src/plugins/coreplugin/statusbarwidget.cpp
+++ b/src/plugins/coreplugin/statusbarwidget.cpp
@@ -29,8 +29,6 @@
 
 #include "statusbarwidget.h"
 
-#include <QWidget>
-
 using namespace Core;
 
 StatusBarWidget::StatusBarWidget(QObject *parent)
diff --git a/src/plugins/coreplugin/statusbarwidget.h b/src/plugins/coreplugin/statusbarwidget.h
index aae3baf8d6..481355e167 100644
--- a/src/plugins/coreplugin/statusbarwidget.h
+++ b/src/plugins/coreplugin/statusbarwidget.h
@@ -32,7 +32,6 @@
 
 #include "core_global.h"
 #include "icontext.h"
-#include <QPointer>
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/tabpositionindicator.cpp b/src/plugins/coreplugin/tabpositionindicator.cpp
index e2ed17abf2..46e5e600c7 100644
--- a/src/plugins/coreplugin/tabpositionindicator.cpp
+++ b/src/plugins/coreplugin/tabpositionindicator.cpp
@@ -31,7 +31,6 @@
 
 #include <QPainter>
 #include <QPaintEvent>
-#include <QBrush>
 #include <QPalette>
 
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp
index 0b0a66a889..672bc6593f 100644
--- a/src/plugins/coreplugin/toolsettings.cpp
+++ b/src/plugins/coreplugin/toolsettings.cpp
@@ -39,8 +39,6 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QDir>
-#include <QTime>
-#include <QIcon>
 
 #include <QDebug>
 
diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp
index d54e487356..3af6ab709f 100644
--- a/src/plugins/coreplugin/variablemanager.cpp
+++ b/src/plugins/coreplugin/variablemanager.cpp
@@ -28,15 +28,10 @@
 ****************************************************************************/
 
 #include "variablemanager.h"
-#include "idocument.h"
-#include "editormanager/ieditor.h"
-#include "editormanager/editormanager.h"
 
 #include <utils/stringutils.h>
-#include <utils/qtcassert.h>
 
 #include <QFileInfo>
-#include <QObject>
 #include <QMap>
 #include <QDebug>
 
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index 90429a5bf9..9cc75744f5 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/src/plugins/coreplugin/variablemanager.h
@@ -32,10 +32,11 @@
 
 #include "core_global.h"
 
-#include <QFileInfo>
 #include <QObject>
 #include <QString>
 
+QT_FORWARD_DECLARE_CLASS(QFileInfo)
+
 namespace Utils {
 class AbstractMacroExpander;
 }
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 4e6ad25159..461c1526a5 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -39,7 +39,6 @@
 #include <QString>
 #include <QList>
 #include <QMap>
-#include <QCoreApplication>
 
 #include <QFileInfo>
 #include <QMessageBox>
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index fed1031f15..9ece9693f3 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -28,21 +28,17 @@
 ****************************************************************************/
 
 #include "versiondialog.h"
-#include "icore.h"
 
 #include <app/app_version.h>
 #include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
 
-#include <QDate>
-#include <QFile>
 #include <QSysInfo>
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QTextBrowser>
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 4cbb7a042e..0e8a07aa5b 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -40,6 +40,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/fileiconprovider.h>
+#include <coreplugin/icontext.h>
 #include <utils/filterlineedit.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 1d613021cf..abdac27b5c 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -38,6 +38,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/icontext.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp
index 880b1affb9..84d3e21ffd 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizard.cpp
@@ -31,6 +31,8 @@
 #include "checkoutwizarddialog.h"
 #include "checkoutjobs.h"
 
+#include <coreplugin/featureprovider.h>
+
 #include <projectexplorer/projectexplorer.h>
 
 #include <QCoreApplication>