diff --git a/src/plugins/debugger/cdb/cdbassembler.cpp b/src/plugins/debugger/cdb/cdbassembler.cpp
index 00c34415ea2488d3056d66f5fe5317c24c0349a7..4cb59c7d69f018d7d9f721c8b17cc5a3fa267e45 100644
--- a/src/plugins/debugger/cdb/cdbassembler.cpp
+++ b/src/plugins/debugger/cdb/cdbassembler.cpp
@@ -230,5 +230,5 @@ bool dissassemble(IDebugClient5 *client,
     return true;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbassembler.h b/src/plugins/debugger/cdb/cdbassembler.h
index d065707db14cd67e2cf17a1efb1a77e5945588a3..e43492ebaf2dccb0a16aa5581e237728bf8a3003 100644
--- a/src/plugins/debugger/cdb/cdbassembler.h
+++ b/src/plugins/debugger/cdb/cdbassembler.h
@@ -57,8 +57,8 @@ bool dissassemble(IDebugClient5 *client,
                   unsigned long afterLines,
                   QList<DisassemblerLine> *lines,
                   QString *errorMessage);
-}
-}
 
+} // namespace Internal
+} // namespace Debugger
 
 #endif // CDBASSEMBLER_H
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index 345ed2f96807cb23c5464d0ecd0d0a944ebabe88..6ef96f5597ad9fe31a1c6134c8e7228018c4dccf 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -385,5 +385,5 @@ bool CDBBreakPoint::synchronizeBreakPoints(IDebugControl4* debugControl,
     return true;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.h b/src/plugins/debugger/cdb/cdbbreakpoint.h
index 3040c0895f030692d0950e80539f59becd7b3531..3d925b2577e2bc251bfd803300d15d979310db7c 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.h
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.h
@@ -49,7 +49,8 @@ class BreakpointData;
 /* CDB Break point data structure with utilities to
  * apply to engine and to retrieve them from the engine and comparison. */
 
-struct CDBBreakPoint {
+struct CDBBreakPoint
+{
     CDBBreakPoint();
     CDBBreakPoint(const BreakpointData &bpd);
 
@@ -94,7 +95,7 @@ inline bool operator!=(const CDBBreakPoint& b1, const CDBBreakPoint& b2)
 inline bool operator<(const CDBBreakPoint& b1, const CDBBreakPoint& b2)
     { return b1.compare(b2) <  0; }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
 
 #endif // CDBBREAKPOINTS_H
diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h
index 665ea28b09e1e04ca5b65b73dd2fe202bf06cf1a..ce9c2e381bf9082c9bd7dade9c3cf1712f5e7ae5 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine_p.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h
@@ -48,7 +48,8 @@ class CdbStackTraceContext;
 // Thin wrapper around the 'DBEng' debugger engine shared library
 // which is loaded at runtime.
 
-class DebuggerEngineLibrary {
+class DebuggerEngineLibrary
+{
 public:
     DebuggerEngineLibrary();
     bool init(QString *errorMessage);
diff --git a/src/plugins/debugger/cdb/cdbmodules.cpp b/src/plugins/debugger/cdb/cdbmodules.cpp
index 8dd52a0135331b66e73590aa217cab4ae31a7a50..237ead9331226b1b9848f0f1e9da07295fc5c1df 100644
--- a/src/plugins/debugger/cdb/cdbmodules.cpp
+++ b/src/plugins/debugger/cdb/cdbmodules.cpp
@@ -159,5 +159,5 @@ bool getModuleSymbols(IDebugSymbols3 *syms, const QString &moduleName,
     return true;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbmodules.h b/src/plugins/debugger/cdb/cdbmodules.h
index d3058bc906f1972953d008dc5441b4ffe027f1fc..9a375cdb031bf1465ddfe64bdec745693c7dc026 100644
--- a/src/plugins/debugger/cdb/cdbmodules.h
+++ b/src/plugins/debugger/cdb/cdbmodules.h
@@ -59,7 +59,7 @@ ResolveSymbolResult resolveSymbol(IDebugSymbols3 *syms, QString *symbol, QString
 bool getModuleSymbols(IDebugSymbols3 *syms, const QString &moduleName,
                       QList<Symbol> *symbols, QString *errorMessage);
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
 
 #endif // CDBMODULES_H
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index 7d207fbba6640e629d645fcfd5db407be5950bdc..07bf81c5bd47fd4e3eda673b3b8f2d3423c8223d 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -166,5 +166,5 @@ IDebugSymbolGroup2 *CdbStackTraceContext::createSymbolGroup(int index, QString *
     return sg;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.h b/src/plugins/debugger/cdb/cdbstacktracecontext.h
index 4f3be5c5fc1d4559c0b5094e81b2c8ab0be9e9e8..efbd1c1e816cfd78c5b67cd5d858f0efb3281bd6 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.h
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.h
@@ -84,7 +84,7 @@ private:
     ULONG64 m_instructionOffset;
 };
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
 
 #endif // CDBSTACKTRACECONTEXT_H
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index c4895df333e1e8fac7925a9ba1a866c204e85982..5f23419278544f27327afa920406843f4ac088be 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -58,13 +58,13 @@ static inline void debugSymbolFlags(unsigned long f, QTextStream &str)
         str << "|DEBUG_SYMBOL_IS_LOCAL";
 }
 
- QTextStream &operator<<(QTextStream &str, const DEBUG_SYMBOL_PARAMETERS& p)
+QTextStream &operator<<(QTextStream &str, const DEBUG_SYMBOL_PARAMETERS &p)
 {
     str << " Type=" << p.TypeId << " parent=";
     if (isTopLevelSymbol(p)) {
         str << "<ROOT>";
     } else {
-       str << p.ParentSymbol;
+        str << p.ParentSymbol;
     }
     str << " Subs=" << p.SubElements << " flags=" << p.Flags << '/';
     debugSymbolFlags(p.Flags, str);
@@ -639,5 +639,5 @@ bool CdbSymbolGroupContext::completeModel(CdbSymbolGroupContext *sg,
     return true;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
index cf4fa2a98390bf909442b90dd1d9c4386a4628cd..0773133c18aa2a0eb962d1b57bb5e40f36cc355a 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
@@ -41,7 +41,7 @@
 #include <QtCore/QMap>
 
 namespace Debugger {
-    namespace Internal {
+namespace Internal {
 
 class WatchData;
 class WatchHandler;
@@ -145,6 +145,7 @@ bool CdbSymbolGroupContext::getChildSymbols(const QString &prefix, OutputIterato
     return true;
 }
 
-}
-}
+} // namespace Internal
+} // namespace Debugger
+
 #endif // CDBSYMBOLGROUPCONTEXT_H