diff --git a/src/plugins/debugger/cdb/cdboptions.h b/src/plugins/debugger/cdb/cdboptions.h
index 93801bfd46fb3339693f98d41e2fd6d13d1dad7b..7aa3d757937bde4bc8209e6de7969db0501c2c80 100644
--- a/src/plugins/debugger/cdb/cdboptions.h
+++ b/src/plugins/debugger/cdb/cdboptions.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CDBSETTINGS_H
-#define CDBSETTINGS_H
+#ifndef CDBOPTIONS_H
+#define CDBOPTIONS_H
 
 #include <QStringList>
 
@@ -80,4 +80,4 @@ inline bool operator!=(const CdbOptions &s1, const CdbOptions &s2)
 } // namespace Internal
 } // namespace Debugger
 
-#endif // CDBSETTINGS_H
+#endif // CDBOPTIONS_H
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index cc871a4efd877019e45421b254a5c8b3bda5ab87..7e27e5a06017f00b6e7d6416ad44c112dcf624db 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CDBSETTINGSPAGE_H
-#define CDBSETTINGSPAGE_H
+#ifndef CDBOPTIONSSPAGE_H
+#define CDBOPTIONSSPAGE_H
 
 #include "cdboptions.h"
 
@@ -147,4 +147,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // CDBSETTINGSPAGE_H
+#endif // CDBOPTIONSSPAGE_H
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index 0dcc67d4ec46a7cf4201f071942aa5b04f0c0e0a..af26a42f7e038a595282caa165b1943f58b36186 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGERUISWITCHER_H
-#define DEBUGGERUISWITCHER_H
+#ifndef DEBUGGERMAINWINDOW_H
+#define DEBUGGERMAINWINDOW_H
 
 #include "debugger_global.h"
 #include "debuggerconstants.h"
@@ -92,4 +92,4 @@ private:
 
 } // namespace Debugger
 
-#endif // DEBUGGERUISWITCHER_H
+#endif // DEBUGGERMAINWINDOW_H
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a14762921943c01729419b7afa907dcce71539de..3a2a9175e48eb3f7d325a2bf18186b5f6e8fb052 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -80,7 +80,6 @@
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/imode.h>
 #include <coreplugin/icorelistener.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/minisplitter.h>
diff --git a/src/plugins/debugger/debuggerstreamops.h b/src/plugins/debugger/debuggerstreamops.h
index b4f33f9ff394f551d3e32111f49208dccba7db10..5c115900980722db1065c9ae0e579ccefc8641bb 100644
--- a/src/plugins/debugger/debuggerstreamops.h
+++ b/src/plugins/debugger/debuggerstreamops.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGERPLUGIN_STREAMOPS_H
-#define DEBUGGERPLUGIN_STREAMOPS_H
+#ifndef DEBUGGERSTREAMOPS_H
+#define DEBUGGERSTREAMOPS_H
 
 #include "threaddata.h"
 #include "stackframe.h"
@@ -66,4 +66,4 @@ QDataStream &operator>>(QDataStream& stream, DisassemblerLines &o);
 } // namespace Internal
 } // namespace Debugger
 
-#endif
+#endif // DEBUGGERSTREAMOPS_H
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index af3e0729e908320ce5779e51675705eadbe6af96..853c1fa62002fb55722d85c3f6f8494a5ff995f2 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -33,7 +33,6 @@
 #include "debuggerengine.h"
 #include "debuggeractions.h"
 #include "watchhandler.h"
-#include "watchutils.h"
 #include "stackhandler.h"
 #include "debuggercore.h"
 
diff --git a/src/plugins/debugger/gdb/abstractgdbprocess.h b/src/plugins/debugger/gdb/abstractgdbprocess.h
index b5e74afbf2824b68b66f93bdab0b91b47742a2d6..b68c04cbf0c0a1c6f0443fd6e9e0d307d77e9c2d 100644
--- a/src/plugins/debugger/gdb/abstractgdbprocess.h
+++ b/src/plugins/debugger/gdb/abstractgdbprocess.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef GDBPROCESSWRAPPER_H
-#define GDBPROCESSWRAPPER_H
+#ifndef ABSTRACTGDBPROCESS_H
+#define ABSTRACTGDBPROCESS_H
 
 #include <QObject>
 #include <QProcess>
