From eedb702bb9c946a27c4a9c6852a10353ea55a090 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 29 Oct 2020 10:20:14 +0100
Subject: [PATCH] Meson: Make spacing and #include ordering a bit more
 consistent

Not 100%, but a step forward.

Change-Id: I6957edbd24c1652b228a96a68424b857603aae45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../exewrappers/mesontools.cpp                |  1 +
 .../exewrappers/mesontools.h                  |  6 +++---
 .../exewrappers/mesonwrapper.cpp              |  6 ++++--
 .../exewrappers/mesonwrapper.h                | 13 ++++++++-----
 .../exewrappers/ninjawrapper.h                |  5 ++++-
 .../exewrappers/toolwrapper.cpp               |  1 +
 .../exewrappers/toolwrapper.h                 |  7 +++++--
 .../mesonprojectmanager/kithelper/kitdata.h   |  5 +++++
 .../mesonprojectmanager/kithelper/kithelper.h | 13 ++++++++++---
 .../machinefiles/machinefilemanager.cpp       |  8 ++++++--
 .../machinefiles/machinefilemanager.h         |  4 +++-
 .../machinefiles/nativefilegenerator.cpp      |  8 +++++++-
 .../machinefiles/nativefilegenerator.h        |  9 ++++++++-
 .../mesonactionsmanager.cpp                   |  4 ++++
 .../mesonactionsmanager/mesonactionsmanager.h |  7 +++++--
 .../mesoninfoparser/buildoptions.h            |  6 ++++--
 .../mesoninfoparser/mesoninfo.h               |  7 ++++++-
 .../mesoninfoparser/mesoninfoparser.h         |  8 ++++++--
 .../parsers/buildoptionsparser.h              |  5 ++++-
 .../parsers/buildsystemfilesparser.h          |  9 +++++++--
 .../mesoninfoparser/parsers/common.h          |  3 +++
 .../mesoninfoparser/parsers/infoparser.h      |  5 ++++-
 .../mesoninfoparser/parsers/targetparser.h    |  5 ++++-
 .../mesoninfoparser/target.h                  |  4 +++-
 .../mesonprojectplugin.cpp                    |  1 +
 .../buildoptions/mesonbuildsettingswidget.cpp | 18 +++++++++++-------
 .../buildoptions/mesonbuildsettingswidget.h   |  6 ++++--
 .../optionsmodel/arrayoptionlineedit.cpp      |  3 +++
 .../optionsmodel/arrayoptionlineedit.h        |  4 +++-
 .../optionsmodel/buildoptionsmodel.cpp        |  2 ++
 .../optionsmodel/buildoptionsmodel.h          |  3 ++-
 .../project/mesonbuildconfiguration.cpp       | 19 +++++++++++--------
 .../project/mesonbuildconfiguration.h         |  1 +
 .../project/mesonbuildsystem.cpp              | 15 +++++++++------
 .../project/mesonbuildsystem.h                | 11 ++++++++---
 .../project/mesonprocess.cpp                  |  4 ++++
 .../project/mesonprocess.h                    |  6 +++++-
 .../project/mesonproject.cpp                  | 10 +++++++---
 .../project/mesonproject.h                    | 13 ++++++++-----
 .../project/mesonprojectimporter.cpp          |  2 ++
 .../project/mesonprojectimporter.h            | 10 +++++++---
 .../project/mesonprojectparser.cpp            |  8 ++++++--
 .../project/mesonprojectparser.h              | 16 +++++++++++-----
 .../project/mesonrunconfiguration.cpp         |  9 +++++++--
 .../project/mesonrunconfiguration.h           |  3 +++
 .../project/ninjabuildstep.cpp                |  7 ++++---
 .../project/ninjabuildstep.h                  |  5 ++++-
 .../outputparsers/mesonoutputparser.cpp       |  3 +++
 .../project/outputparsers/mesonoutputparser.h | 13 +++++++++----
 .../project/outputparsers/ninjaparser.cpp     |  3 +++
 .../project/outputparsers/ninjaparser.h       |  8 +++++++-
 .../project/projecttree/mesonprojectnodes.cpp |  9 ++++++---
 .../project/projecttree/mesonprojectnodes.h   |  6 ++++++
 .../project/projecttree/projecttree.cpp       |  5 +++++
 .../project/projecttree/projecttree.h         |  5 +++++
 .../settings/general/generalsettingspage.cpp  |  6 +++---
 .../settings/general/generalsettingspage.h    |  2 ++
 .../general/generalsettingswidget.cpp         |  3 +++
 .../settings/general/generalsettingswidget.h  |  2 ++
 .../settings/general/settings.cpp             |  3 +++
 .../settings/general/settings.h               |  9 +++++++--
 .../tools/kitaspect/mesontoolkitaspect.cpp    |  2 ++
 .../tools/kitaspect/mesontoolkitaspect.h      |  4 +++-
 .../tools/kitaspect/ninjatoolkitaspect.cpp    |  4 +++-
 .../tools/kitaspect/ninjatoolkitaspect.h      |  4 +++-
 .../tools/kitaspect/toolkitaspectwidget.cpp   |  8 ++++++--
 .../tools/kitaspect/toolkitaspectwidget.h     |  3 +++
 .../settings/tools/toolitemsettings.cpp       |  2 ++
 .../settings/tools/toolitemsettings.h         | 10 +++++++---
 .../settings/tools/toolsmodel.cpp             |  9 ++++++---
 .../settings/tools/toolsmodel.h               |  6 +++++-
 .../settings/tools/toolssettingsaccessor.cpp  | 12 +++++++++---
 .../settings/tools/toolssettingsaccessor.h    |  6 ++++--
 .../settings/tools/toolssettingspage.cpp      |  3 ++-
 .../settings/tools/toolssettingspage.h        |  2 ++
 .../settings/tools/toolssettingswidget.cpp    |  3 +++
 .../settings/tools/toolssettingswidget.h      |  5 +++--
 .../settings/tools/tooltreeitem.cpp           |  4 ++++
 .../settings/tools/tooltreeitem.h             |  7 ++++++-
 .../tests/testmesoninfoparser.cpp             |  4 +++-
 .../tests/testmesonparser.cpp                 | 10 ++++++----
 .../tests/testmesonwrapper.cpp                |  4 +++-
 .../tests/testninjaparser.cpp                 |  6 ++++--
 .../mesonprojectmanager/versionhelper.h       |  4 +++-
 84 files changed, 394 insertions(+), 130 deletions(-)

diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
index 4b63d1ac12e..03a74edea43 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "mesontools.h"
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
index 4a1fe53fc98..1065c6cd5da 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
@@ -22,16 +22,16 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
+#include "mesonpluginconstants.h"
 #include "mesonwrapper.h"
 #include "ninjawrapper.h"
 #include "toolwrapper.h"
-#include <mesonpluginconstants.h>
 
 #include <utils/algorithm.h>
 
-#include <QObject>
-
 #include <memory>
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp
index 4e1fa226810..dfc94d2624f 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp
@@ -24,8 +24,10 @@
 ****************************************************************************/
 
 #include "mesonwrapper.h"
-#include "utils/algorithm.h"
-#include "utils/qtcassert.h"
+
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+
 #include <QUuid>
 
 namespace {
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
index 92893923c34..578010b15e5 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
@@ -24,19 +24,22 @@
 ****************************************************************************/
 
 #pragma once
+
 #include "../mesonpluginconstants.h"
 #include "toolwrapper.h"
-#include "utils/environment.h"
-#include "utils/fileutils.h"
+
+#include <utils/environment.h>
+#include <utils/fileutils.h>
 #include <utils/id.h>
-#include "utils/optional.h"
-#include <tuple>
+#include <utils/optional.h>
+
 #include <QFile>
 #include <QFileInfo>
-#include <QObject>
 #include <QProcess>
 #include <QTemporaryFile>
 
+#include <tuple>
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
index a4fca60ed9c..302774d2ff0 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
@@ -21,10 +21,13 @@
 ** information to ensure the GNU General Public License requirements will
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
-****************************************************************************/
+**************************************************************************/
+
 #pragma once
+
 #include "../mesonpluginconstants.h"
 #include "toolwrapper.h"
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
index 716026c66c0..2e2ad082874 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
@@ -22,6 +22,7 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "toolwrapper.h"
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
index 5f58dbac316..b03f8d4816f 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
@@ -22,15 +22,18 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
+#include "versionhelper.h"
+
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/id.h>
 #include <utils/qtcassert.h>
-#include <versionhelper.h>
+
 #include <QFileInfo>
 #include <QProcess>
-#include <QString>
 #include <QUuid>
 #include <QVariant>
 #include <QVariantMap>
diff --git a/src/plugins/mesonprojectmanager/kithelper/kitdata.h b/src/plugins/mesonprojectmanager/kithelper/kitdata.h
index a4463a66402..8a156b29933 100644
--- a/src/plugins/mesonprojectmanager/kithelper/kitdata.h
+++ b/src/plugins/mesonprojectmanager/kithelper/kitdata.h
@@ -22,11 +22,16 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <utils/cpplanguage_details.h>
+
 #include <QString>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 struct KitData
 {
     QString cCompilerPath;
diff --git a/src/plugins/mesonprojectmanager/kithelper/kithelper.h b/src/plugins/mesonprojectmanager/kithelper/kithelper.h
index 02abb83f7f7..e48c6b8ac9f 100644
--- a/src/plugins/mesonprojectmanager/kithelper/kithelper.h
+++ b/src/plugins/mesonprojectmanager/kithelper/kithelper.h
@@ -22,22 +22,29 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
+#pragma once
+
 #include "kitdata.h"
+#include "versionhelper.h"
+
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
+
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
-#include <versionhelper.h>
-#include <QString>
-#pragma once
+
 namespace MesonProjectManager {
 namespace Internal {
+
 namespace KitHelper {
 namespace details {
+
 inline QString expand(const ProjectExplorer::Kit *kit, const QString &macro)
 {
     return kit->macroExpander()->expand(macro);
 }
+
 } // namespace details
 
 inline QString cCompilerPath(const ProjectExplorer::Kit *kit)
diff --git a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp b/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp
index b4bffabd0b9..390d4a91907 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp
+++ b/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp
@@ -24,12 +24,16 @@
 ****************************************************************************/
 
 #include "machinefilemanager.h"
+
+#include "kithelper/kitdata.h"
+#include "kithelper/kithelper.h"
 #include "nativefilegenerator.h"
-#include <kithelper/kitdata.h>
-#include <kithelper/kithelper.h>
+
 #include <coreplugin/icore.h>
+
 #include <utils/optional.h>
 #include <utils/qtcassert.h>
+
 #include <QDir>
 #include <QFile>
 #include <QRegularExpression>
diff --git a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h b/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h
index e4fe27b6bca..c041745c372 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h
+++ b/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h
@@ -22,11 +22,13 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
+
 #include <utils/fileutils.h>
-#include <QObject>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp b/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
index 249c96809f4..ae456ec8b5f 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
+++ b/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
@@ -22,17 +22,22 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "nativefilegenerator.h"
-#include <kithelper/kithelper.h>
+
+#include "kithelper/kithelper.h"
+
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
+
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 NativeFileGenerator::NativeFileGenerator() {}
 
 inline void addEntry(QIODevice *nativeFile, const QString &key, const QString &value)
@@ -58,5 +63,6 @@ void NativeFileGenerator::makeNativeFile(QIODevice *nativeFile, const KitData &k
     QTC_ASSERT(nativeFile, return );
     writeBinariesSection(nativeFile, kitData);
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h b/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h
index fab2472333d..4f07bf7b07b 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h
+++ b/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h
@@ -22,12 +22,18 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
-#include <kithelper/kitdata.h>
+
+#include "kithelper/kitdata.h"
+
 #include <projectexplorer/kit.h>
+
 #include <QIODevice>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class NativeFileGenerator
 {
     NativeFileGenerator();
@@ -35,5 +41,6 @@ class NativeFileGenerator
 public:
     static void makeNativeFile(QIODevice *nativeFile, const KitData &kitData);
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp b/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp
index 521b0ba865f..6d616b983c8 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp
@@ -24,14 +24,18 @@
 ****************************************************************************/
 
 #include "mesonactionsmanager.h"
+
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
+
 #include <project/mesonbuildsystem.h>
 #include <project/projecttree/mesonprojectnodes.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projecttree.h>
+
 #include <utils/parameteraction.h>
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h
index 34bf2eb4443..66abef199f9 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h
@@ -22,12 +22,14 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <utils/parameteraction.h>
-#include <QAction>
-#include <QObject>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonActionsManager : public QObject
 {
     Q_OBJECT
@@ -42,5 +44,6 @@ class MesonActionsManager : public QObject
 public:
     MesonActionsManager();
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h b/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
index f1b1a6eefc7..68d077a1d13 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
@@ -22,17 +22,19 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <utils/fileutils.h>
 #include <utils/optional.h>
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpinBox>
-#include <QString>
 #include <QVariant>
-#include <QWidget>
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h b/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h
index 258c01a6dd4..90e0a403503 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h
@@ -22,13 +22,18 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
-#include <versionhelper.h>
+
+#include "versionhelper.h"
+
 namespace MesonProjectManager {
 namespace Internal {
+
 struct MesonInfo
 {
     Version mesonVersion;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h
index 7db6d96acfd..4f54a81ed00 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h
@@ -22,7 +22,9 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "buildoptions.h"
 #include "mesoninfo.h"
 #include "parsers/buildoptionsparser.h"
@@ -30,15 +32,17 @@
 #include "parsers/infoparser.h"
 #include "parsers/targetparser.h"
 #include "target.h"
+
 #include <utils/fileutils.h>
 #include <utils/optional.h>
-#include <QString>
-#include <QVariant>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonInfoParserPrivate;
 
 namespace MesonInfoParser {
+
 struct Result
 {
     TargetsList targets;
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h
index bbceb83a57e..2d4a69da37c 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h
@@ -22,10 +22,12 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "../../mesonpluginconstants.h"
 #include "../buildoptions.h"
-#include "./common.h"
+#include "common.h"
 
 #include <QFile>
 #include <QJsonArray>
@@ -113,5 +115,6 @@ public:
         return std::move(m_buildOptions);
     }
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
index 2bd9a469728..fe95f61f130 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
@@ -22,10 +22,14 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "../../mesonpluginconstants.h"
-#include "./common.h"
-#include "utils/fileutils.h"
+#include "common.h"
+
+#include <utils/fileutils.h>
+
 #include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -72,5 +76,6 @@ public:
 
     std::vector<Utils::FilePath> files() { return m_files; };
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h
index 081b93771e5..9ac2e50eba7 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h
@@ -22,8 +22,11 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <utils/optional.h>
+
 #include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h
index 883102a6e3c..bb20d8e0900 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h
@@ -22,10 +22,12 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "../../mesonpluginconstants.h"
 #include "../mesoninfo.h"
-#include "./common.h"
+
 #include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -65,5 +67,6 @@ public:
     }
     MesonInfo info() { return m_info; }
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
index f016cff936a..243c96fe3d7 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
@@ -22,10 +22,12 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "../../mesonpluginconstants.h"
 #include "../target.h"
-#include "./common.h"
+
 #include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -102,5 +104,6 @@ public:
 
     inline TargetsList targetList() { return m_targets; }
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/target.h b/src/plugins/mesonprojectmanager/mesoninfoparser/target.h
index 55d5938e494..9761b2ff6f0 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/target.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/target.h
@@ -22,12 +22,14 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/optional.h>
+
 #include <QDir>
-#include <QString>
 #include <QVariant>
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
index 6e0b58e1f9a..a83f489acb6 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "mesonprojectplugin.h"
+
 #include "exewrappers/mesonwrapper.h"
 #include "machinefiles/machinefilemanager.h"
 #include "mesonactionsmanager/mesonactionsmanager.h"
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp
index 85cb089f232..57cd625081e 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp
@@ -22,18 +22,22 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
-#include <coreplugin/find/itemviewfind.h>
-#include <projectexplorer/buildaspects.h>
-#include <projectexplorer/projectconfiguration.h>
-#include <utils/detailswidget.h>
-#include <utils/headerviewstretcher.h>
-#include <utils/layoutbuilder.h>
+
+#include "mesonbuildsettingswidget.h"
 
 #include "../mesonbuildconfiguration.h"
 #include "../mesonbuildsystem.h"
-#include "mesonbuildsettingswidget.h"
 #include "ui_mesonbuildsettingswidget.h"
 
+#include <coreplugin/find/itemviewfind.h>
+
+#include <projectexplorer/buildaspects.h>
+#include <projectexplorer/projectconfiguration.h>
+
+#include <utils/detailswidget.h>
+#include <utils/headerviewstretcher.h>
+#include <utils/layoutbuilder.h>
+
 using namespace Utils;
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
index b5fec334eb2..8ae5ab89760 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
@@ -22,15 +22,17 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "optionsmodel/buildoptionsmodel.h"
 
+#include <projectexplorer/namedwidget.h>
+
 #include <utils/categorysortfiltermodel.h>
 #include <utils/progressindicator.h>
-#include <projectexplorer/namedwidget.h>
 
 #include <QTimer>
-#include <QWidget>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
index 3391a972d0e..16c85eaae91 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
@@ -24,8 +24,10 @@
 ****************************************************************************/
 
 #include "arrayoptionlineedit.h"
+
 namespace MesonProjectManager {
 namespace Internal {
+
 ArrayOptionLineEdit::ArrayOptionLineEdit(QWidget *parent)
     : QPlainTextEdit(parent)
 {
@@ -84,5 +86,6 @@ void RegexHighlighter::highlightBlock(const QString &text)
         }
     }
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h
index 5107ffee7e8..c2b622a1e22 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h
@@ -22,12 +22,13 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <QColor>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
 #include <QSyntaxHighlighter>
-#include <QWidget>
 
 namespace MesonProjectManager {
 namespace Internal {
@@ -56,5 +57,6 @@ public:
 protected:
     void keyPressEvent(QKeyEvent *e) override;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp
index 061d52249e3..92405c01352 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp
@@ -24,7 +24,9 @@
 ****************************************************************************/
 
 #include "buildoptionsmodel.h"
+
 #include "arrayoptionlineedit.h"
+
 #include <QComboBox>
 #include <QLabel>
 #include <QLineEdit>
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
index 283af738ce0..3e6c8e246f6 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
@@ -22,7 +22,9 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "mesoninfoparser/mesoninfoparser.h"
 
 #include <utils/qtcassert.h>
@@ -31,7 +33,6 @@
 #include <QAbstractTableModel>
 #include <QFont>
 #include <QItemEditorFactory>
-#include <QObject>
 #include <QStyledItemDelegate>
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
index 0736a693829..4334e431dc3 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
@@ -23,6 +23,15 @@
 **
 ****************************************************************************/
 
+#include "mesonbuildconfiguration.h"
+
+#include "buildoptions/mesonbuildsettingswidget.h"
+#include "exewrappers/mesonwrapper.h"
+#include "mesonbuildsystem.h"
+#include "mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
+#include "ninjabuildstep.h"
+
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildstep.h>
@@ -31,20 +40,14 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmacroexpander.h>
+
 #include <utils/fileutils.h>
 
 #include <QDir>
 
-#include "buildoptions/mesonbuildsettingswidget.h"
-#include "mesonbuildconfiguration.h"
-#include "mesonbuildsystem.h"
-#include "mesonpluginconstants.h"
-#include "ninjabuildstep.h"
-#include <exewrappers/mesonwrapper.h>
-#include <mesonpluginconstants.h>
-
 namespace MesonProjectManager {
 namespace Internal {
+
 MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::BuildConfiguration{target, id}
 {
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
index 4e36c843a27..3b1f9075cd8 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
@@ -125,5 +125,6 @@ class MesonBuildConfigurationFactory final : public ProjectExplorer::BuildConfig
 public:
     MesonBuildConfigurationFactory();
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
index 28f3fda6fb1..d977c124535 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
@@ -24,17 +24,20 @@
 ****************************************************************************/
 
 #include "mesonbuildsystem.h"
+
 #include "mesonbuildconfiguration.h"
-#include <kithelper/kithelper.h>
-#include <machinefiles/machinefilemanager.h>
+#include "kithelper/kithelper.h"
+#include "machinefiles/machinefilemanager.h"
+#include "settings/general/settings.h"
+#include "settings/tools/kitaspect/mesontoolkitaspect.h"
+
 #include <projectexplorer/buildconfiguration.h>
-#include <settings/general/settings.h>
-#include <settings/tools/kitaspect/mesontoolkitaspect.h>
+
+#include <qtsupport/qtcppkitinfo.h>
+#include <qtsupport/qtkitinformation.h>
 
 #include <QDir>
 #include <QLoggingCategory>
-#include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
 
 #define LEAVE_IF_BUSY() \
     { \
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h b/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h
index e61a9ef7349..c309d31caaf 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h
@@ -22,19 +22,23 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "mesonprojectparser.h"
-#include <exewrappers/mesonwrapper.h>
-#include <kithelper/kitdata.h>
+#include "exewrappers/mesonwrapper.h"
+#include "kithelper/kitdata.h"
 
 #include <cpptools/cppprojectupdater.h>
+
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/target.h>
+
 #include <utils/filesystemwatcher.h>
-#include <QObject>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonBuildConfiguration;
 class MesonBuildSystem final : public ProjectExplorer::BuildSystem
 {
@@ -73,5 +77,6 @@ private:
     Utils::FileSystemWatcher m_IntroWatcher;
     KitData m_kitData;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp b/src/plugins/mesonprojectmanager/project/mesonprocess.cpp
index 5daf3d227f2..6b47fd75e4c 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprocess.cpp
@@ -24,18 +24,22 @@
 ****************************************************************************/
 
 #include "mesonprocess.h"
+
 #include "outputparsers/mesonoutputparser.h"
 
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/taskhub.h>
+
 #include <utils/stringutils.h>
 
 #include <QLoggingCategory>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 static Q_LOGGING_CATEGORY(mesonProcessLog, "qtc.meson.buildsystem", QtDebugMsg);
 
 MesonProcess::MesonProcess()
diff --git a/src/plugins/mesonprojectmanager/project/mesonprocess.h b/src/plugins/mesonprojectmanager/project/mesonprocess.h
index 235dffc80f7..9c5c6db9a97 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprocess.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprocess.h
@@ -22,8 +22,10 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
-#include <exewrappers/mesonwrapper.h>
+
+#include "exewrappers/mesonwrapper.h"
 
 #include <utils/qtcprocess.h>
 
@@ -39,6 +41,7 @@
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonProcess final : public QObject
 {
     Q_OBJECT
@@ -83,5 +86,6 @@ private:
     QByteArray m_stderr;
     Command m_currentCommand;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/mesonproject.cpp b/src/plugins/mesonprojectmanager/project/mesonproject.cpp
index 5398a75d550..027b6534125 100644
--- a/src/plugins/mesonprojectmanager/project/mesonproject.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonproject.cpp
@@ -24,18 +24,22 @@
 ****************************************************************************/
 
 #include "mesonproject.h"
+
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
-#include <exewrappers/mesontools.h>
-#include <settings/tools/kitaspect/mesontoolkitaspect.h>
-#include <settings/tools/kitaspect/ninjatoolkitaspect.h>
+#include "exewrappers/mesontools.h"
+#include "settings/tools/kitaspect/mesontoolkitaspect.h"
+#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
+
 #include <coreplugin/icontext.h>
+
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 MesonProject::MesonProject(const Utils::FilePath &path)
     : ProjectExplorer::Project{Constants::Project::MIMETYPE, path}
 {
diff --git a/src/plugins/mesonprojectmanager/project/mesonproject.h b/src/plugins/mesonprojectmanager/project/mesonproject.h
index bffbb5f0437..3842e1ce061 100644
--- a/src/plugins/mesonprojectmanager/project/mesonproject.h
+++ b/src/plugins/mesonprojectmanager/project/mesonproject.h
@@ -22,18 +22,21 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "exewrappers/mesonwrapper.h"
 #include "mesonprojectimporter.h"
 
-#include "projectexplorer/project.h"
-#include "projectexplorer/projectimporter.h"
-#include "projectexplorer/task.h"
-#include "utils/fileutils.h"
-#include <QObject>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectimporter.h>
+#include <projectexplorer/task.h>
+
+#include <utils/fileutils.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonProject final : public ProjectExplorer::Project
 {
     Q_OBJECT
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp
index 60f1b26c3ae..5b00db82380 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp
@@ -22,6 +22,7 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "mesonprojectimporter.h"
 
 #include <QLoggingCategory>
@@ -32,6 +33,7 @@ static Q_LOGGING_CATEGORY(mInputLog, "qtc.meson.import", QtWarningMsg);
 
 namespace MesonProjectManager {
 namespace Internal {
+
 MesonProjectImporter::MesonProjectImporter(const Utils::FilePath &path)
     : QtSupport::QtProjectImporter{path}
 {}
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h
index 2ae3c36dd9d..1ceffdac055 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h
@@ -22,16 +22,19 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
 
 #include "exewrappers/mesonwrapper.h"
 
-#include "projectexplorer/buildinfo.h"
-#include "projectexplorer/kit.h"
-#include "qtsupport/qtprojectimporter.h"
+#include <projectexplorer/buildinfo.h>
+#include <projectexplorer/kit.h>
+
+#include <qtsupport/qtprojectimporter.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonProjectImporter final : public QtSupport::QtProjectImporter
 {
 public:
@@ -50,5 +53,6 @@ private:
 
     virtual void deleteDirectoryData(void *directoryData) const final;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
index 0c6d6074272..09a802d5f97 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
@@ -22,14 +22,18 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "mesonprojectparser.h"
+
 #include "projecttree/mesonprojectnodes.h"
 #include "projecttree/projecttree.h"
-#include <exewrappers/mesontools.h>
-#include <mesoninfoparser/mesoninfoparser.h>
+#include "exewrappers/mesontools.h"
+#include "mesoninfoparser/mesoninfoparser.h"
 
 #include <coreplugin/messagemanager.h>
+
 #include <projectexplorer/projectexplorer.h>
+
 #include <utils/fileinprojectfinder.h>
 #include <utils/optional.h>
 #include <utils/runextensions.h>
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
index 3eeb0ba9105..57805060f0a 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
@@ -22,25 +22,30 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
+#include "exewrappers/mesonwrapper.h"
+#include "kithelper/kitdata.h"
+#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesonprocess.h"
 #include "outputparsers/mesonoutputparser.h"
 #include "projecttree/mesonprojectnodes.h"
-#include "mesonprocess.h"
-#include <exewrappers/mesonwrapper.h>
-#include <kithelper/kitdata.h>
-#include <mesoninfoparser/mesoninfoparser.h>
+
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/rawprojectpart.h>
+
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QObject>
 #include <QQueue>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonProjectParser : public QObject
 {
     Q_OBJECT
@@ -127,5 +132,6 @@ private:
     // also this should ease command dependencies
     QQueue<std::tuple<Command, bool>> m_pendingCommands;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
index 28e2a3579a9..66b10555a58 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
@@ -22,18 +22,23 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "mesonrunconfiguration.h"
-#include <mesonpluginconstants.h>
+
+#include "mesonpluginconstants.h"
+
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/desktoprunconfiguration.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/runconfigurationaspects.h>
+
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
-#include <QLatin1String>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::RunConfiguration{target, id}
 {
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
index 896380d4c5a..7e657201ca9 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
@@ -22,13 +22,16 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <projectexplorer/desktoprunconfiguration.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonRunConfiguration final : public ProjectExplorer::RunConfiguration
 {
 public:
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
index 74d75acdbe8..610f925308e 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
@@ -25,12 +25,12 @@
 
 #include "ninjabuildstep.h"
 
-#include "outputparsers/mesonoutputparser.h"
 #include "mesonbuildconfiguration.h"
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
-#include <settings/general/settings.h>
-#include <settings/tools/kitaspect/ninjatoolkitaspect.h>
+#include "outputparsers/mesonoutputparser.h"
+#include "settings/general/settings.h"
+#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
 
 #include <coreplugin/find/itemviewfind.h>
 
@@ -50,6 +50,7 @@ using namespace Utils;
 
 namespace MesonProjectManager {
 namespace Internal {
+
 const char TARGETS_KEY[] = "MesonProjectManager.BuildStep.BuildTargets";
 const char TOOL_ARGUMENTS_KEY[] = "MesonProjectManager.BuildStep.AdditionalArguments";
 
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
index f9a41fcf856..c4a6a81875b 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
@@ -22,16 +22,19 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
 
 #include "outputparsers/ninjaparser.h"
+
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildstep.h>
+
 #include <utils/qtcprocess.h>
-#include <QObject>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class NinjaBuildStep final : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp
index 6cd631d4640..f49ddd75e9a 100644
--- a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp
@@ -22,9 +22,12 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "mesonoutputparser.h"
+
 #include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h
index 49eff4fb64b..c78b78e13e7 100644
--- a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h
+++ b/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h
@@ -22,15 +22,20 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
-#include "projectexplorer/ioutputparser.h"
-#include "utils/outputformatter.h"
-#include <array>
-#include <QObject>
+
+#include <projectexplorer/ioutputparser.h>
+
+#include <utils/outputformatter.h>
+
 #include <QRegularExpression>
 
+#include <array>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonOutputParser final : public ProjectExplorer::OutputTaskParser
 {
     Q_OBJECT
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp
index 8594619d86a..cc8f2c0a290 100644
--- a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp
@@ -24,9 +24,12 @@
 ****************************************************************************/
 
 #include "ninjaparser.h"
+
 #include <utils/fileutils.h>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 NinjaParser::NinjaParser() {}
 
 Utils::optional<int> NinjaParser::extractProgress(const QString &line)
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h
index 209f0efc475..061ac7cc16e 100644
--- a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h
+++ b/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h
@@ -22,14 +22,19 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/task.h>
+
 #include <utils/optional.h>
-#include <QObject>
+
 #include <QRegularExpression>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class NinjaParser final : public ProjectExplorer::OutputTaskParser
 {
     Q_OBJECT
@@ -45,5 +50,6 @@ public:
     bool hasFatalErrors() const override;
     Q_SIGNAL void reportProgress(int progress);
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp b/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp
index ec13a6518df..41d202026f8 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp
+++ b/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp
@@ -24,11 +24,14 @@
 ****************************************************************************/
 
 #include "mesonprojectnodes.h"
-#include <project/mesonbuildconfiguration.h>
-#include <project/mesonbuildsystem.h>
-#include <mesonpluginconstants.h>
+
+#include "project/mesonbuildconfiguration.h"
+#include "project/mesonbuildsystem.h"
+#include "mesonpluginconstants.h"
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
+
 namespace MesonProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h b/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h
index 8ff23caf0df..2419ac0d6eb 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h
+++ b/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h
@@ -22,13 +22,18 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <coreplugin/fileiconprovider.h>
+
 #include <projectexplorer/projectnodes.h>
+
 #include <utils/fileutils.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
@@ -57,5 +62,6 @@ public:
         return filePath().pathAppended("meson.build");
     }
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp b/src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp
index 815097653e0..cd1eaa76b1e 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp
+++ b/src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp
@@ -22,10 +22,14 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "projecttree.h"
+
 #include <set>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 ProjectTree::ProjectTree() {}
 
 void buildTargetTree(std::unique_ptr<MesonProjectNode> &root, const Target &target)
@@ -93,5 +97,6 @@ std::unique_ptr<MesonProjectNode> ProjectTree::buildTree(const Utils::FilePath &
     }
     return root;
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h b/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h
index 7df02ea55b5..98ceec7bf3d 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h
+++ b/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h
@@ -22,12 +22,17 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include "mesoninfoparser/mesoninfoparser.h"
 #include "mesonprojectnodes.h"
+
 #include <utils/fileutils.h>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 class ProjectTree
 {
 public:
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.cpp b/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.cpp
index 0c674780316..0b415cf97f1 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.cpp
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.cpp
@@ -24,10 +24,10 @@
 ****************************************************************************/
 
 #include "generalsettingspage.h"
-#include "generalsettingswidget.h"
-#include "settings.h"
 
-#include <mesonpluginconstants.h>
+#include "generalsettingswidget.h"
+#include "mesonpluginconstants.h"
+#include "settings.h"
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.h b/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.h
index bbcbe67990c..30ebe94b849 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.h
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingspage.h
@@ -31,7 +31,9 @@
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonTools;
+
 class GeneralSettingsPage final : public Core::IOptionsPage
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::GeneralSettingsPage)
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.cpp b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.cpp
index 4adfad656d0..f92659fe5f3 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.cpp
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.cpp
@@ -24,11 +24,13 @@
 ****************************************************************************/
 
 #include "generalsettingswidget.h"
+
 #include "settings.h"
 #include "ui_generalsettingswidget.h"
 
 namespace MesonProjectManager {
 namespace Internal {
+
 GeneralSettingsWidget::GeneralSettingsWidget()
     : Core::IOptionsPageWidget()
     , ui(new Ui::GeneralSettingsWidget)
@@ -48,5 +50,6 @@ void GeneralSettingsWidget::apply()
     Settings::setAutorunMeson(ui->autorunChkBox->isChecked());
     Settings::setVerboseNinja(ui->verboseNinjaChkBox->isChecked());
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
index d16e6ec7559..04cc8adb698 100644
--- a/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
+++ b/src/plugins/mesonprojectmanager/settings/general/generalsettingswidget.h
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #pragma once
+
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QCoreApplication>
@@ -47,5 +48,6 @@ public:
 private:
     Ui::GeneralSettingsWidget *ui;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.cpp b/src/plugins/mesonprojectmanager/settings/general/settings.cpp
index 7be0c1c0176..49151f74465 100644
--- a/src/plugins/mesonprojectmanager/settings/general/settings.cpp
+++ b/src/plugins/mesonprojectmanager/settings/general/settings.cpp
@@ -24,12 +24,15 @@
 ****************************************************************************/
 
 #include "settings.h"
+
 namespace MesonProjectManager {
 namespace Internal {
+
 Settings::Settings(QObject *parent)
     : QObject(parent)
     , m_autorunMeson(true)
     , m_verboseNinja(true)
 {}
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.h b/src/plugins/mesonprojectmanager/settings/general/settings.h
index c9228e118dc..e25ff28f583 100644
--- a/src/plugins/mesonprojectmanager/settings/general/settings.h
+++ b/src/plugins/mesonprojectmanager/settings/general/settings.h
@@ -22,12 +22,16 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
+#include "mesonpluginconstants.h"
+
 #include <coreplugin/icore.h>
-#include <mesonpluginconstants.h>
-#include <QObject>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 template<class F>
 void with_group(QSettings *settings, const QString &name, const F &f)
 {
@@ -85,5 +89,6 @@ public:
         });
     }
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
index c98bf5db7c8..8ff557354e2 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
@@ -24,7 +24,9 @@
 ****************************************************************************/
 
 #include "mesontoolkitaspect.h"
+
 #include "toolkitaspectwidget.h"
+
 #include <utils/qtcassert.h>
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
index a35bdc083c2..bc4ae4d1cf9 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
@@ -24,13 +24,15 @@
 ****************************************************************************/
 
 #pragma once
-#include <exewrappers/mesontools.h>
+
+#include "exewrappers/mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonToolKitAspect final : public ProjectExplorer::KitAspect
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::MesonToolKitAspect)
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
index d5fafc3e378..873c1de4f42 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
@@ -24,8 +24,10 @@
 ****************************************************************************/
 
 #include "ninjatoolkitaspect.h"
+
 #include "toolkitaspectwidget.h"
-#include "utils/qtcassert.h"
+
+#include <utils/qtcassert.h>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
index 91863212ef0..346c74c7043 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
@@ -24,13 +24,15 @@
 ****************************************************************************/
 
 #pragma once
-#include <exewrappers/mesontools.h>
+
+#include "exewrappers/mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class NinjaToolKitAspect final : public ProjectExplorer::KitAspect
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::NinjaToolKitAspect)
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
index d1810caf59b..efd9d3730ba 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
@@ -24,14 +24,17 @@
 ****************************************************************************/
 
 #include "toolkitaspectwidget.h"
-#include "coreplugin/icore.h"
+
 #include "mesonpluginconstants.h"
 #include "mesontoolkitaspect.h"
 #include "ninjatoolkitaspect.h"
-#include "utils/qtcassert.h"
+
+#include <coreplugin/icore.h>
+#include <utils/qtcassert.h>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 ToolKitAspectWidget::ToolKitAspectWidget(ProjectExplorer::Kit *kit,
                                          const ProjectExplorer::KitAspect *ki,
                                          ToolType type)
@@ -140,5 +143,6 @@ void ToolKitAspectWidget::setToDefault()
         setCurrentToolIndex(0);
     }
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
index af2af7c12ee..7758c1ed827 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
@@ -27,6 +27,7 @@
 #include "exewrappers/mesonwrapper.h"
 #include "mesontoolkitaspect.h"
 #include "ninjatoolkitaspect.h"
+
 #include <projectexplorer/kitmanager.h>
 
 #include <QComboBox>
@@ -35,6 +36,7 @@
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class ToolKitAspectWidget final : public ProjectExplorer::KitAspectWidget
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolKitAspect)
@@ -76,5 +78,6 @@ private:
     QPushButton *m_manageButton;
     ToolType m_type;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
index c5ae4e21517..2bf9b22648f 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
@@ -24,11 +24,13 @@
 ****************************************************************************/
 
 #include "toolitemsettings.h"
+
 #include "tooltreeitem.h"
 #include "ui_toolitemsettings.h"
 
 namespace MesonProjectManager {
 namespace Internal {
+
 ToolItemSettings::ToolItemSettings(QWidget *parent)
     : QWidget(parent)
     , ui(new Ui::ToolItemSettings)
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
index 988add23bef..e66761bd970 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
@@ -24,15 +24,18 @@
 ****************************************************************************/
 
 #pragma once
-#include "utils/id.h"
-#include "utils/fileutils.h"
-#include "utils/optional.h"
+
+#include <utils/id.h>
+#include <utils/fileutils.h>
+#include <utils/optional.h>
+
 #include <QWidget>
 
 namespace MesonProjectManager {
 namespace Internal {
 
 namespace Ui { class ToolItemSettings; }
+
 class ToolTreeItem;
 
 class ToolItemSettings : public QWidget
@@ -50,5 +53,6 @@ private:
     Ui::ToolItemSettings *ui;
     Utils::optional<Utils::Id> m_currentId{Utils::nullopt};
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
index f0ab43e45f7..6bdd0a54f8a 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
@@ -24,10 +24,12 @@
 ****************************************************************************/
 
 #include "toolsmodel.h"
+
 #include "tooltreeitem.h"
-#include "utils/qtcassert.h"
-#include "utils/stringutils.h"
-#include <exewrappers/mesontools.h>
+#include "exewrappers/mesontools.h"
+
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 namespace MesonProjectManager {
 namespace Internal {
@@ -113,5 +115,6 @@ Utils::TreeItem *ToolsModel::manualGroup() const
 {
     return rootItem()->childAt(1);
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
index 8bbcc1bb38e..88043501a30 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
@@ -25,16 +25,19 @@
 
 #pragma once
 
+#include "exewrappers/mesontools.h"
 #include "toolssettingspage.h"
-#include <exewrappers/mesontools.h>
 
 #include <utils/treemodel.h>
+
 #include <QCoreApplication>
 #include <QQueue>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class ToolTreeItem;
+
 class ToolsModel final : public Utils::TreeModel<Utils::TreeItem, Utils::TreeItem, ToolTreeItem>
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage)
@@ -54,5 +57,6 @@ private:
     Utils::TreeItem *manualGroup() const;
     QQueue<Utils::Id> m_itemsToRemove;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp
index 52831dd41fe..fc20ca47847 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp
@@ -24,17 +24,22 @@
 ****************************************************************************/
 
 #include "toolssettingsaccessor.h"
+
+#include "mesonpluginconstants.h"
+
 #include <app/app_version.h>
 #include <coreplugin/icore.h>
-#include <iterator>
-#include <mesonpluginconstants.h>
 #include <utils/fileutils.h>
-#include <vector>
+
 #include <QCoreApplication>
 #include <QVariantMap>
 
+#include <iterator>
+#include <vector>
+
 namespace MesonProjectManager {
 namespace Internal {
+
 namespace {
 inline QString entryName(int index)
 {
@@ -93,5 +98,6 @@ std::vector<MesonTools::Tool_t> ToolsSettingsAccessor::loadMesonTools(QWidget *p
     }
     return result;
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h b/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h
index b607666b46f..c508a130abd 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h
@@ -24,8 +24,10 @@
 ****************************************************************************/
 
 #pragma once
-#include "utils/settingsaccessor.h"
-#include <exewrappers/mesontools.h>
+
+#include "exewrappers/mesontools.h"
+
+#include <utils/settingsaccessor.h>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp
index d9c4aff2710..33a372137b1 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp
@@ -24,8 +24,9 @@
 ****************************************************************************/
 
 #include "toolssettingspage.h"
+
+#include "mesonpluginconstants.h"
 #include "toolssettingswidget.h"
-#include <mesonpluginconstants.h>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h b/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h
index 8550f5dbd4b..af517551006 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h
@@ -31,7 +31,9 @@
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class MesonTools;
+
 class ToolsSettingsPage final : public Core::IOptionsPage
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage)
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp
index 075e4956d58..7fe4824ba44 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp
@@ -24,12 +24,14 @@
 ****************************************************************************/
 
 #include "toolssettingswidget.h"
+
 #include "toolsmodel.h"
 #include "tooltreeitem.h"
 #include "ui_toolssettingswidget.h"
 
 namespace MesonProjectManager {
 namespace Internal {
+
 ToolsSettingsWidget::ToolsSettingsWidget()
     : Core::IOptionsPageWidget()
     , ui(new Ui::ToolsSettingsWidget)
@@ -89,5 +91,6 @@ void ToolsSettingsWidget::apply()
 {
     m_model.apply();
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
index 26739e88b9e..06aef812d2e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
@@ -24,15 +24,15 @@
 ****************************************************************************/
 
 #pragma once
+
+#include "exewrappers/mesonwrapper.h"
 #include "toolitemsettings.h"
 #include "toolsmodel.h"
-#include <exewrappers/mesonwrapper.h>
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QCoreApplication>
 #include <QTabWidget>
-#include <QWidget>
 
 namespace MesonProjectManager {
 namespace Internal {
@@ -58,5 +58,6 @@ private:
     ToolItemSettings *m_itemSettings;
     ToolTreeItem *m_currentItem = nullptr;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
index 3fe2374242f..61a93416367 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
@@ -24,12 +24,15 @@
 ****************************************************************************/
 
 #include "tooltreeitem.h"
+
 #include <utils/utilsicons.h>
+
 #include <QFileInfo>
 #include <QUuid>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 ToolTreeItem::ToolTreeItem(const QString &name)
     : m_name{name}
     , m_autoDetected{false}
@@ -131,5 +134,6 @@ void ToolTreeItem::update_tooltip()
 {
     update_tooltip(MesonWrapper::read_version(m_executable));
 }
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
index 9937ac9a3f7..c60d4d8a882 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
@@ -24,17 +24,21 @@
 ****************************************************************************/
 
 #pragma once
+
+#include "exewrappers/mesontools.h"
 #include "toolssettingspage.h"
-#include <exewrappers/mesontools.h>
+
 #include <utils/fileutils.h>
 #include <utils/id.h>
 #include <utils/optional.h>
 #include <utils/treemodel.h>
+
 #include <QCoreApplication>
 #include <QString>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 class ToolTreeItem final : public Utils::TreeItem
 {
     Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolsSettingsPage)
@@ -66,5 +70,6 @@ private:
 
     bool m_unsavedChanges = false;
 };
+
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
index 70893a7c3fb..1b91ffcc1dd 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
@@ -25,7 +25,7 @@
 
 #include "exewrappers/mesonwrapper.h"
 #include "mesoninfoparser/mesoninfoparser.h"
-#include <iostream>
+
 #include <QDir>
 #include <QObject>
 #include <QString>
@@ -33,6 +33,8 @@
 #include <QTemporaryFile>
 #include <QtTest/QtTest>
 
+#include <iostream>
+
 using namespace MesonProjectManager::Internal;
 
 struct projectData
diff --git a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
index 6c7b3978e96..6a003cc45dc 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
@@ -23,18 +23,20 @@
 **
 ****************************************************************************/
 
-#include <project/outputparsers/mesonoutputparser.h>
-#include <iostream>
+#include "project/outputparsers/mesonoutputparser.h"
+
 #include <projectexplorer/taskhub.h>
+
 #include <utils/fileinprojectfinder.h>
 #include <utils/theme/theme.h>
 #include <utils/theme/theme_p.h>
+
 #include <QDir>
-#include <QObject>
-#include <QString>
 #include <QTemporaryDir>
 #include <QtTest/QtTest>
 
+#include <iostream>
+
 using namespace MesonProjectManager::Internal;
 
 struct TestData
diff --git a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
index 5e1cb3b4afa..8bca81083bd 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
@@ -24,13 +24,15 @@
 ****************************************************************************/
 
 #include "exewrappers/mesonwrapper.h"
-#include <iostream>
+
 #include <QDir>
 #include <QObject>
 #include <QString>
 #include <QTemporaryDir>
 #include <QtTest/QtTest>
 
+#include <iostream>
+
 using namespace MesonProjectManager::Internal;
 
 namespace {
diff --git a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
index 0ce15301975..321eb02e3ae 100644
--- a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
@@ -23,14 +23,16 @@
 **
 ****************************************************************************/
 
-#include <project/outputparsers/ninjaparser.h>
-#include <iostream>
+#include "project/outputparsers/ninjaparser.h"
+
 #include <QDir>
 #include <QObject>
 #include <QString>
 #include <QTemporaryDir>
 #include <QtTest/QtTest>
 
+#include <iostream>
+
 using namespace MesonProjectManager::Internal;
 
 struct TestData
diff --git a/src/plugins/mesonprojectmanager/versionhelper.h b/src/plugins/mesonprojectmanager/versionhelper.h
index 5db2e238a8f..13993217e2b 100644
--- a/src/plugins/mesonprojectmanager/versionhelper.h
+++ b/src/plugins/mesonprojectmanager/versionhelper.h
@@ -22,12 +22,14 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #pragma once
+
 #include <QRegularExpression>
-#include <QString>
 
 namespace MesonProjectManager {
 namespace Internal {
+
 struct Version
 {
     int major = -1;