Clean headers in debugger plugin.

Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb
Reviewed-by: hjk <hjk121@nokiamail.com>

106 files changed, 19 insertions, 549 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 5a3a68929a..5db94d13dd 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -28,14 +28,12 @@
 ****************************************************************************/
 
 #include "breakhandler.h"
-#include "debuggerinternalconstants.h"
 #include "breakpointmarker.h"
 
 #include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 #include "debuggerstringutils.h"
-#include "stackframe.h"
 
 #include <extensionsystem/invoker.h>
 #include <utils/hostosinfo.h>
@@ -46,8 +44,7 @@
 #endif
 
 #include <QDir>
-#include <QFileInfo>
-#include <QTimerEvent>
+#include <QDebug>
 
 #define BREAK_ASSERT(cond, action) if (cond) {} else { action; }
 //#define BREAK_ASSERT(cond, action) QTC_ASSERT(cond, action)
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 6c01a3d7e3..b898b15c8c 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -32,11 +32,8 @@
 
 #include "breakpoint.h"
 
-#include <QObject>
 #include <QAbstractTableModel>
 
-#include <QIcon>
-
 //////////////////////////////////////////////////////////////////
 //
 // BreakHandler
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index ce42969b4b..da5c6ec80b 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -31,7 +31,6 @@
 
 #include "utils/qtcassert.h"
 
-#include <QByteArray>
 #include <QDebug>
 #include <QFileInfo>
 
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index 76aa6e7302..b9317fce90 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -30,8 +30,6 @@
 #ifndef DEBUGGER_BREAKPOINT_H
 #define DEBUGGER_BREAKPOINT_H
 
-#include <QDebug>
-#include <QList>
 #include <QMetaType>
 #include <QString>
 
diff --git a/src/plugins/debugger/breakpointmarker.cpp b/src/plugins/debugger/breakpointmarker.cpp
index 92c5fb91f2..0f945921b6 100644
--- a/src/plugins/debugger/breakpointmarker.cpp
+++ b/src/plugins/debugger/breakpointmarker.cpp
@@ -31,8 +31,6 @@
 #include "breakhandler.h"
 #include "debuggercore.h"
 
-#include <QIcon>
-
 //////////////////////////////////////////////////////////////////
 //
 // BreakpointMarker
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 212fd1f6ed..2f1bf83197 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "breakwindow.h"
-#include "debuggerinternalconstants.h"
 #include "breakhandler.h"
 #include "debuggerengine.h"
 #include "debuggeractions.h"
@@ -38,28 +37,18 @@
 #include <utils/qtcassert.h>
 #include <utils/savedaction.h>
 
-#include <QAction>
-#include <QApplication>
-#include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QDebug>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QIntValidator>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
-#include <QSpacerItem>
 #include <QSpinBox>
 #include <QTextEdit>
-#include <QVariant>
-#include <QVBoxLayout>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/cdb/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h
index 9ab29497ef..a2ff61df10 100644
--- a/src/plugins/debugger/cdb/bytearrayinputstream.h
+++ b/src/plugins/debugger/cdb/bytearrayinputstream.h
@@ -30,7 +30,6 @@
 #ifndef BYTEARRAYINPUTSTREAM_H
 #define BYTEARRAYINPUTSTREAM_H
 
-#include <QByteArray>
 #include <QString>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index d3c728fdbe..68d4662142 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -30,16 +30,12 @@
 #include "cdbengine.h"
 
 #include "breakhandler.h"
-#include "breakpoint.h"
 #include "bytearrayinputstream.h"
-#include "cdboptions.h"
 #include "cdboptionspage.h"
 #include "cdbparsehelpers.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
-#include "debuggerinternalconstants.h"
 #include "debuggerprotocol.h"
-#include "debuggerrunner.h"
 #include "debuggerstartparameters.h"
 #include "debuggertooltipmanager.h"
 #include "disassembleragent.h"
@@ -47,23 +43,15 @@
 #include "memoryagent.h"
 #include "moduleshandler.h"
 #include "registerhandler.h"
-#include "stackframe.h"
 #include "stackhandler.h"
 #include "threadshandler.h"
 #include "watchhandler.h"
-#include "watchutils.h"
 #include "shared/cdbsymbolpathlisteditor.h"
 #include "shared/hostutils.h"
 #include "procinterrupt.h"
 #include "sourceutils.h"
 
-#include <TranslationUnit.h>
-
 #include <coreplugin/icore.h>
-#include <texteditor/itexteditor.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
 
 #include <utils/synchronousprocess.h>
@@ -76,17 +64,9 @@
 #include <utils/hostosinfo.h>
 
 #include <cplusplus/findcdbbreakpoint.h>
-#include <cplusplus/CppDocument.h>
 #include <cpptools/ModelManagerInterface.h>
 
-#include <QCoreApplication>
-#include <QFileInfo>
 #include <QDir>
-#include <QDebug>
-#include <QTextStream>
-#include <QDateTime>
-#include <QToolTip>
-#include <QMainWindow>
 #include <QMessageBox>
 
 #include <cctype>
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 537fc1ba3a..0183ac80bb 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -31,17 +31,12 @@
 #define DEBUGGER_CDBENGINE_H
 
 #include "debuggerengine.h"
-#include "breakpoint.h"
-#include "threaddata.h"
 
 #include <QSharedPointer>
 #include <QProcess>
-#include <QVariantList>
 #include <QMap>
-#include <QMultiHash>
+#include <QVariant>
 #include <QTime>