@@ -71,4 +71,4 @@ signals:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // GDBPROCESSWRAPPER_H
+#endif // ABSTRACTGDBPROCESS_H
diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.h b/src/plugins/debugger/gdb/localplaingdbadapter.h
index ad34f6944d5849ca5751301d585e8a87883e799d..7163b199f347ebab7b83b7d1e4cb41735ef327b1 100644
--- a/src/plugins/debugger/gdb/localplaingdbadapter.h
+++ b/src/plugins/debugger/gdb/localplaingdbadapter.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_PLAINGDBADAPTER_H
-#define DEBUGGER_PLAINGDBADAPTER_H
+#ifndef LOCALPLAINGDBADAPTER_H
+#define LOCALPLAINGDBADAPTER_H
 
 #include "abstractplaingdbadapter.h"
 #include "localgdbprocess.h"
@@ -70,4 +70,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGER_PLAINGDBADAPTER_H
+#endif // LOCALPLAINGDBADAPTER_H
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.h b/src/plugins/debugger/gdb/remotegdbserveradapter.h
index d0d4094028c429e01b51bcdeaf701d22e49b5d0e..4cdc1843cd31cf68aa349b9dd629a0cdbbf20a8a 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.h
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_REMOTEGDBADAPTER_H
-#define DEBUGGER_REMOTEGDBADAPTER_H
+#ifndef REMOTEGDBSERVERADAPTER_H
+#define REMOTEGDBSERVERADAPTER_H
 
 #include "gdbengine.h"
 #include "localgdbprocess.h"
@@ -96,4 +96,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGER_PLAINGDBADAPTER_H
+#endif // REMOTEGDBSERVERADAPTER_H
diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.h b/src/plugins/debugger/gdb/remoteplaingdbadapter.h
index 92c95b5d1f923c406ed5acd89764295e10f3bb80..92df4945f02b682cbb96708863d04e537200ddda 100644
--- a/src/plugins/debugger/gdb/remoteplaingdbadapter.h
+++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef REMOTEGDBCLIENTADAPTER_H
-#define REMOTEGDBCLIENTADAPTER_H
+#ifndef REMOTEPLAINGDBADAPTER_H
+#define REMOTEPLAINGDBADAPTER_H
 
 #include "abstractplaingdbadapter.h"
 #include "remotegdbprocess.h"
@@ -69,4 +69,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // REMOTEGDBCLIENTADAPTER_H
+#endif // REMOTEPLAINGDBADAPTER_H
diff --git a/src/plugins/debugger/lldblib/ipcengineguest.h b/src/plugins/debugger/lldblib/ipcengineguest.h
index 671e49028d41c92ca516912f5a515ef56eb6faad..88442a67ca5153307545fe7e62dc05a2f755e5a9 100644
--- a/src/plugins/debugger/lldblib/ipcengineguest.h
+++ b/src/plugins/debugger/lldblib/ipcengineguest.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_IPCENGINE_H
-#define DEBUGGER_IPCENGINE_H
+#ifndef IPCENGINEGUEST_H
+#define IPCENGINEGUEST_H
 
 #include "breakhandler.h"
 #include "debuggerengine.h"
