diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.cpp b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
index dca2e9ad5bece78bf8d02aab450a1dde4d343cd7..e9f67b9a48b8e99123ec97f9e4a60053a4dadf93 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
@@ -31,7 +31,6 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QObject>
 #include <QtCore/QProcess>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index ae83ed6a49076b347a61fe195cb33e305f693a6a..440c29bbd8ec08f8c0d0a912ba8d09c3077f753f 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -29,7 +29,6 @@
 
 #include "attachgdbadapter.h"
 
-#include "debuggeractions.h"
 #include "gdbengine.h"
 #include "procinterrupt.h"
 #include "debuggerstringutils.h"
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.h b/src/plugins/debugger/gdb/attachgdbadapter.h
index 1ae5b1c7cae4e7b65f25148d7ba7e64d58e7dfd4..006b49b1a5b6b37c854087e0a0c62e2d97f0aeb3 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.h
+++ b/src/plugins/debugger/gdb/attachgdbadapter.h
@@ -31,10 +31,6 @@
 #define DEBUGGER_ATTACHGDBADAPTER_H
 
 #include "abstractgdbadapter.h"
-#include "gdbengine.h"
-
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/coregdbadapter.h b/src/plugins/debugger/gdb/coregdbadapter.h
index 69f7d067da2cf55f8a46b419438a74b20431017b..bb1244ba9358e6aa47cf259edb98644f375a6651 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.h
+++ b/src/plugins/debugger/gdb/coregdbadapter.h
@@ -31,10 +31,6 @@
 #define DEBUGGER_COREGDBADAPTER_H
 
 #include "abstractgdbadapter.h"
-#include "gdbengine.h"
-
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index 8df6d740165dd922cbe63c8c8c48a904a6dc6ff8..9eb4da18b775e8d72af220eacced7fcce069925b 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -29,18 +29,13 @@
 
 #include "plaingdbadapter.h"
 
-#include "debuggeractions.h"
 #include "gdbengine.h"
 #include "procinterrupt.h"
 #include "debuggerstringutils.h"
 
 #include <utils/qtcassert.h>
-#include <utils/fancymainwindow.h>
-#include <coreplugin/icore.h>
 
 #include <QtCore/QFileInfo>
-#include <QtCore/QVariant>
-#include <QtGui/QMessageBox>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.h b/src/plugins/debugger/gdb/plaingdbadapter.h
index 0998ad2b82fe53175868aabfe48d94f3713551e9..41154640223c4bc45384d19b269cb60a903e4eab 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.h
+++ b/src/plugins/debugger/gdb/plaingdbadapter.h
@@ -31,11 +31,8 @@
 #define DEBUGGER_PLAINGDBADAPTER_H
 
 #include "abstractgdbadapter.h"
-#include "gdbengine.h"
-#include "outputcollector.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
+#include <outputcollector.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index 1729cea07088fd6e74c6e0e295da0935249930db..006f314584a55a7a63317f52a505bbc0dc1774b6 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -28,8 +28,8 @@
 **************************************************************************/
 
 #include "remotegdbadapter.h"
+
 #include "debuggerstringutils.h"
-#include "debuggeractions.h"
 #include "gdbengine.h"
 
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.h b/src/plugins/debugger/gdb/remotegdbadapter.h
index edc65ece950d085b69cdf75458c59b8f84d93e9e..24ca66b43949c199ab90ba3a781143c14d140790 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.h
+++ b/src/plugins/debugger/gdb/remotegdbadapter.h
@@ -31,10 +31,6 @@
 #define DEBUGGER_REMOTEGDBADAPTER_H
 
 #include "abstractgdbadapter.h"
-#include "gdbengine.h"
-
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 7e992b61bddf48dc5b06ed5b5653cab7cd5c0934..5c6d070eddc586ac6ea13c2054858bed78af53cd 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -29,17 +29,13 @@
 
 #include "termgdbadapter.h"
 
-#include "debuggeractions.h"
 #include "gdbengine.h"
 #include "procinterrupt.h"
 #include "debuggerstringutils.h"
 
 #include <utils/qtcassert.h>
-#include <utils/fancymainwindow.h>
 #include <coreplugin/icore.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QVariant>
 #include <QtGui/QMessageBox>
 
 namespace Debugger {
diff --git a/src/plugins/debugger/gdb/termgdbadapter.h b/src/plugins/debugger/gdb/termgdbadapter.h
index 62d7b415c742e9b4e184bf8f2c8f18e8c75d3426..11fb04a2c4cb03b9918fa934f36094377fc55fa6 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.h
+++ b/src/plugins/debugger/gdb/termgdbadapter.h
@@ -31,13 +31,9 @@
 #define DEBUGGER_TERMGDBADAPTER_H
 
 #include "abstractgdbadapter.h"
-#include "gdbengine.h"
 
 #include <consoleprocess.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 16f434a495440ac27817432d23675d8a93830de5..c62a31b9678dfd0f6872c2553a378cd11e3f82f8 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -30,10 +30,17 @@
 #include "trkgdbadapter.h"
 #include "trkoptions.h"
 #include "trkoptionspage.h"
+
 #include "debuggerstringutils.h"
 #ifndef STANDALONE_RUNNER
 #include "gdbengine.h"
 #endif
+
+#include <utils/qtcassert.h>
+
+#include <QtCore/QTimer>
+#include <QtCore/QDir>
+
 #ifdef Q_OS_WIN
 #  include <windows.h>
 #else
@@ -41,11 +48,6 @@
 #  include <unistd.h>
 #endif
 
-#include <utils/qtcassert.h>
-
-#include <QtCore/QTimer>
-#include <QtCore/QDir>
-
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&TrkGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index b813178689ce9ae5351e9fd4f4656ad9c16e9dcf..9bc68b430981f39ea246d85622b238f4c07b8a80 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -30,10 +30,11 @@
 #ifndef DEBUGGER_TRKGDBADAPTER_H
 #define DEBUGGER_TRKGDBADAPTER_H
 
+#include "abstractgdbadapter.h"
+
 #include "trkutils.h"
 #include "trkdevice.h"
 #include "trkoptions.h"
-#include "abstractgdbadapter.h"
 
 #include <QtCore/QHash>
 #include <QtCore/QPointer>