-#include <QPair>
-#include <QList>
 
 namespace Utils {
 class ConsoleProcess;
diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
index 7f28581b61..96875bf5aa 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -28,22 +28,15 @@
 ****************************************************************************/
 
 #include "cdboptionspage.h"
-#include "cdboptions.h"
 #include "commonoptionspage.h"
 #include "debuggerinternalconstants.h"
 #include "cdbengine.h"
 #include "cdbsymbolpathlisteditor.h"
 
-#include <utils/synchronousprocess.h>
-
 #include <coreplugin/icore.h>
 
-#include <QTextStream>
-#include <QLineEdit>
 #include <QDialogButtonBox>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QVBoxLayout>
+#include <QTextStream>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index d234ed9091..01dcad7d34 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -35,7 +35,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include "ui_cdboptionspagewidget.h"
 
-#include <QWidget>
 #include <QPointer>
 #include <QSharedPointer>
 #include <QDialog>
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
index 3d004b45fa..52e456a575 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
@@ -29,20 +29,16 @@
 
 #include "cdbparsehelpers.h"
 
-#include "breakpoint.h"
 #include "bytearrayinputstream.h"
 #include "debuggerprotocol.h"
 #include "disassemblerlines.h"
-#include "registerhandler.h"
 #include "shared/hostutils.h"
-#include "threadshandler.h"
+#include "threaddata.h"
 
 #include <utils/qtcassert.h>
 
-#include <QByteArray>
-#include <QVariant>
-#include <QString>
 #include <QDir>
+#include <QTextStream>
 #include <QDebug>
 
 #include <cctype>
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h
index f271f518af..2d95fc8904 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.h
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.h
@@ -32,11 +32,7 @@
 
 #include "breakpoint.h"
 
-#include <QtGlobal>
-#include <QList>
-#include <QVector>
 #include <QPair>
-#include <QByteArray>
 
 QT_BEGIN_NAMESPACE
 class QVariant;
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 5de162e0ad..0082bdce25 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -32,16 +32,12 @@
 #include "debuggeractions.h"
 #include "debuggerinternalconstants.h"
 #include "debuggercore.h"
-#include "debuggerstringutils.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/manhattanstyle.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
-#include <projectexplorer/projectexplorer.h>
-
-#include <QLabel>
+#include <QSpinBox>
 #include <QTextStream>
 
 using namespace Core;
diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h
index 4b77509b02..78d44c54f9 100644
--- a/src/plugins/debugger/commonoptionspage.h
+++ b/src/plugins/debugger/commonoptionspage.h
@@ -36,11 +36,10 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <utils/savedaction.h>
 
-#include <QCheckBox>
-#include <QLabel>
 #include <QPointer>
 #include <QSharedPointer>
-#include <QSpinBox>
+
+class QSpinBox;
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index b8b00437fc..504ab60728 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 
 #ifdef Q_OS_WIN
 #include "registerpostmortemaction.h"
@@ -36,10 +35,8 @@
 
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
-#include <utils/pathchooser.h>
 
 #include <QDebug>
-#include <QVariant>
 #include <QSettings>
 
 using namespace Utils;
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 901bc46701..ce87cc925d 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -30,46 +30,28 @@
 #include "debuggerdialogs.h"
 #include "debuggerstartparameters.h"
 
-#include "debuggerconstants.h"
 #include "debuggerkitinformation.h"
 #include "debuggerstringutils.h"
 #include "cdb/cdbengine.h"
-#include "shared/hostutils.h"
 
 #include <coreplugin/icore.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/kitinformation.h>
-#include <utils/historycompleter.h>
 #include <utils/pathchooser.h>
 #include <utils/fancylineedit.h>
 #include <utils/qtcassert.h>
-#include <utils/synchronousprocess.h>
 
-#include <QAction>
-#include <QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDebug>
-#include <QDialog>
 #include <QDialogButtonBox>
 #include <QDir>
-#include <QFileDialog>
 #include <QFormLayout>
-#include <QGridLayout>
 #include <QGroupBox>
-#include <QHeaderView>
 #include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QRegExp>
 #include <QScrollArea>
 #include <QSpinBox>
-#include <QStandardItemModel>
-#include <QTreeView>
-#include <QVariant>
-#include <QVBoxLayout>
 
 using namespace Core;
 using namespace ProjectExplorer;
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index ebd4c5bfb0..df3887c2ea 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -34,8 +34,6 @@
 #include <projectexplorer/abi.h>
 
 #include <QDialog>
-#include <QHash>
-#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 class QModelIndex;
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 08d006fb2b..a37b2b6cd3 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -32,7 +32,6 @@
 #include "debuggerinternalconstants.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
-#include "debuggerplugin.h"
 #include "debuggerrunner.h"
 #include "debuggerstringutils.h"
 #include "debuggerstartparameters.h"
@@ -43,25 +42,19 @@
 #include "moduleshandler.h"
 #include "peutils.h"
 #include "registerhandler.h"
-#include "snapshothandler.h"
 #include "sourcefileshandler.h"
 #include "stackhandler.h"
 #include "threadshandler.h"
 #include "watchhandler.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 
-#include <texteditor/itexteditor.h>
-#include <texteditor/basetextmark.h>
-
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/taskhub.h>
 
-#include <utils/elfreader.h>
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 #include <utils/fileinprojectfinder.h>
@@ -70,9 +63,7 @@
 
 #include <QDebug>
 #include <QTimer>
-#include <QFile>
 #include <QFileInfo>
-#include <QFutureInterface>
 
 #include <QMessageBox>
 
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 9f0964141f..f4f02dba21 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -36,7 +36,6 @@
 #include "threaddata.h" // For ThreadId.
 
 #include <QObject>
-#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 class QDebug;
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp
index 8a980de349..9aa8ece045 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.cpp
+++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp
@@ -28,31 +28,20 @@
 ****************************************************************************/
 
 #include "debuggerkitconfigwidget.h"
-#include "debuggerkitinformation.h"
 
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/abi.h>
-#include <projectexplorer/kitinformation.h>
 
 #include <utils/pathchooser.h>
-#include <utils/qtcassert.h>
 #include <utils/elidinglabel.h>
 
 #ifdef Q_OS_WIN
 #include <utils/winutils.h>
 #endif
 
-#include <QUrl>
-
-#include <QDesktopServices>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QFormLayout>
-#include <QLabel>
 #include <QComboBox>
-#include <QMenu>
-#include <QAction>
 #include <QPushButton>
 #include <QDialogButtonBox>
 
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.h b/src/plugins/debugger/debuggerkitconfigwidget.h
index 53c54ceda4..27f2a614da 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.h
+++ b/src/plugins/debugger/debuggerkitconfigwidget.h
@@ -49,7 +49,6 @@ class FileName;
 }
 
 namespace Debugger {
-class DebuggerKitInformation;
 
 namespace Internal {
 // -----------------------------------------------------------------------
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index 58fe942831..6224cb7532 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -33,14 +33,12 @@
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
 
 #include <QDir>
-#include <QPair>
 
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index ad40e0e327..a88b5cc748 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -34,39 +34,27 @@
 #include <utils/appmainwindow.h>
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
-#include <utils/fancymainwindow.h>
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/minisplitter.h>
 #include <coreplugin/navigationwidget.h>
 #include <coreplugin/outputpane.h>
 #include <coreplugin/rightpane.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 
 #include <QDebug>
-#include <QList>
-#include <QMap>
-#include <QPair>
-#include <QSettings>
 
 #include <QDockWidget>
-#include <QMenu>
-#include <QResizeEvent>
-#include <QStackedWidget>
 #include <QVBoxLayout>
 
 using namespace Core;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index dd314c7496..48e21b145b 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -31,7 +31,6 @@
 
 #include "debuggerstartparameters.h"
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggerinternalconstants.h"
 #include "debuggercore.h"
 #include "debuggerdialogs.h"
@@ -42,7 +41,6 @@
 #include "debuggerstringutils.h"
 #include "debuggerkitinformation.h"
 #include "memoryagent.h"
-#include "breakpoint.h"
 #include "breakhandler.h"
 #include "breakwindow.h"
 #include "disassemblerlines.h"
@@ -71,45 +69,26 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/findplaceholder.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/icorelistener.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/minisplitter.h>
 #include <coreplugin/modemanager.h>
 
 #include <cppeditor/cppeditorconstants.h>
 #include <cpptools/ModelManagerInterface.h>
 
-#include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/localapplicationrunconfiguration.h>
-#include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/devicesupport/deviceprocesslist.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
-#include <projectexplorer/kitchooser.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
-#include <projectexplorer/toolchainmanager.h>
-#include <projectexplorer/devicesupport/deviceprocesslist.h>
-
-#include <qtsupport/qtsupportconstants.h>
 
 #include <texteditor/basetexteditor.h>
 #include <texteditor/fontsettings.h>
@@ -117,26 +96,18 @@
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
-#include <utils/savedaction.h>
 #include <utils/styledbar.h>
 #include <utils/proxyaction.h>
 #include <utils/statuslabel.h>
-#include <utils/fileutils.h>
 #ifdef Q_OS_WIN
 #  include <utils/winutils.h>
 #endif
 
-#include <QComboBox>
 #include <QDockWidget>
 #include <QFileDialog>
 #include <QInputDialog>
-#include <QMenu>
 #include <QMessageBox>
-#include <QPushButton>
-#include <QTemporaryFile>
 #include <QTextBlock>
-#include <QTextCursor>
-#include <QTimer>
 #include <QToolButton>
 #include <QtPlugin>
 #include <QTreeWidget>
diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp
index ed2f9a547f..b2cabdade1 100644
--- a/src/plugins/debugger/debuggerprotocol.cpp
+++ b/src/plugins/debugger/debuggerprotocol.cpp
@@ -29,11 +29,9 @@
 
 #include "debuggerprotocol.h"
 
-#include <QByteArray>
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDebug>
-#include <QTextStream>
 
 #include <ctype.h>
 
diff --git a/src/plugins/debugger/debuggerprotocol.h b/src/plugins/debugger/debuggerprotocol.h
index 2fcdbfacfc..8f3df34bca 100644
--- a/src/plugins/debugger/debuggerprotocol.h
+++ b/src/plugins/debugger/debuggerprotocol.h
@@ -30,10 +30,6 @@
 #ifndef DEBUGGER_PROTOCOL_H
 #define DEBUGGER_PROTOCOL_H
 
-#include "debugger_global.h"
-
-#include <QByteArray>
-#include <QList>
 #include <QVariant>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index bfe8ceae8e..89995a1711 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -31,10 +31,7 @@
 #include "debuggerruncontrolfactory.h"
 
 #include "debuggeractions.h"
-#include "debuggerinternalconstants.h"
 #include "debuggercore.h"
-#include "debuggerengine.h"
-#include "debuggermainwindow.h"
 #include "debuggerplugin.h"
 #include "debuggerstringutils.h"
 #include "debuggerstartparameters.h"
@@ -47,31 +44,24 @@
 #  include <utils/winutils.h>
 #endif
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/localapplicationrunconfiguration.h> // For LocalApplication*
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
-#include <projectexplorer/toolchain.h>
 
-#include <utils/outputformat.h>
-#include <utils/synchronousprocess.h>
 #include <utils/qtcassert.h>
-#include <utils/fancymainwindow.h>
 #include <utils/qtcprocess.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/helpmanager.h>
 
-#include <QDir>
 #include <QCheckBox>
 #include <QSpinBox>
 #include <QDebug>
 #include <QErrorMessage>
 #include <QFormLayout>
 #include <QLabel>
-#include <QPointer>
 
 using namespace Debugger::Internal;
 using namespace ProjectExplorer;
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index 8ed1321bea..18e57313bf 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -33,12 +33,8 @@
 #include "debugger_global.h"
 #include "debuggerconstants.h"
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/runconfiguration.h>
 
-#include <QPair>
-#include <QStringList>
-
 namespace Utils {
 class Environment;
 }
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index 268a0ef4e3..93cbed5375 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -35,21 +35,14 @@
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
 
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QStandardItemModel>
-#include <QStandardItem>
 #include <QTreeView>
 #include <QLineEdit>
-#include <QSpacerItem>
 #include <QPushButton>
 #include <QFormLayout>
 #include <QFileDialog>
 #include <QLabel>
 
-#include <QDir>
-#include <QPair>
-
 using namespace Utils;
 
 // Qt's various build paths for unpatched versions.
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.h b/src/plugins/debugger/debuggersourcepathmappingwidget.h
index 4f996a5afd..83d94cf383 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.h
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.h
@@ -32,7 +32,6 @@
 
 #include <QGroupBox>
 #include <QMap>
-#include <QPair>
 
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 853c1fa620..5237962ef4 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -29,19 +29,13 @@
 
 #include "debuggertooltipmanager.h"
 #include "debuggerinternalconstants.h"
-#include "watchutils.h"
 #include "debuggerengine.h"
 #include "debuggeractions.h"
-#include "watchhandler.h"
 #include "stackhandler.h"
 #include "debuggercore.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/imode.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
 #include <utils/tooltip/tooltip.h>
@@ -51,25 +45,16 @@
 #include <QToolButton>
 #include <QToolBar>
 #include <QVBoxLayout>
-#include <QStyle>
-#include <QIcon>
 #include <QApplication>
-#include <QMoveEvent>
 #include <QDesktopWidget>
 #include <QScrollBar>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
-#include <QStandardItem>
-#include <QPlainTextEdit>
-#include <QTextCursor>
-#include <QTextDocument>
 #include <QLabel>
 #include <QClipboard>
 
-#include <QVariant>
 #include <QStack>
 #include <QDebug>
-#include <QTimer>
 
 using namespace Core;
 using namespace TextEditor;
diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h
index a597e12e68..05721d4931 100644
--- a/src/plugins/debugger/debuggertooltipmanager.h
+++ b/src/plugins/debugger/debuggertooltipmanager.h
@@ -35,8 +35,6 @@
 #include <QTreeView>
 
 #include <QPointer>
-#include <QPoint>
-#include <QList>
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
 #include <QDate>
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index f121a3e987..a45dbf3fa8 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -36,27 +36,17 @@
 #include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 #include "disassemblerlines.h"
-#include "stackframe.h"
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 
-#include <projectexplorer/abi.h>
-
 #include <texteditor/basetextdocument.h>
-#include <texteditor/basetexteditor.h>
-#include <texteditor/basetextmark.h>
 #include <texteditor/plaintexteditor.h>
-#include <texteditor/texteditorconstants.h>
 
 #include <utils/qtcassert.h>
 
 #include <QTextBlock>
-#include <QIcon>
-#include <QPointer>
-#include <QPair>
 #include <QDir>
 
 using namespace Core;
diff --git a/src/plugins/debugger/disassemblerlines.cpp b/src/plugins/debugger/disassemblerlines.cpp
index 1703cd2934..a583e60c9f 100644
--- a/src/plugins/debugger/disassemblerlines.cpp
+++ b/src/plugins/debugger/disassemblerlines.cpp
@@ -33,7 +33,6 @@
 #include <QDebug>
 #include <QRegExp>
 #include <QFile>
-#include <QTextStream>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/abstractgdbprocess.h b/src/plugins/debugger/gdb/abstractgdbprocess.h
index b68c04cbf0..22b3385601 100644
--- a/src/plugins/debugger/gdb/abstractgdbprocess.h
+++ b/src/plugins/debugger/gdb/abstractgdbprocess.h
@@ -30,7 +30,6 @@
 #ifndef ABSTRACTGDBPROCESS_H
 #define ABSTRACTGDBPROCESS_H
 
-#include <QObject>
 #include <QProcess>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
index 305d68d71a..84488944f8 100644
--- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp
@@ -35,10 +35,6 @@
 #include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 
-#include <QDir>
-#include <QFile>
-#include <QTemporaryFile>
-
 #include <utils/qtcassert.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 9467471bd9..a0da463373 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -32,7 +32,6 @@
 #include "debuggerprotocol.h"
 #include "debuggerstringutils.h"
 #include "debuggerstartparameters.h"
-#include "procinterrupt.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 79618006a5..55476ba88e 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -36,15 +36,11 @@
 #include "debuggerstringutils.h"
 #include "sourceutils.h"
 #include "stackhandler.h"
-#include "watchhandler.h"
 
 #include <coreplugin/icore.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/savedaction.h>
-#include <utils/fileutils.h>
-
-#include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 71f3f4657c..d82b6cd129 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -29,21 +29,15 @@
 
 #include "coregdbadapter.h"
 
-#include "debuggeractions.h"
 #include "debuggercore.h"
 #include "debuggerprotocol.h"
 #include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 
-#include <utils/consoleprocess.h>
-#include <utils/elfreader.h>
 #include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
 
 #include <QDir>
-#include <QFileInfo>
 #include <QMessageBox>
-#include <QProcess>
 #include <QTemporaryFile>
 
 using namespace Utils;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index e5f9eb144e..6088620a51 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -41,60 +41,38 @@
 #include "remoteplaingdbadapter.h"
 
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerplugin.h"
 #include "debuggerprotocol.h"
-#include "debuggerrunner.h"
 #include "debuggerstringutils.h"
 #include "debuggertooltipmanager.h"
 #include "disassembleragent.h"
 #include "gdboptionspage.h"
 #include "memoryagent.h"
 #include "sourceutils.h"
-#include "watchutils.h"
 
 #include "breakhandler.h"
 #include "moduleshandler.h"
 #include "registerhandler.h"
-#include "snapshothandler.h"
 #include "sourcefileshandler.h"
 #include "stackhandler.h"
 #include "threadshandler.h"
-#include "watchhandler.h"
 #include "debuggersourcepathmappingwidget.h"
 #include "hostutils.h"
 #include "logwindow.h"
 #include "procinterrupt.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/itaskhandler.h>
-#include <texteditor/itexteditor.h>
-#include <utils/elfreader.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/savedaction.h>
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
 #include <QDirIterator>
-#include <QFileInfo>
-#include <QMetaObject>
-#include <QTime>
-#include <QTimer>
 #include <QTemporaryFile>
-#include <QTextStream>
 
-#include <QAction>
-#include <QDialogButtonBox>
-#include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 552db05492..1a4d77c580 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -32,26 +32,15 @@
 
 #include "debuggerengine.h"
 
-#include "stackframe.h"
 #include "watchhandler.h"
 #include "watchutils.h"
-#include "threaddata.h"
 
 #include <coreplugin/id.h>
 
-#include <QByteArray>
 #include <QProcess>
-#include <QHash>
-#include <QMap>
-#include <QMultiMap>
-#include <QObject>
-#include <QPoint>
-#include <QSet>
 #include <QTextCodec>
 #include <QTime>
 #include <QTimer>
-#include <QVariant>
-
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index 86bd7ce361..ea5b109c8d 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -34,20 +34,10 @@
 #include "debuggerinternalconstants.h"
 
 #include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorer.h>
-#include <utils/savedaction.h>
 
-#include <QCoreApplication>
 #include <QDebug>
-#include <QTextStream>
 
-#include <QCheckBox>
 #include <QFormLayout>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QRadioButton>
 #include <QSpinBox>
 #include <QTextEdit>
 
diff --git a/src/plugins/debugger/gdb/localgdbprocess.cpp b/src/plugins/debugger/gdb/localgdbprocess.cpp
index 9655625544..0c408b5d4e 100644
--- a/src/plugins/debugger/gdb/localgdbprocess.cpp
+++ b/src/plugins/debugger/gdb/localgdbprocess.cpp
@@ -36,9 +36,6 @@
 #include <utils/winutils.h>
 #endif
 
-#include <utils/qtcassert.h>
-
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
index 366b20860a..ad68efbd17 100644
--- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
@@ -29,14 +29,9 @@
 
 #include "localplaingdbadapter.h"
 
-#include "gdbengine.h"
 #include "debuggerstartparameters.h"
-#include "procinterrupt.h"
-#include "debuggercore.h"
 #include "debuggerstringutils.h"
 
-#include <projectexplorer/abi.h>
-
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 9b8ed82ea4..03285e1b8c 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -35,8 +35,6 @@
 #include "debuggerstringutils.h"
 #include "debuggertooltipmanager.h"
 
-#include "breakhandler.h"
-#include "watchhandler.h"
 #include "stackhandler.h"
 
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/remotegdbprocess.h b/src/plugins/debugger/gdb/remotegdbprocess.h
index bc73d026dd..cafd366497 100644
--- a/src/plugins/debugger/gdb/remotegdbprocess.h
+++ b/src/plugins/debugger/gdb/remotegdbprocess.h
@@ -35,7 +35,6 @@
 #include <ssh/sshconnection.h>
 #include <ssh/sshremoteprocess.h>
 
-#include <QByteArray>
 #include <QQueue>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 733e7b5a9e..6a3b6b12ec 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -35,8 +35,6 @@
 #include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
 
-#include <projectexplorer/abi.h>
-#include <utils/fancymainwindow.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
index b1e94e41eb..d97ac2370b 100644
--- a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
@@ -28,11 +28,8 @@
 ****************************************************************************/
 
 #include "remoteplaingdbadapter.h"
-#include "gdbengine.h"
 #include "debuggerstartparameters.h"
 
-#include <debugger/debuggeractions.h>
-#include <debugger/debuggerstringutils.h>
 #include <utils/qtcassert.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
index f3057e32ab..6c9d52a834 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
@@ -29,26 +29,19 @@
 
 #include "startgdbserverdialog.h"
 
-#include "debuggercore.h"
 #include "debuggermainwindow.h"
 #include "debuggerplugin.h"
 #include "debuggerkitinformation.h"
-#include "debuggerrunner.h"
 #include "debuggerruncontrolfactory.h"
 #include "debuggerstartparameters.h"
 
-#include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/kitchooser.h>
-#include <projectexplorer/devicesupport/deviceprocesslist.h>
+#include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
-#include <ssh/sshconnection.h>
 #include <ssh/sshremoteprocessrunner.h>
-#include <utils/pathchooser.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
-#include <QVariant>
 #include <QMessageBox>
 #include <QFileInfo>
 
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.h b/src/plugins/debugger/gdb/startgdbserverdialog.h
index 990dd5fd9b..bc5422f7ee 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.h
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.h
@@ -30,9 +30,9 @@
 #ifndef STARTGDBSERVERDIALOG_H
 #define STARTGDBSERVERDIALOG_H
 
-#include "debugger_global.h"
-#include <projectexplorer/kit.h>
-#include <projectexplorer/devicesupport/deviceprocessesdialog.h>
+#include <QObject>
+
+namespace ProjectExplorer { class DeviceProcessesDialog; }
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index d0f19cd2a6..4d2d508060 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -33,7 +33,6 @@
 #include "debuggerprotocol.h"
 #include "debuggerstartparameters.h"
 #include "debuggerstringutils.h"
-#include "procinterrupt.h"
 #include "shared/hostutils.h"
 
 #include <utils/hostosinfo.h>
diff --git a/src/plugins/debugger/imageviewer.cpp b/src/plugins/debugger/imageviewer.cpp
index eeddbf78bb..db7f722e4a 100644
--- a/src/plugins/debugger/imageviewer.cpp
+++ b/src/plugins/debugger/imageviewer.cpp
@@ -34,21 +34,15 @@
 #include <coreplugin/editormanager/ieditor.h>
 
 #include <QLabel>
-#include <QVBoxLayout>
 #include <QImage>
-#include <QPixmap>
-#include <QPoint>
+#include <QVBoxLayout>
 #include <QMouseEvent>
 #include <QScrollArea>
-#include <QMenu>
-#include <QAction>
-#include <QKeySequence>
 #include <QClipboard>
 #include <QApplication>
 #include <QPainter>
 #include <QDir>
 #include <QTemporaryFile>
-#include <QVariant>
 
 // Widget showing the image in a 1-pixel frame with context menu.
 class ImageWidget : public QWidget
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp
index c39ac6d756..ad6c4aee5a 100644
--- a/src/plugins/debugger/loadcoredialog.cpp
+++ b/src/plugins/debugger/loadcoredialog.cpp
@@ -29,50 +29,29 @@
 
 #include "loadcoredialog.h"
 
-#include "debuggerconstants.h"
-#include "debuggercore.h"
 #include "debuggerstartparameters.h"
 #include "debuggerdialogs.h"
 
-#include <coreplugin/icore.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
-#include <ssh/sshconnection.h>
-#include <ssh/sshremoteprocessrunner.h>
-#include <ssh/sftpdefs.h>
 #include <ssh/sftpfilesystemmodel.h>
-#include <utils/historycompleter.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 
 #include <QCheckBox>
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QRegExp>
 #include <QTemporaryFile>
 
-#include <QButtonGroup>
-#include <QComboBox>
 #include <QDialogButtonBox>
-#include <QFileDialog>
 #include <QFormLayout>
-#include <QGridLayout>
-#include <QGroupBox>
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QPushButton>
-#include <QRadioButton>
-#include <QScrollArea>
 #include <QSortFilterProxyModel>
-#include <QStandardItemModel>
-#include <QTableView>
 #include <QTextBrowser>
 #include <QTreeView>
-#include <QVBoxLayout>
 
 using namespace Core;
 using namespace ProjectExplorer;
diff --git a/src/plugins/debugger/localsandexpressionswindow.cpp b/src/plugins/debugger/localsandexpressionswindow.cpp
index a9b96c265e..5f9e48adbe 100644
--- a/src/plugins/debugger/localsandexpressionswindow.cpp
+++ b/src/plugins/debugger/localsandexpressionswindow.cpp
@@ -32,7 +32,6 @@
 #include <coreplugin/minisplitter.h>
 
 #include <QVBoxLayout>
-#include <QSplitter>
 #include <QStackedWidget>
 
 const int LOCAL_WIDGET_INDEX = 0;
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 862c229e38..132eb9b90d 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -34,29 +34,21 @@
 #include "debuggerengine.h"
 
 #include <QDebug>
-#include <QFile>
 #include <QTime>
 
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QLabel>
-#include <QLineEdit>
-#include <QKeyEvent>
 #include <QMenu>
-#include <QSpacerItem>
 #include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
 #include <QFileDialog>
-#include <QMessageBox>
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/findplaceholder.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
 #include <find/basetextfind.h>
 
 #include <utils/savedaction.h>
-#include <utils/fileutils.h>
 #include <utils/fancylineedit.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp
index c6e635f988..fe318ba61f 100644
--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -38,15 +38,12 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icore.h>
 
 #include <utils/qtcassert.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
 
 #include <QMessageBox>
-#include <QVBoxLayout>
 
 #include <cstring>
 
diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h
index c54ff94932..f44df5d2f1 100644
--- a/src/plugins/debugger/memoryagent.h
+++ b/src/plugins/debugger/memoryagent.h
@@ -34,8 +34,6 @@
 
 #include <QObject>
 #include <QPointer>
-#include <QString>
-#include <QList>
 #include <QColor>
 
 QT_FORWARD_DECLARE_CLASS(QPoint)
diff --git a/src/plugins/debugger/memoryview.cpp b/src/plugins/debugger/memoryview.cpp
index 14e8778b39..a03b3a8976 100644
--- a/src/plugins/debugger/memoryview.cpp
+++ b/src/plugins/debugger/memoryview.cpp
@@ -34,7 +34,6 @@
 #include <bineditor/markup.h>
 
 #include <QVBoxLayout>
-#include <QModelIndex>
 #include <QDebug>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index 104b069f2d..e35c8d1b20 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -29,7 +29,6 @@
 
 #include "moduleshandler.h"
 
-#include <utils/elfreader.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h
index c39d4f58da..2680d5ab0f 100644
--- a/src/plugins/debugger/moduleshandler.h
+++ b/src/plugins/debugger/moduleshandler.h
@@ -32,9 +32,6 @@
 
 #include <utils/elfreader.h>
 
-#include <QObject>
-#include <QVector>
-
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
 class QSortFilterProxyModel;
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index dbe8b7f757..ed5d3a6ca7 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -30,7 +30,6 @@
 #include "moduleswindow.h"
 
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 
@@ -41,7 +40,6 @@
 #include <QDebug>
 #include <QProcess>
 
-#include <QHeaderView>
 #include <QMenu>
 #include <QResizeEvent>
 
diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.h b/src/plugins/debugger/namedemangler/parsetreenodes.h
index 72897b2bcd..e2a78df816 100644
--- a/src/plugins/debugger/namedemangler/parsetreenodes.h
+++ b/src/plugins/debugger/namedemangler/parsetreenodes.h
@@ -31,11 +31,6 @@
 
 #include "globalparsestate.h"
 
-#include <QByteArray>
-#include <QList>
-#include <QSet>
-#include <QSharedPointer>
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/outputcollector.cpp b/src/plugins/debugger/outputcollector.cpp
index 39ec45c0d7..da5f973324 100644
--- a/src/plugins/debugger/outputcollector.cpp
+++ b/src/plugins/debugger/outputcollector.cpp
@@ -39,7 +39,6 @@
 
 #else
 
-#include <QFile>
 #include <QSocketNotifier>
 #include <QTemporaryFile>
 #include <QVarLengthArray>
diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp
index d67512498e..29033d1b94 100644
--- a/src/plugins/debugger/procinterrupt.cpp
+++ b/src/plugins/debugger/procinterrupt.cpp
@@ -28,12 +28,10 @@
 ****************************************************************************/
 
 #include "procinterrupt.h"
-#include "debuggerconstants.h"
 
-#include <QCoreApplication>
 #include <QProcess> // makes kill visible on Windows.
-#include <QFile>
 #include <QDir>
+
 using namespace Debugger::Internal;
 
 static inline QString msgCannotInterrupt(int pid, const QString &why)
diff --git a/src/plugins/debugger/qml/baseqmldebuggerclient.cpp b/src/plugins/debugger/qml/baseqmldebuggerclient.cpp
index 17e1e96d02..a552eed310 100644
--- a/src/plugins/debugger/qml/baseqmldebuggerclient.cpp
+++ b/src/plugins/debugger/qml/baseqmldebuggerclient.cpp
@@ -28,9 +28,7 @@
 ****************************************************************************/
 
 #include "baseqmldebuggerclient.h"
-#include "breakpoint.h"
 
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/qml/interactiveinterpreter.h b/src/plugins/debugger/qml/interactiveinterpreter.h
index cc62dbd25e..4678de9c0e 100644
--- a/src/plugins/debugger/qml/interactiveinterpreter.h
+++ b/src/plugins/debugger/qml/interactiveinterpreter.h
@@ -33,10 +33,6 @@
 #include <qmljs/parser/qmljslexer_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include <QVector>
-#include <QString>
-#include <QList>
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index 792301370e..a5c5810c20 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -34,7 +34,6 @@
 #include "qmlv8debuggerclient.h"
 #include "qscriptdebuggerclient.h"
 
-#include <qmldebug/qdebugmessageclient.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index b77684d169..497cc7f06b 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -30,12 +30,8 @@
 #ifndef QMLADAPTER_H
 #define QMLADAPTER_H
 
-#include "debugger_global.h"
-
 #include <qmldebug/qmldebugclient.h>
 
-#include <QAbstractSocket>
-#include <QObject>
 #include <QPointer>
 #include <QTimer>
 
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index d8e56ad190..bcd329d241 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -29,22 +29,16 @@
 
 #include "qmlcppengine.h"
 #include "debuggerruncontrolfactory.h"
-#include "debuggercore.h"
 #include "debuggerstartparameters.h"
 #include "stackhandler.h"
 #include "qmlengine.h"
-#include "watchdata.h"
 #include "watchhandler.h"
 
-#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
-#include <texteditor/itexteditor.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <qmljs/consolemanagerinterface.h>
 
-#include <QTimer>
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 1c5690c700..e44cf92dab 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -33,9 +33,7 @@
 
 #include "debuggerstartparameters.h"
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
-#include "debuggerdialogs.h"
 #include "debuggerinternalconstants.h"
 #include "debuggermainwindow.h"
 #include "debuggerrunner.h"
@@ -45,44 +43,25 @@
 #include "watchwindow.h"
 
 #include "breakhandler.h"
-#include "moduleshandler.h"
-#include "registerhandler.h"
 #include "stackhandler.h"
 #include "watchhandler.h"
 #include "sourcefileshandler.h"
-#include "watchutils.h"
-
-#include <qmldebug/baseenginedebugclient.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/consolemanagerinterface.h>
-#include <qmljs/consoleitem.h>
 
-#include <utils/environment.h>
 #include <utils/qtcassert.h>
 
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
 
-#include <texteditor/itexteditor.h>
-
-#include <QDateTime>
 #include <QDebug>
 #include <QDir>
-#include <QFileInfo>
-#include <QTimer>
 
-#include <QAction>
-#include <QApplication>
 #include <QMessageBox>
 #include <QPlainTextEdit>
-#include <QToolTip>
-
-#include <QTcpSocket>
-#include <QHostAddress>
 
 #include <QDockWidget>
 
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 7fdfcaf767..efc1108ebe 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -38,11 +38,8 @@
 #include <projectexplorer/applicationlauncher.h>
 #include <qmldebug/qdebugmessageclient.h>
 #include <qmldebug/qmloutputparser.h>
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/iscriptevaluator.h>
-#include <utils/outputformat.h>
 
-#include <QAbstractSocket>
 #include <QTextDocument>
 
 namespace Core {
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
index f827136d02..c2cd81e0d5 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
@@ -38,7 +38,6 @@
 #include "qmllivetextpreview.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
 #include <qmldebug/declarativeenginedebugclient.h>
 #include <qmldebug/declarativeenginedebugclientv2.h>
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h
index 33f2855d1b..b94e37d542 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.h
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.h
@@ -32,9 +32,6 @@
 
 #include "debuggerconstants.h"
 
-#include <QObject>
-#include <QStringList>
-
 #include <coreplugin/icontext.h>
 #include <qmldebug/qmldebugclient.h>
 #include <qmljs/qmljsdocument.h>
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.h b/src/plugins/debugger/qml/qmlinspectoragent.h
index b50e8df9ca..5ea7561e31 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.h
+++ b/src/plugins/debugger/qml/qmlinspectoragent.h
@@ -30,12 +30,10 @@
 #ifndef QMLINSPECTORAGENT_H
 #define QMLINSPECTORAGENT_H
 
-#include <QObject>
 #include <QStack>
 #include <QTimer>
 
 #include <qmldebug/baseenginedebugclient.h>
-#include <watchdata.h>
 
 namespace Debugger {
 
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.h b/src/plugins/debugger/qml/qmllivetextpreview.h
index 7fd7af72e3..5f1ff8f5c7 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.h
+++ b/src/plugins/debugger/qml/qmllivetextpreview.h
@@ -30,8 +30,6 @@
 #ifndef QMLLIVETEXTPREVIEW_H
 #define QMLLIVETEXTPREVIEW_H
 
-#include <QObject>
-
 #include <texteditor/basetexteditor.h>
 #include <qmljs/qmljsdocument.h>
 
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index ce0ebf5660..12ebbc10d3 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -32,7 +32,6 @@
 #include "debuggerstringutils.h"
 
 #include "watchhandler.h"
-#include "breakpoint.h"
 #include "breakhandler.h"
 #include "qmlengine.h"
 #include "stackhandler.h"
@@ -40,20 +39,13 @@
 #include "debuggeractions.h"
 
 #include <utils/qtcassert.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/basetexteditor.h>
 
 #include <qmljs/consolemanagerinterface.h>
-#include <qmljs/consoleitem.h>
 
 #include <QTextBlock>
-#include <QVariant>
-#include <QStack>
-#include <QQueue>
 #include <QFileInfo>
-#include <QTextDocument>
 #include <QScriptEngine>
-#include <QScriptValue>
 
 #define DEBUG_QML 0
 #if DEBUG_QML
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.h b/src/plugins/debugger/qml/qmlv8debuggerclient.h
index cedcf4163b..1d68ae1186 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.h
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.h
@@ -31,8 +31,6 @@
 #define QMLV8DEBUGGERCLIENT_H
 
 #include "baseqmldebuggerclient.h"
-#include "stackframe.h"
-#include "watchdata.h"
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 50d0b0906a..22bb857f51 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -28,21 +28,15 @@
 ****************************************************************************/
 #include "qscriptdebuggerclient.h"
 
-#include "watchdata.h"
 #include "watchhandler.h"
-#include "breakpoint.h"
 #include "breakhandler.h"
-#include "debuggerconstants.h"
 #include "qmlengine.h"
 #include "stackhandler.h"
 #include "debuggercore.h"
 #include "debuggerstringutils.h"
 
-#include <QTextDocument>
 #include <QFileInfo>
-#include <QTextStream>
 #include <QMessageBox>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.h b/src/plugins/debugger/qml/qscriptdebuggerclient.h
index bd87e806d0..9f33f9301c 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.h
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.h
@@ -31,9 +31,6 @@
 #define QSCRIPTDEBUGGERCLIENT_H
 
 #include "baseqmldebuggerclient.h"
-#include "stackframe.h"
-#include "watchdata.h"
-#include "qmlengine.h"
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 6be8a98e22..9d99baef59 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -29,9 +29,7 @@
 
 #include "registerwindow.h"
 #include "memoryview.h"
-#include "debuggeractions.h"
 #include "debuggerdialogs.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 #include "registerhandler.h"
@@ -39,11 +37,9 @@
 #include "memoryagent.h"
 
 #include <utils/qtcassert.h>
-#include <utils/savedaction.h>
 
 #include <QDebug>
 
-#include <QHeaderView>
 #include <QItemDelegate>
 #include <QMenu>
 #include <QPainter>
diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h
index 96f5e41242..1526a67568 100644
--- a/src/plugins/debugger/script/scriptengine.h
+++ b/src/plugins/debugger/script/scriptengine.h
@@ -33,7 +33,6 @@
 #include "debuggerengine.h"
 
 #include <QSharedPointer>
-#include <QScopedPointer>
 #include <QHash>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h
index dc92346244..c00bf3cc90 100644
--- a/src/plugins/debugger/shared/backtrace.h
+++ b/src/plugins/debugger/shared/backtrace.h
@@ -30,8 +30,6 @@
 #ifndef DEBUGGER_BACKTRACE_H
 #define DEBUGGER_BACKTRACE_H
 
-#include <qglobal.h>
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
index 2da2fea4f7..9d957a6ce9 100644
--- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
+++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
@@ -36,12 +36,8 @@
 
 #include <QDir>
 #include <QDebug>
-#include <QFileDialog>
 #include <QAction>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
 #include <QFormLayout>
-#include <QMessageBox>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/shared/hostutils.cpp b/src/plugins/debugger/shared/hostutils.cpp
index 17a5574432..e487e73aee 100644
--- a/src/plugins/debugger/shared/hostutils.cpp
+++ b/src/plugins/debugger/shared/hostutils.cpp
@@ -29,16 +29,6 @@
 
 #include "hostutils.h"
 
-#include <utils/synchronousprocess.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QLibrary>
-#include <QProcess>
-#include <QString>
-#include <QTextStream>
-
 #ifdef Q_OS_WIN
 
 // Enable Win API of XP SP1 and later
diff --git a/src/plugins/debugger/shared/hostutils.h b/src/plugins/debugger/shared/hostutils.h
index d544b12936..23a998dce0 100644
--- a/src/plugins/debugger/shared/hostutils.h
+++ b/src/plugins/debugger/shared/hostutils.h
@@ -31,7 +31,6 @@
 #define DEBUGGER_HOSTUTILS_H
 
 #include <QList>
-#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QTextStream;
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index 47792426cf..ea088f7eaa 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -29,18 +29,14 @@
 
 #include "snapshothandler.h"
 
-#include "debuggerconstants.h"
 #include "debuggerinternalconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
-#include "debuggerrunner.h"
 #include "debuggerstartparameters.h"
 
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QFile>
-#include <QIcon>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index 116448c4b7..541f43da00 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -40,7 +40,6 @@
 
 #include <QDebug>
 
-#include <QHeaderView>
 #include <QMenu>
 #include <QKeyEvent>
 
diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp
index 9a1bf77534..16132473fc 100644
--- a/src/plugins/debugger/sourceagent.cpp
+++ b/src/plugins/debugger/sourceagent.cpp
@@ -29,40 +29,21 @@
 
 #include "sourceagent.h"
 
-#include "breakhandler.h"
 #include "debuggerengine.h"
 #include "debuggerinternalconstants.h"
 #include "debuggercore.h"
-#include "debuggerstringutils.h"
-#include "stackframe.h"
 #include "stackhandler.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icore.h>
-
-#include <texteditor/basetextdocument.h>
 #include <texteditor/basetexteditor.h>
-#include <texteditor/basetextmark.h>
-#include <texteditor/plaintexteditor.h>
-#include <texteditor/texteditorconstants.h>
 
 #include <cppeditor/cppeditorconstants.h>
 
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QMetaObject>
-#include <QTimer>
-#include <QPointer>
 #include <QFileInfo>
 
-#include <QMessageBox>
-#include <QPlainTextEdit>
 #include <QTextBlock>
-#include <QTextCursor>
-#include <QIcon>
 
 #include <limits.h>
 
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index bd06d92cef..fb4830d055 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -29,16 +29,12 @@
 
 #include "sourcefileswindow.h"
 
-#include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 
 #include <utils/qtcassert.h>
-#include <utils/savedaction.h>
 
 #include <QDebug>
-#include <QFileInfo>
 
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp
index 7a54998028..10cb2d0e7b 100644
--- a/src/plugins/debugger/sourceutils.cpp
+++ b/src/plugins/debugger/sourceutils.cpp
@@ -29,42 +29,18 @@
 
 #include "sourceutils.h"
 
-#include "debuggerprotocol.h"
-#include "debuggerstringutils.h"
 #include "watchdata.h"
 #include "watchutils.h"
 
-#include <utils/qtcassert.h>
-
-#include <coreplugin/idocument.h>
-
 #include <texteditor/basetexteditor.h>
-#include <texteditor/basetextmark.h>
-#include <texteditor/itexteditor.h>
-#include <texteditor/texteditorconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/abstracteditorsupport.h>
 
 #include <cpptools/ModelManagerInterface.h>
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/Overview.h>
-#include <Symbols.h>
-#include <Scope.h>
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <QCoreApplication>
-#include <QDateTime>
 #include <QDebug>
-#include <QHash>
-#include <QStringList>
-#include <QTextStream>
-#include <QTime>
-
-#include <QTextCursor>
-#include <QPlainTextEdit>
 
 #include <string.h>
 #include <ctype.h>
diff --git a/src/plugins/debugger/sourceutils.h b/src/plugins/debugger/sourceutils.h
index 37845e1e95..5bc283fbd5 100644
--- a/src/plugins/debugger/sourceutils.h
+++ b/src/plugins/debugger/sourceutils.h
@@ -30,7 +30,6 @@
 #ifndef SOURCE_UTILS_H
 #define SOURCE_UTILS_H
 
-#include <QSet>
 #include <QString>
 
 namespace TextEditor { class ITextEditor; }
diff --git a/src/plugins/debugger/stackframe.cpp b/src/plugins/debugger/stackframe.cpp
index f7ceb9f4ac..12de6eeda8 100644
--- a/src/plugins/debugger/stackframe.cpp
+++ b/src/plugins/debugger/stackframe.cpp
@@ -30,11 +30,8 @@
 #include "stackframe.h"
 #include "watchutils.h"
 
-#include <QFileInfo>
 #include <QDebug>
 #include <QDir>
-#include <QTextStream>
-#include <QCoreApplication>
 
 #include <utils/hostosinfo.h>
 
diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h
index 0936a9ce45..51a1dda071 100644
--- a/src/plugins/debugger/stackframe.h
+++ b/src/plugins/debugger/stackframe.h
@@ -30,10 +30,8 @@
 #ifndef DEBUGGER_STACKFRAME_H
 #define DEBUGGER_STACKFRAME_H
 
-#include <QList>
-#include <QMetaType>
-#include <QString>
 #include <QCoreApplication>
+#include <QMetaType>
 
 QT_BEGIN_NAMESPACE
 class QDebug;
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 5dbade1a1e..18a61f6395 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -31,7 +31,6 @@
 
 #include "debuggeractions.h"
 #include "debuggercore.h"
-#include "debuggerengine.h"
 
 #include <utils/qtcassert.h>
 #include <utils/savedaction.h>
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 6e88f5b59e..fed2e8031f 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -36,7 +36,7 @@
 #include "debuggerdialogs.h"
 #include "memoryagent.h"
 
-#include <utils/qtcassert.h>
+
 #include <utils/savedaction.h>
 
 #include <QDebug>
@@ -44,7 +44,6 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QContextMenuEvent>
-#include <QHeaderView>
 #include <QInputDialog>
 #include <QMenu>
 
diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp
index 1c4d1d173b..ef27294154 100644
--- a/src/plugins/debugger/threadshandler.cpp
+++ b/src/plugins/debugger/threadshandler.cpp
@@ -29,7 +29,6 @@
 
 #include "threadshandler.h"
 
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerprotocol.h"
 #include "watchutils.h"
@@ -37,8 +36,6 @@
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QTextStream>
-#include <QSortFilterProxyModel>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 99ace3cd1e..c2b9faae7f 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -29,9 +29,7 @@
 
 #include "threadswindow.h"
 
-#include "threadshandler.h"
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
 
@@ -39,7 +37,6 @@
 
 #include <QDebug>
 #include <QContextMenuEvent>
-#include <QHeaderView>
 #include <QMenu>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp
index 1547fcc179..24c9b9a4b9 100644
--- a/src/plugins/debugger/watchdata.cpp
+++ b/src/plugins/debugger/watchdata.cpp
@@ -34,8 +34,7 @@
 #include "watchutils.h"
 #include "debuggerprotocol.h"
 
-#include <QTextDocument>
-#include <QTextStream>
+#include <QTextDocument> // Qt::escape() in Qt 4
 #include <QDebug>
 
 ////////////////////////////////////////////////////////////////////
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index 10d8d195d3..fd2a3cbb0e 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -30,9 +30,8 @@
 #ifndef DEBUGGER_WATCHDATA_H
 #define DEBUGGER_WATCHDATA_H
 
-#include <QMetaType>
-#include <QtGlobal>
 #include <QCoreApplication>
+#include <QMetaType>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h
index e54534aa19..7e49963900 100644
--- a/src/plugins/debugger/watchdelegatewidgets.h
+++ b/src/plugins/debugger/watchdelegatewidgets.h
@@ -32,7 +32,6 @@
 
 #include <QLineEdit>
 #include <QComboBox>
-#include <QVariant>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index ef994ae29b..ba60785674 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -45,16 +45,9 @@
 #include <cplusplus/CppRewriter.h>
 
 #include <QDebug>
-#include <QEvent>
-#include <QFile>
-#include <QPointer>
 #include <QProcess>
-#include <QTextStream>
 #include <QtAlgorithms>
-
-#include <QLabel>
 #include <QTextEdit>
-#include <QTabWidget>
 
 #include <ctype.h>
 
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 198b86f178..4319459aff 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -32,9 +32,6 @@
 
 #include "watchdata.h"
 
-#include <QHash>
-#include <QSet>
-#include <QStringList>
 #include <QPointer>
 #include <QAbstractItemModel>
 
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 5a683636a5..6d97d2c8fd 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -32,7 +32,6 @@
 
 #include "watchutils.h"
 #include "watchdata.h"
-#include "debuggerprotocol.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index 00432fb8f1..bf841942ef 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -34,7 +34,6 @@
 // This is used in the debugger auto-tests.
 
 #include <QSet>
-#include <QString>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 47220ab046..d215cfde55 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -32,12 +32,10 @@
 #include "breakhandler.h"
 #include "registerhandler.h"
 #include "debuggeractions.h"
-#include "debuggerconstants.h"
 #include "debuggerinternalconstants.h"
 #include "debuggercore.h"
 #include "debuggerdialogs.h"
 #include "debuggerengine.h"
-#include "debuggerstartparameters.h"
 #include "watchdelegatewidgets.h"
 #include "watchhandler.h"
 #include "debuggertooltipmanager.h"
@@ -49,19 +47,14 @@
 #include <utils/savedaction.h>
 
 #include <QDebug>
-#include <QMetaObject>
 #include <QMetaProperty>
-#include <QVariant>
 #include <QMimeData>
 
 #include <QApplication>
-#include <QPalette>
 #include <QClipboard>
-#include <QContextMenuEvent>
 #include <QHeaderView>
 #include <QItemDelegate>
 #include <QMenu>
-#include <QPainter>
 #include <QInputDialog>
 #include <QMessageBox>