Clean up single namespace forward-declarations

Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

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

268 files changed, 306 insertions, 922 deletions

diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h
index 2109748dd6..2ea9534014 100644
--- a/src/libs/extensionsystem/plugindetailsview.h
+++ b/src/libs/extensionsystem/plugindetailsview.h
@@ -39,9 +39,7 @@ namespace ExtensionSystem {
 class PluginSpec;
 
 namespace Internal {
-namespace Ui {
-    class PluginDetailsView;
-} // namespace Ui
+namespace Ui { class PluginDetailsView; }
 } // namespace Internal
 
 
diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h
index 6fd3b003ce..19d7401bc1 100644
--- a/src/libs/extensionsystem/pluginerrorview.h
+++ b/src/libs/extensionsystem/pluginerrorview.h
@@ -38,9 +38,7 @@ namespace ExtensionSystem {
 
 class PluginSpec;
 namespace Internal {
-namespace Ui {
-    class PluginErrorView;
-} // namespace Ui
+namespace Ui { class PluginErrorView; }
 } // namespace Internal
 
 class EXTENSIONSYSTEM_EXPORT PluginErrorView : public QWidget
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index 1a199e53e3..f40722e087 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -46,9 +46,7 @@ class PluginCollection;
 class IPlugin;
 class PluginSpec;
 
-namespace Internal {
-class PluginManagerPrivate;
-}
+namespace Internal { class PluginManagerPrivate; }
 
 class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject
 {
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
index 9b00717267..b3f7ea85e9 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -35,14 +35,10 @@
 
 QT_BEGIN_NAMESPACE
 class QVariant;
-namespace Ui {
-    class ContextPaneTextWidget;
-}
+namespace Ui { class ContextPaneTextWidget; }
 QT_END_NAMESPACE
 
-namespace QmlJS {
-    class PropertyReader;
-}
+namespace QmlJS { class PropertyReader; }
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h
index 5f6d0f190b..f711add01d 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.h
+++ b/src/libs/qmleditorwidgets/contextpanewidget.h
@@ -41,9 +41,7 @@ class QGraphicsDropShadowEffect;
 class QGraphicsOpacityEffect;
 QT_END_NAMESPACE
 
-namespace QmlJS {
-    class PropertyReader;
-}
+namespace QmlJS { class PropertyReader; }
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 136c6f2a2f..84eff64824 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -46,9 +46,7 @@ class QLabel;
 class QSlider;
 QT_END_NAMESPACE
 
-namespace QmlJS {
-    class PropertyReader;
-}
+namespace QmlJS { class PropertyReader; }
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index baa71fdd59..ad8ded0cee 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -34,14 +34,10 @@
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
-namespace Ui {
-    class ContextPaneWidgetRectangle;
-}
+namespace Ui { class ContextPaneWidgetRectangle; }
 QT_END_NAMESPACE
 
-namespace QmlJS {
-    class PropertyReader;
-}
+namespace QmlJS { class PropertyReader; }
 
 namespace QmlEditorWidgets {
 
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
index 68e3f5ffff..ff3d30bab4 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
@@ -36,14 +36,10 @@
 
 QT_BEGIN_NAMESPACE
 class QVariant;
-namespace Ui {
-    class EasingContextPane;
-}
+namespace Ui { class EasingContextPane; }
 QT_END_NAMESPACE
 
-namespace QmlJS {
-    class PropertyReader;
-}
+namespace QmlJS { class PropertyReader; }
 
 namespace QmlEditorWidgets {
 class EasingSimulation;
diff --git a/src/libs/qmljs/qmljsbundle.h b/src/libs/qmljs/qmljsbundle.h
index a348bde0a5..3026c66ffd 100644
--- a/src/libs/qmljs/qmljsbundle.h
+++ b/src/libs/qmljs/qmljsbundle.h
@@ -39,9 +39,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QTextStream)
 
-namespace Utils {
-class JsonObjectValue;
-}
+namespace Utils { class JsonObjectValue; }
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsicontextpane.h b/src/libs/qmljs/qmljsicontextpane.h
index 3a71bd889e..8f9cd7271a 100644
--- a/src/libs/qmljs/qmljsicontextpane.h
+++ b/src/libs/qmljs/qmljsicontextpane.h
@@ -37,9 +37,7 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 
-namespace TextEditor {
-class BaseTextEditor;
-} //TextEditor
+namespace TextEditor { class BaseTextEditor; }
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h
index 3894fa230e..c77b42dfd0 100644
--- a/src/libs/qmljs/qmljsimportdependencies.h
+++ b/src/libs/qmljs/qmljsimportdependencies.h
@@ -50,9 +50,7 @@ QT_END_NAMESPACE
 
 namespace QmlJS {
 class ImportInfo;
-namespace Internal {
-class ImportDependenciesPrivate;
-}
+namespace Internal { class ImportDependenciesPrivate; }
 class ImportDependencies;
 
 // match strenght wrt to the selectors of a ViewerContext
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h
index 988ac539d6..7d225f33a6 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.h
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h
@@ -41,9 +41,7 @@
 #include <QStringList>
 #include <QPointer>
 
-namespace ProjectExplorer {
-    class Project;
-}
+namespace ProjectExplorer { class Project; }
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsscopebuilder.h b/src/libs/qmljs/qmljsscopebuilder.h
index ad95ce7957..0e8f856328 100644
--- a/src/libs/qmljs/qmljsscopebuilder.h
+++ b/src/libs/qmljs/qmljsscopebuilder.h
@@ -44,9 +44,7 @@ class ObjectValue;
 class Value;
 class ScopeChain;
 
-namespace AST {
-    class Node;
-}
+namespace AST { class Node; }
 
 class QMLJS_EXPORT ScopeBuilder
 {
diff --git a/src/libs/ssh/sshconnection.h b/src/libs/ssh/sshconnection.h
index 1a3f3d169f..c5aeb73444 100644
--- a/src/libs/ssh/sshconnection.h
+++ b/src/libs/ssh/sshconnection.h
@@ -46,9 +46,7 @@ class SftpChannel;
 class SshDirectTcpIpTunnel;
 class SshRemoteProcess;
 
-namespace Internal {
-class SshConnectionPrivate;
-} // namespace Internal
+namespace Internal { class SshConnectionPrivate; }
 
 enum SshConnectionOption {
     SshIgnoreDefaultProxy = 0x1,
diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h
index 8ac3522b5f..34b974a0cd 100644
--- a/src/libs/ssh/sshremoteprocessrunner.h
+++ b/src/libs/ssh/sshremoteprocessrunner.h
@@ -34,9 +34,7 @@
 #include "sshremoteprocess.h"
 
 namespace QSsh {
-namespace Internal {
-class SshRemoteProcessRunnerPrivate;
-} // namespace Internal
+namespace Internal { class SshRemoteProcessRunnerPrivate; }
 
 class QSSH_EXPORT SshRemoteProcessRunner : public QObject
 {
diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h
index 9ddcfba182..340b2c9009 100644
--- a/src/libs/utils/environmentmodel.h
+++ b/src/libs/utils/environmentmodel.h
@@ -38,9 +38,7 @@ namespace Utils {
 class Environment;
 class EnvironmentItem;
 
-namespace Internal {
-class EnvironmentModelPrivate;
-} // namespace Internal
+namespace Internal { class EnvironmentModelPrivate; }
 
 class QTCREATOR_UTILS_EXPORT EnvironmentModel : public QAbstractTableModel
 {
diff --git a/src/libs/utils/portlist.h b/src/libs/utils/portlist.h
index 89edf4c590..74004a8a9f 100644
--- a/src/libs/utils/portlist.h
+++ b/src/libs/utils/portlist.h
@@ -35,9 +35,7 @@
 QT_FORWARD_DECLARE_CLASS(QString)
 
 namespace Utils {
-namespace Internal {
-class PortListPrivate;
-} // namespace Internal
+namespace Internal { class PortListPrivate; }
 
 class QTCREATOR_UTILS_EXPORT PortList
 {
diff --git a/src/libs/utils/tcpportsgatherer.h b/src/libs/utils/tcpportsgatherer.h
index a268e77f71..e9b02e8e1e 100644
--- a/src/libs/utils/tcpportsgatherer.h
+++ b/src/libs/utils/tcpportsgatherer.h
@@ -35,9 +35,7 @@
 #include <QAbstractSocket>
 
 namespace Utils {
-namespace Internal {
-class TcpPortsGathererPrivate;
-}
+namespace Internal { class TcpPortsGathererPrivate; }
 
 class QTCREATOR_UTILS_EXPORT TcpPortsGatherer
 {
diff --git a/src/libs/utils/tooltip/tips.h b/src/libs/utils/tooltip/tips.h
index 13ada7c3eb..84c776a65e 100644
--- a/src/libs/utils/tooltip/tips.h
+++ b/src/libs/utils/tooltip/tips.h
@@ -36,9 +36,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 
-namespace Utils {
-class TipContent;
-}
+namespace Utils { class TipContent; }
 
 #ifndef Q_MOC_RUN
 namespace Utils {
diff --git a/src/plugins/analyzerbase/analyzerutils.h b/src/plugins/analyzerbase/analyzerutils.h
index 555e681aa7..5422cec5da 100644
--- a/src/plugins/analyzerbase/analyzerutils.h
+++ b/src/plugins/analyzerbase/analyzerutils.h
@@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 QT_END_NAMESPACE
 
-namespace CPlusPlus {
-class Symbol;
-}
+namespace CPlusPlus { class Symbol; }
 
 namespace AnalyzerUtils
 {
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h
index 41fef32d39..7b37eb419e 100644
--- a/src/plugins/analyzerbase/ianalyzertool.h
+++ b/src/plugins/analyzerbase/ianalyzertool.h
@@ -40,9 +40,7 @@
 #include <QObject>
 #include <QAction>
 
-namespace ProjectExplorer {
-class RunConfiguration;
-}
+namespace ProjectExplorer { class RunConfiguration; }
 
 namespace Analyzer {
 
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
index d2cff3523e..be5fdb5699 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
@@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE
 class QComboBox;
 QT_END_NAMESPACE
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
index b9f14b98a5..c999670ee2 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
@@ -34,9 +34,7 @@
 
 #include <utils/wizard.h>
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
index 2ba726f6ef..21b996e2aa 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
@@ -38,9 +38,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QDir)
 
-namespace Utils {
-class FileSystemWatcher;
-}
+namespace Utils { class FileSystemWatcher; }
 
 namespace ProjectExplorer {
 class Node;
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
index f31d3ac98f..82564ec115 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
@@ -34,9 +34,7 @@
 
 #include <projectexplorer/projectnodes.h>
 
-namespace Core {
-class IDocument;
-}
+namespace Core { class IDocument; }
 
 namespace AutotoolsProjectManager {
 namespace Internal {
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
index bfbd0097d5..e56808dbfd 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
@@ -34,9 +34,7 @@
 
 namespace BareMetal {
 
-namespace Ui {
-class BareMetalDeviceConfigurationWidget;
-}
+namespace Ui { class BareMetalDeviceConfigurationWidget; }
 
 class BareMetalDeviceConfigurationWidget
       : public ProjectExplorer::IDeviceWidget
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
index 1f9b5e7c47..c1c7ab7772 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
@@ -34,9 +34,7 @@
 #include <utils/wizard.h>
 
 namespace BareMetal {
-namespace Internal {
-   class BareMetalDeviceConfigrationWizardPrivate;
-} // namespace Internal
+namespace Internal { class BareMetalDeviceConfigrationWizardPrivate; }
 
 class BareMetalDeviceConfigurationWizard : public Utils::Wizard
 {
diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.h b/src/plugins/baremetal/baremetalrunconfigurationwidget.h
index 964e380e13..16e930a013 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationwidget.h
+++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.h
@@ -40,9 +40,7 @@ QT_END_NAMESPACE
 namespace BareMetal {
 class BareMetalRunConfiguration;
 
-namespace Internal {
-class BareMetalRunConfigurationWidgetPrivate;
-} // namespace Internal
+namespace Internal { class BareMetalRunConfigurationWidgetPrivate; }
 
 class BareMetalRunConfigurationWidget : public QWidget
 {
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 7a2ee3c181..f5f5b1d53d 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -49,13 +49,9 @@ class IEditorFactory;
 class IEditor;
 } // namespace Core
 
-namespace Utils {
-class ParameterAction;
-} //namespace Utils
+namespace Utils { class ParameterAction; }
 
-namespace VcsBase {
-class VcsBaseSubmitEditor;
-}
+namespace VcsBase { class VcsBaseSubmitEditor; }
 
 namespace Bazaar {
 namespace Internal {
diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h
index 65feb0af89..121a591d7a 100644
--- a/src/plugins/bazaar/cloneoptionspanel.h
+++ b/src/plugins/bazaar/cloneoptionspanel.h
@@ -34,9 +34,7 @@
 namespace Bazaar {
 namespace Internal {
 
-namespace Ui {
-class CloneOptionsPanel;
-}
+namespace Ui { class CloneOptionsPanel; }
 
 class CloneOptionsPanel : public QWidget
 {
diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h
index 4ecf878358..d6879d68af 100644
--- a/src/plugins/bazaar/commiteditor.h
+++ b/src/plugins/bazaar/commiteditor.h
@@ -32,9 +32,7 @@
 #include <vcsbase/vcsbaseclient.h>
 #include <vcsbase/vcsbasesubmiteditor.h>
 
-namespace VcsBase {
-class SubmitFileModel;
-}
+namespace VcsBase { class SubmitFileModel; }
 
 namespace Bazaar {
 namespace Internal {
diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h
index 88e48a5c74..74a6edb3dd 100644
--- a/src/plugins/bazaar/pullorpushdialog.h
+++ b/src/plugins/bazaar/pullorpushdialog.h
@@ -34,9 +34,7 @@
 namespace Bazaar {
 namespace Internal {
 
-namespace Ui {
-class PullOrPushDialog;
-}
+namespace Ui { class PullOrPushDialog; }
 
 class PullOrPushDialog : public QDialog
 {
diff --git a/src/plugins/bazaar/uncommitdialog.h b/src/plugins/bazaar/uncommitdialog.h
index 865f1b02a1..dd50bec2fc 100644
--- a/src/plugins/bazaar/uncommitdialog.h
+++ b/src/plugins/bazaar/uncommitdialog.h
@@ -34,9 +34,7 @@
 namespace Bazaar {
 namespace Internal {
 
-namespace Ui {
-class UnCommitDialog;
-}
+namespace Ui { class UnCommitDialog; }
 
 class UnCommitDialog : public QDialog
 {
diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h
index 8672d8cfc3..a3f661dc3c 100644
--- a/src/plugins/bineditor/bineditor.h
+++ b/src/plugins/bineditor/bineditor.h
@@ -45,13 +45,9 @@
 QT_FORWARD_DECLARE_CLASS(QMenu)
 QT_FORWARD_DECLARE_CLASS(QHelpEvent)
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
 namespace BINEditor {
 
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index aa821126f0..bfc42a3019 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -40,13 +40,9 @@ class QAction;
 class QMenu;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace Bookmarks {
 namespace Internal {
diff --git a/src/plugins/clangcodemodel/indexer.h b/src/plugins/clangcodemodel/indexer.h
index e40afaaca9..9b6e8c1297 100644
--- a/src/plugins/clangcodemodel/indexer.h
+++ b/src/plugins/clangcodemodel/indexer.h
@@ -44,9 +44,7 @@
 
 namespace ClangCodeModel {
 
-namespace Internal {
-class ClangSymbolSearcher;
-} // namespace Internal
+namespace Internal { class ClangSymbolSearcher; }
 
 class IndexerPrivate;
 
diff --git a/src/plugins/clearcase/checkoutdialog.h b/src/plugins/clearcase/checkoutdialog.h
index 364138fa5f..d66bda85b9 100644
--- a/src/plugins/clearcase/checkoutdialog.h
+++ b/src/plugins/clearcase/checkoutdialog.h
@@ -36,9 +36,7 @@
 namespace ClearCase {
 namespace Internal {
 
-namespace Ui {
-    class CheckOutDialog;
-}
+namespace Ui { class CheckOutDialog; }
 
 class ActivitySelector;
 
diff --git a/src/plugins/clearcase/versionselector.h b/src/plugins/clearcase/versionselector.h
index cc94c7ff65..8374a187e4 100644
--- a/src/plugins/clearcase/versionselector.h
+++ b/src/plugins/clearcase/versionselector.h
@@ -40,9 +40,7 @@ QT_END_NAMESPACE
 namespace ClearCase {
 namespace Internal {
 
-namespace Ui {
-    class VersionSelector;
-}
+namespace Ui { class VersionSelector; }
 
 class VersionSelector : public QDialog
 {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 01034b57fa..54cffa4310 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -33,9 +33,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/abi.h>
 
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
 
 namespace CMakeProjectManager {
 class CMakeBuildInfo;
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index dffc1e95d8..035a10bcac 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -36,9 +36,7 @@
 #include <utils/uncommentselection.h>
 
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
 namespace CMakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
index 745a0855fc..c79a462bb2 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
@@ -50,9 +50,7 @@ class FancyLineEdit;
 class PathChooser;
 }
 
-namespace ProjectExplorer {
-class Kit;
-}
+namespace ProjectExplorer { class Kit; }
 
 namespace CMakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
index ae7e59b5d3..0b3509b520 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
@@ -52,9 +52,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QLabel)
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 
 namespace CMakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h
index 85f714b4fd..980fbab70a 100644
--- a/src/plugins/cmakeprojectmanager/makestep.h
+++ b/src/plugins/cmakeprojectmanager/makestep.h
@@ -38,9 +38,7 @@ class QListWidget;
 class QListWidgetItem;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
 
 namespace CMakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h
index d691586863..72a8f2d9b4 100644
--- a/src/plugins/coreplugin/designmode.h
+++ b/src/plugins/coreplugin/designmode.h
@@ -35,9 +35,7 @@
 namespace Core {
 class IEditor;
 
-namespace Internal {
-class DesignModeCoreListener;
-} // namespace Internal
+namespace Internal { class DesignModeCoreListener; }
 
 /**
   * A global mode for Design pane - used by Bauhaus (QML Designer) and
diff --git a/src/plugins/coreplugin/dialogs/addtovcsdialog.h b/src/plugins/coreplugin/dialogs/addtovcsdialog.h
index dd40d03cd3..a66cb5b5ef 100644
--- a/src/plugins/coreplugin/dialogs/addtovcsdialog.h
+++ b/src/plugins/coreplugin/dialogs/addtovcsdialog.h
@@ -35,9 +35,7 @@
 namespace Core {
 namespace Internal {
 
-namespace Ui {
-class AddToVcsDialog;
-}
+namespace Ui { class AddToVcsDialog; }
 
 class AddToVcsDialog : public QDialog
 {
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
index 959707a119..04951535df 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
@@ -38,9 +38,7 @@
 namespace Core {
 namespace Internal {
 
-namespace Ui {
-    class ExternalToolConfig;
-}
+namespace Ui { class ExternalToolConfig; }
 
 class ExternalToolModel : public QAbstractItemModel
 {
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index 9d1a68b73d..362ee60a67 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -50,9 +50,7 @@ namespace Core {
 
 namespace Internal {
 
-namespace Ui {
-    class NewDialog;
-}
+namespace Ui { class NewDialog; }
 
 class NewDialog : public QDialog
 {
diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h
index 6d32c03382..b47b85c5a0 100644
--- a/src/plugins/coreplugin/externaltool.h
+++ b/src/plugins/coreplugin/externaltool.h
@@ -37,9 +37,7 @@
 #include <QTextCodec>
 #include <QMetaType>
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 namespace Core {
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index d51a7a8ecd..dd3186df2b 100644
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -40,9 +40,7 @@ QT_END_NAMESPACE
 namespace Core {
 namespace Internal {
 
-namespace Ui {
-    class GeneralSettings;
-}
+namespace Ui { class GeneralSettings; }
 
 class GeneralSettings : public IOptionsPage
 {
diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h
index 2b599dd5a3..491d5a112f 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.h
+++ b/src/plugins/coreplugin/locator/locatorwidget.h
@@ -42,9 +42,7 @@ class QMenu;
 class QTreeView;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class FilterLineEdit;
-}
+namespace Utils { class FilterLineEdit; }
 
 namespace Core {
 namespace Internal {
diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h
index 13fd9083e2..ee4c5b61a8 100644
--- a/src/plugins/coreplugin/navigationsubwidget.h
+++ b/src/plugins/coreplugin/navigationsubwidget.h
@@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE
 class QToolButton;
 QT_END_NAMESPACE
 
-namespace Utils {
-class StyledBar;
-}
+namespace Utils { class StyledBar; }
 
 namespace Core {
 class INavigationWidgetFactory;
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index b3dda6e124..70bed61f7b 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -48,9 +48,7 @@ class IMode;
 class Command;
 class NavigationWidget;
 struct NavigationWidgetPrivate;
-namespace Internal {
-class NavigationSubWidget;
-}
+namespace Internal { class NavigationSubWidget; }
 
 class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget
 {
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 270915016a..e7c3d4e455 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -42,9 +42,7 @@ namespace Core {
 
 class IMode;
 
-namespace Internal {
-class OutputPaneManager;
-}
+namespace Internal { class OutputPaneManager; }
 struct OutputPanePlaceHolderPrivate;
 
 class CORE_EXPORT OutputPanePlaceHolder : public QWidget
diff --git a/src/plugins/coreplugin/removefiledialog.h b/src/plugins/coreplugin/removefiledialog.h
index 9ff4f16672..d256ac4516 100644
--- a/src/plugins/coreplugin/removefiledialog.h
+++ b/src/plugins/coreplugin/removefiledialog.h
@@ -36,9 +36,7 @@
 
 namespace Core {
 
-namespace Ui {
-class RemoveFileDialog;
-}
+namespace Ui { class RemoveFileDialog; }
 
 class CORE_EXPORT RemoveFileDialog : public QDialog
 {
diff --git a/src/plugins/coreplugin/settingsdatabase.h b/src/plugins/coreplugin/settingsdatabase.h
index b122cf08d4..71c81adf65 100644
--- a/src/plugins/coreplugin/settingsdatabase.h
+++ b/src/plugins/coreplugin/settingsdatabase.h
@@ -39,9 +39,7 @@
 
 namespace Core {
 
-namespace Internal {
-class SettingsDatabasePrivate;
-}
+namespace Internal { class SettingsDatabasePrivate; }
 
 class CORE_EXPORT SettingsDatabase : public QObject
 {
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index 13368d2b0c..a6415f5025 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -46,9 +46,7 @@ namespace Core {
 class Command;
 struct SideBarPrivate;
 
-namespace Internal {
-class SideBarWidget;
-} // namespace Internal
+namespace Internal { class SideBarWidget; }
 
 /*
  * An item in the sidebar. Has a widget that is displayed in the sidebar and
diff --git a/src/plugins/coreplugin/textdocument.h b/src/plugins/coreplugin/textdocument.h
index 2cbbe7f19a..dd4791e9c3 100644
--- a/src/plugins/coreplugin/textdocument.h
+++ b/src/plugins/coreplugin/textdocument.h
@@ -36,9 +36,7 @@
 
 namespace Core {
 
-namespace Internal {
-class TextDocumentPrivate;
-}
+namespace Internal { class TextDocumentPrivate; }
 
 class CORE_EXPORT TextDocument : public IDocument
 {
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index 137b2fded0..4612bd8f4f 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/src/plugins/coreplugin/variablemanager.h
@@ -37,9 +37,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QFileInfo)
 
-namespace Utils {
-class AbstractMacroExpander;
-}
+namespace Utils { class AbstractMacroExpander; }
 
 namespace Core {
 
diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h
index ec5ffdb7ff..ca4679e4f4 100644
--- a/src/plugins/cpaster/protocol.h
+++ b/src/plugins/cpaster/protocol.h
@@ -40,9 +40,7 @@ class QNetworkReply;
 class QWidget;
 QT_END_NAMESPACE
 
-namespace Core {
-class IOptionsPage;
-}
+namespace Core { class IOptionsPage; }
 
 namespace CodePaster {
 
diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index ca7a6f8010..e18fc4fdf9 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/src/plugins/cppeditor/cppclasswizard.h
@@ -36,11 +36,7 @@
 
 #include <QWizardPage>
 
-namespace Utils {
-
-class NewClassWidget;
-
-} // namespace Utils
+namespace Utils { class NewClassWidget; }
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h
index 998c6ca952..3a510fa670 100644
--- a/src/plugins/cppeditor/cppeditorplugin.h
+++ b/src/plugins/cppeditor/cppeditorplugin.h
@@ -37,9 +37,7 @@
 #include <QtPlugin>
 #include <QAction>
 
-namespace TextEditor {
-class ITextEditor;
-} // namespace TextEditor
+namespace TextEditor { class ITextEditor; }
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cpphoverhandler.h b/src/plugins/cppeditor/cpphoverhandler.h
index ecf2c4049c..b931f88a58 100644
--- a/src/plugins/cppeditor/cpphoverhandler.h
+++ b/src/plugins/cppeditor/cpphoverhandler.h
@@ -34,13 +34,9 @@
 
 #include <QObject>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cppincludehierarchy.h b/src/plugins/cppeditor/cppincludehierarchy.h
index 118dcaca60..21d515067f 100644
--- a/src/plugins/cppeditor/cppincludehierarchy.h
+++ b/src/plugins/cppeditor/cppincludehierarchy.h
@@ -43,9 +43,7 @@ class QModelIndex;
 class QLabel;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace Utils {
 class AnnotatedItemDelegate;
diff --git a/src/plugins/cppeditor/cppincludehierarchymodel.h b/src/plugins/cppeditor/cppincludehierarchymodel.h
index 434cf06846..387c17c27f 100644
--- a/src/plugins/cppeditor/cppincludehierarchymodel.h
+++ b/src/plugins/cppeditor/cppincludehierarchymodel.h
@@ -41,9 +41,7 @@ enum ItemRole {
 
 } // Anonymous
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h
index 3c41c416a8..456575c336 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.h
+++ b/src/plugins/cppeditor/cpptypehierarchy.h
@@ -45,9 +45,7 @@ template <class> class QVector;
 template <class> class QList;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace Utils {
 class NavigationTreeView;
diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h
index 83fa49cec8..b5322e7301 100644
--- a/src/plugins/cpptools/completionsettingspage.h
+++ b/src/plugins/cpptools/completionsettingspage.h
@@ -40,9 +40,7 @@
 namespace CppTools {
 namespace Internal {
 
-namespace Ui {
-class CompletionSettingsPage;
-}
+namespace Ui { class CompletionSettingsPage; }
 
 // TODO: Move this class to the text editor plugin
 
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index 18736e3145..a19e688e58 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -48,9 +48,7 @@ class QTextBlock;
 QT_END_NAMESPACE
 
 namespace CppTools {
-namespace Internal {
-class CppCodeFormatterData;
-}
+namespace Internal { class CppCodeFormatterData; }
 
 class CPPTOOLS_EXPORT CodeFormatter
 {
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h
index c9719bed48..667abffdd0 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.h
+++ b/src/plugins/cpptools/cppcodestylesettingspage.h
@@ -53,9 +53,7 @@ class CppCodeStylePreferences;
 
 namespace Internal {
 
-namespace Ui {
-class CppCodeStyleSettingsPage;
-}
+namespace Ui { class CppCodeStyleSettingsPage; }
 
 class CppCodeStylePreferencesWidget : public QWidget
 {
diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h
index 3f131f135e..0546332ff1 100644
--- a/src/plugins/cpptools/cppcompletionassistprovider.h
+++ b/src/plugins/cpptools/cppcompletionassistprovider.h
@@ -39,9 +39,7 @@ QT_BEGIN_NAMESPACE
 class QTextDocument;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-class Project;
-}
+namespace ProjectExplorer { class Project; }
 
 namespace TextEditor {
 class BaseTextEditor;
diff --git a/src/plugins/cpptools/cpphighlightingsupport.h b/src/plugins/cpptools/cpphighlightingsupport.h
index 757c3b04df..7272289a79 100644
--- a/src/plugins/cpptools/cpphighlightingsupport.h
+++ b/src/plugins/cpptools/cpphighlightingsupport.h
@@ -38,9 +38,7 @@
 
 #include <QFuture>
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h
index b8d3f4d5ee..7fac75f5e3 100644
--- a/src/plugins/cpptools/cpptoolstestcase.h
+++ b/src/plugins/cpptools/cpptoolstestcase.h
@@ -41,9 +41,7 @@ namespace CPlusPlus {
 class Document;
 class Snapshot;
 }
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace CppTools {
 namespace Tests {
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 0030334385..ff790032e5 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -40,9 +40,7 @@
 #include <QVariant>
 #include <QTime>
 
-namespace Utils {
-class ConsoleProcess;
-}
+namespace Utils { class ConsoleProcess; }
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index f8fd0bcc35..a804dc59f9 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -43,9 +43,7 @@ QT_BEGIN_NAMESPACE
 class QCheckBox;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class PathListEditor;
-}
+namespace Utils { class PathListEditor; }
 namespace Debugger {
 namespace Internal {
 
diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h
index 304d317323..3be5cb2851 100644
--- a/src/plugins/debugger/debuggercore.h
+++ b/src/plugins/debugger/debuggercore.h
@@ -43,17 +43,11 @@ class QMessageBox;
 class QWidget;
 QT_END_NAMESPACE
 
-namespace CPlusPlus {
-class Snapshot;
-}
+namespace CPlusPlus { class Snapshot; }
 
-namespace Utils {
-class SavedAction;
-}
+namespace Utils { class SavedAction; }
 
-namespace ProjectExplorer {
-class RunControl;
-}
+namespace ProjectExplorer { class RunControl; }
 
 namespace Debugger {
 
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index f6a66487c2..64622a095a 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -35,9 +35,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-namespace Utils {
-class Environment;
-}
+namespace Utils { class Environment; }
 
 namespace Debugger {
 class DebuggerEngine;
diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h
index 3ee5bbb9d4..81b22171ec 100644
--- a/src/plugins/debugger/debuggertooltipmanager.h
+++ b/src/plugins/debugger/debuggertooltipmanager.h
@@ -52,9 +52,7 @@ class IEditor;
 class IMode;
 }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace Debugger {
 class DebuggerEngine;
diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h
index 3328e61172..ba9c644edd 100644
--- a/src/plugins/debugger/memoryagent.h
+++ b/src/plugins/debugger/memoryagent.h
@@ -38,13 +38,9 @@
 
 QT_FORWARD_DECLARE_CLASS(QPoint)
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace ProjectExplorer {
-class Abi;
-}
+namespace ProjectExplorer { class Abi; }
 
 namespace Debugger {
 
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 3d2641669a..fc86d2af5c 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -42,9 +42,7 @@
 
 #include <QTextDocument>
 
-namespace Core {
-class IDocument;
-}
+namespace Core { class IDocument; }
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h
index 96d8dd6537..5bc04bf67d 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.h
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.h
@@ -36,9 +36,7 @@
 #include <qmldebug/qmldebugclient.h>
 #include <qmljs/qmljsdocument.h>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace QmlDebug {
 class BaseEngineDebugClient;
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.h b/src/plugins/debugger/qml/qmllivetextpreview.h
index e2cefed415..783a658578 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.h
+++ b/src/plugins/debugger/qml/qmllivetextpreview.h
@@ -33,13 +33,9 @@
 #include <texteditor/basetexteditor.h>
 #include <qmljs/qmljsdocument.h>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace QmlJS {
-class ModelManagerInterface;
-}
+namespace QmlJS { class ModelManagerInterface; }
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h
index f80a803397..b09e47d2f5 100644
--- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h
+++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h
@@ -34,9 +34,7 @@
 
 #include <QDialog>
 
-namespace Utils {
-    class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 QT_BEGIN_NAMESPACE
 class QDialogButtonBox;
diff --git a/src/plugins/debugger/shared/symbolpathsdialog.h b/src/plugins/debugger/shared/symbolpathsdialog.h
index c4d82468bb..5d8e064be1 100644
--- a/src/plugins/debugger/shared/symbolpathsdialog.h
+++ b/src/plugins/debugger/shared/symbolpathsdialog.h
@@ -36,9 +36,7 @@
 namespace Debugger {
 namespace Internal {
 
-namespace Ui {
-class SymbolPathsDialog;
-}
+namespace Ui { class SymbolPathsDialog; }
 
 class SymbolPathsDialog : public QDialog
 {
diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h
index 776549a6b6..cb27d6531c 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.h
+++ b/src/plugins/designer/cpp/formclasswizardpage.h
@@ -39,9 +39,7 @@ class FormClassWizardGenerationParameters;
 
 namespace Internal {
 
-namespace Ui {
-class FormClassWizardPage;
-}
+namespace Ui { class FormClassWizardPage; }
 
 
 class FormClassWizardPage : public QWizardPage
diff --git a/src/plugins/designer/editordata.h b/src/plugins/designer/editordata.h
index c13ec63dd9..c1c7361665 100644
--- a/src/plugins/designer/editordata.h
+++ b/src/plugins/designer/editordata.h
@@ -30,9 +30,7 @@
 #ifndef EDITORDATA_H
 #define EDITORDATA_H
 
-namespace SharedTools {
-    class WidgetHost;
-}
+namespace SharedTools { class WidgetHost; }
 
 namespace Designer {
     class FormWindowEditor;
diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h
index ea554e83fd..5c938c932e 100644
--- a/src/plugins/designer/editorwidget.h
+++ b/src/plugins/designer/editorwidget.h
@@ -38,12 +38,8 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 QT_END_NAMESPACE
 
-namespace SharedTools {
-    class WidgetHost;
-}
-namespace Core {
-    class IEditor;
-}
+namespace SharedTools { class WidgetHost; }
+namespace Core { class IEditor; }
 namespace Designer {
 class FormWindowEditor;
 
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h
index c476e1c7ce..92f8a4cfd9 100644
--- a/src/plugins/designer/formeditorw.h
+++ b/src/plugins/designer/formeditorw.h
@@ -54,9 +54,7 @@ class QToolBar;
 #if QT_VERSION >= 0x050000
 class QDesignerFormWindowManagerInterface;
 #else
-namespace qdesigner_internal {
-    class QDesignerFormWindowManager;
-}
+namespace qdesigner_internal { class QDesignerFormWindowManager; }
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 7f84e71be0..8c7275786a 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -38,15 +38,11 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 QT_END_NAMESPACE
 
-namespace TextEditor {
-    class PlainTextEditor;
-}
+namespace TextEditor { class PlainTextEditor; }
 
 namespace Designer {
 
-namespace Internal {
-    class DesignerXmlEditorWidget;
-}
+namespace Internal { class DesignerXmlEditorWidget; }
 struct FormWindowEditorPrivate;
 
 // IEditor that is used for the QDesignerFormWindowInterface
diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h
index 98c8e6a8c1..3652d5afdf 100644
--- a/src/plugins/designer/formwizarddialog.h
+++ b/src/plugins/designer/formwizarddialog.h
@@ -32,9 +32,7 @@
 
 #include <utils/wizard.h>
 
-namespace Utils {
-    class FileWizardPage;
-}
+namespace Utils { class FileWizardPage; }
 
 namespace Designer {
 namespace Internal {
diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h
index 12ad8a30f0..c6d74efe01 100644
--- a/src/plugins/designer/resourcehandler.h
+++ b/src/plugins/designer/resourcehandler.h
@@ -37,9 +37,7 @@ QT_BEGIN_NAMESPACE
 #if QT_VERSION >= 0x050000
 class QDesignerFormWindowInterface;
 #else
-namespace qdesigner_internal {
-    class FormWindowBase;
-}
+namespace qdesigner_internal { class FormWindowBase; }
 #endif
 QT_END_NAMESPACE
 
diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.h b/src/plugins/genericprojectmanager/filesselectionwizardpage.h
index 142707875c..e75d7af527 100644
--- a/src/plugins/genericprojectmanager/filesselectionwizardpage.h
+++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.h
@@ -39,9 +39,7 @@ class QTreeView;
 class QLineEdit;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-    class SelectableFilesModel;
-}
+namespace ProjectExplorer { class SelectableFilesModel; }
 
 namespace GenericProjectManager {
 namespace Internal {
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index e64c5bd1ab..9dc6c32bf8 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -36,9 +36,7 @@
 #include <QHash>
 #include <QSet>
 
-namespace Core {
-class IDocument;
-}
+namespace Core { class IDocument; }
 
 namespace GenericProjectManager {
 namespace Internal {
diff --git a/src/plugins/git/branchadddialog.h b/src/plugins/git/branchadddialog.h
index 56d750e92d..893c89063e 100644
--- a/src/plugins/git/branchadddialog.h
+++ b/src/plugins/git/branchadddialog.h
@@ -36,9 +36,7 @@ namespace Git {
 namespace Internal {
 
 
-namespace Ui {
-    class BranchAddDialog;
-}
+namespace Ui { class BranchAddDialog; }
 
 class BranchAddDialog : public QDialog
 {
diff --git a/src/plugins/git/branchcheckoutdialog.h b/src/plugins/git/branchcheckoutdialog.h
index c36d19c6ce..ba9466ae28 100644
--- a/src/plugins/git/branchcheckoutdialog.h
+++ b/src/plugins/git/branchcheckoutdialog.h
@@ -35,9 +35,7 @@
 namespace Git {
 namespace Internal {
 
-namespace Ui {
-    class BranchCheckoutDialog;
-}
+namespace Ui { class BranchCheckoutDialog; }
 
 class BranchCheckoutDialog : public QDialog
 {
diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h
index f80188db1d..841f16150f 100644
--- a/src/plugins/git/branchdialog.h
+++ b/src/plugins/git/branchdialog.h
@@ -39,9 +39,7 @@ QT_END_NAMESPACE
 namespace Git {
 namespace Internal {
 
-namespace Ui {
-class BranchDialog;
-}
+namespace Ui { class BranchDialog; }
 
 class BranchAddDialog;
 class BranchModel;
diff --git a/src/plugins/git/clonewizardpage.h b/src/plugins/git/clonewizardpage.h
index fc59b264f9..526ee1f24d 100644
--- a/src/plugins/git/clonewizardpage.h
+++ b/src/plugins/git/clonewizardpage.h
@@ -34,9 +34,7 @@
 
 #include <QSharedPointer>
 
-namespace VcsBase {
-    class Command;
-}
+namespace VcsBase { class Command; }
 
 namespace Git {
 
diff --git a/src/plugins/git/gerrit/branchcombobox.h b/src/plugins/git/gerrit/branchcombobox.h
index 207bc4b546..31bc0ebf10 100644
--- a/src/plugins/git/gerrit/branchcombobox.h
+++ b/src/plugins/git/gerrit/branchcombobox.h
@@ -33,9 +33,7 @@
 #include <QComboBox>
 
 namespace Git {
-namespace Internal {
-class GitClient;
-}
+namespace Internal { class GitClient; }
 }
 
 namespace Gerrit {
diff --git a/src/plugins/git/gerrit/gerritoptionspage.h b/src/plugins/git/gerrit/gerritoptionspage.h
index 91eedde18b..e03829d127 100644
--- a/src/plugins/git/gerrit/gerritoptionspage.h
+++ b/src/plugins/git/gerrit/gerritoptionspage.h
@@ -42,9 +42,7 @@ class QSpinBox;
 class QCheckBox;
 QT_END_NAMESPACE
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 namespace Gerrit {
 namespace Internal {
 
diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h
index 27fd99f040..e21bddd484 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.h
+++ b/src/plugins/git/gerrit/gerritpushdialog.h
@@ -35,17 +35,13 @@
 #include <QDate>
 
 namespace Git {
-namespace Internal {
-class GitClient;
-}
+namespace Internal { class GitClient; }
 }
 
 namespace Gerrit {
 namespace Internal {
 
-namespace Ui {
-    class GerritPushDialog;
-}
+namespace Ui { class GerritPushDialog; }
 
 class GerritPushDialog : public QDialog
 {
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index ad3877b0c8..61dcbb2931 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -47,9 +47,7 @@ class QDebug;
 class QProcessEnvironment;
 QT_END_NAMESPACE
 
-namespace Core {
-    class ICore;
-}
+namespace Core { class ICore; }
 
 namespace VcsBase {
     class Command;
@@ -62,9 +60,7 @@ namespace Utils {
     struct SynchronousProcessResponse;
 }
 
-namespace DiffEditor {
-    class DiffEditor;
-}
+namespace DiffEditor { class DiffEditor; }
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/githighlighters.h b/src/plugins/git/githighlighters.h
index e269e97bb6..de77e975af 100644
--- a/src/plugins/git/githighlighters.h
+++ b/src/plugins/git/githighlighters.h
@@ -32,9 +32,7 @@
 
 #include <texteditor/syntaxhighlighter.h>
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/gitorious/gitorioushostwidget.h b/src/plugins/git/gitorious/gitorioushostwidget.h
index 1fcb0f9f97..6137c1fc4e 100644
--- a/src/plugins/git/gitorious/gitorioushostwidget.h
+++ b/src/plugins/git/gitorious/gitorioushostwidget.h
@@ -44,9 +44,7 @@ QT_END_NAMESPACE
 namespace Gitorious {
 namespace Internal {
 
-namespace Ui {
-    class GitoriousHostWidget;
-}
+namespace Ui { class GitoriousHostWidget; }
 
 /* A page listing gitorious hosts with browse/add options. isValid() and the
  * related change signals are provided for use within a QWizardPage.
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.h b/src/plugins/git/gitorious/gitoriousprojectwidget.h
index 55c8c7d69f..65b0f54bb9 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.h
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.h
@@ -46,9 +46,7 @@ namespace Internal {
 class GitoriousHostWizardPage;
 struct GitoriousProject;
 
-namespace Ui {
-    class GitoriousProjectWidget;
-}
+namespace Ui { class GitoriousProjectWidget; }
 
 /* Let the user select a project from a host. Displays name and description
  * with tooltip and info button that opens URLs contained in the description.
diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
index 338fd434b6..7b3829ba9e 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
+++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h
@@ -44,9 +44,7 @@ class GitoriousHostWizardPage;
 struct GitoriousProject;
 class GitoriousProjectWidget;
 
-namespace Ui {
-    class GitoriousProjectWizardPage;
-}
+namespace Ui { class GitoriousProjectWizardPage; }
 
 /* GitoriousProjectWizardPage: Let the user select a project via
  * GitoriousProjectWidget. As switching back and forth hosts (repopulating
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
index ce1272b5f0..d88b9c3594 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
@@ -45,9 +45,7 @@ namespace Internal {
 
 class GitoriousProjectWizardPage;
 
-namespace Ui {
-    class GitoriousRepositoryWizardPage;
-}
+namespace Ui { class GitoriousRepositoryWizardPage; }
 
 // A wizard page listing Gitorious repositories in a tree, by repository type.
 
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 27e3292630..307f6a7a5b 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -54,13 +54,9 @@ class Context;
 class ActionManager;
 class ActionContainer;
 }
-namespace Utils {
-class ParameterAction;
-}
+namespace Utils { class ParameterAction; }
 namespace Gerrit {
-namespace Internal {
-class GerritPlugin;
-}
+namespace Internal { class GerritPlugin; }
 }
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h
index e7aec33c10..629ae4fcbc 100644
--- a/src/plugins/git/gitsubmiteditor.h
+++ b/src/plugins/git/gitsubmiteditor.h
@@ -36,9 +36,7 @@
 
 #include <QStringList>
 
-namespace VcsBase {
-    class SubmitFileModel;
-}
+namespace VcsBase { class SubmitFileModel; }
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h
index d169d785e5..39735d86e8 100644
--- a/src/plugins/git/stashdialog.h
+++ b/src/plugins/git/stashdialog.h
@@ -41,9 +41,7 @@ QT_END_NAMESPACE
 namespace Git {
 namespace Internal {
 
-namespace Ui {
-    class StashDialog;
-}
+namespace Ui { class StashDialog; }
 class StashModel;
 
 /* StashDialog: Non-modal dialog that manages the list of stashes
diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h
index 879307e818..29dddf90e2 100644
--- a/src/plugins/glsleditor/glslcompletionassist.h
+++ b/src/plugins/glsleditor/glslcompletionassist.h
@@ -40,13 +40,9 @@
 #include <QScopedPointer>
 #include <QIcon>
 
-namespace GLSL {
-class Function;
-}
+namespace GLSL { class Function; }
 
-namespace TextEditor {
-class BasicProposalItem;
-}
+namespace TextEditor { class BasicProposalItem; }
 
 namespace GLSLEditor {
 namespace Internal {
diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h
index 58ce5fd5bd..843d2417c3 100644
--- a/src/plugins/glsleditor/glslhoverhandler.h
+++ b/src/plugins/glsleditor/glslhoverhandler.h
@@ -34,13 +34,9 @@
 
 #include <QObject>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace GLSLEditor {
 namespace Internal {
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 1e03dfe9a2..55bf18c739 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -49,9 +49,7 @@ class SideBar;
 class SideBarItem;
 }   // Core
 
-namespace Utils {
-class StyledBar;
-}   // Utils
+namespace Utils { class StyledBar; }
 
 namespace Help {
 namespace Internal {
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index fbd464fb8f..e34125461b 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -35,9 +35,7 @@
 
 #include <QSharedPointer>
 
-namespace ProjectExplorer {
-class Kit;
-}
+namespace ProjectExplorer { class Kit; }
 namespace Ios {
 namespace Internal {
 class IosConfigurations;
diff --git a/src/plugins/ios/iostoolhandler.h b/src/plugins/ios/iostoolhandler.h
index 749565a55e..e8f4210a7f 100644
--- a/src/plugins/ios/iostoolhandler.h
+++ b/src/plugins/ios/iostoolhandler.h
@@ -38,9 +38,7 @@
 
 
 namespace Ios {
-namespace Internal {
-class IosToolHandlerPrivate;
-}
+namespace Internal { class IosToolHandlerPrivate; }
 
 class IosToolHandler : public QObject
 {
diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h
index 33a68e5766..420a92a903 100644
--- a/src/plugins/macros/findmacrohandler.h
+++ b/src/plugins/macros/findmacrohandler.h
@@ -34,9 +34,7 @@
 
 #include <coreplugin/find/textfindconstants.h>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index ed75a15d16..ee68a832d3 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -45,9 +45,7 @@ namespace Internal {
 
 class MacroSettings;
 
-namespace Ui {
-    class MacroOptionsWidget;
-}
+namespace Ui { class MacroOptionsWidget; }
 
 class MacroOptionsWidget : public QWidget {
     Q_OBJECT
diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h
index a6e5a7fa57..fbf96861df 100644
--- a/src/plugins/macros/savedialog.h
+++ b/src/plugins/macros/savedialog.h
@@ -35,9 +35,7 @@
 namespace Macros {
 namespace Internal {
 
-namespace Ui {
-    class SaveDialog;
-}
+namespace Ui { class SaveDialog; }
 
 class SaveDialog : public QDialog
 {
diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h
index f747a14dd2..ec37106a56 100644
--- a/src/plugins/macros/texteditormacrohandler.h
+++ b/src/plugins/macros/texteditormacrohandler.h
@@ -32,13 +32,9 @@
 
 #include "imacrohandler.h"
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h
index d657c11506..a756986dba 100644
--- a/src/plugins/mercurial/commiteditor.h
+++ b/src/plugins/mercurial/commiteditor.h
@@ -35,9 +35,7 @@
 
 #include <QFileInfo>
 
-namespace VcsBase {
-class SubmitFileModel;
-}
+namespace VcsBase { class SubmitFileModel; }
 
 namespace Mercurial {
 namespace Internal {
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 9b6b48ca4d..347131de6c 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -53,9 +53,7 @@ namespace Utils {
     class TempFileSaver;
 }
 
-namespace Core {
-    class CommandLocator;
-}
+namespace Core { class CommandLocator; }
 
 namespace Perforce {
 namespace Internal {
diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h
index 129114d889..70821dde77 100644
--- a/src/plugins/perforce/perforcesubmiteditor.h
+++ b/src/plugins/perforce/perforcesubmiteditor.h
@@ -35,9 +35,7 @@
 #include <QStringList>
 #include <QMap>
 
-namespace VcsBase {
-    class SubmitFileModel;
-}
+namespace VcsBase { class SubmitFileModel; }
 
 namespace Perforce {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/abiwidget.h b/src/plugins/projectexplorer/abiwidget.h
index 55d5a0934f..e86bf63f89 100644
--- a/src/plugins/projectexplorer/abiwidget.h
+++ b/src/plugins/projectexplorer/abiwidget.h
@@ -37,9 +37,7 @@
 namespace ProjectExplorer {
 class Abi;
 
-namespace Internal {
-class AbiWidgetPrivate;
-} // namespace
+namespace Internal { class AbiWidgetPrivate; }
 
 // --------------------------------------------------------------------------
 // AbiWidget:
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index aa9d0ebfd0..25db1d6982 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -41,9 +41,7 @@ class QEventLoop;
 class QTimer;
 QT_END_NAMESPACE
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 namespace ProjectExplorer {
 
 class IOutputParser;
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index ad737c3ba7..b3677ebb47 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -36,9 +36,7 @@
 
 #include <QProcess>
 
-namespace Utils {
-class Environment;
-}
+namespace Utils { class Environment; }
 
 namespace ProjectExplorer {
 struct ApplicationLauncherPrivate;
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 4b630b81f9..ec729f2d17 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -34,9 +34,7 @@
 #include <coreplugin/basefilewizard.h>
 #include <utils/wizard.h>
 
-namespace Utils {
-    class ProjectIntroPage;
-}
+namespace Utils { class ProjectIntroPage; }
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h
index 8f1ea27771..c995f1eee4 100644
--- a/src/plugins/projectexplorer/buildstepspage.h
+++ b/src/plugins/projectexplorer/buildstepspage.h
@@ -43,9 +43,7 @@ class QSignalMapper;
 class QGraphicsOpacityEffect;
 QT_END_NAMESPACE
 
-namespace Utils {
-class DetailsWidget;
-}
+namespace Utils { class DetailsWidget; }
 
 namespace ProjectExplorer {
 
@@ -146,9 +144,7 @@ private:
     int m_leftMargin;
 };
 
-namespace Ui {
-    class BuildStepsPage;
-}
+namespace Ui { class BuildStepsPage; }
 
 class BuildStepsPage : public NamedWidget
 {
diff --git a/src/plugins/projectexplorer/cesdkhandler.h b/src/plugins/projectexplorer/cesdkhandler.h
index d5e295b798..1764370ad4 100644
--- a/src/plugins/projectexplorer/cesdkhandler.h
+++ b/src/plugins/projectexplorer/cesdkhandler.h
@@ -34,9 +34,7 @@
 
 #include <QDir>
 
-namespace Utils {
-class Environment;
-}
+namespace Utils { class Environment; }
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index 948c22aadf..6119c7c5c2 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -42,9 +42,7 @@ QT_BEGIN_NAMESPACE
 class QDir;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class Wizard;
-}
+namespace Utils { class Wizard; }
 
 namespace ProjectExplorer {
 class CustomWizard;
diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h
index e3538c560d..ee6f2b35c5 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardpage.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h
@@ -42,9 +42,7 @@ class QTextEdit;
 class QLabel;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
index bc12cd0c1c..656807eb3d 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
@@ -33,9 +33,7 @@
 #include <QMap>
 #include <QStringList>
 
-namespace Core {
-class GeneratedFile;
-}
+namespace Core { class GeneratedFile; }
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h
index 2c54e519d2..abb14f7946 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h
@@ -33,9 +33,7 @@
 #include "idevicewidget.h"
 
 namespace ProjectExplorer {
-namespace Ui {
-class DesktopDeviceConfigurationWidget;
-}
+namespace Ui { class DesktopDeviceConfigurationWidget; }
 
 class DesktopDeviceConfigurationWidget : public IDeviceWidget
 {
diff --git a/src/plugins/projectexplorer/doubletabwidget.h b/src/plugins/projectexplorer/doubletabwidget.h
index 99cd8bfb9c..1c88b8d255 100644
--- a/src/plugins/projectexplorer/doubletabwidget.h
+++ b/src/plugins/projectexplorer/doubletabwidget.h
@@ -37,9 +37,7 @@
 namespace ProjectExplorer {
 namespace Internal {
 
-namespace Ui {
-    class DoubleTabWidget;
-}
+namespace Ui { class DoubleTabWidget; }
 
 class DoubleTabWidget : public QWidget
 {
diff --git a/src/plugins/projectexplorer/environmentitemswidget.h b/src/plugins/projectexplorer/environmentitemswidget.h
index c38e24f21d..8b34cf7b7e 100644
--- a/src/plugins/projectexplorer/environmentitemswidget.h
+++ b/src/plugins/projectexplorer/environmentitemswidget.h
@@ -32,9 +32,7 @@
 
 #include <QDialog>
 
-namespace Utils {
-class EnvironmentItem;
-}
+namespace Utils { class EnvironmentItem; }
 
 namespace ProjectExplorer {
 class EnvironmentItemsWidgetPrivate;
diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h
index 0d1302ab2e..c5c07a6843 100644
--- a/src/plugins/projectexplorer/gcctoolchainfactories.h
+++ b/src/plugins/projectexplorer/gcctoolchainfactories.h
@@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE
 class QComboBox;
 QT_END_NAMESPACE
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 namespace ProjectExplorer {
 class GccToolChain;
diff --git a/src/plugins/projectexplorer/processparameters.h b/src/plugins/projectexplorer/processparameters.h
index 19e64e82af..0e9810de0c 100644
--- a/src/plugins/projectexplorer/processparameters.h
+++ b/src/plugins/projectexplorer/processparameters.h
@@ -34,9 +34,7 @@
 
 #include <utils/environment.h>
 
-namespace Utils {
-class AbstractMacroExpander;
-}
+namespace Utils { class AbstractMacroExpander; }
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index c351fdebf7..a32b8a449b 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE
 class QFileInfo;
 QT_END_NAMESPACE
 
-namespace Core {
-    class MimeDatabase;
-}
+namespace Core { class MimeDatabase; }
 
 namespace ProjectExplorer {
 class RunConfiguration;
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 7bc4b8709f..eb4b96413c 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -35,9 +35,7 @@
 namespace ProjectExplorer {
 namespace Internal {
 
-namespace Ui {
-class WizardPage;
-}
+namespace Ui { class WizardPage; }
 
 // Documentation inside.
 class ProjectWizardPage : public QWizardPage
diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h
index 016b829142..df9d76d5dc 100644
--- a/src/plugins/projectexplorer/settingsaccessor.h
+++ b/src/plugins/projectexplorer/settingsaccessor.h
@@ -40,9 +40,7 @@ namespace ProjectExplorer {
 
 class Project;
 
-namespace Internal {
-class UserFileVersionHandler;
-}
+namespace Internal { class UserFileVersionHandler; }
 
 class SettingsAccessor
 {
diff --git a/src/plugins/projectexplorer/targetsettingswidget.h b/src/plugins/projectexplorer/targetsettingswidget.h
index f22b537daf..3129244d18 100644
--- a/src/plugins/projectexplorer/targetsettingswidget.h
+++ b/src/plugins/projectexplorer/targetsettingswidget.h
@@ -42,9 +42,7 @@ class Target;
 class Kit;
 namespace Internal {
 
-namespace Ui {
-    class TargetSettingsWidget;
-}
+namespace Ui { class TargetSettingsWidget; }
 
 class TargetSettingsWidget : public QWidget
 {
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index fe8a752eef..4ab13a5736 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -44,9 +44,7 @@ class FileName;
 
 namespace ProjectExplorer {
 
-namespace Internal {
-class ToolChainPrivate;
-}
+namespace Internal { class ToolChainPrivate; }
 
 class Abi;
 class HeaderPath;
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
index b96fd6981e..44104a041b 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
@@ -43,9 +43,7 @@ class QRadioButton;
 class QComboBox;
 QT_END_NAMESPACE
 
-namespace qbs {
-class InstallOptions;
-}
+namespace qbs { class InstallOptions; }
 
 namespace Utils {
 class PathChooser;
diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
index 741487572c..542aaff393 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
@@ -48,9 +48,7 @@ class LibraryTypePage;
 class DetailsPage;
 class SummaryPage;
 
-namespace Ui {
-    class LibraryDetailsWidget;
-}
+namespace Ui { class LibraryDetailsWidget; }
 
 class AddLibraryWizard : public Utils::Wizard
 {
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
index 144c96e905..f92af63094 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
@@ -41,9 +41,7 @@ namespace Internal {
 struct PluginOptions;
 class CustomWidgetWidgetsWizardPage;
 
-namespace Ui {
-    class CustomWidgetPluginWizardPage;
-}
+namespace Ui { class CustomWidgetPluginWizardPage; }
 
 class CustomWidgetPluginWizardPage : public QWizardPage
 {
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
index 245fb59685..b820da8aa0 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
@@ -46,9 +46,7 @@ namespace Internal {
 class ClassDefinition;
 struct PluginOptions;
 
-namespace Ui {
-    class CustomWidgetWidgetsWizardPage;
-}
+namespace Ui { class CustomWidgetWidgetsWizardPage; }
 
 class CustomWidgetWidgetsWizardPage : public QWizardPage
 {
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
index df72ce8a36..69427d30bd 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
@@ -39,9 +39,7 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 QT_END_NAMESPACE
 
-namespace Core {
-    class GeneratedFile;
-}
+namespace Core { class GeneratedFile; }
 
 namespace QmakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h
index f0dccaf578..91c072d970 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.h
+++ b/src/plugins/qmakeprojectmanager/externaleditors.h
@@ -42,9 +42,7 @@ class QTcpSocket;
 class QSignalMapper;
 QT_END_NAMESPACE
 
-namespace QtSupport {
-class BaseQtVersion;
-}
+namespace QtSupport { class BaseQtVersion; }
 
 namespace QmakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
index 07006c16f0..2732e01a6b 100644
--- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
+++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
@@ -36,9 +36,7 @@ namespace QmakeProjectManager {
 class QmakeProFileNode;
 namespace Internal {
 
-namespace Ui {
-    class LibraryDetailsWidget;
-}
+namespace Ui { class LibraryDetailsWidget; }
 
 class LibraryDetailsController : public QObject
 {
diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
index 8cc4f5ac88..77e05e66ad 100644
--- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h
+++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
@@ -39,13 +39,9 @@ QT_BEGIN_NAMESPACE
 class QUrl;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace QmakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index a7a91ac009..6856d7d60a 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -49,9 +49,7 @@ QT_END_NAMESPACE
 
 namespace Utils { class FileName; }
 
-namespace Core {
-class ICore;
-}
+namespace Core { class ICore; }
 
 namespace QtSupport {
 class BaseQtVersion;
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
index c8ae210233..4f71e70501 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
@@ -36,18 +36,14 @@ QT_BEGIN_NAMESPACE
 class QAbstractButton;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class DetailsWidget;
-}
+namespace Utils { class DetailsWidget; }
 
 namespace QmakeProjectManager {
 class QmakeBuildConfiguration;
 class QmakeProFileNode;
 
 namespace Internal {
-namespace Ui {
-class QmakeProjectConfigWidget;
-}
+namespace Ui { class QmakeProjectConfigWidget; }
 
 class QmakeProjectConfigWidget : public ProjectExplorer::NamedWidget
 {
diff --git a/src/plugins/qmakeprojectmanager/wizards/filespage.h b/src/plugins/qmakeprojectmanager/wizards/filespage.h
index 79312ac049..89b35836c8 100644
--- a/src/plugins/qmakeprojectmanager/wizards/filespage.h
+++ b/src/plugins/qmakeprojectmanager/wizards/filespage.h
@@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE
 class QLabel;
 QT_END_NAMESPACE
 
-namespace Utils {
-class NewClassWidget;
-} // namespace Utils
+namespace Utils { class NewClassWidget; }
 
 namespace QmakeProjectManager {
 namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h
index aa876262ff..6fbc164d39 100644
--- a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h
+++ b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h
@@ -35,9 +35,7 @@
 namespace QmakeProjectManager {
 namespace Internal {
 
-namespace Ui {
-    class TestWizardPage;
-}
+namespace Ui { class TestWizardPage; }
 
 struct TestWizardParameters;
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
index f1fd43de3a..97710f8ce9 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
@@ -37,9 +37,7 @@ class QGraphicsScene;
 class QGraphicsSceneMouseEvent;
 QT_END_NAMESPACE
 
-namespace Utils {
-class CrumblePath;
-}
+namespace Utils { class CrumblePath; }
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.h b/src/plugins/qmldesigner/components/formeditor/toolbox.h
index e8be00880b..c9de075b30 100644
--- a/src/plugins/qmldesigner/components/formeditor/toolbox.h
+++ b/src/plugins/qmldesigner/components/formeditor/toolbox.h
@@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE
 class QToolBar;
 QT_END_NAMESPACE
 
-namespace Utils {
-class CrumblePath;
-}
+namespace Utils { class CrumblePath; }
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
index 530885dee6..de0bc6f761 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
@@ -44,9 +44,7 @@ class StatesEditorModel;
 class StatesEditorView;
 class NodeInstanceView;
 
-namespace Internal {
-class StatesEditorImageProvider;
-}
+namespace Internal { class StatesEditorImageProvider; }
 
 class StatesEditorWidget : public QWidget
 {
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
index 61cbaa2c7b..022db9962a 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
@@ -4,9 +4,7 @@
 #include <QDialog>
 
 QT_BEGIN_NAMESPACE
-namespace Ui {
-    class QmlWarningDialog;
-}
+namespace Ui { class QmlWarningDialog; }
 QT_END_NAMESPACE
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
index a526f7da75..4b8e95cb7f 100644
--- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
@@ -38,9 +38,7 @@
 
 #include <QStringList>
 
-namespace QmlJS {
-class Snapshot;
-} // namespace QmlJS
+namespace QmlJS { class Snapshot; }
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 76efc8584b..44cdc1aa87 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -42,9 +42,7 @@ QT_END_NAMESPACE
 
 namespace QmlDesigner {
 
-namespace Internal {
-    class ModelPrivate;
-}
+namespace Internal { class ModelPrivate; }
 
 class AnchorLine;
 class ModelNode;
diff --git a/src/plugins/qmldesigner/designercore/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h
index 9c9f5b150e..fbc8283364 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeproperty.h
@@ -35,9 +35,7 @@
 
 namespace QmlDesigner {
 
-namespace Internal {
-    class ModelPrivate;
-}
+namespace Internal { class ModelPrivate; }
 
 class QMLDESIGNERCORE_EXPORT NodeProperty : public NodeAbstractProperty
 {
diff --git a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
index 6c117af1e8..0648dea9b6 100644
--- a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
@@ -38,9 +38,7 @@ class QIODevice;
 class QPlainTextEdit;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class ChangeSet;
-}
+namespace Utils { class ChangeSet; }
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/include/stylemanager.h b/src/plugins/qmldesigner/designercore/include/stylemanager.h
index dccdac377b..b876017fe2 100644
--- a/src/plugins/qmldesigner/designercore/include/stylemanager.h
+++ b/src/plugins/qmldesigner/designercore/include/stylemanager.h
@@ -37,9 +37,7 @@
 
 namespace QmlDesigner {
 
-namespace Internal {
-class StyleManagerGuard;
-}
+namespace Internal { class StyleManagerGuard; }
 
 class CORESHARED_EXPORT StyleManager {
 public:
diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h
index 592556e0d3..e1a0413abf 100644
--- a/src/plugins/qmldesigner/designercore/include/variantproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h
@@ -42,9 +42,7 @@ namespace QmlDesigner {
 
 class AbstractView;
 
-namespace Internal {
-    class ModelPrivate;
-}
+namespace Internal { class ModelPrivate; }
 
 class QMLDESIGNERCORE_EXPORT VariantProperty : public AbstractProperty
 {
diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h
index 6046fe92d2..b333b5f911 100644
--- a/src/plugins/qmldesigner/designercore/include/viewmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h
@@ -41,9 +41,7 @@ class AbstractCustomTool;
 class DesignerActionManager;
 class NodeInstanceView;
 
-namespace Internal {
-    class DesignModeWidget;
-}
+namespace Internal { class DesignModeWidget; }
 
 class ViewManagerData;
 
diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h
index 388d764cb5..b7d80e7a69 100644
--- a/src/plugins/qmldesigner/documentmanager.h
+++ b/src/plugins/qmldesigner/documentmanager.h
@@ -36,9 +36,7 @@
 
 #include <designdocument.h>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index 14b37dbdf5..abf3fb301f 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -44,9 +44,7 @@
 #include <QVariant>
 #include <QIcon>
 
-namespace QmlJS {
-class Value;
-}
+namespace QmlJS { class Value; }
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 96bc6cecc5..2c520a3876 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -48,17 +48,13 @@ class QComboBox;
 class QTimer;
 QT_END_NAMESPACE
 
-namespace Core {
-class ICore;
-}
+namespace Core { class ICore; }
 
 namespace QmlJS {
     class ModelManagerInterface;
     class IContextPane;
     class LookupContext;
-namespace AST {
-    class UiObjectMember;
-}
+namespace AST { class UiObjectMember; }
 }
 
 /*!
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index 36e599327f..ec5e9845f8 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -38,9 +38,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
-namespace Utils {
-class JsonSchemaManager;
-}
+namespace Utils { class JsonSchemaManager; }
 
 namespace Core {
 class Command;
@@ -49,13 +47,9 @@ class ActionManager;
 class IEditor;
 }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
-namespace QmlJS {
-    class ModelManagerInterface;
-}
+namespace QmlJS { class ModelManagerInterface; }
 
 namespace QmlJSEditor {
 
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index e2cbf63533..ced89f1c5b 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -39,13 +39,9 @@ QT_BEGIN_NAMESPACE
 template <class> class QList;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace QmlJS {
 class ScopeChain;
diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h
index a512fd455f..668b697c72 100644
--- a/src/plugins/qmljseditor/qmljsoutline.h
+++ b/src/plugins/qmljseditor/qmljsoutline.h
@@ -36,13 +36,9 @@
 
 #include <QSortFilterProxyModel>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace QmlJS {
-class Editor;
-}
+namespace QmlJS { class Editor; }
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h
index cd316a95c9..2dcf9f151f 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.h
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h
@@ -37,18 +37,12 @@
 
 namespace QmlJS {
 class ScopeChain;
-namespace AST {
-class SourceLocation;
-}
+namespace AST { class SourceLocation; }
 }
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
-namespace QmlJSTools {
-class SemanticInfo;
-}
+namespace QmlJSTools { class SemanticInfo; }
 
 namespace QmlJSEditor {
 
diff --git a/src/plugins/qmljseditor/quicktoolbar.h b/src/plugins/qmljseditor/quicktoolbar.h
index 78e0e0e0bc..37a4f407ff 100644
--- a/src/plugins/qmljseditor/quicktoolbar.h
+++ b/src/plugins/qmljseditor/quicktoolbar.h
@@ -34,13 +34,9 @@
 
 #include <QPointer>
 
-namespace TextEditor {
-class BaseTextEditor;
-}
+namespace TextEditor { class BaseTextEditor; }
 
-namespace QmlEditorWidgets {
-class ContextPaneWidget;
-}
+namespace QmlEditorWidgets { class ContextPaneWidget; }
 
 namespace QmlJSEditor {
 
diff --git a/src/plugins/qmljstools/qmlconsolemanager.h b/src/plugins/qmljstools/qmlconsolemanager.h
index cd75195327..99fa207a3b 100644
--- a/src/plugins/qmljstools/qmlconsolemanager.h
+++ b/src/plugins/qmljstools/qmlconsolemanager.h
@@ -36,14 +36,10 @@
 
 #include <QObject>
 
-namespace QmlJS {
-class IScriptEvaluator;
-}
+namespace QmlJS { class IScriptEvaluator; }
 namespace QmlJSTools {
 
-namespace Internal {
-class QmlConsoleModel;
-}
+namespace Internal { class QmlConsoleModel; }
 
 class QmlConsoleManagerPrivate;
 class QMLJSTOOLS_EXPORT QmlConsoleManager : public QmlJS::ConsoleManagerInterface
diff --git a/src/plugins/qmljstools/qmlconsolepane.h b/src/plugins/qmljstools/qmlconsolepane.h
index 938369839d..0495430892 100644
--- a/src/plugins/qmljstools/qmlconsolepane.h
+++ b/src/plugins/qmljstools/qmlconsolepane.h
@@ -37,9 +37,7 @@ class QToolButton;
 class QLabel;
 QT_END_NAMESPACE
 
-namespace Utils {
-class SavedAction;
-}
+namespace Utils { class SavedAction; }
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.h b/src/plugins/qmljstools/qmljscodestylesettingspage.h
index cf6782f50b..9025b37d41 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.h
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.h
@@ -48,9 +48,7 @@ namespace TextEditor {
 namespace QmlJSTools {
 namespace Internal {
 
-namespace Ui {
-class QmlJSCodeStyleSettingsPage;
-}
+namespace Ui { class QmlJSCodeStyleSettingsPage; }
 
 class QmlJSCodeStylePreferencesWidget : public QWidget
 {
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h
index dce0955504..ac60ea106c 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.h
+++ b/src/plugins/qmljstools/qmljsmodelmanager.h
@@ -46,17 +46,11 @@
 QT_FORWARD_DECLARE_CLASS(QTimer)
 QT_FORWARD_DECLARE_CLASS(QLocale)
 
-namespace Core {
-class MimeType;
-}
+namespace Core { class MimeType; }
 
-namespace CPlusPlus {
-class CppModelManagerInterface;
-}
+namespace CPlusPlus { class CppModelManagerInterface; }
 
-namespace QmlJS {
-class QrcParser;
-}
+namespace QmlJS { class QrcParser; }
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmljstools/qmljsplugindumper.h b/src/plugins/qmljstools/qmljsplugindumper.h
index 65c1da9481..a1567b7ab3 100644
--- a/src/plugins/qmljstools/qmljsplugindumper.h
+++ b/src/plugins/qmljstools/qmljsplugindumper.h
@@ -40,9 +40,7 @@ QT_BEGIN_NAMESPACE
 class QDir;
 QT_END_NAMESPACE
 
-namespace Utils {
-class FileSystemWatcher;
-}
+namespace Utils { class FileSystemWatcher; }
 
 namespace QmlJSTools {
 namespace Internal {
diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h
index 5b98b88cb7..87df015ae0 100644
--- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h
+++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h
@@ -35,9 +35,7 @@
 #include <texteditor/basetextdocumentlayout.h>
 #include <qmljs/qmljscodeformatter.h>
 
-namespace TextEditor {
-    class TabSettings;
-}
+namespace TextEditor { class TabSettings; }
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.h b/src/plugins/qmljstools/qmljsrefactoringchanges.h
index 906c57f75a..966417f79f 100644
--- a/src/plugins/qmljstools/qmljsrefactoringchanges.h
+++ b/src/plugins/qmljstools/qmljsrefactoringchanges.h
@@ -36,9 +36,7 @@
 
 #include <texteditor/refactoringchanges.h>
 
-namespace QmlJS {
-class ModelManagerInterface;
-} // namespace QmlJS
+namespace QmlJS { class ModelManagerInterface; }
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h
index 3cdd38577e..f1b16894f8 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.h
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.h
@@ -33,9 +33,7 @@
 #include <QQuickView>
 #include <QWidget>
 
-namespace Analyzer {
-class IAnalyzerTool;
-}
+namespace Analyzer { class IAnalyzerTool; }
 
 namespace QmlProfiler {
 
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
index 98941a944b..f6eeb623bf 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
@@ -38,9 +38,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QDir)
 
-namespace Utils {
-class FileSystemWatcher;
-}
+namespace Utils { class FileSystemWatcher; }
 
 namespace QmlProjectManager {
 
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
index f2c8d44067..835c4d4e38 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
@@ -33,9 +33,7 @@
 #include <coreplugin/basefilewizard.h>
 #include <projectexplorer/baseprojectwizarddialog.h>
 
-namespace ExtensionSystem {
-class IPlugin;
-} // namespace ExtensionSystem
+namespace ExtensionSystem { class IPlugin; }
 
 namespace QmlProjectManager {
 namespace Internal {
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
index d35e8fed8f..6dedae8a96 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
@@ -35,9 +35,7 @@
 #include <QStringList>
 #include <QHash>
 
-namespace Core {
-class IDocument;
-}
+namespace Core { class IDocument; }
 
 namespace QmlProjectManager {
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index 7968e59c49..f2530d3221 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -38,9 +38,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QStringListModel)
 
-namespace Core {
-    class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace QtSupport { class BaseQtVersion; }
 
diff --git a/src/plugins/qnx/bardescriptoreditor.h b/src/plugins/qnx/bardescriptoreditor.h
index ce235885e2..2327680a96 100644
--- a/src/plugins/qnx/bardescriptoreditor.h
+++ b/src/plugins/qnx/bardescriptoreditor.h
@@ -39,9 +39,7 @@ class QActionGroup;
 class QToolBar;
 QT_END_NAMESPACE
 
-namespace Utils {
-class LineColumnLabel;
-}
+namespace Utils { class LineColumnLabel; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h b/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h
index d45075de03..f028f885fd 100644
--- a/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h
@@ -36,9 +36,7 @@
 
 #include "bardescriptordocument.h"
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 QT_BEGIN_NAMESPACE
 class QCheckBox;
diff --git a/src/plugins/qnx/bardescriptoreditorassetswidget.h b/src/plugins/qnx/bardescriptoreditorassetswidget.h
index c03293c653..fb18822309 100644
--- a/src/plugins/qnx/bardescriptoreditorassetswidget.h
+++ b/src/plugins/qnx/bardescriptoreditorassetswidget.h
@@ -42,9 +42,7 @@ QT_END_NAMESPACE
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorAssetsWidget;
-}
+namespace Ui { class BarDescriptorEditorAssetsWidget; }
 
 class BarDescriptorAsset;
 
diff --git a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h
index 2bc2def1f7..c919c83c3f 100644
--- a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorAuthorInformationWidget;
-}
+namespace Ui { class BarDescriptorEditorAuthorInformationWidget; }
 
 class BarDescriptorEditorAuthorInformationWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
index e0bb894eef..820b8d1d34 100644
--- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h
@@ -45,9 +45,7 @@ QT_END_NAMESPACE
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorEntryPointWidget;
-}
+namespace Ui { class BarDescriptorEditorEntryPointWidget; }
 
 class BarDescriptorEditorEntryPointWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h b/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h
index 36d3ca4f39..841d8a7aa1 100644
--- a/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h
@@ -39,9 +39,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorEnvironmentWidget;
-}
+namespace Ui { class BarDescriptorEditorEnvironmentWidget; }
 
 class BarDescriptorEditorEnvironmentWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorgeneralwidget.h b/src/plugins/qnx/bardescriptoreditorgeneralwidget.h
index 1941ca469e..401d9bdea9 100644
--- a/src/plugins/qnx/bardescriptoreditorgeneralwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorgeneralwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorGeneralWidget;
-}
+namespace Ui { class BarDescriptorEditorGeneralWidget; }
 
 class BarDescriptorEditorGeneralWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h b/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h
index 6a46496405..7a5e023cf7 100644
--- a/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorPackageInformationWidget;
-}
+namespace Ui { class BarDescriptorEditorPackageInformationWidget; }
 
 class BarDescriptorEditorPackageInformationWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorpermissionswidget.h b/src/plugins/qnx/bardescriptoreditorpermissionswidget.h
index 5ee81abdb1..a01e365709 100644
--- a/src/plugins/qnx/bardescriptoreditorpermissionswidget.h
+++ b/src/plugins/qnx/bardescriptoreditorpermissionswidget.h
@@ -39,9 +39,7 @@ namespace Internal {
 
 class BarDescriptorPermissionsModel;
 
-namespace Ui {
-class BarDescriptorEditorPermissionsWidget;
-}
+namespace Ui { class BarDescriptorEditorPermissionsWidget; }
 
 class BarDescriptorEditorPermissionsWidget : public BarDescriptorEditorAbstractPanelWidget
 {
diff --git a/src/plugins/qnx/bardescriptoreditorwidget.h b/src/plugins/qnx/bardescriptoreditorwidget.h
index 1c67cb11cd..4532a255a5 100644
--- a/src/plugins/qnx/bardescriptoreditorwidget.h
+++ b/src/plugins/qnx/bardescriptoreditorwidget.h
@@ -36,13 +36,9 @@
 
 #include <QStackedWidget>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace ProjectExplorer {
-class PanelsWidget;
-}
+namespace ProjectExplorer { class PanelsWidget; }
 
 namespace TextEditor {
 class PlainTextEditorWidget;
diff --git a/src/plugins/qnx/blackberryabstractdeploystep.h b/src/plugins/qnx/blackberryabstractdeploystep.h
index 67a8c38afa..c4f3a7bdc8 100644
--- a/src/plugins/qnx/blackberryabstractdeploystep.h
+++ b/src/plugins/qnx/blackberryabstractdeploystep.h
@@ -43,9 +43,7 @@ QT_BEGIN_NAMESPACE
 class QEventLoop;
 QT_END_NAMESPACE
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberryapplicationrunner.h b/src/plugins/qnx/blackberryapplicationrunner.h
index 7654263a85..6d3251cb52 100644
--- a/src/plugins/qnx/blackberryapplicationrunner.h
+++ b/src/plugins/qnx/blackberryapplicationrunner.h
@@ -44,9 +44,7 @@
 #include <QProcess>
 #include <QDateTime>
 
-namespace QSsh {
-class SshRemoteProcessRunner;
-}
+namespace QSsh { class SshRemoteProcessRunner; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h b/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h
index 791f8575df..a218bf876d 100644
--- a/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h
+++ b/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BlackBerryCheckDeviceStatusStepConfigWidget;
-}
+namespace Ui { class BlackBerryCheckDeviceStatusStepConfigWidget; }
 
 class BlackBerryCheckDeviceStatusStep;
 class BlackBerryCheckDeviceStatusStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h
index 9f5b30ba80..b5df8ebbae 100644
--- a/src/plugins/qnx/blackberryconfiguration.h
+++ b/src/plugins/qnx/blackberryconfiguration.h
@@ -45,12 +45,8 @@
 #include <QObject>
 #include <QCoreApplication>
 
-namespace QtSupport {
-class BaseQtVersion;
-}
-namespace Debugger {
-class DebuggerItem;
-}
+namespace QtSupport { class BaseQtVersion; }
+namespace Debugger { class DebuggerItem; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h
index ff183e51a4..e7d3a74da3 100644
--- a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h
+++ b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BlackBerryCreatePackageStepConfigWidget;
-}
+namespace Ui { class BlackBerryCreatePackageStepConfigWidget; }
 
 class BlackBerryCreatePackageStep;
 
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h
index 377acbbb16..7ad8f414af 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.h
+++ b/src/plugins/qnx/blackberrydeployconfiguration.h
@@ -36,9 +36,7 @@
 
 #include "blackberrydeviceconfiguration.h"
 
-namespace ProjectExplorer {
-class Target;
-}
+namespace ProjectExplorer { class Target; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.h b/src/plugins/qnx/blackberrydeployconfigurationfactory.h
index 55bbcdccb8..42b335e6dc 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationfactory.h
+++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.h
@@ -34,9 +34,7 @@
 
 #include <projectexplorer/deployconfiguration.h>
 
-namespace ProjectExplorer {
-class Target;
-}
+namespace ProjectExplorer { class Target; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
index bbb39a0e1c..654c4f8112 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
@@ -38,9 +38,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BlackBerryDeployConfigurationWidget;
-}
+namespace Ui { class BlackBerryDeployConfigurationWidget; }
 
 class BlackBerryDeployConfiguration;
 
diff --git a/src/plugins/qnx/blackberrydeployinformation.h b/src/plugins/qnx/blackberrydeployinformation.h
index 48373bd511..c387bf123d 100644
--- a/src/plugins/qnx/blackberrydeployinformation.h
+++ b/src/plugins/qnx/blackberrydeployinformation.h
@@ -33,9 +33,7 @@
 
 #include <QAbstractTableModel>
 
-namespace ProjectExplorer {
-class Target;
-}
+namespace ProjectExplorer { class Target; }
 
 namespace QmakeProjectManager {
 class QmakeProFileNode;
diff --git a/src/plugins/qnx/blackberrydeviceconfiguration.h b/src/plugins/qnx/blackberrydeviceconfiguration.h
index d5d57dab8e..8e79bedbc0 100644
--- a/src/plugins/qnx/blackberrydeviceconfiguration.h
+++ b/src/plugins/qnx/blackberrydeviceconfiguration.h
@@ -34,9 +34,7 @@
 
 #include <remotelinux/linuxdevice.h>
 
-namespace ProjectExplorer {
-class Kit;
-}
+namespace ProjectExplorer { class Kit; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
index 8a75153cd6..72f461db6e 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
@@ -47,9 +47,7 @@ namespace Internal {
 class BlackBerryDebugTokenUploader;
 class BlackBerrySigningUtils;
 
-namespace Ui {
-class BlackBerryDeviceConfigurationWidget;
-}
+namespace Ui { class BlackBerryDeviceConfigurationWidget; }
 
 class BlackBerryDeviceConfigurationWidget : public ProjectExplorer::IDeviceWidget
 {
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
index 50b58eced1..a0254a7c40 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
@@ -39,9 +39,7 @@
 #include <QWizardPage>
 #include <QListWidgetItem>
 
-namespace QSsh {
-class SshKeyGenerator;
-}
+namespace QSsh { class SshKeyGenerator; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrylogprocessrunner.h b/src/plugins/qnx/blackberrylogprocessrunner.h
index 5d50ab3d1d..0275cda06b 100644
--- a/src/plugins/qnx/blackberrylogprocessrunner.h
+++ b/src/plugins/qnx/blackberrylogprocessrunner.h
@@ -38,9 +38,7 @@
 
 #include <QObject>
 
-namespace ProjectExplorer {
-class SshDeviceProcess;
-}
+namespace ProjectExplorer { class SshDeviceProcess; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberryrunconfiguration.h b/src/plugins/qnx/blackberryrunconfiguration.h
index f1d7a37969..9c30cc08e8 100644
--- a/src/plugins/qnx/blackberryrunconfiguration.h
+++ b/src/plugins/qnx/blackberryrunconfiguration.h
@@ -34,9 +34,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-namespace ProjectExplorer {
-class Target;
-}
+namespace ProjectExplorer { class Target; }
 
 namespace QmakeProjectManager {
 class QmakeBuildConfiguration;
diff --git a/src/plugins/qnx/blackberryrunconfigurationwidget.h b/src/plugins/qnx/blackberryrunconfigurationwidget.h
index 2b28a7b0c7..bcecddcb25 100644
--- a/src/plugins/qnx/blackberryrunconfigurationwidget.h
+++ b/src/plugins/qnx/blackberryrunconfigurationwidget.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BlackBerryRunConfigurationWidget;
-}
+namespace Ui { class BlackBerryRunConfigurationWidget; }
 
 class BlackBerryRunConfiguration;
 
diff --git a/src/plugins/qnx/blackberryruncontrol.h b/src/plugins/qnx/blackberryruncontrol.h
index 766a103f6d..c1278bc058 100644
--- a/src/plugins/qnx/blackberryruncontrol.h
+++ b/src/plugins/qnx/blackberryruncontrol.h
@@ -34,9 +34,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-namespace QmakeProjectManager {
-class QmakeBuildConfiguration;
-}
+namespace QmakeProjectManager { class QmakeBuildConfiguration; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberryruncontrolfactory.h b/src/plugins/qnx/blackberryruncontrolfactory.h
index e9e8f49cce..6c66d6e1de 100644
--- a/src/plugins/qnx/blackberryruncontrolfactory.h
+++ b/src/plugins/qnx/blackberryruncontrolfactory.h
@@ -36,9 +36,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-namespace RemoteLinux {
-class RemoteLinuxRunConfiguration;
-}
+namespace RemoteLinux { class RemoteLinuxRunConfiguration; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrysetupwizard.h b/src/plugins/qnx/blackberrysetupwizard.h
index aa4d50f72b..ff97361488 100644
--- a/src/plugins/qnx/blackberrysetupwizard.h
+++ b/src/plugins/qnx/blackberrysetupwizard.h
@@ -38,9 +38,7 @@
 #include <QList>
 #include <QByteArray>
 
-namespace QSsh {
-class SshKeyGenerator;
-}
+namespace QSsh { class SshKeyGenerator; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.h b/src/plugins/qnx/blackberrysetupwizardpages.h
index c1d8eb1dd8..ae0065f436 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.h
+++ b/src/plugins/qnx/blackberrysetupwizardpages.h
@@ -34,9 +34,7 @@
 
 #include <QWizardPage>
 
-namespace Utils {
-class PathChooser;
-}
+namespace Utils { class PathChooser; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/blackberrysigningpasswordsdialog.h b/src/plugins/qnx/blackberrysigningpasswordsdialog.h
index 8279b4d021..1fb38c4306 100644
--- a/src/plugins/qnx/blackberrysigningpasswordsdialog.h
+++ b/src/plugins/qnx/blackberrysigningpasswordsdialog.h
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BlackBerrySigningPasswordsDialog;
-}
+namespace Ui { class BlackBerrySigningPasswordsDialog; }
 
 class BlackBerrySigningPasswordsDialog : public QDialog
 {
diff --git a/src/plugins/qnx/blackberrysshkeysgenerator.h b/src/plugins/qnx/blackberrysshkeysgenerator.h
index 6422f63973..58bea9c957 100644
--- a/src/plugins/qnx/blackberrysshkeysgenerator.h
+++ b/src/plugins/qnx/blackberrysshkeysgenerator.h
@@ -33,9 +33,7 @@
 
 #include <QThread>
 
-namespace QSsh {
-class SshKeyGenerator;
-}
+namespace QSsh { class SshKeyGenerator; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
index 8e0facc8e0..a8e3461eab 100644
--- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
+++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
@@ -35,9 +35,7 @@
 #include <coreplugin/basefilewizard.h>
 #include <utils/wizard.h>
 
-namespace Utils {
-    class ProjectIntroPage;
-}
+namespace Utils { class ProjectIntroPage; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/cascadesimport/fileconverter.h b/src/plugins/qnx/cascadesimport/fileconverter.h
index 7b3b7e818e..3b236a4395 100644
--- a/src/plugins/qnx/cascadesimport/fileconverter.h
+++ b/src/plugins/qnx/cascadesimport/fileconverter.h
@@ -35,9 +35,7 @@
 #include <QStringList>
 #include <QCoreApplication>
 
-namespace Core {
-class GeneratedFile;
-}
+namespace Core { class GeneratedFile; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/qnxbaseqtconfigwidget.h b/src/plugins/qnx/qnxbaseqtconfigwidget.h
index eb70735416..d13ef85c27 100644
--- a/src/plugins/qnx/qnxbaseqtconfigwidget.h
+++ b/src/plugins/qnx/qnxbaseqtconfigwidget.h
@@ -36,9 +36,7 @@
 
 namespace Qnx {
 namespace Internal {
-namespace Ui {
-class QnxBaseQtConfigWidget;
-}
+namespace Ui { class QnxBaseQtConfigWidget; }
 
 class QnxAbstractQtVersion;
 
diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h
index b75d49cfca..5c6313c233 100644
--- a/src/plugins/qnx/qnxdevicetester.h
+++ b/src/plugins/qnx/qnxdevicetester.h
@@ -36,9 +36,7 @@
 
 #include <QStringList>
 
-namespace QSsh {
-class SshRemoteProcessRunner;
-}
+namespace QSsh { class SshRemoteProcessRunner; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h
index 5f66966b3a..4ed332bbbb 100644
--- a/src/plugins/qnx/slog2inforunner.h
+++ b/src/plugins/qnx/slog2inforunner.h
@@ -40,9 +40,7 @@
 #include <QDateTime>
 #include <QByteArray>
 
-namespace ProjectExplorer {
-class SshDeviceProcess;
-}
+namespace ProjectExplorer { class SshDeviceProcess; }
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 431ccef273..c06afa4681 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -39,13 +39,9 @@
 #include <QStringList>
 #include <QVariantMap>
 
-namespace Utils {
-class Environment;
-} // namespace Utils
+namespace Utils { class Environment; }
 
-namespace Core {
-class FeatureSet;
-} // namespace Core
+namespace Core { class FeatureSet; }
 
 namespace ProjectExplorer {
 class IOutputParser;
diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h
index 8c6a13b2fa..11ef7c2424 100644
--- a/src/plugins/qtsupport/profilereader.h
+++ b/src/plugins/qtsupport/profilereader.h
@@ -40,9 +40,7 @@
 #include <QTimer>
 
 namespace QtSupport {
-namespace Internal {
-class QtSupportPlugin;
-}
+namespace Internal { class QtSupportPlugin; }
 
 class QTSUPPORT_EXPORT ProMessageHandler : public QObject, public QMakeHandler
 {
diff --git a/src/plugins/qtsupport/qmldumptool.h b/src/plugins/qtsupport/qmldumptool.h
index a6a4ff2f55..83a0fdf24e 100644
--- a/src/plugins/qtsupport/qmldumptool.h
+++ b/src/plugins/qtsupport/qmldumptool.h
@@ -34,9 +34,7 @@
 
 #include <utils/buildablehelperlibrary.h>
 
-namespace Utils {
-    class Environment;
-}
+namespace Utils { class Environment; }
 
 namespace ProjectExplorer {
     class Project;
diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h
index 9fc0454d61..2e762da58d 100644
--- a/src/plugins/qtsupport/qtoptionspage.h
+++ b/src/plugins/qtsupport/qtoptionspage.h
@@ -43,9 +43,7 @@ class QTextBrowser;
 class QUrl;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
 
 namespace QtSupport {
 
diff --git a/src/plugins/qtsupport/qtoutputformatter.h b/src/plugins/qtsupport/qtoutputformatter.h
index e2b88cdd5f..4bdd606e26 100644
--- a/src/plugins/qtsupport/qtoutputformatter.h
+++ b/src/plugins/qtsupport/qtoutputformatter.h
@@ -40,9 +40,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QTextCursor)
 
-namespace ProjectExplorer {
-class Project;
-} // namespace ProjectExplorer
+namespace ProjectExplorer { class Project; }
 
 namespace QtSupport {
 
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index 7ba82c2767..923937a624 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -44,9 +44,7 @@ class PersistentSettingsWriter;
 namespace ProjectExplorer { class KitInformation; }
 
 namespace QtSupport {
-namespace Internal {
-class QtOptionsPage;
-}
+namespace Internal { class QtOptionsPage; }
 
 struct QMakeAssignment
 {
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 9cb88a89d0..732555c315 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -39,9 +39,7 @@ namespace RemoteLinux {
 class AbstractRemoteLinuxDeployService;
 class RemoteLinuxDeployConfiguration;
 
-namespace Internal {
-class AbstractRemoteLinuxDeployStepPrivate;
-}
+namespace Internal { class AbstractRemoteLinuxDeployStepPrivate; }
 
 class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer::BuildStep
 {
diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
index 70ac3242e0..74b889552e 100644
--- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
+++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
@@ -35,9 +35,7 @@
 namespace RemoteLinux {
 class AbstractRemoteLinuxPackageInstaller;
 
-namespace Internal {
-class AbstractUploadAndInstallPackageServicePrivate;
-}
+namespace Internal { class AbstractUploadAndInstallPackageServicePrivate; }
 
 class REMOTELINUX_EXPORT AbstractUploadAndInstallPackageService : public AbstractRemoteLinuxDeployService
 {
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index 1bb0269137..b5df95efec 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -34,9 +34,7 @@
 #include "remotelinux_export.h"
 
 namespace RemoteLinux {
-namespace Internal {
-class GenericDirectUploadStepPrivate;
-}
+namespace Internal { class GenericDirectUploadStepPrivate; }
 
 class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDeployStep
 {
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index f81aef377e..16a9f7ddbd 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -36,9 +36,7 @@
 
 namespace RemoteLinux {
 
-namespace Ui {
-class GenericLinuxDeviceConfigurationWidget;
-}
+namespace Ui { class GenericLinuxDeviceConfigurationWidget; }
 
 class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWidget
         : public ProjectExplorer::IDeviceWidget
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
index 8c8ab50815..278baea7ce 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
@@ -35,9 +35,7 @@
 #include <utils/wizard.h>
 
 namespace RemoteLinux {
-namespace Internal {
-class GenericLinuxDeviceConfigurationWizardPrivate;
-} // namespace Internal
+namespace Internal { class GenericLinuxDeviceConfigurationWizardPrivate; }
 
 class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizard : public Utils::Wizard
 {
diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h
index 2d01074f1e..00cae135f4 100644
--- a/src/plugins/remotelinux/linuxdevicetester.h
+++ b/src/plugins/remotelinux/linuxdevicetester.h
@@ -40,9 +40,7 @@ namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
 
 namespace RemoteLinux {
 
-namespace Internal {
-class GenericLinuxDeviceTesterPrivate;
-}
+namespace Internal { class GenericLinuxDeviceTesterPrivate; }
 
 class REMOTELINUX_EXPORT GenericLinuxDeviceTester : public ProjectExplorer::DeviceTester
 {
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h
index 89194e54eb..bdc7fb0cbe 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.h
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.h
@@ -36,9 +36,7 @@
 #include <QProgressDialog>
 
 namespace RemoteLinux {
-namespace Internal {
-class PublicKeyDeploymentDialogPrivate;
-} // namespace Internal
+namespace Internal { class PublicKeyDeploymentDialogPrivate; }
 
 class REMOTELINUX_EXPORT PublicKeyDeploymentDialog : public QProgressDialog
 {
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
index 814fd231d0..d5ef63e5be 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
@@ -32,9 +32,7 @@
 #include "abstractremotelinuxdeployservice.h"
 
 namespace RemoteLinux {
-namespace Internal {
-class RemoteLinuxCustomCommandDeployservicePrivate;
-} // namespace Internal
+namespace Internal { class RemoteLinuxCustomCommandDeployservicePrivate; }
 
 class REMOTELINUX_EXPORT RemoteLinuxCustomCommandDeployService
     : public AbstractRemoteLinuxDeployService
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index 13933b338c..d6853c8396 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -36,9 +36,7 @@
 namespace RemoteLinux {
 class RemoteLinuxDeployConfiguration;
 
-namespace Internal {
-class RemoteLinuxDeployConfigurationWidgetPrivate;
-} // namespace Internal
+namespace Internal { class RemoteLinuxDeployConfigurationWidgetPrivate; }
 
 class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget
     : public ProjectExplorer::NamedWidget
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
index ca4e5f1ece..6afe9bf7bd 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
@@ -36,9 +36,7 @@
 
 namespace RemoteLinux {
 
-namespace Internal {
-class AbstractRemoteLinuxPackageInstallerPrivate;
-} // namespace Internal
+namespace Internal { class AbstractRemoteLinuxPackageInstallerPrivate; }
 
 class REMOTELINUX_EXPORT AbstractRemoteLinuxPackageInstaller : public QObject
 {
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
index 2056e157a3..35fdceeff3 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
@@ -41,9 +41,7 @@ QT_END_NAMESPACE
 namespace RemoteLinux {
 class RemoteLinuxRunConfiguration;
 
-namespace Internal {
-class RemoteLinuxRunConfigurationWidgetPrivate;
-} // namespace Internal
+namespace Internal { class RemoteLinuxRunConfigurationWidgetPrivate; }
 
 class REMOTELINUX_EXPORT RemoteLinuxRunConfigurationWidget : public QWidget
 {
diff --git a/src/plugins/remotelinux/sshkeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h
index d269fb7c4b..9080f8e169 100644
--- a/src/plugins/remotelinux/sshkeydeployer.h
+++ b/src/plugins/remotelinux/sshkeydeployer.h
@@ -33,14 +33,10 @@
 
 #include <QObject>
 
-namespace QSsh {
-class SshConnectionParameters;
-}
+namespace QSsh { class SshConnectionParameters; }
 
 namespace RemoteLinux {
-namespace Internal {
-class SshKeyDeployerPrivate;
-}
+namespace Internal { class SshKeyDeployerPrivate; }
 
 class REMOTELINUX_EXPORT SshKeyDeployer : public QObject
 {
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
index c30722d901..dd37785ea0 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
@@ -35,9 +35,7 @@
 namespace RemoteLinux {
 class AbstractRemoteLinuxPackageInstaller;
 
-namespace Internal {
-class UploadAndInstallTarPackageServicePrivate;
-}
+namespace Internal { class UploadAndInstallTarPackageServicePrivate; }
 
 class REMOTELINUX_EXPORT UploadAndInstallTarPackageService : public AbstractUploadAndInstallPackageService
 {
diff --git a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h
index 699cfd563b..78179b0da5 100644
--- a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h
+++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h
@@ -32,9 +32,7 @@
 
 #include <QMainWindow>
 
-namespace SharedTools {
-    class QrcEditor;
-}
+namespace SharedTools { class QrcEditor; }
 
 class MainWindow : public QMainWindow
 {
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 14e818156d..117a7e1099 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -46,13 +46,9 @@ namespace Core {
     class IVersionControl;
     class IEditor;
 }
-namespace Utils {
-    class ParameterAction;
-}
+namespace Utils { class ParameterAction; }
 
-namespace VcsBase {
-    class VcsBaseSubmitEditor;
-}
+namespace VcsBase { class VcsBaseSubmitEditor; }
 
 namespace Subversion {
 namespace Internal {
diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h
index d65920ed84..60f012dca6 100644
--- a/src/plugins/tasklist/taskfile.h
+++ b/src/plugins/tasklist/taskfile.h
@@ -32,9 +32,7 @@
 
 #include <coreplugin/idocument.h>
 
-namespace ProjectExplorer {
-class Project;
-} // namespace ProjectExplorer
+namespace ProjectExplorer { class Project; }
 
 namespace TaskList {
 namespace Internal {
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index f7f14662d5..c3d8e7dc81 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -48,9 +48,7 @@ class IFindSupport;
 } // namespace Core
 
 namespace TextEditor {
-namespace Internal {
-class BaseFileFindPrivate;
-} // namespace Internal
+namespace Internal { class BaseFileFindPrivate; }
 
 class TEXTEDITOR_EXPORT BaseFileFind : public Core::IFindFilter
 {
diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h
index 427a20711e..ea6c781568 100644
--- a/src/plugins/texteditor/basehoverhandler.h
+++ b/src/plugins/texteditor/basehoverhandler.h
@@ -40,9 +40,7 @@ QT_BEGIN_NAMESPACE
 class QPoint;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h
index 3f3f65aaf5..849092ce78 100644
--- a/src/plugins/texteditor/basetextmark.h
+++ b/src/plugins/texteditor/basetextmark.h
@@ -34,9 +34,7 @@
 #include "itextmark.h"
 
 namespace TextEditor {
-namespace Internal {
-class BaseTextMarkRegistry;
-}
+namespace Internal { class BaseTextMarkRegistry; }
 
 class ITextMarkable;
 
diff --git a/src/plugins/texteditor/codeassist/iassistinterface.h b/src/plugins/texteditor/codeassist/iassistinterface.h
index 51c501f0b8..7debebe4bf 100644
--- a/src/plugins/texteditor/codeassist/iassistinterface.h
+++ b/src/plugins/texteditor/codeassist/iassistinterface.h
@@ -41,9 +41,7 @@ class QTextDocument;
 class QThread;
 QT_END_NAMESPACE
 
-namespace Core {
-class IDocument;
-}
+namespace Core { class IDocument; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h
index b449163d75..631d5f9f31 100644
--- a/src/plugins/texteditor/codestylepool.h
+++ b/src/plugins/texteditor/codestylepool.h
@@ -42,9 +42,7 @@ class ICodeStylePreferences;
 class ICodeStylePreferencesFactory;
 class TabSettings;
 
-namespace Internal {
-class CodeStylePoolPrivate;
-}
+namespace Internal { class CodeStylePoolPrivate; }
 
 class TEXTEDITOR_EXPORT CodeStylePool : public QObject
 {
diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h
index fd7000d1ee..d5cfe14a12 100644
--- a/src/plugins/texteditor/colorschemeedit.h
+++ b/src/plugins/texteditor/colorschemeedit.h
@@ -42,9 +42,7 @@ QT_END_NAMESPACE
 namespace TextEditor {
 namespace Internal {
 
-namespace Ui {
-class ColorSchemeEdit;
-}
+namespace Ui { class ColorSchemeEdit; }
 
 class FormatsModel;
 
diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h
index 0466ad8bf8..c0e82fd295 100644
--- a/src/plugins/texteditor/fontsettingspage.h
+++ b/src/plugins/texteditor/fontsettingspage.h
@@ -46,9 +46,7 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-namespace Internal {
-class FontSettingsPagePrivate;
-} // namespace Internal
+namespace Internal { class FontSettingsPagePrivate; }
 
 // GUI description of a format consisting of id (settings key)
 // and displayName to be displayed
diff --git a/src/plugins/texteditor/generichighlighter/highlighterexception.h b/src/plugins/texteditor/generichighlighter/highlighterexception.h
index c674dd7c0a..85054e8019 100644
--- a/src/plugins/texteditor/generichighlighter/highlighterexception.h
+++ b/src/plugins/texteditor/generichighlighter/highlighterexception.h
@@ -31,11 +31,7 @@
 #define HIGHLIGHTEREXCEPTION_H
 
 namespace TextEditor {
-namespace Internal {
-
-class HighlighterException {};
-
-} // namespace Internal
+namespace Internal { class HighlighterException {}; }
 } // namespace TextEditor
 
 #endif // HIGHLIGHTEREXCEPTION_H
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
index 69d1372f53..a7081c6bc9 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
@@ -38,9 +38,7 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-namespace Internal {
-class HighlightDefinitionMetaData;
-}
+namespace Internal { class HighlightDefinitionMetaData; }
 
 class HighlighterSettings;
 
diff --git a/src/plugins/texteditor/highlighterutils.h b/src/plugins/texteditor/highlighterutils.h
index ead9854403..627c45d613 100644
--- a/src/plugins/texteditor/highlighterutils.h
+++ b/src/plugins/texteditor/highlighterutils.h
@@ -37,9 +37,7 @@
  * but due to a very hackish test of that generic highlighter,
  * there functions must be outside. */
 
-namespace Core {
-class MimeType;
-}
+namespace Core { class MimeType; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h
index ca19586018..42ca853f46 100644
--- a/src/plugins/texteditor/icodestylepreferences.h
+++ b/src/plugins/texteditor/icodestylepreferences.h
@@ -41,9 +41,7 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-namespace Internal {
-class ICodeStylePreferencesPrivate;
-}
+namespace Internal { class ICodeStylePreferencesPrivate; }
 
 class TabSettings;
 class CodeStylePool;
diff --git a/src/plugins/texteditor/ioutlinewidget.h b/src/plugins/texteditor/ioutlinewidget.h
index e6f27da106..077637caed 100644
--- a/src/plugins/texteditor/ioutlinewidget.h
+++ b/src/plugins/texteditor/ioutlinewidget.h
@@ -33,9 +33,7 @@
 #include <texteditor/texteditor_global.h>
 #include <QWidget>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h
index 594efad15d..96f7e03b3e 100644
--- a/src/plugins/texteditor/itexteditor.h
+++ b/src/plugins/texteditor/itexteditor.h
@@ -50,9 +50,7 @@ class QRect;
 class QTextBlock;
 QT_END_NAMESPACE
 
-namespace Utils {
-    class CommentDefinition;
-}
+namespace Utils { class CommentDefinition; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h
index a4eb8b2c77..3806d18f33 100644
--- a/src/plugins/texteditor/linenumberfilter.h
+++ b/src/plugins/texteditor/linenumberfilter.h
@@ -36,9 +36,7 @@
 #include <QList>
 #include <QFutureInterface>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace TextEditor {
 namespace Internal {
diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h
index de2b9ddd87..ea001520b3 100644
--- a/src/plugins/texteditor/outlinefactory.h
+++ b/src/plugins/texteditor/outlinefactory.h
@@ -35,9 +35,7 @@
 #include <QStackedWidget>
 #include <QMenu>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
 namespace TextEditor {
 namespace Internal {
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index ca620afd91..dd2604a36e 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -34,9 +34,7 @@
 
 #include <utils/uncommentselection.h>
 
-namespace Core {
-class MimeType;
-}
+namespace Core { class MimeType; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.h b/src/plugins/texteditor/simplecodestylepreferenceswidget.h
index 992b242b34..33f014de09 100644
--- a/src/plugins/texteditor/simplecodestylepreferenceswidget.h
+++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.h
@@ -40,9 +40,7 @@ class TabSettings;
 class TabSettingsWidget;
 class ICodeStylePreferences;
 
-namespace Ui {
-    class TabPreferencesWidget;
-}
+namespace Ui { class TabPreferencesWidget; }
 
 class TEXTEDITOR_EXPORT SimpleCodeStylePreferencesWidget : public QWidget
 {
diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h
index 3fd323b156..24930a17ee 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -32,9 +32,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace Core {
-class SearchResultWindow;
-}
+namespace Core { class SearchResultWindow; }
 
 namespace TextEditor {
 
diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h
index a644661086..9aaea056cb 100644
--- a/src/plugins/todo/keyworddialog.h
+++ b/src/plugins/todo/keyworddialog.h
@@ -37,9 +37,7 @@
 namespace Todo {
 namespace Internal {
 
-namespace Ui {
-    class KeywordDialog;
-}
+namespace Ui { class KeywordDialog; }
 
 class Keyword;
 
diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h
index d271f71ed1..57171fa734 100644
--- a/src/plugins/todo/optionsdialog.h
+++ b/src/plugins/todo/optionsdialog.h
@@ -40,9 +40,7 @@ QT_END_NAMESPACE
 namespace Todo {
 namespace Internal {
 
-namespace Ui {
-    class OptionsDialog;
-}
+namespace Ui { class OptionsDialog; }
 
 class Settings;
 class Keyword;
diff --git a/src/plugins/valgrind/callgrindtextmark.h b/src/plugins/valgrind/callgrindtextmark.h
index 0107bebee4..14f2467a9c 100644
--- a/src/plugins/valgrind/callgrindtextmark.h
+++ b/src/plugins/valgrind/callgrindtextmark.h
@@ -36,9 +36,7 @@
 
 namespace Valgrind {
 
-namespace Callgrind {
-class Function;
-}
+namespace Callgrind { class Function; }
 
 namespace Internal {
 
diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h
index d501a6cd45..b53e491784 100644
--- a/src/plugins/valgrind/callgrindvisualisation.h
+++ b/src/plugins/valgrind/callgrindvisualisation.h
@@ -38,9 +38,7 @@ class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Valgrind {
-namespace Callgrind {
-class Function;
-}
+namespace Callgrind { class Function; }
 }
 
 namespace Valgrind {
diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h
index c897dd21e7..f20e433464 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.h
+++ b/src/plugins/valgrind/valgrindconfigwidget.h
@@ -40,9 +40,7 @@ QT_END_NAMESPACE
 namespace Valgrind {
 namespace Internal {
 
-namespace Ui {
-class ValgrindConfigWidget;
-}
+namespace Ui { class ValgrindConfigWidget; }
 
 class ValgrindBaseSettings;
 
diff --git a/src/plugins/vcsbase/basecheckoutwizard.h b/src/plugins/vcsbase/basecheckoutwizard.h
index 600199a5aa..00ad9474a1 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.h
+++ b/src/plugins/vcsbase/basecheckoutwizard.h
@@ -41,9 +41,7 @@ class QWizardPage;
 QT_END_NAMESPACE
 
 namespace VcsBase {
-namespace Internal {
-class BaseCheckoutWizardPrivate;
-}
+namespace Internal { class BaseCheckoutWizardPrivate; }
 
 class Command;
 
diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h
index bb4ca62c8e..ae44d94729 100644
--- a/src/plugins/vcsbase/basecheckoutwizardpage.h
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.h
@@ -39,9 +39,7 @@ namespace VcsBase {
 namespace Internal {
 class BaseCheckoutWizardPagePrivate;
 
-namespace Ui {
-class BaseCheckoutWizardPage;
-} // namespace Ui
+namespace Ui { class BaseCheckoutWizardPage; }
 } // namespace Internal
 
 
diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h
index d239b85e56..7bc9e30eff 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.h
+++ b/src/plugins/vcsbase/basevcseditorfactory.h
@@ -36,9 +36,7 @@
 #include <coreplugin/editormanager/ieditorfactory.h>
 
 namespace VcsBase {
-namespace Internal {
-class BaseVcsEditorFactoryPrivate;
-} // namespace Internal
+namespace Internal { class BaseVcsEditorFactoryPrivate; }
 
 class VCSBASE_EXPORT BaseVcsEditorFactory : public Core::IEditorFactory
 {
diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h
index 863d0ba061..f4a6657f86 100644
--- a/src/shared/designerintegrationv2/widgethost.h
+++ b/src/shared/designerintegrationv2/widgethost.h
@@ -36,9 +36,7 @@ QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface)
 
 namespace SharedTools {
 
-namespace Internal {
-    class FormResizer;
-}
+namespace Internal { class FormResizer; }
 
 /* A scroll area that embeds a Designer form window */
 
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h
index 216473fb6a..532de85b9d 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h
+++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h
@@ -34,9 +34,7 @@
 
 QT_BEGIN_NAMESPACE
 class QString;
-namespace Ui {
-class CrashHandlerDialog;
-}
+namespace Ui { class CrashHandlerDialog; }
 QT_END_NAMESPACE
 
 class CrashHandler;
diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.h b/src/tools/screenshotcropper/screenshotcropperwindow.h
index aa842e8874..e361f46167 100644
--- a/src/tools/screenshotcropper/screenshotcropperwindow.h
+++ b/src/tools/screenshotcropper/screenshotcropperwindow.h
@@ -35,9 +35,7 @@
 
 using namespace QtSupport::Internal;
 
-namespace Ui {
-class ScreenShotCropperWindow;
-}
+namespace Ui { class ScreenShotCropperWindow; }
 
 class ScreenShotCropperWindow : public QMainWindow
 {