@@ -188,4 +188,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGER_LLDBENGINE_H
+#endif // IPCENGINEGUEST_H
diff --git a/src/plugins/debugger/lldblib/lldboptionspage.h b/src/plugins/debugger/lldblib/lldboptionspage.h
index 78cd3c7e67d5718e52141496a6c97b003400eeeb..81ebfaf28c3149a4f3d5dc66e24cda129977c692 100644
--- a/src/plugins/debugger/lldblib/lldboptionspage.h
+++ b/src/plugins/debugger/lldblib/lldboptionspage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef LLDBSETTINGSPAGE_H
-#define LLDBSETTINGSPAGE_H
+#ifndef LLDBOPTIONSPAGE_H
+#define LLDBOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include "ui_lldboptionspagewidget.h"
@@ -77,4 +77,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // LLDBSETTINGSPAGE_H
+#endif // LLDBOPTIONSPAGE_H
diff --git a/src/plugins/debugger/loadcoredialog.h b/src/plugins/debugger/loadcoredialog.h
index 928ddba7916a928934312e7371b4a83f62e795dc..d566c0b0f51361be1b7079c137b891d9aa2a122a 100644
--- a/src/plugins/debugger/loadcoredialog.h
+++ b/src/plugins/debugger/loadcoredialog.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_ATTACHCOREDIALOG_H
-#define DEBUGGER_ATTACHCOREDIALOG_H
+#ifndef LOADCOREDIALOG_H
+#define LOADCOREDIALOG_H
 
 #include <QDialog>
 
@@ -79,4 +79,4 @@ private:
 } // namespace Debugger
 } // namespace Internal
 
-#endif // DEBUGGER_ATTACHCOREDIALOG_H
+#endif // LOADCOREDIALOG_H
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 21d4fffec9e0f2cd74a71fab0518e918256a9dd6..fff3041be03c1739ff29bba98c1a9b7696b06477 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLGDBENGINE_H
-#define QMLGDBENGINE_H
+#ifndef QMLCPPENGINE_H
+#define QMLCPPENGINE_H
 
 #include "debuggerengine.h"
 
@@ -140,4 +140,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // QMLGDBENGINE_H
+#endif // QMLCPPENGINE_H
diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h
index b824a4cdee0e34267c0914530898e4cbdc64e7aa..6df1ada16766c68b90ed457309862ae6d42dcbed 100644
--- a/src/plugins/debugger/sourcefileswindow.h
+++ b/src/plugins/debugger/sourcefileswindow.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_SOURCEFILEWINDOW_H
-#define DEBUGGER_SOURCEFILEWINDOW_H
+#ifndef SOURCEFILESWINDOW_H
+#define SOURCEFILESWINDOW_H
 
 #include "basewindow.h"
 
@@ -58,5 +58,5 @@ public:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGER_SOURCEFILEWINDOW_H
+#endif // SOURCEFILESWINDOW_H
 
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 7158a98b16ed300993e3d43f5257a0ca081055cd..06fc1a60ab4a9a699e64780e85400bdd896eefaf 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGER_THREADWINDOW_H
-#define DEBUGGER_THREADWINDOW_H
+#ifndef THREADSWINDOW_H
+#define THREADSWINDOW_H
 
 #include "basewindow.h"
 
@@ -59,4 +59,4 @@ public:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGER_THREADWINDOW_H
+#endif // THREADSWINDOW_H
diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h
index 470ae793756329767c42d5bb9baa6b1d1d649de4..e54534aa19be8cc5bd3e30949defb567ebcad22a 100644
--- a/src/plugins/debugger/watchdelegatewidgets.h
+++ b/src/plugins/debugger/watchdelegatewidgets.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef WATCHDELEGATEEDITS_H
-#define WATCHDELEGATEEDITS_H
+#ifndef WATCHDELEGATEWIDGETS_H
+#define WATCHDELEGATEWIDGETS_H
 
 #include <QLineEdit>
 #include <QComboBox>
@@ -115,4 +115,4 @@ public:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // WATCHDELEGATEEDITS_H
+#endif // WATCHDELEGATEWIDGETS_H
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 3e3e3542926f909a3e08d612758032704fc585d6..ef994ae29ba0c0cf14eaac97f2e0055619de1298 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -57,7 +57,6 @@
 #include <QTabWidget>
 
 #include <ctype.h>
-#include <utils/qtcassert.h>
 
 //#define USE_WATCH_MODEL_TEST 0
 //#define USE_EXPENSIVE_CHECKS 0