diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 3df1c01142d516e9ef1f7443883e9a3163549c71..2bd17a1f820e951f5a691f88a01c6f07bbfc1e32 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -196,14 +196,14 @@ TEST_F(SpecularScanTest, GenerateSimElements) {
     EXPECT_EQ(scan2.numberOfSimulationElements(), 3u);
     for (size_t i = 0; i < sim_elements2.size(); ++i)
         EXPECT_TRUE(sim_elements2[i].isCalculated());
-    
+
     const double offset = 1.;
     scan2.setOffset(offset);
     std::vector<SpecularSimulationElement> sim_elements3 =
         scan2.generateSimulationElements(instrument);
     std::vector<Slice> slices;
     slices.emplace_back(0., MaterialBySLD());
-    for (size_t i = 0; i < sim_elements3.size(); ++i){
+    for (size_t i = 0; i < sim_elements3.size(); ++i) {
         const auto generatedKzs = sim_elements3[i].produceKz(slices);
         EXPECT_EQ(generatedKzs[0].imag(), 0.);
         EXPECT_EQ(2. * generatedKzs[0].real(), scan2_qvector[i] + offset);
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
index 96bfbb0072ee7520dda66c042010224871a75af2..60b0ab6a553c75a327572b7e42ba3f59a69883ad 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
@@ -8,31 +8,27 @@
 // ************************************************************************** //
 
 #include "folderbasedtest.h"
-#include "test_utils.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
 
-FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir)
-{
+FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir) {
     TestUtils::CreateTestDirectory(m_test_dir);
 }
 
-std::string FolderBasedTest::testDir() const
-{
+std::string FolderBasedTest::testDir() const {
     return m_test_dir;
 }
 
 //! Return full path to the test folder. Located in CMAKE_BINARY_DIR/test_output/<m_test_dir>.
 
-std::string FolderBasedTest::testPath() const
-{
+std::string FolderBasedTest::testPath() const {
     return TestUtils::TestDirectoryPath(m_test_dir);
 }
 
 //! Creates an empty directory in main test folder.
 //! Remove recursively previous one with the same name, if exist.
 
-std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const
-{
+std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const {
     auto path = ModelView::Utils::join(testPath(), subdir);
     ModelView::Utils::remove_all(path);
     ModelView::Utils::create_directory(path);
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
index 60b00e265670ae447e987ade2518e40e6767872d..9e5163497d0b14e767b441bd972df8fed445b9cd 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
@@ -15,8 +15,7 @@
 
 //! Convenience class which creates a directory on disk for test content.
 
-class FolderBasedTest : public ::testing::Test
-{
+class FolderBasedTest : public ::testing::Test {
 public:
     FolderBasedTest(const std::string& test_dir);
     ~FolderBasedTest();
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp b/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
index 1ed0ec6ab2c677c805e85f3819a1e54ad9b36dac..757de37ea30172ee103a112edd8b45e3576f735e 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
@@ -8,42 +8,37 @@
 // ************************************************************************** //
 
 #include "test_utils.h"
+#include "mvvm/utils/fileutils.h"
 #include "testconfig.h" // this file is auto generated by the build system in build directory
 #include <QFile>
 #include <QString>
 #include <QTextStream>
-#include "mvvm/utils/fileutils.h"
 #include <stdexcept>
 #include <string>
 
 using namespace ModelView;
 
-std::string TestUtils::TestOutputDir()
-{
+std::string TestUtils::TestOutputDir() {
     return TestConfig::TestOutputDir(); // defined in auto-generated testconfig.h
 }
 
-std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir)
-{
+std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir) {
     std::string result = TestDirectoryPath(test_sub_dir);
     Utils::create_directory(result);
     return result;
 }
 
-std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir)
-{
+std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir) {
     return TestOutputDir() + std::string("/") + test_sub_dir;
 }
 
-std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name)
-{
+std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name) {
 
     return TestDirectoryPath(test_sub_dir) + std::string("/") + file_name;
 }
 
 std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName,
-                                      const std::string& content)
-{
+                                      const std::string& content) {
     std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
 
     QFile file(QString::fromStdString(filename));
@@ -61,8 +56,7 @@ std::string TestUtils::CreateTestFile(const std::string& dirname, const std::str
     return filename;
 }
 
-std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName) {
     std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
 
     QFile file(QString::fromStdString(filename));
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h b/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
index ac0ccf2ba52a590eeb5e447af1ed19b0fd369374..bf48c70799a9f2cfdf1ddc3b991867c3d8e6c28d 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
@@ -10,9 +10,9 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 
+#include "mvvm/model/customvariants.h"
 #include <QString>
 #include <memory>
-#include "mvvm/model/customvariants.h"
 
 //! @file test_utils.h
 //! @brief Collection of utility functions for various unit tests.
@@ -20,15 +20,13 @@
 class QJsonObject;
 class QJsonArray;
 
-namespace ModelView
-{
+namespace ModelView {
 class SessionModel;
 }
 
 //! Various common utils for unit tests.
 
-namespace TestUtils
-{
+namespace TestUtils {
 
 //! Returns full path to the main test folder, as defined by CMake at compile time.
 //! Shoud point to CMAKE_BINARY_DIR/test_output
@@ -54,8 +52,7 @@ std::string CreateTestFile(const std::string& dirname, const std::string& fileNa
 std::string CreateEmptyFile(const std::string& dirname, const std::string& fileName);
 
 template <typename T = std::string, typename... Args>
-std::vector<T> toStringVector(Args&&... args)
-{
+std::vector<T> toStringVector(Args&&... args) {
     std::vector<T> v;
     (v.push_back(std::string(args)), ...);
     return v;
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
index 46ab6bc12b8e4f9a0f137e931967e19bcbca75bb..3dd8ac213d3487671dfc8fcd7e8e3162ec892755 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
@@ -12,8 +12,7 @@
 
 QApplication* WidgetBasedTest::m_app = nullptr;
 
-namespace
-{
+namespace {
 // faking argc and argv
 char progname[] = "testview";
 char* argv[] = {&progname[0], nullptr};
@@ -22,13 +21,11 @@ int argc = 1;
 
 WidgetBasedTest::WidgetBasedTest() {}
 
-void WidgetBasedTest::SetUpTestSuite()
-{
+void WidgetBasedTest::SetUpTestSuite() {
     m_app = new QApplication(argc, argv);
 }
 
-void WidgetBasedTest::TearDownTestSuite()
-{
+void WidgetBasedTest::TearDownTestSuite() {
     delete m_app;
     m_app = 0;
 }
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
index 60b02dc575a6dbab98d5842c39c2d199f4d80526..dc7fe2103bdbdf601b885e607d753d9462cc5583 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
@@ -16,8 +16,7 @@ class QApplication;
 
 //! Convenience class to setup QApplication for tests involving QWidget creation.
 
-class WidgetBasedTest : public ::testing::Test
-{
+class WidgetBasedTest : public ::testing::Test {
 public:
     WidgetBasedTest();
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp b/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
index 6e00903ef61809bb50035ae82a6da2de803b33bb..adc5870aa2f1a07910daa66abeedb7d740288603 100644
--- a/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
+#include "mvvm/model/comparators.h"
 #include <QApplication>
 #include <QStandardItem>
-#include "mvvm/model/comparators.h"
 #include <string>
 
 int main(int argc, char** argv) {
diff --git a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
index 55bc755ef7638db016087db41f4ec47685dfce05..634664c0642f25f50053e6f6f075d22fd97a1be1 100644
--- a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "folderbasedtest.h"
-#include "test_utils.h"
 #include "gui2/dataloader/datahandler.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
 
 using TestUtils::toStringVector;
 using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
index c3ee09bb9e37de4db0e98a0fae8b13d8f3311c1b..5343890388f8bf0e72c096ef7fd4a1c35042b084 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "folderbasedtest.h"
-#include "test_utils.h"
 #include "gui2/dataloader/dataloader_constants.h"
 #include "gui2/dataloader/dataloader_utils.h"
 #include "gui2/importdataview/graphimportdata.h"
+#include "test_utils.h"
 #include <initializer_list>
 #include <vector>
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
index 9d5a3e3b8231f45d09d51c8c448385f1984220bd..fcb299e6372993de2a36dd6682d921c3e0264593 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
 #include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/dataviewmodel.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/graphitem.h"
+#include "test_utils.h"
+#include <QDebug>
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
index b4a77c2e9e301dc3be0bec79b06943c92c517d44..0afddc9aafe0f69a5be1d10aacbaf7dd76762806 100644
--- a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "gui2/dataloader/dataloader_types.h"
 #include "gui2/dataloader/defaultparser.h"
+#include "test_utils.h"
 
 using namespace DaRefl;
 using TestUtils::toStringVector;
diff --git a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
index 36b6e7b8b7fcd6991c2673b5ac565825041df5eb..96b0edc3201e3fd3de76f2912e20988cd51ba5cf 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
@@ -8,7 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/dataviewmodel.h"
 #include "gui2/importdataview/graphimportdata.h"
@@ -19,6 +18,7 @@
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "test_utils.h"
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
index 4931c5936782303ab98b7077e2ba8994c2787d05..7cca2633cb4eeabe3e5568b853e8007c637aba8f 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "gui2/dataloader/dataloader_constants.h"
 #include "gui2/dataloader/dataloader_types.h"
 #include "gui2/dataloader/importtableheader.h"
 #include "mvvm/model/comboproperty.h"
+#include "test_utils.h"
 
 using namespace DaRefl;
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
index 1caff388ff86292441074ed28d9d1d6c1e16b356..c6db07a6c57c258d4f8d48ee966fd0d324cb6f9b 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
@@ -8,8 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
 #include "gui2/layereditor/layereditoractions.h"
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/layereditor/layerviewmodel.h"
@@ -18,6 +16,8 @@
 #include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QDebug>
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
index eaaa037b9b2c0630827a0f2b76cc9fa7183ac392..c09b9073730342f888ab91a9db41386dce0864ea 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
@@ -9,7 +9,6 @@
 
 #include "google_test.h"
 
-#include "test_utils.h"
 #include "gui2/model/materialmodel.h"
 #include "gui2/model/samplemodel.h"
 #include "gui2/sldeditor/graphicsscene.h"
@@ -20,6 +19,7 @@
 #include "gui2/sldeditor/segmentelementview.h"
 #include "gui2/sldeditor/sldelementmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
 
 #include <QColor>
 #include <QGraphicsSceneMouseEvent>
diff --git a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
index ac46cbedd6ebcdbcd9b6bcccb635c59fb90451d2..3711acc1f223cdb88bb031bee0540375a89d13b4 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
+#include "test_utils.h"
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
index 7c69289b980230fe8be5285c22477df19c834126..edf2107ffb3ca915c5b95046f1f0ca029b6adc6e 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/layereditor/layerviewmodel.h"
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
index e207c9a9dae9515d936527a39268d4f5909a8fa9..82d2664d45243afe034d0ef7efa611130ace14d8 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
 #include "gui2/layereditor/layerviewmodel.h"
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QSignalSpy>
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
index c4558635b3070ac6fc2ba2d79bd96709c96a70ee..9419b7be645a2fac058ea5ef6d355a4492c4be42 100644
--- a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
@@ -8,7 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QColor>
 #include "gui2/model/materialitems.h"
 #include "gui2/model/materialmodel.h"
 #include "gui2/model/sampleitems.h"
@@ -16,6 +15,7 @@
 #include "gui2/quicksimeditor/quicksimutils.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itempool.h"
+#include <QColor>
 #include <tuple>
 
 using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
index 20669c61cfaf565d03c6ab443739da19a81e65d9..b394803b27bfc3c71bea2a96b91f03ce00f173a3 100644
--- a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
@@ -9,8 +9,6 @@
 
 #include "google_test.h"
 
-#include "test_utils.h"
-#include <QGraphicsScene>
 #include "gui2/model/materialmodel.h"
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
@@ -18,6 +16,8 @@
 #include "gui2/sldeditor/layerelementcontroller.h"
 #include "gui2/sldeditor/sldelementcontroller.cpp"
 #include "gui2/sldeditor/sldelementmodel.h"
+#include "test_utils.h"
+#include <QGraphicsScene>
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/gui2/core/app_constants.h b/gui2/core/app_constants.h
index 512570d5d6ae1ff92603409bf6d7acec48296c2f..5c6a06d95dc426feadb47f835ba72fe72d4756c9 100644
--- a/gui2/core/app_constants.h
+++ b/gui2/core/app_constants.h
@@ -12,8 +12,7 @@
 
 #include <QString>
 
-namespace DaRefl::Constants
-{
+namespace DaRefl::Constants {
 
 //! Constants for QSettings.
 
diff --git a/gui2/core/version.h b/gui2/core/version.h
index d4c3a4763100942264dd4c116152a86a0ba5768d..95091f2bc5dd83849d5602af2514a8054f35cea2 100644
--- a/gui2/core/version.h
+++ b/gui2/core/version.h
@@ -15,33 +15,28 @@
 
 #include <string>
 
-namespace DaRefl
-{
+namespace DaRefl {
 
 //! Returns major project version.
-inline int ProjectVersionMajor()
-{
+inline int ProjectVersionMajor() {
     const int project_version_major = 0;
     return project_version_major;
 }
 
 //! Returns minor project version.
-inline int ProjectVersionMinor()
-{
+inline int ProjectVersionMinor() {
     const int project_version_minor = 1;
     return project_version_minor;
 }
 
 //! Returns patch project version.
-inline int ProjectVersionPatch()
-{
+inline int ProjectVersionPatch() {
     const int project_version_path = 0;
     return project_version_path;
 }
 
 //! Returns project version string
-inline std::string ProjectVersion()
-{
+inline std::string ProjectVersion() {
     const std::string project_version = "0.1.0";
     return project_version;
 }
diff --git a/gui2/dataloader/datahandler.cpp b/gui2/dataloader/datahandler.cpp
index 777fb9e31a8dd89a1e998cb5538a08475641471d..8abfa71106a96af7a413d51319ab6c7a09a744ce 100644
--- a/gui2/dataloader/datahandler.cpp
+++ b/gui2/dataloader/datahandler.cpp
@@ -9,8 +9,8 @@
 
 #include "gui2/dataloader/datahandler.h"
 #include "gui2/dataloader/dataloader_utils.h"
-#include <iostream>
 #include "mvvm/utils/containerutils.h"
+#include <iostream>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/dataloader_utils.cpp b/gui2/dataloader/dataloader_utils.cpp
index fc26a6a416012b28b5973c20f93ab3518051cf49..93bb0381643d8a0a72f8d32ed95599f0c7f9013f 100644
--- a/gui2/dataloader/dataloader_utils.cpp
+++ b/gui2/dataloader/dataloader_utils.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
-#include "gui2/dataloader/dataloader_constants.h"
 #include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/dataloader/dataloader_constants.h"
 #include "gui2/importdataview/graphimportdata.h"
-#include <fstream>
 #include "mvvm/utils/stringutils.h"
+#include <algorithm>
+#include <fstream>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/dataloaderdialog.cpp b/gui2/dataloader/dataloaderdialog.cpp
index 1fffbc3e866059058ef958ee085654e01528e989..02fdea9e6bef473cbca8515a08a18deee44165a6 100644
--- a/gui2/dataloader/dataloaderdialog.cpp
+++ b/gui2/dataloader/dataloaderdialog.cpp
@@ -7,26 +7,26 @@
 //
 // ************************************************************************** //
 
-#include <QApplication>
-#include <QDebug>
-#include <QDialogButtonBox>
-#include <QKeyEvent>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QSettings>
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/dataloader/dataloaderdialog.h"
 #include "gui2/core/app_constants.h"
 #include "gui2/dataloader/datahandler.h"
 #include "gui2/dataloader/dataloader_types.h"
 #include "gui2/dataloader/dataloader_utils.h"
-#include "gui2/dataloader/dataloaderdialog.h"
 #include "gui2/dataloader/dataloadertoolbar.h"
 #include "gui2/dataloader/loaderpreviewpanel.h"
 #include "gui2/dataloader/loaderselectorpanel.h"
 #include "gui2/dataloader/parserinterface.h"
 #include "mvvm/utils/fileutils.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QApplication>
+#include <QDebug>
+#include <QDialogButtonBox>
+#include <QKeyEvent>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSettings>
+#include <QSplitter>
+#include <QVBoxLayout>
 #include <sstream>
 
 namespace DaRefl {
diff --git a/gui2/dataloader/dataloaderdialog.h b/gui2/dataloader/dataloaderdialog.h
index 69d7f0922abe3e4d2d4981011228ff6c3d9525db..3b22cde93f7d8ea25cf470d6def0d26a1e61b622 100644
--- a/gui2/dataloader/dataloaderdialog.h
+++ b/gui2/dataloader/dataloaderdialog.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_DATALOADER_DATALOADERDIALOG_H
 #define DAREFL_DATALOADER_DATALOADERDIALOG_H
 
-#include <QDialog>
 #include "darefl_export.h"
 #include "gui2/importdataview/graphimportdata.h"
+#include <QDialog>
 #include <memory>
 #include <vector>
 
diff --git a/gui2/dataloader/dataloadertoolbar.cpp b/gui2/dataloader/dataloadertoolbar.cpp
index 1ed5586d62b84bea320cbefe96a3410e713a66ab..3da2e839a9357b46e8957183b5887b8cf1914389 100644
--- a/gui2/dataloader/dataloadertoolbar.cpp
+++ b/gui2/dataloader/dataloadertoolbar.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <QAction>
 #include "gui2/dataloader/dataloadertoolbar.h"
 #include "gui2/mainwindow/styleutils.h"
+#include <QAction>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/dataloadertoolbar.h b/gui2/dataloader/dataloadertoolbar.h
index 4dfb09ee7f007d6b38a09861f2e83b51978eaa0d..39fea9fbbaed8519c2dcdddb8cce70c6b689a6c0 100644
--- a/gui2/dataloader/dataloadertoolbar.h
+++ b/gui2/dataloader/dataloadertoolbar.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_DATALOADERTOOLBAR_H
 #define DAREFL_DATALOADER_DATALOADERTOOLBAR_H
 
-#include <QToolBar>
 #include "darefl_export.h"
+#include <QToolBar>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/defaultparser.cpp b/gui2/dataloader/defaultparser.cpp
index 663ef622f7dd018980e260de9ce751b944a850f1..4ac5eace6ed672bbe07834933cfe7f05357f7de7 100644
--- a/gui2/dataloader/defaultparser.cpp
+++ b/gui2/dataloader/defaultparser.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/dataloader/dataloader_utils.h"
 #include "gui2/dataloader/defaultparser.h"
+#include "gui2/dataloader/dataloader_utils.h"
 #include <stdexcept>
 
 namespace DaRefl {
diff --git a/gui2/dataloader/importfilewidget.cpp b/gui2/dataloader/importfilewidget.cpp
index 1eef932064f6974a741a8b6a6b1225c77080dc50..5179448b1673db94a188eac0f664b9cafcf33338 100644
--- a/gui2/dataloader/importfilewidget.cpp
+++ b/gui2/dataloader/importfilewidget.cpp
@@ -7,6 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "gui2/dataloader/importfilewidget.h"
+#include "gui2/core/app_constants.h"
+#include "mvvm/utils/binutils.h"
+#include "mvvm/utils/fileutils.h"
 #include <QFileDialog>
 #include <QItemSelectionModel>
 #include <QListView>
@@ -14,10 +18,6 @@
 #include <QSettings>
 #include <QStringListModel>
 #include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/dataloader/importfilewidget.h"
-#include "mvvm/utils/binutils.h"
-#include "mvvm/utils/fileutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/importfilewidget.h b/gui2/dataloader/importfilewidget.h
index f2262d68cb1af2673caad0ad29cb20a95042e334..4867228b297bd3b5b7c0f0335a2d509a6a8da329 100644
--- a/gui2/dataloader/importfilewidget.h
+++ b/gui2/dataloader/importfilewidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_IMPORTFILEWIDGET_H
 #define DAREFL_DATALOADER_IMPORTFILEWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 class QListView;
 class QStringListModel;
diff --git a/gui2/dataloader/importtableheader.cpp b/gui2/dataloader/importtableheader.cpp
index f00a96d47b72324115b12c821961d9ad81d1179f..bbc660982ef505e92be2502945d37ae462998786 100644
--- a/gui2/dataloader/importtableheader.cpp
+++ b/gui2/dataloader/importtableheader.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/dataloader/importtableheader.h"
 #include "gui2/dataloader/dataloader_constants.h"
 #include "gui2/dataloader/dataloader_types.h"
-#include "gui2/dataloader/importtableheader.h"
 #include "mvvm/model/comboproperty.h"
 
 using ModelView::ComboProperty;
diff --git a/gui2/dataloader/importtableheader.h b/gui2/dataloader/importtableheader.h
index 5b28dff197e3bd31b8c6ff7e0c5c1938e0ea5798..393b8fabac0aeb40313d3f615b69340866d0564f 100644
--- a/gui2/dataloader/importtableheader.h
+++ b/gui2/dataloader/importtableheader.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_IMPORTTABLEHEADER_H
 #define DAREFL_DATALOADER_IMPORTTABLEHEADER_H
 
-#include <QVariant>
 #include "darefl_export.h"
+#include <QVariant>
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/dataloader/importtablemodel.cpp b/gui2/dataloader/importtablemodel.cpp
index d37717ff29c33cddd1a27a93a5c8e15a586655de..da8f8eb77d438761bc2fb7b72b7a9018e41c630b 100644
--- a/gui2/dataloader/importtablemodel.cpp
+++ b/gui2/dataloader/importtablemodel.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QBrush>
+#include "gui2/dataloader/importtablemodel.h"
 #include "gui2/dataloader/dataloader_types.h"
 #include "gui2/dataloader/importtableheader.h"
-#include "gui2/dataloader/importtablemodel.h"
+#include <QBrush>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/importtablemodel.h b/gui2/dataloader/importtablemodel.h
index 0e32f5d335b3bd6398cdc9d4ef96d3a4bc77e989..df0eece90cf86589fd290b780bbce82eb9dce5fc 100644
--- a/gui2/dataloader/importtablemodel.h
+++ b/gui2/dataloader/importtablemodel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_IMPORTTABLEMODEL_H
 #define DAREFL_DATALOADER_IMPORTTABLEMODEL_H
 
-#include <QAbstractTableModel>
 #include "darefl_export.h"
+#include <QAbstractTableModel>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/gui2/dataloader/importtablewidget.cpp b/gui2/dataloader/importtablewidget.cpp
index b9368f7555a2c9c4c6fc7c57313b6deb80cb49a5..095b4a764d9543bc262b1fa9ac5789fd1739be40 100644
--- a/gui2/dataloader/importtablewidget.cpp
+++ b/gui2/dataloader/importtablewidget.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QStandardItemModel>
-#include <QTableView>
-#include <QVBoxLayout>
+#include "gui2/dataloader/importtablewidget.h"
 #include "gui2/dataloader/dataloader_types.h"
 #include "gui2/dataloader/importtablemodel.h"
-#include "gui2/dataloader/importtablewidget.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QStandardItemModel>
+#include <QTableView>
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/importtablewidget.h b/gui2/dataloader/importtablewidget.h
index 6c7a5993cc361116799dd52276a9ab9ff49d5472..41be7c985888008ea23cd22225a28731660dd11d 100644
--- a/gui2/dataloader/importtablewidget.h
+++ b/gui2/dataloader/importtablewidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_IMPORTTABLEWIDGET_H
 #define DAREFL_DATALOADER_IMPORTTABLEWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/gui2/dataloader/loaderpreviewpanel.cpp b/gui2/dataloader/loaderpreviewpanel.cpp
index ffaaf994411526ac6c503df190b50b15a3f95070..347495eb2603d27d51ecef4081eb889f5ad48ae9 100644
--- a/gui2/dataloader/loaderpreviewpanel.cpp
+++ b/gui2/dataloader/loaderpreviewpanel.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include "gui2/dataloader/loaderpreviewpanel.h"
 #include "gui2/dataloader/dataloader_utils.h"
 #include "gui2/dataloader/importtablewidget.h"
 #include "gui2/dataloader/importtextview.h"
-#include "gui2/dataloader/loaderpreviewpanel.h"
 #include "gui2/dataloader/parserinterface.h"
+#include <QColor>
+#include <QTabWidget>
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/loaderpreviewpanel.h b/gui2/dataloader/loaderpreviewpanel.h
index bad8798cc81d52728285b786aee2e1ae97181969..f51ea6abe5f8e8972e7a6b1c0a3095dab03ee8be 100644
--- a/gui2/dataloader/loaderpreviewpanel.h
+++ b/gui2/dataloader/loaderpreviewpanel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_LOADERPREVIEWPANEL_H
 #define DAREFL_DATALOADER_LOADERPREVIEWPANEL_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 class ImportTextView;
 class ImportTableWidget;
diff --git a/gui2/dataloader/loaderselectorpanel.cpp b/gui2/dataloader/loaderselectorpanel.cpp
index b4d3b18e57ac5a39fe443e73d7cf88591796425d..96d14d2376db810b1217867578ce9541e1f53791 100644
--- a/gui2/dataloader/loaderselectorpanel.cpp
+++ b/gui2/dataloader/loaderselectorpanel.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/dataloader/loaderselectorpanel.h"
 #include "gui2/dataloader/defaultparser.h"
 #include "gui2/dataloader/importfilewidget.h"
-#include "gui2/dataloader/loaderselectorpanel.h"
 #include "gui2/dataloader/parserpropertywidget.h"
+#include <QSplitter>
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/dataloader/loaderselectorpanel.h b/gui2/dataloader/loaderselectorpanel.h
index 856db89edd79b80aec7b2a97875e521523be15c0..c35faed67d1b192e211ae902598db586e3053922 100644
--- a/gui2/dataloader/loaderselectorpanel.h
+++ b/gui2/dataloader/loaderselectorpanel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_DATALOADER_LOADERSELECTORPANEL_H
 #define DAREFL_DATALOADER_LOADERSELECTORPANEL_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 
 class QSplitter;
diff --git a/gui2/dataloader/parserpropertywidget.cpp b/gui2/dataloader/parserpropertywidget.cpp
index 1cb718885b7acb57d06cb96c7474a00a038ac1cc..0ffaf31d02f761ee10059dbac369ff16569f9d68 100644
--- a/gui2/dataloader/parserpropertywidget.cpp
+++ b/gui2/dataloader/parserpropertywidget.cpp
@@ -7,6 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "gui2/dataloader/parserpropertywidget.h"
+#include "gui2/core/app_constants.h"
+#include "gui2/dataloader/defaultparser.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QButtonGroup>
 #include <QComboBox>
 #include <QDebug>
@@ -18,10 +22,6 @@
 #include <QRegExpValidator>
 #include <QSettings>
 #include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/dataloader/defaultparser.h"
-#include "gui2/dataloader/parserpropertywidget.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace {
 
diff --git a/gui2/dataloader/parserpropertywidget.h b/gui2/dataloader/parserpropertywidget.h
index 1189752047bdd9fe8fdff20ee2cdd7e8e26839ab..76d25e5c06869e579c51b2265e55abc97bdfd17c 100644
--- a/gui2/dataloader/parserpropertywidget.h
+++ b/gui2/dataloader/parserpropertywidget.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_DATALOADER_PARSERPROPERTYWIDGET_H
 #define DAREFL_DATALOADER_PARSERPROPERTYWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
 #include "gui2/dataloader/dataloader_types.h"
+#include <QWidget>
 #include <memory>
 
 class QGridLayout;
diff --git a/gui2/importdataview/dataselectionmodel.h b/gui2/importdataview/dataselectionmodel.h
index 451a4e76ab7e7481000c59e808a523e249e8fd7b..e1a36f5be948f22b4c3f41d3e02561055a617d96 100644
--- a/gui2/importdataview/dataselectionmodel.h
+++ b/gui2/importdataview/dataselectionmodel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_DATASELECTIONMODEL_H
 #define DAREFL_IMPORTDATAVIEW_DATASELECTIONMODEL_H
 
-#include <QItemSelectionModel>
 #include "darefl_export.h"
+#include <QItemSelectionModel>
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/importdataview/dataselectorwidget.cpp b/gui2/importdataview/dataselectorwidget.cpp
index 4634b74b59c8eb6c0268bcff4fa727c8a1bd8fcb..d9208e9e2844a3f92f0945cd849b059dfbf2d956 100644
--- a/gui2/importdataview/dataselectorwidget.cpp
+++ b/gui2/importdataview/dataselectorwidget.cpp
@@ -7,19 +7,19 @@
 //
 // ************************************************************************** //
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSplitter>
-#include <QTreeView>
-#include <QVBoxLayout>
-#include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/dataselectorwidget.h"
+#include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/dataviewmodel.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/widgets/collapsiblelistwidget.h"
 #include "mvvm/widgets/standardtreeviews.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSplitter>
+#include <QTreeView>
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/importdataview/dataselectorwidget.h b/gui2/importdataview/dataselectorwidget.h
index c7f0df1e7fa5f6d9a6325e4c5f7d5cd44ed87f9f..c6ddce2aaf589f72be8cc873fe46e867c0156fb3 100644
--- a/gui2/importdataview/dataselectorwidget.h
+++ b/gui2/importdataview/dataselectorwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_DATASELECTORWIDGET_H
 #define DAREFL_IMPORTDATAVIEW_DATASELECTORWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 class QTreeView;
 
diff --git a/gui2/importdataview/dataviewmodel.cpp b/gui2/importdataview/dataviewmodel.cpp
index 4d45bd864bb29442b8fbfd883e78246afb3ab24e..4441499052ce65a3bb58955726130706bc11357b 100644
--- a/gui2/importdataview/dataviewmodel.cpp
+++ b/gui2/importdataview/dataviewmodel.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QByteArray>
-#include <QDataStream>
-#include <QMimeData>
 #include "gui2/importdataview/dataviewmodel.h"
 #include "gui2/model/experimentaldatamodel.h"
 #include "gui2/model/item_constants.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QByteArray>
+#include <QDataStream>
+#include <QMimeData>
 
 using namespace ModelView;
 
diff --git a/gui2/importdataview/graphcanvaswidget.cpp b/gui2/importdataview/graphcanvaswidget.cpp
index c3a96fe0f73232e9b1529fd15daf4b7d04d0b0c7..6361de8b8d6eb0658ce78a6f7579c5ad82f37348 100644
--- a/gui2/importdataview/graphcanvaswidget.cpp
+++ b/gui2/importdataview/graphcanvaswidget.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
 #include "gui2/importdataview/graphcanvaswidget.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "mvvm/plotting/graphcanvas.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/importdataview/graphcanvaswidget.h b/gui2/importdataview/graphcanvaswidget.h
index 6fd60d2f4ab4c0d8c59377f0e4b40fa1060035ab..6f1bbb999f567cd435174c66ae5113fb36915020 100644
--- a/gui2/importdataview/graphcanvaswidget.h
+++ b/gui2/importdataview/graphcanvaswidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_GRAPHCANVASWIDGET_H
 #define DAREFL_IMPORTDATAVIEW_GRAPHCANVASWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace ModelView {
 class GraphCanvas;
diff --git a/gui2/importdataview/importdataeditor.cpp b/gui2/importdataview/importdataeditor.cpp
index 9c70b1f6e0da6f6541849acb9f4ba5281831822e..bc1d2004b7d1c570400a65abc252d59a50e7cd96 100644
--- a/gui2/importdataview/importdataeditor.cpp
+++ b/gui2/importdataview/importdataeditor.cpp
@@ -7,20 +7,20 @@
 //
 // ************************************************************************** //
 
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/importdataview/importdataeditor.h"
 #include "gui2/dataloader/dataloaderdialog.h"
 #include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/dataselectorwidget.h"
 #include "gui2/importdataview/dataviewmodel.h"
 #include "gui2/importdataview/graphcanvaswidget.h"
-#include "gui2/importdataview/importdataeditor.h"
 #include "gui2/importdataview/importdataeditoractions.h"
 #include "gui2/importdataview/importdataeditortoolbal.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/utils/containerutils.h"
+#include <QSplitter>
+#include <QVBoxLayout>
 
 using namespace ModelView;
 
diff --git a/gui2/importdataview/importdataeditor.h b/gui2/importdataview/importdataeditor.h
index 89125eeeeb5639d2ca161144a82ecbffc642b92f..bbe427cfe63f5ac5459b0d76e2217e1be4ff927e 100644
--- a/gui2/importdataview/importdataeditor.h
+++ b/gui2/importdataview/importdataeditor.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITOR_H
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITOR_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <string>
 
 namespace DaRefl {
diff --git a/gui2/importdataview/importdataeditoractions.cpp b/gui2/importdataview/importdataeditoractions.cpp
index 3de9ddc3560a0f953b096c5c226a24896e345275..defe0efe69b843cc1c16592eea4ee481f26a6e03 100644
--- a/gui2/importdataview/importdataeditoractions.cpp
+++ b/gui2/importdataview/importdataeditoractions.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/importdataview/importdataeditoractions.h"
 #include "gui2/importdataview/dataselectionmodel.h"
 #include "gui2/importdataview/graphimportdata.h"
-#include "gui2/importdataview/importdataeditoractions.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/interfaces/undostackinterface.h"
diff --git a/gui2/importdataview/importdataeditoractions.h b/gui2/importdataview/importdataeditoractions.h
index b5ac96e83f748dab3ca9d60550de794c359fb502..c15a70feddab2ebc85aa989904f6271873cac404 100644
--- a/gui2/importdataview/importdataeditoractions.h
+++ b/gui2/importdataview/importdataeditoractions.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORACTIONS_H
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORACTIONS_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 
 class QItemSelection;
 
diff --git a/gui2/importdataview/importdataeditortoolbal.cpp b/gui2/importdataview/importdataeditortoolbal.cpp
index 96234ae5440078ba23e97c157b2719c356df84e0..3a1f694c6def33836ebc71c87330ae54d1be307f 100644
--- a/gui2/importdataview/importdataeditortoolbal.cpp
+++ b/gui2/importdataview/importdataeditortoolbal.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QAction>
-#include "gui2/importdataview/importdataeditoractions.h"
 #include "gui2/importdataview/importdataeditortoolbal.h"
+#include "gui2/importdataview/importdataeditoractions.h"
 #include "gui2/mainwindow/styleutils.h"
+#include <QAction>
 
 namespace DaRefl {
 
diff --git a/gui2/importdataview/importdataeditortoolbal.h b/gui2/importdataview/importdataeditortoolbal.h
index 54ca32dd1f0a5514b00dfdfd3835ee7fb0add867..ef22864d9d04514405e0020662323fe012441027 100644
--- a/gui2/importdataview/importdataeditortoolbal.h
+++ b/gui2/importdataview/importdataeditortoolbal.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORTOOLBAL_H
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORTOOLBAL_H
 
-#include <QToolBar>
 #include "darefl_export.h"
+#include <QToolBar>
 
 namespace DaRefl {
 
diff --git a/gui2/importdataview/importdataview.cpp b/gui2/importdataview/importdataview.cpp
index 1c44c22dbcbb4b948c3055df78e01107ca0d0134..ca188a7df4824018f66fc5c5289b2c9a0540bc03 100644
--- a/gui2/importdataview/importdataview.cpp
+++ b/gui2/importdataview/importdataview.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
-#include "gui2/importdataview/importdataeditor.h"
 #include "gui2/importdataview/importdataview.h"
+#include "gui2/importdataview/importdataeditor.h"
 #include "gui2/model/applicationmodels.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/importdataview/importdataview.h b/gui2/importdataview/importdataview.h
index 0a892ce8e40dbd9ef24e18d278dcbbd0260a65a3..4a4e471104db1b96ed63a6c5da8e9e9b64e00d74 100644
--- a/gui2/importdataview/importdataview.h
+++ b/gui2/importdataview/importdataview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAVIEW_H
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAVIEW_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/customlayertreeeditorfactory.cpp b/gui2/layereditor/customlayertreeeditorfactory.cpp
index 176b5bc437d49362f45e46cd6ed1ca439db5a40b..7ec4d2aaaa2c87e0bf20d121f7a851ffc1c245ec 100644
--- a/gui2/layereditor/customlayertreeeditorfactory.cpp
+++ b/gui2/layereditor/customlayertreeeditorfactory.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QModelIndex>
-#include <algorithm>
 #include "gui2/layereditor/customlayertreeeditorfactory.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/materialmodel.h"
 #include "mvvm/editors/externalpropertycomboeditor.h"
 #include "mvvm/model/externalproperty.h"
+#include <QModelIndex>
+#include <algorithm>
 
 using namespace ModelView;
 
diff --git a/gui2/layereditor/layereditor.cpp b/gui2/layereditor/layereditor.cpp
index 63c3941e6fffe80131e19d619850e659d1f208c7..80cd76cbd2174ae2341700581e3831ab955060ce 100644
--- a/gui2/layereditor/layereditor.cpp
+++ b/gui2/layereditor/layereditor.cpp
@@ -7,7 +7,6 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
 #include "gui2/layereditor/layereditor.h"
 #include "gui2/layereditor/layereditoractions.h"
 #include "gui2/layereditor/layereditortoolbar.h"
@@ -15,6 +14,7 @@
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/model/applicationmodels.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/layereditor.h b/gui2/layereditor/layereditor.h
index 89edd266781c6f27e0eded9f8e5703b77e171406..7abd736af3a29e37950d0dcc0efbdc8fccde692c 100644
--- a/gui2/layereditor/layereditor.h
+++ b/gui2/layereditor/layereditor.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_LAYEREDITOR_LAYEREDITOR_H
 #define DAREFL_LAYEREDITOR_LAYEREDITOR_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace ModelView {
 class AbstractViewModel;
diff --git a/gui2/layereditor/layereditoractions.cpp b/gui2/layereditor/layereditoractions.cpp
index 554d583bbbcde34e80c7d4ba084eeb73a0d88ab5..06a1dcf5be1706ba041bd077873d6a11f85ad17c 100644
--- a/gui2/layereditor/layereditoractions.cpp
+++ b/gui2/layereditor/layereditoractions.cpp
@@ -7,7 +7,6 @@
 //
 // ************************************************************************** //
 
-#include <QAction>
 #include "gui2/layereditor/layereditoractions.h"
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/model/item_constants.h"
@@ -16,6 +15,7 @@
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodel.h"
+#include <QAction>
 
 using namespace ModelView;
 
diff --git a/gui2/layereditor/layereditoractions.h b/gui2/layereditor/layereditoractions.h
index a5c480296a1c6d29ada453ab3641ca889df9f914..a23d2c8f89e30a25ac49fb639acf20b81eb4dc15 100644
--- a/gui2/layereditor/layereditoractions.h
+++ b/gui2/layereditor/layereditoractions.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_LAYEREDITOR_LAYEREDITORACTIONS_H
 #define DAREFL_LAYEREDITOR_LAYEREDITORACTIONS_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/layereditor/layereditortoolbar.cpp b/gui2/layereditor/layereditortoolbar.cpp
index 5b3a243f239082203cc12ad82214aa7c22777e8f..24f177823e583a5e236202a42a5ba88395dfc9d1 100644
--- a/gui2/layereditor/layereditortoolbar.cpp
+++ b/gui2/layereditor/layereditortoolbar.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/layereditor/layereditortoolbar.h"
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/mainwindow/styleutils.h"
 #include <QAction>
 #include <QMenu>
 #include <QToolButton>
-#include "gui2/layereditor/layereditoractions.h"
-#include "gui2/layereditor/layereditortoolbar.h"
-#include "gui2/mainwindow/styleutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/layereditortoolbar.h b/gui2/layereditor/layereditortoolbar.h
index a7e064f491d8e3bbffe51102ec00ebbc70727256..0ccc4a1a404e71e9b36435b8788b69a59442f6a3 100644
--- a/gui2/layereditor/layereditortoolbar.h
+++ b/gui2/layereditor/layereditortoolbar.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_LAYEREDITOR_LAYEREDITORTOOLBAR_H
 #define DAREFL_LAYEREDITOR_LAYEREDITORTOOLBAR_H
 
+#include "darefl_export.h"
 #include <QToolBar>
 #include <QWidget>
-#include "darefl_export.h"
 #include <map>
 #include <string>
 
diff --git a/gui2/layereditor/layereditorwidget.cpp b/gui2/layereditor/layereditorwidget.cpp
index 4cce0932c4914883e27a9fd9276dea23ff42a933..d37a6dd6fde66ac19e4065eb0e5a8a029cee2fce 100644
--- a/gui2/layereditor/layereditorwidget.cpp
+++ b/gui2/layereditor/layereditorwidget.cpp
@@ -7,9 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
-#include "gui2/layereditor/customlayertreeeditorfactory.h"
 #include "gui2/layereditor/layereditorwidget.h"
+#include "gui2/layereditor/customlayertreeeditorfactory.h"
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/layereditor/layertreeview.h"
 #include "gui2/layereditor/layerviewmodel.h"
@@ -17,6 +16,7 @@
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/layereditorwidget.h b/gui2/layereditor/layereditorwidget.h
index 8c4e73de1796e376a55298005eef8d70bc69b8d8..39267b1298b1d00ebdaa700d62fb6e4839aeb8da 100644
--- a/gui2/layereditor/layereditorwidget.h
+++ b/gui2/layereditor/layereditorwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_LAYEREDITOR_LAYEREDITORWIDGET_H
 #define DAREFL_LAYEREDITOR_LAYEREDITORWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/layereditor/layerselectionmodel.cpp b/gui2/layereditor/layerselectionmodel.cpp
index 7d4954a450848c8b0f7e2b458014a8b416709312..1f19572f323d634f48d3566e33d9c6b54811323a 100644
--- a/gui2/layereditor/layerselectionmodel.cpp
+++ b/gui2/layereditor/layerselectionmodel.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <QItemSelection>
 #include "gui2/layereditor/layerselectionmodel.h"
 #include "gui2/model/sampleitems.h"
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include <QItemSelection>
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/layerselectionmodel.h b/gui2/layereditor/layerselectionmodel.h
index a4ede1a8d3807481fd4aaeb8940b6d1f0590b72d..1bd03b53bb6adfe4b98edaa3572d902641ef14de 100644
--- a/gui2/layereditor/layerselectionmodel.h
+++ b/gui2/layereditor/layerselectionmodel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_LAYEREDITOR_LAYERSELECTIONMODEL_H
 #define DAREFL_LAYEREDITOR_LAYERSELECTIONMODEL_H
 
-#include <QItemSelectionModel>
 #include "darefl_export.h"
+#include <QItemSelectionModel>
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/layereditor/layertreeview.cpp b/gui2/layereditor/layertreeview.cpp
index 39189e2f21d8996d49c0a2316c39d58bd152e5de..bde16f9202c55998312c7139f8526f59dab3d843 100644
--- a/gui2/layereditor/layertreeview.cpp
+++ b/gui2/layereditor/layertreeview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/layereditor/layertreeview.h"
 #include <QHeaderView>
 #include <QMouseEvent>
-#include "gui2/layereditor/layertreeview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/layereditor/layertreeview.h b/gui2/layereditor/layertreeview.h
index 241b44597680a47245495781443236a99c7959fc..82c7ca128a71f3ce6bed93cc8bf06f24b1e12bfb 100644
--- a/gui2/layereditor/layertreeview.h
+++ b/gui2/layereditor/layertreeview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_LAYEREDITOR_LAYERTREEVIEW_H
 #define DAREFL_LAYEREDITOR_LAYERTREEVIEW_H
 
-#include <QTreeView>
 #include "darefl_export.h"
+#include <QTreeView>
 
 namespace DaRefl {
 
diff --git a/gui2/main.cpp b/gui2/main.cpp
index 3ede179c9f56564a6c74e870daf89af463d38544..65e06f34d9bd8e0dce2afd91e9815aae3a62ca50 100644
--- a/gui2/main.cpp
+++ b/gui2/main.cpp
@@ -11,8 +11,7 @@
 #include <QApplication>
 #include <QLocale>
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
 
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff --git a/gui2/mainwindow/actionmanager.cpp b/gui2/mainwindow/actionmanager.cpp
index 6610da2d99a767609352394495096b1b0f1bcb99..6f428f69f148558e29c8945ac8902434ca7dd7ae 100644
--- a/gui2/mainwindow/actionmanager.cpp
+++ b/gui2/mainwindow/actionmanager.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/mainwindow/actionmanager.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QAction>
 #include <QMainWindow>
 #include <QMenuBar>
 #include <QToolBar>
-#include "gui2/mainwindow/actionmanager.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/mainwindow/actionmanager.h b/gui2/mainwindow/actionmanager.h
index e6f45e00fa9c4feff764369e7986fa174fb926a8..a956b7410232c057d6c1c063662dcba592c88040 100644
--- a/gui2/mainwindow/actionmanager.h
+++ b/gui2/mainwindow/actionmanager.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MAINWINDOW_ACTIONMANAGER_H
 #define DAREFL_MAINWINDOW_ACTIONMANAGER_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 
 class QMainWindow;
 class QAction;
diff --git a/gui2/mainwindow/fancytab.cpp b/gui2/mainwindow/fancytab.cpp
index d9a56b09767492ccd13d47fd1861c5f1b16e2da0..060d0c667ec3d12e05480c83acd131c6d47afc00 100644
--- a/gui2/mainwindow/fancytab.cpp
+++ b/gui2/mainwindow/fancytab.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/mainwindow/fancytab.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
-#include "gui2/mainwindow/fancytab.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace {
 QColor defaultColor() {
diff --git a/gui2/mainwindow/fancytab.h b/gui2/mainwindow/fancytab.h
index f4be33a601bbb17c1a54bb6b7b491f40915523d0..45f84c1b9188787b8ed8a0a5922171a4279cefb4 100644
--- a/gui2/mainwindow/fancytab.h
+++ b/gui2/mainwindow/fancytab.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_MAINWINDOW_FANCYTAB_H
 #define DAREFL_MAINWINDOW_FANCYTAB_H
 
+#include "darefl_export.h"
 #include <QColor>
 #include <QWidget>
-#include "darefl_export.h"
 
 class QLabel;
 class QString;
diff --git a/gui2/mainwindow/mainbarwidget.cpp b/gui2/mainwindow/mainbarwidget.cpp
index a56f7feb97eb6ed13df05abca8b9a8638f84e23c..9e2173f12773019bbed950f55a188b3503df28a9 100644
--- a/gui2/mainwindow/mainbarwidget.cpp
+++ b/gui2/mainwindow/mainbarwidget.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
+#include "gui2/mainwindow/mainbarwidget.h"
+#include "gui2/mainwindow/fancytab.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QVBoxLayout>
-#include "gui2/mainwindow/fancytab.h"
-#include "gui2/mainwindow/mainbarwidget.h"
 
 namespace DaRefl {
 
diff --git a/gui2/mainwindow/mainbarwidget.h b/gui2/mainwindow/mainbarwidget.h
index 9c67284528b348e655d3cbf4bb8395053bc97523..b8fcf5e8aeabe914936fbb28226f600375cede68 100644
--- a/gui2/mainwindow/mainbarwidget.h
+++ b/gui2/mainwindow/mainbarwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MAINWINDOW_MAINBARWIDGET_H
 #define DAREFL_MAINWINDOW_MAINBARWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <map>
 
 class QStackedWidget;
diff --git a/gui2/mainwindow/mainwindow.cpp b/gui2/mainwindow/mainwindow.cpp
index 9966a199735b5dca8fc5318f1ad0190d29263103..fb48927951b0d40b79dc2af6303ba1db03581431 100644
--- a/gui2/mainwindow/mainwindow.cpp
+++ b/gui2/mainwindow/mainwindow.cpp
@@ -7,19 +7,19 @@
 //
 // ************************************************************************** //
 
-#include <QCloseEvent>
-#include <QCoreApplication>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QSettings>
+#include "gui2/mainwindow/mainwindow.h"
 #include "gui2/importdataview/importdataview.h"
 #include "gui2/mainwindow/actionmanager.h"
 #include "gui2/mainwindow/mainbarwidget.h"
-#include "gui2/mainwindow/mainwindow.h"
 #include "gui2/mainwindow/simulationview.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/settingsview/settingsview.h"
 #include "gui2/welcomeview/welcomeview.h"
+#include <QCloseEvent>
+#include <QCoreApplication>
+#include <QFileDialog>
+#include <QMenuBar>
+#include <QSettings>
 
 namespace {
 const QString main_window_group = "MainWindow";
diff --git a/gui2/mainwindow/mainwindow.h b/gui2/mainwindow/mainwindow.h
index 6fc3790c1b32171c8cf8a6859ca0372196685bbc..f90ac43a89b5137d17a0301e634a8d7f92d0ee4b 100644
--- a/gui2/mainwindow/mainwindow.h
+++ b/gui2/mainwindow/mainwindow.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MAINWINDOW_MAINWINDOW_H
 #define DAREFL_MAINWINDOW_MAINWINDOW_H
 
-#include <QMainWindow>
 #include "darefl_export.h"
+#include <QMainWindow>
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/mainwindow/simulationview.cpp b/gui2/mainwindow/simulationview.cpp
index 83dc300d512f22ddb9dc8a39f3e70952775d294b..b0ae3aecc6733f935cb70abd879a0198ae9772ae 100644
--- a/gui2/mainwindow/simulationview.cpp
+++ b/gui2/mainwindow/simulationview.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QSplitter>
-#include <QVBoxLayout>
-#include "gui2/layereditor/layereditor.h"
 #include "gui2/mainwindow/simulationview.h"
+#include "gui2/layereditor/layereditor.h"
 #include "gui2/materialeditor/materialeditor.h"
 #include "gui2/quicksimeditor/instrumentpropertyeditor.h"
 #include "gui2/quicksimeditor/quicksimeditor.h"
 #include "gui2/sldeditor/sldeditor.h"
 #include "mvvm/widgets/collapsiblelistwidget.h"
+#include <QSplitter>
+#include <QVBoxLayout>
 
 using namespace ModelView;
 
diff --git a/gui2/mainwindow/simulationview.h b/gui2/mainwindow/simulationview.h
index 2d968b9ab026a8ffb467c697de273d6ebfafe842..37e806e7493da427384647dd1812ac732c095a09 100644
--- a/gui2/mainwindow/simulationview.h
+++ b/gui2/mainwindow/simulationview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MAINWINDOW_SIMULATIONVIEW_H
 #define DAREFL_MAINWINDOW_SIMULATIONVIEW_H
 
-#include <QMainWindow>
 #include "darefl_export.h"
+#include <QMainWindow>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/mainwindow/styleutils.cpp b/gui2/mainwindow/styleutils.cpp
index f1275ae4e2488ad0955668fbb633586ae138f548..06e2c2f234cb156095250ff5482d8c0dde71a6f0 100644
--- a/gui2/mainwindow/styleutils.cpp
+++ b/gui2/mainwindow/styleutils.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/resources/resources.h"
 #include <QFontMetrics>
 #include <QSize>
 #include <QToolBar>
 #include <QWidget>
-#include "gui2/mainwindow/styleutils.h"
-#include "gui2/resources/resources.h"
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditor.cpp b/gui2/materialeditor/materialeditor.cpp
index 25c09d91d0b2763813da53ff4411665e2e9c12c4..d049b5214c86896e3feb13610bf8d33bd41be60c 100644
--- a/gui2/materialeditor/materialeditor.cpp
+++ b/gui2/materialeditor/materialeditor.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
-#include "gui2/mainwindow/styleutils.h"
 #include "gui2/materialeditor/materialeditor.h"
+#include "gui2/mainwindow/styleutils.h"
 #include "gui2/materialeditor/materialeditoractions.h"
 #include "gui2/materialeditor/materialeditortoolbar.h"
 #include "gui2/materialeditor/materialeditorwidget.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/materialmodel.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditor.h b/gui2/materialeditor/materialeditor.h
index 42affc20ac6a4d32e8dca2b196980bef192de08e..fd7b96302e00f2ddc0898e789a48cc924f65f183 100644
--- a/gui2/materialeditor/materialeditor.h
+++ b/gui2/materialeditor/materialeditor.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALEDITOR_H
 #define DAREFL_MATERIALEDITOR_MATERIALEDITOR_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditoractions.cpp b/gui2/materialeditor/materialeditoractions.cpp
index 168e17f6804a69bfe1f9deecc75d97b3b75b09ff..6888a175fa33b7bd35873c029399abbb26f4f74a 100644
--- a/gui2/materialeditor/materialeditoractions.cpp
+++ b/gui2/materialeditor/materialeditoractions.cpp
@@ -7,8 +7,6 @@
 //
 // ************************************************************************** //
 
-#include <QFile>
-#include <QTextStream>
 #include "gui2/materialeditor/materialeditoractions.h"
 #include "gui2/materialeditor/materialselectionmodel.h"
 #include "gui2/model/materialitems.h"
@@ -16,6 +14,8 @@
 #include "mvvm/model/modelutils.h"
 #include "mvvm/model/sessionitemdata.h"
 #include "mvvm/viewmodel/viewmodel.h"
+#include <QFile>
+#include <QTextStream>
 
 using namespace ModelView;
 
diff --git a/gui2/materialeditor/materialeditoractions.h b/gui2/materialeditor/materialeditoractions.h
index c5eef6387ec2b319b06384ebb5252a813f744b0a..97848c8c716a588d172067557e063a0b5bba47f9 100644
--- a/gui2/materialeditor/materialeditoractions.h
+++ b/gui2/materialeditor/materialeditoractions.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORACTIONS_H
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORACTIONS_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditortoolbar.cpp b/gui2/materialeditor/materialeditortoolbar.cpp
index f9b8f67cb151b5e51732e3053fcbc34a0c3f1ad6..b6582321ea48d6b2e1502bc5c8df1d013b952ffc 100644
--- a/gui2/materialeditor/materialeditortoolbar.cpp
+++ b/gui2/materialeditor/materialeditortoolbar.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <QAction>
-#include <QToolButton>
+#include "gui2/materialeditor/materialeditortoolbar.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/materialeditor/materialeditoractions.h"
-#include "gui2/materialeditor/materialeditortoolbar.h"
+#include <QAction>
+#include <QToolButton>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditortoolbar.h b/gui2/materialeditor/materialeditortoolbar.h
index a20fb979d408ebcb80ffbab1a2267cb8a8789c13..92a950e4bc6fa07562d93bf2ca864592d4a45a4b 100644
--- a/gui2/materialeditor/materialeditortoolbar.h
+++ b/gui2/materialeditor/materialeditortoolbar.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
 
-#include <QToolBar>
 #include "darefl_export.h"
+#include <QToolBar>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditorwidget.cpp b/gui2/materialeditor/materialeditorwidget.cpp
index b3527dc64d197acf82e3f0268ad69ffc89d35c2d..2e8df2ff9800a31e419b8e0e25450b450a4da540 100644
--- a/gui2/materialeditor/materialeditorwidget.cpp
+++ b/gui2/materialeditor/materialeditorwidget.cpp
@@ -7,7 +7,6 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
 #include "gui2/materialeditor/materialeditorwidget.h"
 #include "gui2/materialeditor/materialselectionmodel.h"
 #include "gui2/materialeditor/materialtableview.h"
@@ -18,6 +17,7 @@
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialeditorwidget.h b/gui2/materialeditor/materialeditorwidget.h
index 5fe93093d31682ca6e490671c1e0e9818709970a..3a962bc0c4530820242fdc22c9bbdebea103890e 100644
--- a/gui2/materialeditor/materialeditorwidget.h
+++ b/gui2/materialeditor/materialeditorwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORWIDGET_H
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/materialeditor/materialselectionmodel.h b/gui2/materialeditor/materialselectionmodel.h
index 7e40053f4746569c989ed2942cee30623b41dfc1..5284f31b02082faccbc7bb805d20cdbae3587d15 100644
--- a/gui2/materialeditor/materialselectionmodel.h
+++ b/gui2/materialeditor/materialselectionmodel.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALSELECTIONMODEL_H
 #define DAREFL_MATERIALEDITOR_MATERIALSELECTIONMODEL_H
 
-#include <QItemSelectionModel>
 #include "darefl_export.h"
+#include <QItemSelectionModel>
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/materialeditor/materialtableview.cpp b/gui2/materialeditor/materialtableview.cpp
index 7990fbe6580db1ec60c397ee3b36f8dddab8c5b6..fbdf1787c63b04aeba2fbf77e8cf39ed77006fae 100644
--- a/gui2/materialeditor/materialtableview.cpp
+++ b/gui2/materialeditor/materialtableview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/materialeditor/materialtableview.h"
 #include <QHeaderView>
 #include <QMouseEvent>
-#include "gui2/materialeditor/materialtableview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialtableview.h b/gui2/materialeditor/materialtableview.h
index e5c663bc54f1552eab6090a47ae491ef9b49d6a7..37e35b906e80de60944c5ed820b7f220c64f9db0 100644
--- a/gui2/materialeditor/materialtableview.h
+++ b/gui2/materialeditor/materialtableview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALTABLEVIEW_H
 #define DAREFL_MATERIALEDITOR_MATERIALTABLEVIEW_H
 
-#include <QTableView>
 #include "darefl_export.h"
+#include <QTableView>
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialtreeview.cpp b/gui2/materialeditor/materialtreeview.cpp
index cc1323d859b31ead97351fd9314faaf8c560a9b2..13896beff645d63b43d666cf0a93b417fa061d42 100644
--- a/gui2/materialeditor/materialtreeview.cpp
+++ b/gui2/materialeditor/materialtreeview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/materialeditor/materialtreeview.h"
 #include <QHeaderView>
 #include <QMouseEvent>
-#include "gui2/materialeditor/materialtreeview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/materialeditor/materialtreeview.h b/gui2/materialeditor/materialtreeview.h
index 7be584d5d37cf37589abefcf88a4933b66ddc3ab..de18762dbe7e0c628806d853f480a03cdbce113a 100644
--- a/gui2/materialeditor/materialtreeview.h
+++ b/gui2/materialeditor/materialtreeview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_MATERIALEDITOR_MATERIALTREEVIEW_H
 #define DAREFL_MATERIALEDITOR_MATERIALTREEVIEW_H
 
-#include <QTreeView>
 #include "darefl_export.h"
+#include <QTreeView>
 
 namespace DaRefl {
 
diff --git a/gui2/model/applicationmodels.h b/gui2/model/applicationmodels.h
index 29e9cfa2192fb2f551107683a37f305ef27e4561..5c62edb85f2fa51341ea8d8781151ca15e54c7b0 100644
--- a/gui2/model/applicationmodels.h
+++ b/gui2/model/applicationmodels.h
@@ -11,8 +11,8 @@
 #define DAREFL_MODEL_APPLICATIONMODELS_H
 
 #include "darefl_export.h"
-#include <memory>
 #include "mvvm/interfaces/applicationmodelsinterface.h"
+#include <memory>
 
 namespace ModelView {
 class SessionModel;
diff --git a/gui2/model/experimentaldatamodel.cpp b/gui2/model/experimentaldatamodel.cpp
index 73ce0e0887046548e1ffba35cc1aff0e603efade..d3c35fc43812c97747f724852423b8269558cc6b 100644
--- a/gui2/model/experimentaldatamodel.cpp
+++ b/gui2/model/experimentaldatamodel.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/model/experimentaldatamodel.h"
 #include "gui2/importdataview/graphimportdata.h"
 #include "gui2/model/experimentaldataitems.h"
-#include "gui2/model/experimentaldatamodel.h"
 
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/modelutils.h"
diff --git a/gui2/model/instrumentitems.cpp b/gui2/model/instrumentitems.cpp
index e1552e4212c8beb0068ccc7670621a8d8176757e..07c20e9fa6c0030924272beb482cc09c4ded72c7 100644
--- a/gui2/model/instrumentitems.cpp
+++ b/gui2/model/instrumentitems.cpp
@@ -7,7 +7,6 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
 #include "gui2/model/instrumentitems.h"
 #include "gui2/model/item_constants.h"
 #include "gui2/model/modelutils.h"
@@ -15,6 +14,7 @@
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/graphitem.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/gui2/model/instrumentmodel.cpp b/gui2/model/instrumentmodel.cpp
index 5c2be3f4153a56b31d2bc41af66e8a99c59e9dc6..76950aaf0cb1ba773d99bdb51774aa0d8c826cf4 100644
--- a/gui2/model/instrumentmodel.cpp
+++ b/gui2/model/instrumentmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/model/instrumentitems.h"
 #include "gui2/model/instrumentmodel.h"
+#include "gui2/model/instrumentitems.h"
 #include "mvvm/model/itemcatalogue.h"
 
 using namespace ModelView;
diff --git a/gui2/model/jobitem.cpp b/gui2/model/jobitem.cpp
index 1fc1280235a763c71cde680618fcdb13cbc12389..5362e11a7d983fb45a1161be938461204211191a 100644
--- a/gui2/model/jobitem.cpp
+++ b/gui2/model/jobitem.cpp
@@ -7,10 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
+#include "gui2/model/jobitem.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/item_constants.h"
-#include "gui2/model/jobitem.h"
 #include "gui2/model/jobmodel.h"
 #include "gui2/model/modelutils.h"
 #include "mvvm/model/modelutils.h"
@@ -18,6 +17,7 @@
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/gui2/model/jobmodel.cpp b/gui2/model/jobmodel.cpp
index dfce378c068a8fa8445e35d1af263b2d8334a9f6..7eeb9d091a0d81eea70684e430d9301bfe09aa0c 100644
--- a/gui2/model/jobmodel.cpp
+++ b/gui2/model/jobmodel.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "gui2/model/jobmodel.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/jobitem.h"
-#include "gui2/model/jobmodel.h"
 #include "gui2/quicksimeditor/quicksim_types.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/modelutils.h"
diff --git a/gui2/model/materialitems.cpp b/gui2/model/materialitems.cpp
index 9c7ffb6b476fdf3f932a12761199c27bf3eed28c..d35cfa3661f61b0b05d77342a42701373e83b896 100644
--- a/gui2/model/materialitems.cpp
+++ b/gui2/model/materialitems.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
-#include "gui2/model/item_constants.h"
 #include "gui2/model/materialitems.h"
+#include "gui2/model/item_constants.h"
 #include "mvvm/model/externalproperty.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/gui2/model/materialmodel.cpp b/gui2/model/materialmodel.cpp
index e1df14bad4982347349245a86211ad9b9d26fa29..a2765a5b1052d3dbd2919a4ac10945b168eb6e34 100644
--- a/gui2/model/materialmodel.cpp
+++ b/gui2/model/materialmodel.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
+#include "gui2/model/materialmodel.h"
 #include "gui2/model/item_constants.h"
 #include "gui2/model/materialitems.h"
-#include "gui2/model/materialmodel.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/gui2/model/materialpropertycontroller.cpp b/gui2/model/materialpropertycontroller.cpp
index 42add71c636b506c11812db900cd8f5db782eadd..c42ff736d63798491d4a92b30f8ee2564228a9a5 100644
--- a/gui2/model/materialpropertycontroller.cpp
+++ b/gui2/model/materialpropertycontroller.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/model/materialmodel.h"
 #include "gui2/model/materialpropertycontroller.h"
+#include "gui2/model/materialmodel.h"
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
 #include "mvvm/model/externalproperty.h"
diff --git a/gui2/model/modelutils.cpp b/gui2/model/modelutils.cpp
index 8d0d4e31e5edcedf2bf551d642ee14cd1101b469..cad58eb38b0285d4e7497a41973b0750d143230c 100644
--- a/gui2/model/modelutils.cpp
+++ b/gui2/model/modelutils.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/model/experimentaldatamodel.h"
 #include "gui2/model/modelutils.h"
+#include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
diff --git a/gui2/model/sampleitems.cpp b/gui2/model/sampleitems.cpp
index 0a30979c83d76f1cc037e6b1a03922e8e19b7494..74298a8840dbc87e8c4039d893cd74290491e3ca 100644
--- a/gui2/model/sampleitems.cpp
+++ b/gui2/model/sampleitems.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QVariant>
+#include "gui2/model/sampleitems.h"
 #include "gui2/model/item_constants.h"
 #include "gui2/model/materialitems.h"
 #include "gui2/model/materialmodel.h"
-#include "gui2/model/sampleitems.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/signals/itemmapper.h"
+#include <QVariant>
 
 namespace DaRefl {
 
diff --git a/gui2/model/samplemodel.cpp b/gui2/model/samplemodel.cpp
index 5f6372939daf3982657a22689b860a947cb735b7..0d01aac46688a9bbb151a5f438d6f3a6d6844380 100644
--- a/gui2/model/samplemodel.cpp
+++ b/gui2/model/samplemodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
+#include "gui2/model/sampleitems.h"
 #include "mvvm/model/itemcatalogue.h"
 
 using namespace ModelView;
diff --git a/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
index 3543c81a9fd5a9e9fd6d1fee3e5801a04cc0c65e..0dedd3fccc39d2f84a9e3e4348e714fbf0aed63e 100644
--- a/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
+++ b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
@@ -7,18 +7,18 @@
 //
 // ************************************************************************** //
 
-#include <QModelIndex>
-#include <algorithm>
+#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/experimentaldatamodel.h"
 #include "gui2/model/materialmodel.h"
 #include "gui2/model/modelutils.h"
-#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
 #include "mvvm/editors/externalpropertycomboeditor.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/graphitem.h"
+#include <QModelIndex>
+#include <algorithm>
 
 using namespace ModelView;
 
diff --git a/gui2/quicksimeditor/instrumentpropertyeditor.cpp b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
index 410bed5252305d5e7f09e2f8daf5dc7c3f473da8..bcde0f81c5907021df3e9bb259bca02203f63d18 100644
--- a/gui2/quicksimeditor/instrumentpropertyeditor.cpp
+++ b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
@@ -7,16 +7,16 @@
 //
 // ************************************************************************** //
 
-#include <QTreeView>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/instrumentitems.h"
 #include "gui2/model/instrumentmodel.h"
 #include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
-#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
 #include "mvvm/widgets/propertytreeview.h"
+#include <QTreeView>
+#include <QVBoxLayout>
 
 using namespace ModelView;
 
diff --git a/gui2/quicksimeditor/jobmanager.h b/gui2/quicksimeditor/jobmanager.h
index 9f214b45eaf1dcc1af0dc75f77035c4e27e8da70..a3d1374c9cbe8f4fcdbb300ee5b6a88f61c2e2b2 100644
--- a/gui2/quicksimeditor/jobmanager.h
+++ b/gui2/quicksimeditor/jobmanager.h
@@ -10,10 +10,10 @@
 #ifndef DAREFL_QUICKSIMEDITOR_JOBMANAGER_H
 #define DAREFL_QUICKSIMEDITOR_JOBMANAGER_H
 
-#include <QObject>
 #include "darefl_export.h"
 #include "gui2/quicksimeditor/quicksim_types.h"
 #include "mvvm/utils/threadsafestack.h"
+#include <QObject>
 
 namespace DaRefl {
 
diff --git a/gui2/quicksimeditor/materialprofile.cpp b/gui2/quicksimeditor/materialprofile.cpp
index 07717d00322d976a74f7127166c0d8a5ee5f1dc1..605ae9101f75eecd8e1f3a6ecf6fce7680662ef5 100644
--- a/gui2/quicksimeditor/materialprofile.cpp
+++ b/gui2/quicksimeditor/materialprofile.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <Sample/Slice/Slice.h>
 #include "gui2/quicksimeditor/materialprofile.h"
 #include "gui2/quicksimeditor/profilehelper.h"
 #include "gui2/quicksimeditor/quicksimutils.h"
+#include <Sample/Slice/Slice.h>
 
 namespace DaRefl {
 
diff --git a/gui2/quicksimeditor/quicksim_types.h b/gui2/quicksimeditor/quicksim_types.h
index dc94e1cb2622b5360531ea598c3f6e63f26f12ab..9502b677a7eb4f31bf98944a0724b4e56e6e46c5 100644
--- a/gui2/quicksimeditor/quicksim_types.h
+++ b/gui2/quicksimeditor/quicksim_types.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_QUICKSIM_TYPES_H
 #define DAREFL_QUICKSIMEDITOR_QUICKSIM_TYPES_H
 
-#include <complex>
 #include "darefl_export.h"
+#include <complex>
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimcontroller.cpp b/gui2/quicksimeditor/quicksimcontroller.cpp
index 4b13c2bdbf6053008f946dd75fa676106b1b7fba..73488db279e0881658d2d5c8238fa64756dcc213 100644
--- a/gui2/quicksimeditor/quicksimcontroller.cpp
+++ b/gui2/quicksimeditor/quicksimcontroller.cpp
@@ -7,6 +7,7 @@
 //
 // ************************************************************************** //
 
+#include "gui2/quicksimeditor/quicksimcontroller.h"
 #include "gui2/core/app_constants.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/instrumentitems.h"
@@ -17,7 +18,6 @@
 #include "gui2/model/sampleitems.h"
 #include "gui2/model/samplemodel.h"
 #include "gui2/quicksimeditor/jobmanager.h"
-#include "gui2/quicksimeditor/quicksimcontroller.h"
 #include "gui2/quicksimeditor/quicksimutils.h"
 #include "gui2/quicksimeditor/speculartoysimulation.h"
 #include "mvvm/project/modelhaschangedcontroller.h"
diff --git a/gui2/quicksimeditor/quicksimcontroller.h b/gui2/quicksimeditor/quicksimcontroller.h
index f6133143c22e799c0f9c43395822b07bf808d450..cedc8bee437566277be56c2953869977de10e041 100644
--- a/gui2/quicksimeditor/quicksimcontroller.h
+++ b/gui2/quicksimeditor/quicksimcontroller.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMCONTROLLER_H
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMCONTROLLER_H
 
-#include <QObject>
 #include "darefl_export.h"
 #include "gui2/quicksimeditor/quicksim_types.h"
+#include <QObject>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/quicksimeditor/quicksimeditor.cpp b/gui2/quicksimeditor/quicksimeditor.cpp
index 2403d1a0f8073f8ea1e981603a118b89644a88ef..1a140e1503bdc97dc7ed5054c2982c504a962e30 100644
--- a/gui2/quicksimeditor/quicksimeditor.cpp
+++ b/gui2/quicksimeditor/quicksimeditor.cpp
@@ -7,20 +7,20 @@
 //
 // ************************************************************************** //
 
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/quicksimeditor.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/jobmodel.h"
 #include "gui2/quicksimeditor/quicksimcontroller.h"
-#include "gui2/quicksimeditor/quicksimeditor.h"
 #include "gui2/quicksimeditor/quicksimeditortoolbar.h"
 #include "gui2/quicksimeditor/simplotcontroller.h"
 #include "gui2/quicksimeditor/simplotwidget.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/plotting/graphcanvas.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include <QTabWidget>
+#include <QVBoxLayout>
 
 using namespace ModelView;
 
diff --git a/gui2/quicksimeditor/quicksimeditor.h b/gui2/quicksimeditor/quicksimeditor.h
index 0fd4f2019f494b3689b20f03972a39b45b883b26..fc57fe7b3bfa44a92e4137dd2caa78d5bbbecc6b 100644
--- a/gui2/quicksimeditor/quicksimeditor.h
+++ b/gui2/quicksimeditor/quicksimeditor.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMEDITOR_H
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITOR_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace DaRefl {
 
diff --git a/gui2/quicksimeditor/quicksimeditortoolbar.cpp b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
index 5ba6f38795e4ae6bf89404928e9b66e6312b4421..661e5bce02c883bdaa6c13616b5965bb0f0547b8 100644
--- a/gui2/quicksimeditor/quicksimeditortoolbar.cpp
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
+#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
+#include "gui2/core/app_constants.h"
 #include <QAction>
 #include <QCheckBox>
 #include <QLabel>
 #include <QProgressBar>
 #include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
 
 namespace DaRefl {
 
diff --git a/gui2/quicksimeditor/quicksimeditortoolbar.h b/gui2/quicksimeditor/quicksimeditortoolbar.h
index 1084a36516c06f5557afae36267e642b6dbd3633..27f7d183beadfe602f0989f099b52cdb211356cf 100644
--- a/gui2/quicksimeditor/quicksimeditortoolbar.h
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMEDITORTOOLBAR_H
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITORTOOLBAR_H
 
-#include <QToolBar>
 #include "darefl_export.h"
+#include <QToolBar>
 
 class QProgressBar;
 class QCheckBox;
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index ba7bf733b18cc1e6d0222104aeba92e53887d15d..c7601da57d3fe56f7bb231411275c42c73ea4689 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
+#include "gui2/quicksimeditor/quicksimutils.h"
 #include "gui2/model/item_constants.h"
 #include "gui2/model/materialitems.h"
 #include "gui2/model/sampleitems.h"
-#include "gui2/quicksimeditor/quicksimutils.h"
+#include "mvvm/model/externalproperty.h"
+#include "mvvm/model/sessionmodel.h"
 #include <Sample/Material/MaterialFactoryFuncs.h>
 #include <Sample/Slice/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
-#include "mvvm/model/externalproperty.h"
-#include "mvvm/model/sessionmodel.h"
 #include <stdexcept>
 
 namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimutils.h b/gui2/quicksimeditor/quicksimutils.h
index 0c73233e2820c989707652eebe89b8c447a31177..ea6efe0e77e63a047c1c662e1f2292eb163a17c9 100644
--- a/gui2/quicksimeditor/quicksimutils.h
+++ b/gui2/quicksimeditor/quicksimutils.h
@@ -23,8 +23,7 @@ namespace DaRefl::Utils {
 //! Creates multi-slice presentation of internal multilayer structure.
 DAREFLCORE_EXPORT multislice_t CreateMultiSlice(const MultiLayerItem& multilayer);
 
-DAREFLCORE_EXPORT std::vector<Slice>
-createBornAgainSlices(const multislice_t& multislice);
+DAREFLCORE_EXPORT std::vector<Slice> createBornAgainSlices(const multislice_t& multislice);
 
 } // namespace DaRefl::Utils
 
diff --git a/gui2/quicksimeditor/simplotcontroller.cpp b/gui2/quicksimeditor/simplotcontroller.cpp
index e59708e466a8f116ae663a7adf0509a5eaa8dec7..af0d4b7e5341b0141dd9551dd12f692ef7ca0e3f 100644
--- a/gui2/quicksimeditor/simplotcontroller.cpp
+++ b/gui2/quicksimeditor/simplotcontroller.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/quicksimeditor/simplotcontroller.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/instrumentitems.h"
 #include "gui2/model/instrumentmodel.h"
 #include "gui2/model/jobitem.h"
 #include "gui2/model/jobmodel.h"
-#include "gui2/quicksimeditor/simplotcontroller.h"
 #include "mvvm/project/modelhaschangedcontroller.h"
 
 namespace DaRefl {
diff --git a/gui2/quicksimeditor/simplotcontroller.h b/gui2/quicksimeditor/simplotcontroller.h
index 17d9c44452970e875755aaf72766da301f93cc25..89461592c60bcb1e739a5f84ca6a24266a0b152a 100644
--- a/gui2/quicksimeditor/simplotcontroller.h
+++ b/gui2/quicksimeditor/simplotcontroller.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_SIMPLOTCONTROLLER_H
 #define DAREFL_QUICKSIMEDITOR_SIMPLOTCONTROLLER_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/quicksimeditor/simplotwidget.cpp b/gui2/quicksimeditor/simplotwidget.cpp
index 3340b7e8f05d3809642e71cd8182c87dbe7371c5..e851fe03845b3be9eaf182ad2ba4269a25846a20 100644
--- a/gui2/quicksimeditor/simplotwidget.cpp
+++ b/gui2/quicksimeditor/simplotwidget.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QList>
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/simplotwidget.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/experimentaldataitems.h"
 #include "gui2/model/jobmodel.h"
-#include "gui2/quicksimeditor/simplotwidget.h"
 #include "mvvm/plotting/graphcanvas.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include <QList>
+#include <QSplitter>
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/quicksimeditor/simplotwidget.h b/gui2/quicksimeditor/simplotwidget.h
index 6899848b02eb7f2fd4f6260976a6751394b5b9a7..558c0fac0a5746e5d73fc656d20ad21bff147470 100644
--- a/gui2/quicksimeditor/simplotwidget.h
+++ b/gui2/quicksimeditor/simplotwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_SIMPLOTWIDGET_H
 #define DAREFL_QUICKSIMEDITOR_SIMPLOTWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace ModelView {
 class GraphCanvas;
diff --git a/gui2/quicksimeditor/speculartoysimulation.cpp b/gui2/quicksimeditor/speculartoysimulation.cpp
index 7bab4e5efcbdec41d756455836f7cb6c2f524f99..51b6a3fc40f03a3d08150b2078b7c68f29d691b0 100644
--- a/gui2/quicksimeditor/speculartoysimulation.cpp
+++ b/gui2/quicksimeditor/speculartoysimulation.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
+#include "gui2/quicksimeditor/speculartoysimulation.h"
 #include "gui2/quicksimeditor/materialprofile.h"
 #include "gui2/quicksimeditor/quicksimutils.h"
-#include "gui2/quicksimeditor/speculartoysimulation.h"
-#include <Sample/Slice/Slice.h>
-#include <Sample/Slice/KzComputation.h>
-#include <Sample/Specular/SpecularScalarTanhStrategy.h>
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/utils/containerutils.h"
+#include <Sample/Slice/KzComputation.h>
+#include <Sample/Slice/Slice.h>
+#include <Sample/Specular/SpecularScalarTanhStrategy.h>
+#include <algorithm>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/gui2/quicksimeditor/speculartoysimulation.h b/gui2/quicksimeditor/speculartoysimulation.h
index f40d4bdc98f00b07373c2e061567e897a6459994..daeae5d3abbac3f3e95c6656caee957db116aec2 100644
--- a/gui2/quicksimeditor/speculartoysimulation.h
+++ b/gui2/quicksimeditor/speculartoysimulation.h
@@ -12,8 +12,8 @@
 
 #include "darefl_export.h"
 #include "gui2/quicksimeditor/quicksim_types.h"
-#include <memory>
 #include "mvvm/utils/progresshandler.h"
+#include <memory>
 #include <vector>
 
 class SpecularScalarTanhStrategy;
diff --git a/gui2/settingsview/settingsview.cpp b/gui2/settingsview/settingsview.cpp
index f95b4f6a1475f7257bef963fbabf2bf61e56df7e..acd416ee825454fa6f2ba87d8ded457b8c9c0e44 100644
--- a/gui2/settingsview/settingsview.cpp
+++ b/gui2/settingsview/settingsview.cpp
@@ -7,17 +7,17 @@
 //
 // ************************************************************************** //
 
+#include "gui2/settingsview/settingsview.h"
+#include "gui2/model/applicationmodels.h"
+#include "mvvm/model/sessionmodel.h"
+#include "mvvm/widgets/allitemstreeview.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QHBoxLayout>
 #include <QListView>
 #include <QListWidget>
 #include <QStackedWidget>
 #include <QTabWidget>
 #include <QTreeView>
-#include "gui2/model/applicationmodels.h"
-#include "gui2/settingsview/settingsview.h"
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/widgets/allitemstreeview.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/settingsview/settingsview.h b/gui2/settingsview/settingsview.h
index ebba0c5e650288575e7d95760114a45d120172b3..b4be2d9f30653e32db35b409f331c50c92a27b37 100644
--- a/gui2/settingsview/settingsview.h
+++ b/gui2/settingsview/settingsview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SETTINGSVIEW_SETTINGSVIEW_H
 #define DAREFL_SETTINGSVIEW_SETTINGSVIEW_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 class QTabWidget;
 class QStackedWidget;
diff --git a/gui2/sldeditor/elementview.cpp b/gui2/sldeditor/elementview.cpp
index ee6cc81dc076448b255d1971aacd9f919492a230..1a381d103a7f34416d4f3368b05fde78e9df52c3 100644
--- a/gui2/sldeditor/elementview.cpp
+++ b/gui2/sldeditor/elementview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/plotting/sceneadapterinterface.h"
 #include "gui2/sldeditor/elementview.h"
 #include "gui2/sldeditor/graphicsscene.h"
+#include "mvvm/plotting/sceneadapterinterface.h"
 
 #include <QCursor>
 #include <QPainter>
diff --git a/gui2/sldeditor/graphicsscene.h b/gui2/sldeditor/graphicsscene.h
index 018fffd5bfb02c658f0bb2d1b9a105a06f486e4d..4d055d5296166d403200bd77e936f194f1fb51c7 100644
--- a/gui2/sldeditor/graphicsscene.h
+++ b/gui2/sldeditor/graphicsscene.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_GRAPHICSSCENE_H
 #define DAREFL_SLDEDITOR_GRAPHICSSCENE_H
 
-#include <QGraphicsScene>
 #include "darefl_export.h"
+#include <QGraphicsScene>
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/sldeditor/layerelementcontroller.h b/gui2/sldeditor/layerelementcontroller.h
index 4c580142c5e4b6f32aaf10e033cb9c20746bb180..ca744886894f7313f6924df4a7f7df624a6282b0 100644
--- a/gui2/sldeditor/layerelementcontroller.h
+++ b/gui2/sldeditor/layerelementcontroller.h
@@ -10,10 +10,10 @@
 #ifndef DAREFL_SLDEDITOR_LAYERELEMENTCONTROLLER_H
 #define DAREFL_SLDEDITOR_LAYERELEMENTCONTROLLER_H
 
+#include "darefl_export.h"
 #include "mvvm/plotting/sceneadapterinterface.h"
 #include <QObject>
 #include <QPainterPath>
-#include "darefl_export.h"
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/sldeditor/roughnesselementview.cpp b/gui2/sldeditor/roughnesselementview.cpp
index 0da9c1c78c198642a83cb3bbf14f7872d56e13f7..b2fea0156f10384ac0c786cbd969147732501dea 100644
--- a/gui2/sldeditor/roughnesselementview.cpp
+++ b/gui2/sldeditor/roughnesselementview.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/sldeditor/layerelementcontroller.h"
 #include "gui2/sldeditor/roughnesselementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
 
 #include <QPainter>
 #include <QStyleOption>
diff --git a/gui2/sldeditor/segmentelementview.cpp b/gui2/sldeditor/segmentelementview.cpp
index 80cb6d1c5f9c94bd158dad22f41c158336d4b7a5..85f9553468c69ef029dab77f71fbde1bab4fd681 100644
--- a/gui2/sldeditor/segmentelementview.cpp
+++ b/gui2/sldeditor/segmentelementview.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/sldeditor/layerelementcontroller.h"
 #include "gui2/sldeditor/segmentelementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
diff --git a/gui2/sldeditor/sldeditor.cpp b/gui2/sldeditor/sldeditor.cpp
index 33a60a4dd7981b82069b22ed6ddf3400d2c27c3a..813b531473deaef305d7ddda3144ce2c875fb3a3 100644
--- a/gui2/sldeditor/sldeditor.cpp
+++ b/gui2/sldeditor/sldeditor.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
+#include "gui2/sldeditor/sldeditor.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/sldeditor/graphicsscene.h"
-#include "gui2/sldeditor/sldeditor.h"
 #include "gui2/sldeditor/sldeditoractions.h"
 #include "gui2/sldeditor/sldeditortoolbar.h"
 #include "gui2/sldeditor/sldviewwidget.h"
 #include "mvvm/plotting/graphcanvas.h"
+#include <QVBoxLayout>
 
 namespace DaRefl {
 
diff --git a/gui2/sldeditor/sldeditor.h b/gui2/sldeditor/sldeditor.h
index 730ca69460f2cbfad7338fec996b5dd447fe391c..515773bb8680e3a2080e7ca10640e25dc1906bad 100644
--- a/gui2/sldeditor/sldeditor.h
+++ b/gui2/sldeditor/sldeditor.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_SLDEDITOR_H
 #define DAREFL_SLDEDITOR_SLDEDITOR_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 namespace DaRefl {
 class SLDEditorActions;
diff --git a/gui2/sldeditor/sldeditoractions.cpp b/gui2/sldeditor/sldeditoractions.cpp
index 02132317cb32a759b14e1654c23fdcfb73a9cc3a..bade45438633881e172bfecb6478222052df01df 100644
--- a/gui2/sldeditor/sldeditoractions.cpp
+++ b/gui2/sldeditor/sldeditoractions.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/sldeditor/layerelementitem.h"
 #include "gui2/sldeditor/sldeditoractions.h"
+#include "gui2/sldeditor/layerelementitem.h"
 #include "gui2/sldeditor/sldelementmodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodel.h"
diff --git a/gui2/sldeditor/sldeditoractions.h b/gui2/sldeditor/sldeditoractions.h
index 58799546a9461160d06e391c06fd33713463b9c6..f4a6d63428c272bac9aeff278e87774d12295074 100644
--- a/gui2/sldeditor/sldeditoractions.h
+++ b/gui2/sldeditor/sldeditoractions.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_SLDEDITORACTIONS_H
 #define DAREFL_SLDEDITOR_SLDEDITORACTIONS_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/sldeditor/sldeditortoolbar.cpp b/gui2/sldeditor/sldeditortoolbar.cpp
index 20a17629225d1939b369e0e4954c57d1b1f6ea54..21d4633d9f8acb12c695b6c0f2b8636bce55380d 100644
--- a/gui2/sldeditor/sldeditortoolbar.cpp
+++ b/gui2/sldeditor/sldeditortoolbar.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QAction>
-#include <QToolButton>
+#include "gui2/sldeditor/sldeditortoolbar.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/resources/resources.h"
 #include "gui2/sldeditor/sldeditoractions.h"
-#include "gui2/sldeditor/sldeditortoolbar.h"
+#include <QAction>
+#include <QToolButton>
 
 namespace DaRefl {
 
diff --git a/gui2/sldeditor/sldeditortoolbar.h b/gui2/sldeditor/sldeditortoolbar.h
index 4e65cb179bf979b0650ce6215b2a2989321fd8cf..c852b51021ec6f0211294e87fabc0e51b77944bd 100644
--- a/gui2/sldeditor/sldeditortoolbar.h
+++ b/gui2/sldeditor/sldeditortoolbar.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_SLDEDITORTOOLBAR_H
 #define DAREFL_SLDEDITOR_SLDEDITORTOOLBAR_H
 
-#include <QToolBar>
 #include "darefl_export.h"
+#include <QToolBar>
 
 namespace DaRefl {
 
diff --git a/gui2/sldeditor/sldelementcontroller.cpp b/gui2/sldeditor/sldelementcontroller.cpp
index 45e58cb0fcf5e7c9b896df8b8542be3925072284..9f5589dc8f220d541284cd4e49db240fe2200b57 100644
--- a/gui2/sldeditor/sldelementcontroller.cpp
+++ b/gui2/sldeditor/sldelementcontroller.cpp
@@ -7,6 +7,7 @@
 //
 // ************************************************************************** //
 
+#include "gui2/sldeditor/sldelementcontroller.h"
 #include "gui2/model/materialitems.h"
 #include "gui2/model/materialmodel.h"
 #include "gui2/model/sampleitems.h"
@@ -15,13 +16,12 @@
 #include "gui2/sldeditor/layerelementcontroller.h"
 #include "gui2/sldeditor/layerelementitem.h"
 #include "gui2/sldeditor/segmentelementview.h"
-#include "gui2/sldeditor/sldelementcontroller.h"
 #include "gui2/sldeditor/sldelementmodel.h"
-#include <iostream>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/signals/modelmapper.h"
+#include <iostream>
 
 using namespace ModelView;
 
diff --git a/gui2/sldeditor/sldelementcontroller.h b/gui2/sldeditor/sldelementcontroller.h
index a6afd05701465d15ec95c7c01d8da3747145c058..745e79c50e471934f3f55d908c6361c97b8d5224 100644
--- a/gui2/sldeditor/sldelementcontroller.h
+++ b/gui2/sldeditor/sldelementcontroller.h
@@ -10,11 +10,11 @@
 #ifndef DAREFL_SLDEDITOR_SLDELEMENTCONTROLLER_H
 #define DAREFL_SLDEDITOR_SLDELEMENTCONTROLLER_H
 
-#include <QObject>
 #include "darefl_export.h"
 #include "gui2/sldeditor/layerelementcontroller.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
+#include <QObject>
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/sldeditor/sldelementmodel.cpp b/gui2/sldeditor/sldelementmodel.cpp
index 0d76c8cab24f676bedbfef360a3d503c60390413..7fa77d81d6ffb74bcd1f6ca8f056dce018b72ba0 100644
--- a/gui2/sldeditor/sldelementmodel.cpp
+++ b/gui2/sldeditor/sldelementmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "gui2/sldeditor/layerelementitem.h"
 #include "gui2/sldeditor/sldelementmodel.h"
+#include "gui2/sldeditor/layerelementitem.h"
 
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemcatalogue.h"
diff --git a/gui2/sldeditor/sldviewwidget.cpp b/gui2/sldeditor/sldviewwidget.cpp
index 16aaf592bf298f7b5a976c9f48e720451bea163e..e30f026bfb7fb2a3ccdc776d2529aba4a404e681 100644
--- a/gui2/sldeditor/sldviewwidget.cpp
+++ b/gui2/sldeditor/sldviewwidget.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QResizeEvent>
+#include "gui2/sldeditor/sldviewwidget.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/model/jobmodel.h"
 #include "gui2/sldeditor/graphicsscene.h"
 #include "gui2/sldeditor/sldelementcontroller.h"
-#include "gui2/sldeditor/sldviewwidget.h"
+#include <QResizeEvent>
 
 namespace DaRefl {
 
diff --git a/gui2/sldeditor/sldviewwidget.h b/gui2/sldeditor/sldviewwidget.h
index 78f21b110cfd2b94ea64c20635865730866bd38c..f2fed31d3b34ae1bc6bc90f3a8e3f0afbc1be64a 100644
--- a/gui2/sldeditor/sldviewwidget.h
+++ b/gui2/sldeditor/sldviewwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_SLDVIEWWIDGET_H
 #define DAREFL_SLDEDITOR_SLDVIEWWIDGET_H
 
-#include <QGraphicsView>
 #include "darefl_export.h"
+#include <QGraphicsView>
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/welcomeview/openprojectwidget.cpp b/gui2/welcomeview/openprojectwidget.cpp
index dc04bdd814218d103168eafc2f04bf082b25419e..4c4be3bc1f1807e2dc7cb9a13dcdc35eff44f92e 100644
--- a/gui2/welcomeview/openprojectwidget.cpp
+++ b/gui2/welcomeview/openprojectwidget.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include "gui2/welcomeview/openprojectwidget.h"
 #include "gui2/core/version.h"
 #include "gui2/mainwindow/styleutils.h"
-#include "gui2/welcomeview/openprojectwidget.h"
 #include "mvvm/core/version.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 namespace {
 int logo_width() {
diff --git a/gui2/welcomeview/openprojectwidget.h b/gui2/welcomeview/openprojectwidget.h
index 3ed640020581a862f491be805b1a6cb682fda73e..16b37828d1318da7be7c1b417b51169d8251381d 100644
--- a/gui2/welcomeview/openprojectwidget.h
+++ b/gui2/welcomeview/openprojectwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_OPENPROJECTWIDGET_H
 #define DAREFL_WELCOMEVIEW_OPENPROJECTWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 
 class QBoxLayout;
diff --git a/gui2/welcomeview/projecthandler.cpp b/gui2/welcomeview/projecthandler.cpp
index 62c6ff8b9899d8b49ca3e854a3c749e12fe3490e..4fe92f08f988ff81995103430ef9509e42cf0195 100644
--- a/gui2/welcomeview/projecthandler.cpp
+++ b/gui2/welcomeview/projecthandler.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QMainWindow>
-#include "gui2/model/applicationmodels.h"
 #include "gui2/welcomeview/projecthandler.h"
+#include "gui2/model/applicationmodels.h"
 #include "gui2/welcomeview/recentprojectsettings.h"
 #include "gui2/welcomeview/recentprojectwidget.h"
 #include "gui2/welcomeview/userinteractor.h"
 #include "mvvm/factories/projectmanagerfactory.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QMainWindow>
 
 using namespace ModelView;
 
diff --git a/gui2/welcomeview/projecthandler.h b/gui2/welcomeview/projecthandler.h
index 97b3b3fa41d0b0e49b19ffc9ce119017c7cd2e5f..8396f68cb93dd6bcb986b0baaaa080ff3dc70e9f 100644
--- a/gui2/welcomeview/projecthandler.h
+++ b/gui2/welcomeview/projecthandler.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_PROJECTHANDLER_H
 #define DAREFL_WELCOMEVIEW_PROJECTHANDLER_H
 
-#include <QObject>
 #include "darefl_export.h"
+#include <QObject>
 #include <memory>
 #include <vector>
 
diff --git a/gui2/welcomeview/projectpanewidget.cpp b/gui2/welcomeview/projectpanewidget.cpp
index 47846570d7b7d5d1b94ff8e652dd9c8790885155..aa96853335a7096d193f0b9b3cfa365f5e45e725 100644
--- a/gui2/welcomeview/projectpanewidget.cpp
+++ b/gui2/welcomeview/projectpanewidget.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "gui2/welcomeview/projectpanewidget.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QVBoxLayout>
-#include "gui2/welcomeview/projectpanewidget.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace {
 int widget_height() {
diff --git a/gui2/welcomeview/projectpanewidget.h b/gui2/welcomeview/projectpanewidget.h
index 7b1efaba407f1771212abbee380ebfa80e0cd1dd..9082a9ef67d9d135de829e72949885ff44a57c85 100644
--- a/gui2/welcomeview/projectpanewidget.h
+++ b/gui2/welcomeview/projectpanewidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_PROJECTPANEWIDGET_H
 #define DAREFL_WELCOMEVIEW_PROJECTPANEWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 
 class QLabel;
 
diff --git a/gui2/welcomeview/recentprojectsettings.cpp b/gui2/welcomeview/recentprojectsettings.cpp
index 7197285675cbceb981f9476f41d6eaa403a0c54f..a5480179e3faa328a1527775cb243784e1c539cd 100644
--- a/gui2/welcomeview/recentprojectsettings.cpp
+++ b/gui2/welcomeview/recentprojectsettings.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QDir>
-#include <QSettings>
 #include "gui2/welcomeview/recentprojectsettings.h"
 #include "mvvm/utils/fileutils.h"
+#include <QDir>
+#include <QSettings>
 
 namespace {
 const int max_recent_projects = 10;
diff --git a/gui2/welcomeview/recentprojectsettings.h b/gui2/welcomeview/recentprojectsettings.h
index 957937663e82f8b6afd2eae610db9a963c929b4d..3dfbbd9b43d49a430c3a8af277f083ac4cded2f5 100644
--- a/gui2/welcomeview/recentprojectsettings.h
+++ b/gui2/welcomeview/recentprojectsettings.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_RECENTPROJECTSETTINGS_H
 #define DAREFL_WELCOMEVIEW_RECENTPROJECTSETTINGS_H
 
-#include <QStringList>
 #include "darefl_export.h"
+#include <QStringList>
 
 namespace DaRefl {
 
diff --git a/gui2/welcomeview/recentprojectwidget.cpp b/gui2/welcomeview/recentprojectwidget.cpp
index 0adb195071d567cbcf9f903e3b2ffde0f2630dc8..efe79076f64570e5c353f555da9f1fdecff58782 100644
--- a/gui2/welcomeview/recentprojectwidget.cpp
+++ b/gui2/welcomeview/recentprojectwidget.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include "gui2/welcomeview/recentprojectwidget.h"
 #include "gui2/mainwindow/styleutils.h"
 #include "gui2/welcomeview/projectpanewidget.h"
-#include "gui2/welcomeview/recentprojectwidget.h"
 #include "mvvm/widgets/adjustingscrollarea.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QLabel>
+#include <QScrollArea>
+#include <QVBoxLayout>
 
 namespace {
 const int max_recent_project_count = 10;
diff --git a/gui2/welcomeview/recentprojectwidget.h b/gui2/welcomeview/recentprojectwidget.h
index 9a8a69b8a9645a62117889e8964305f4cdd873a6..7abfe54cb73e8e14c162689dd9accf68babff5f4 100644
--- a/gui2/welcomeview/recentprojectwidget.h
+++ b/gui2/welcomeview/recentprojectwidget.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_RECENTPROJECTWIDGET_H
 #define DAREFL_WELCOMEVIEW_RECENTPROJECTWIDGET_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 #include <vector>
 
diff --git a/gui2/welcomeview/userinteractor.cpp b/gui2/welcomeview/userinteractor.cpp
index bb94b42c87f068a4926bbeb682dce1252d86e017..37c6af6b13f89b5a548092af15436a4e512ee921 100644
--- a/gui2/welcomeview/userinteractor.cpp
+++ b/gui2/welcomeview/userinteractor.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <QFileDialog>
-#include <QMessageBox>
-#include "gui2/welcomeview/recentprojectsettings.h"
 #include "gui2/welcomeview/userinteractor.h"
-#include <map>
+#include "gui2/welcomeview/recentprojectsettings.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectutils.h"
 #include "mvvm/utils/fileutils.h"
+#include <QFileDialog>
+#include <QMessageBox>
+#include <map>
 
 using namespace ModelView;
 
diff --git a/gui2/welcomeview/welcomeview.cpp b/gui2/welcomeview/welcomeview.cpp
index de3f5a291968dcaf35e950a59b8ee065e469912d..fcfc57c986a94deb3bcc23c588bcb5c419b537ca 100644
--- a/gui2/welcomeview/welcomeview.cpp
+++ b/gui2/welcomeview/welcomeview.cpp
@@ -7,17 +7,17 @@
 //
 // ************************************************************************** //
 
-#include <QApplication>
-#include <QHBoxLayout>
-#include <QMainWindow>
+#include "gui2/welcomeview/welcomeview.h"
 #include "gui2/model/applicationmodels.h"
 #include "gui2/welcomeview/openprojectwidget.h"
 #include "gui2/welcomeview/projecthandler.h"
 #include "gui2/welcomeview/recentprojectsettings.h"
 #include "gui2/welcomeview/recentprojectwidget.h"
-#include "gui2/welcomeview/welcomeview.h"
 #include "mvvm/project/projectutils.h"
 #include "mvvm/widgets/widgetutils.h"
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QMainWindow>
 
 namespace DaRefl {
 
diff --git a/gui2/welcomeview/welcomeview.h b/gui2/welcomeview/welcomeview.h
index 0a4fd33afbe4f521b8f72c524bf5c9dbeead4bd5..f90248d5e884e2df1028778398eb3a9c38a168b8 100644
--- a/gui2/welcomeview/welcomeview.h
+++ b/gui2/welcomeview/welcomeview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_WELCOMEVIEW_WELCOMEVIEW_H
 #define DAREFL_WELCOMEVIEW_WELCOMEVIEW_H
 
-#include <QWidget>
 #include "darefl_export.h"
+#include <QWidget>
 #include <memory>
 
 namespace DaRefl {
diff --git a/mvvm/model/mvvm/commands/abstractitemcommand.h b/mvvm/model/mvvm/commands/abstractitemcommand.h
index bb877fdc534a4edbe865bcdc851e0678d6655fe9..87d527d108bc03d2dcde5b7e6dff3f79ea22bf03 100644
--- a/mvvm/model/mvvm/commands/abstractitemcommand.h
+++ b/mvvm/model/mvvm/commands/abstractitemcommand.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_COMMANDS_ABSTRACTITEMCOMMAND_H
 #define MVVM_COMMANDS_ABSTRACTITEMCOMMAND_H
 
-#include <memory>
 #include "mvvm/commands/commandresult.h"
 #include "mvvm/model_export.h"
+#include <memory>
 #include <string>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/commands/commandadapter.cpp b/mvvm/model/mvvm/commands/commandadapter.cpp
index 2e6f9efad8a0431dbcc8e9ca3af4a4fd1096553d..2f139f4bb1bbed83f815b69fa8f48fdc5c59727e 100644
--- a/mvvm/model/mvvm/commands/commandadapter.cpp
+++ b/mvvm/model/mvvm/commands/commandadapter.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/commands/abstractitemcommand.h"
 #include "mvvm/commands/commandadapter.h"
+#include "mvvm/commands/abstractitemcommand.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/commands/commandadapter.h b/mvvm/model/mvvm/commands/commandadapter.h
index 7ce98597538157e690e8ef279fa2c44fab9cdedf..b7fc978090c8ccc9846a682585563eda802f0c6e 100644
--- a/mvvm/model/mvvm/commands/commandadapter.h
+++ b/mvvm/model/mvvm/commands/commandadapter.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_COMMANDS_COMMANDADAPTER_H
 #define MVVM_COMMANDS_COMMANDADAPTER_H
 
+#include "mvvm/model_export.h"
 #include <QUndoCommand>
 #include <memory>
-#include "mvvm/model_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/commands/commandservice.h b/mvvm/model/mvvm/commands/commandservice.h
index 13de6325863dbcd93dc634be6d77d088a45fc4af..441a2f874734ac75fd86d430edfc79315e653b08 100644
--- a/mvvm/model/mvvm/commands/commandservice.h
+++ b/mvvm/model/mvvm/commands/commandservice.h
@@ -10,12 +10,12 @@
 #ifndef MVVM_COMMANDS_COMMANDSERVICE_H
 #define MVVM_COMMANDS_COMMANDSERVICE_H
 
-#include <memory>
 #include "mvvm/commands/commandresult.h"
 #include "mvvm/commands/undostack.h"
 #include "mvvm/core/variant.h"
 #include "mvvm/model/function_types.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 class QUndoCommand;
 
diff --git a/mvvm/model/mvvm/commands/commandutils.h b/mvvm/model/mvvm/commands/commandutils.h
index 878f558930157e9f801021783aa5688548adb31b..636b2c610d3f30015d35d9d8ae3d63f8529868d6 100644
--- a/mvvm/model/mvvm/commands/commandutils.h
+++ b/mvvm/model/mvvm/commands/commandutils.h
@@ -13,9 +13,9 @@
 //! @file commandutils.h
 //! Collection of various utility functions for command service.
 
-#include <memory>
 #include "mvvm/interfaces/itembackupstrategy.h"
 #include "mvvm/interfaces/itemcopystrategy.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/commands/copyitemcommand.cpp b/mvvm/model/mvvm/commands/copyitemcommand.cpp
index 8943697b25aa40e8761965185f11a0fe67c203b3..5228e01eebf7535656ffe84b27bdd6e73aa40008 100644
--- a/mvvm/model/mvvm/commands/copyitemcommand.cpp
+++ b/mvvm/model/mvvm/commands/copyitemcommand.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/commands/commandutils.h"
 #include "mvvm/commands/copyitemcommand.h"
+#include "mvvm/commands/commandutils.h"
 #include "mvvm/interfaces/itembackupstrategy.h"
 #include "mvvm/interfaces/itemcopystrategy.h"
 #include "mvvm/model/path.h"
diff --git a/mvvm/model/mvvm/commands/moveitemcommand.h b/mvvm/model/mvvm/commands/moveitemcommand.h
index 0cbe280abf923a78ae0476e19dc80a29aabf55e8..6e446bf9c418ec9fa0575a406790ec15ec9b9995 100644
--- a/mvvm/model/mvvm/commands/moveitemcommand.h
+++ b/mvvm/model/mvvm/commands/moveitemcommand.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_COMMANDS_MOVEITEMCOMMAND_H
 #define MVVM_COMMANDS_MOVEITEMCOMMAND_H
 
-#include <memory>
 #include "mvvm/commands/abstractitemcommand.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/commands/removeitemcommand.cpp b/mvvm/model/mvvm/commands/removeitemcommand.cpp
index c7d5ab9acb55f52cf506eb70e5efaeab5ae7495c..1a0c3a8052eaaf6a99f8d17377fa345c6a260831 100644
--- a/mvvm/model/mvvm/commands/removeitemcommand.cpp
+++ b/mvvm/model/mvvm/commands/removeitemcommand.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/commands/commandutils.h"
 #include "mvvm/commands/removeitemcommand.h"
+#include "mvvm/commands/commandutils.h"
 #include "mvvm/interfaces/itembackupstrategy.h"
 #include "mvvm/model/path.h"
 #include "mvvm/model/sessionitem.h"
diff --git a/mvvm/model/mvvm/commands/undostack.cpp b/mvvm/model/mvvm/commands/undostack.cpp
index 0e3298ba0ca2b65ceb98576e3421d06c01a7e229..779d3214678e9b6c74abacad51183d5b85575579 100644
--- a/mvvm/model/mvvm/commands/undostack.cpp
+++ b/mvvm/model/mvvm/commands/undostack.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <QUndoStack>
-#include "mvvm/commands/commandadapter.h"
 #include "mvvm/commands/undostack.h"
+#include "mvvm/commands/commandadapter.h"
+#include <QUndoStack>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/commands/undostack.h b/mvvm/model/mvvm/commands/undostack.h
index f1ef560056d0a14ae1a43fd779956160ff47b100..01996f872658eabbf128186d847e408e49064c2d 100644
--- a/mvvm/model/mvvm/commands/undostack.h
+++ b/mvvm/model/mvvm/commands/undostack.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_COMMANDS_UNDOSTACK_H
 #define MVVM_COMMANDS_UNDOSTACK_H
 
-#include <memory>
 #include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 class QUndoStack;
 
diff --git a/mvvm/model/mvvm/core/uniqueidgenerator.cpp b/mvvm/model/mvvm/core/uniqueidgenerator.cpp
index 8640af93192aa7be3c3976e598a10150cf8c5191..74eebef6e1ff4d7ceb8d01ccabf3801a9ee92826 100644
--- a/mvvm/model/mvvm/core/uniqueidgenerator.cpp
+++ b/mvvm/model/mvvm/core/uniqueidgenerator.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <QUuid>
 #include "mvvm/core/uniqueidgenerator.h"
+#include <QUuid>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/factories/itemconverterfactory.h b/mvvm/model/mvvm/factories/itemconverterfactory.h
index 895eb26d2a90cc337589a6230080b0fcdaa42ace..7d470905a4aa3e23c917ea17c62f5ba7384433b8 100644
--- a/mvvm/model/mvvm/factories/itemconverterfactory.h
+++ b/mvvm/model/mvvm/factories/itemconverterfactory.h
@@ -13,8 +13,8 @@
 //! @file itemconverterfactory.h
 //! Collection of factory functions to create SessionItem converters to/from serialized content.
 
-#include <memory>
 #include "mvvm/serialization/jsonitemconverterinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/factories/modelconverterfactory.cpp b/mvvm/model/mvvm/factories/modelconverterfactory.cpp
index 00bc60f2046212a107daec58c998faf90e79ed89..0e4585b05caa7ac0f231fc1f5a26e7509151b14c 100644
--- a/mvvm/model/mvvm/factories/modelconverterfactory.cpp
+++ b/mvvm/model/mvvm/factories/modelconverterfactory.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/factories/modelconverterfactory.h"
+#include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/serialization/jsonitem_types.h"
 #include "mvvm/serialization/jsonmodelconverter.h"
 
diff --git a/mvvm/model/mvvm/factories/modelconverterfactory.h b/mvvm/model/mvvm/factories/modelconverterfactory.h
index 0d006c313dd770355d4d0547733a777c9d25ea8c..f9bb99e4ea8fafefa200aad3d4c2cf5be89a1f0c 100644
--- a/mvvm/model/mvvm/factories/modelconverterfactory.h
+++ b/mvvm/model/mvvm/factories/modelconverterfactory.h
@@ -13,8 +13,8 @@
 //! @file modelconverterfactory.h
 //! Collection of factory functions to create SessionModel converters to/from serialized content.
 
-#include <memory>
 #include "mvvm/serialization/jsonmodelconverterinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/factories/modeldocumentfactory.h b/mvvm/model/mvvm/factories/modeldocumentfactory.h
index 66e790bfb0293e31f63f04d3331f6cbdffb0de8e..6b926f8da4becc4fb0b9a8c2b41c9c362fb76b45 100644
--- a/mvvm/model/mvvm/factories/modeldocumentfactory.h
+++ b/mvvm/model/mvvm/factories/modeldocumentfactory.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_FACTORIES_MODELDOCUMENTFACTORY_H
 #define MVVM_FACTORIES_MODELDOCUMENTFACTORY_H
 
-#include <memory>
 #include "mvvm/interfaces/modeldocumentinterface.h"
+#include <memory>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/factories/projectmanagerfactory.h b/mvvm/model/mvvm/factories/projectmanagerfactory.h
index 1c7deaf94fa75d77d42ddb9048a7889f8d20bf17..8942ef4388047d20736ea4ad626aff3384718f25 100644
--- a/mvvm/model/mvvm/factories/projectmanagerfactory.h
+++ b/mvvm/model/mvvm/factories/projectmanagerfactory.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_FACTORIES_PROJECTMANAGERFACTORY_H
 #define MVVM_FACTORIES_PROJECTMANAGERFACTORY_H
 
-#include <memory>
 #include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/interfaces/itembackupstrategy.h b/mvvm/model/mvvm/interfaces/itembackupstrategy.h
index 2158cee9c04d08e9f5a0371eefac73b3c5fa02ba..43e560f1d9d1b2df55f339ffc85a2edc35bd46b3 100644
--- a/mvvm/model/mvvm/interfaces/itembackupstrategy.h
+++ b/mvvm/model/mvvm/interfaces/itembackupstrategy.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_ITEMBACKUPSTRATEGY_H
 #define MVVM_SERIALIZATION_ITEMBACKUPSTRATEGY_H
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/interfaces/itemcopystrategy.h b/mvvm/model/mvvm/interfaces/itemcopystrategy.h
index 1c03adb1e2d87be574a02378f29dfb75b1dfc66a..8a463a60c5cf7d2647742af8f51eb72e60e9e3e4 100644
--- a/mvvm/model/mvvm/interfaces/itemcopystrategy.h
+++ b/mvvm/model/mvvm/interfaces/itemcopystrategy.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_ITEMCOPYSTRATEGY_H
 #define MVVM_SERIALIZATION_ITEMCOPYSTRATEGY_H
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/interfaces/itemfactoryinterface.h b/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
index 539f7500457c96be86234ad432482f7ab7361952..8e479dc8d833d2e607c94b09a72f8f67edd32d8b 100644
--- a/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
+++ b/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
@@ -10,10 +10,10 @@
 #ifndef MVVM_MODEL_ITEMFACTORYINTERFACE_H
 #define MVVM_MODEL_ITEMFACTORYINTERFACE_H
 
-#include <memory>
 #include "mvvm/core/types.h"
 #include "mvvm/model/function_types.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/comparators.cpp b/mvvm/model/mvvm/model/comparators.cpp
index 3d0db213cbae21c9b71663d6f6e43489bd764163..50423e9835fe1eabe0bf13ffc7aa5a808c80be11 100644
--- a/mvvm/model/mvvm/model/comparators.cpp
+++ b/mvvm/model/mvvm/model/comparators.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QMetaType>
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/comparators.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/utils/reallimits.h"
+#include <QMetaType>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/model/customvariants.cpp b/mvvm/model/mvvm/model/customvariants.cpp
index c669c202fa020f04d30e9925f9d5fcd218967322..3fe17afed8ad719ccf20f224e2135420a9748b0c 100644
--- a/mvvm/model/mvvm/model/customvariants.cpp
+++ b/mvvm/model/mvvm/model/customvariants.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/variant_constants.h"
 
diff --git a/mvvm/model/mvvm/model/customvariants.h b/mvvm/model/mvvm/model/customvariants.h
index 1995b8d56835783b2424e86b417819883b57857b..8fb4d9ef93bb2dd39ba7bb49b2c72c53c19085b3 100644
--- a/mvvm/model/mvvm/model/customvariants.h
+++ b/mvvm/model/mvvm/model/customvariants.h
@@ -13,10 +13,10 @@
 //! @file customvariants.h
 //! Registrations and translations for custom variants.
 
-#include <QMetaType>
 #include "mvvm/core/variant.h"
 #include "mvvm/model_export.h"
 #include "mvvm/utils/reallimits.h"
+#include <QMetaType>
 #include <string>
 #include <vector>
 
diff --git a/mvvm/model/mvvm/model/datarole.cpp b/mvvm/model/mvvm/model/datarole.cpp
index d69300046647eb87f3b2a55aa36702f1a0729b32..8203f753bb33abf586f41d91f9d2b492b91fae16 100644
--- a/mvvm/model/mvvm/model/datarole.cpp
+++ b/mvvm/model/mvvm/model/datarole.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/customvariants.h"
 #include "mvvm/model/datarole.h"
+#include "mvvm/model/customvariants.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/model/externalproperty.h b/mvvm/model/mvvm/model/externalproperty.h
index 85d18a41ca3df86a4d15288a5e1ec4ecfce593a1..d2bc3c0c4e5db6c8a6fb6acb8d6152bbe942e9ad 100644
--- a/mvvm/model/mvvm/model/externalproperty.h
+++ b/mvvm/model/mvvm/model/externalproperty.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_MODEL_EXTERNALPROPERTY_H
 #define MVVM_MODEL_EXTERNALPROPERTY_H
 
-#include <QColor>
 #include "mvvm/core/variant.h"
 #include "mvvm/model_export.h"
+#include <QColor>
 #include <string>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/model/groupitem.cpp b/mvvm/model/mvvm/model/groupitem.cpp
index 04cd3468f5750938740d595ce1afe8322d5de0ba..a99d2f899fc13b8f3a5ce9d6923451be4a57de6a 100644
--- a/mvvm/model/mvvm/model/groupitem.cpp
+++ b/mvvm/model/mvvm/model/groupitem.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/groupitem.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/utils/containerutils.h"
 #include <stdexcept>
diff --git a/mvvm/model/mvvm/model/groupitem.h b/mvvm/model/mvvm/model/groupitem.h
index f1a7a1c3ac03e8137bd0b89a5ccbce277d37f8a2..78babe706b4da7e100742091d088d07c24143d24 100644
--- a/mvvm/model/mvvm/model/groupitem.h
+++ b/mvvm/model/mvvm/model/groupitem.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_MODEL_GROUPITEM_H
 #define MVVM_MODEL_GROUPITEM_H
 
-#include <memory>
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/sessionitem.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/itemfactory.cpp b/mvvm/model/mvvm/model/itemfactory.cpp
index 282372e67a528512dd875cec12ec73c94618c3e4..04a733e5a9dda19efde5e4b332d44fdbba489de5 100644
--- a/mvvm/model/mvvm/model/itemfactory.cpp
+++ b/mvvm/model/mvvm/model/itemfactory.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/itemfactory.h"
+#include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/sessionitem.h"
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/itemfactory.h b/mvvm/model/mvvm/model/itemfactory.h
index 5a52ee34e8f3fd4e7e7c3d6c3cc38378e56d83e9..02090fce2e744b1868f129b69e75489daea43fa5 100644
--- a/mvvm/model/mvvm/model/itemfactory.h
+++ b/mvvm/model/mvvm/model/itemfactory.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_MODEL_ITEMFACTORY_H
 #define MVVM_MODEL_ITEMFACTORY_H
 
-#include <memory>
 #include "mvvm/interfaces/itemfactoryinterface.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/itemmanager.cpp b/mvvm/model/mvvm/model/itemmanager.cpp
index 801cd5124b541b5ca5f990ffca7e4307330eaebe..6a76b70bbf9d46f6de4f3518357c8bf0436ba867 100644
--- a/mvvm/model/mvvm/model/itemmanager.cpp
+++ b/mvvm/model/mvvm/model/itemmanager.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/model/itemmanager.h"
 #include "mvvm/factories/itemcataloguefactory.h"
 #include "mvvm/model/itemfactory.h"
-#include "mvvm/model/itemmanager.h"
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/sessionitem.h"
 
diff --git a/mvvm/model/mvvm/model/itemmanager.h b/mvvm/model/mvvm/model/itemmanager.h
index 7aa6c5e5304eb9f975ebb68cae6f8f1b05c31e05..51cb6f3592b46e2437d9aedea0fa391f4e4c090f 100644
--- a/mvvm/model/mvvm/model/itemmanager.h
+++ b/mvvm/model/mvvm/model/itemmanager.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_MODEL_ITEMMANAGER_H
 #define MVVM_MODEL_ITEMMANAGER_H
 
-#include <memory>
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/itempool.cpp b/mvvm/model/mvvm/model/itempool.cpp
index a52873146c72469536fedc7c6953ee9344e80e57..a0b8c1cacdbdedea63ef9ea7a38d54c24901d2dd 100644
--- a/mvvm/model/mvvm/model/itempool.cpp
+++ b/mvvm/model/mvvm/model/itempool.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/core/uniqueidgenerator.h"
 #include "mvvm/model/itempool.h"
+#include "mvvm/core/uniqueidgenerator.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/itempool.h b/mvvm/model/mvvm/model/itempool.h
index 04bf76d7361c383462015e6ac25032d5178ad8f8..c82089fa26a577bf74bd1b5fdc4475e9cadbceae 100644
--- a/mvvm/model/mvvm/model/itempool.h
+++ b/mvvm/model/mvvm/model/itempool.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_MODEL_ITEMPOOL_H
 #define MVVM_MODEL_ITEMPOOL_H
 
-#include <map>
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model_export.h"
+#include <map>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/itemutils.cpp b/mvvm/model/mvvm/model/itemutils.cpp
index af36cef516eaeb61fe3cdfe5b1b4e1ca5477bcd8..0eaad7dc7d3cabf369134f6ab29d1ebf55c07b09 100644
--- a/mvvm/model/mvvm/model/itemutils.cpp
+++ b/mvvm/model/mvvm/model/itemutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <iterator>
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/utils/containerutils.h"
+#include <iterator>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/model/itemutils.h b/mvvm/model/mvvm/model/itemutils.h
index 6b9a489f8dc8d1d690e65175164a3518e494c5ed..dfdc6f547157af8b719dbdf352b084db5e20ed9b 100644
--- a/mvvm/model/mvvm/model/itemutils.h
+++ b/mvvm/model/mvvm/model/itemutils.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_MODEL_ITEMUTILS_H
 #define MVVM_MODEL_ITEMUTILS_H
 
-#include <functional>
 #include "mvvm/model_export.h"
+#include <functional>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/model/modelutils.cpp b/mvvm/model/mvvm/model/modelutils.cpp
index cc843e585a60999259dce586e6aff1e1f8bff7de..d81534fad9b1c43306c7212d02930e98907b3d78 100644
--- a/mvvm/model/mvvm/model/modelutils.cpp
+++ b/mvvm/model/mvvm/model/modelutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QJsonObject>
-#include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model/modelutils.h"
+#include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model/path.h"
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/model/modelutils.h b/mvvm/model/mvvm/model/modelutils.h
index 269582a1ddd72646ec6912ef806dd8b04ede2d06..f51c4c389723e7ea080034da9387ec9d654e1235 100644
--- a/mvvm/model/mvvm/model/modelutils.h
+++ b/mvvm/model/mvvm/model/modelutils.h
@@ -10,12 +10,12 @@
 #ifndef MVVM_MODEL_MODELUTILS_H
 #define MVVM_MODEL_MODELUTILS_H
 
-#include <memory>
 #include "mvvm/factories/modelconverterfactory.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model_export.h"
+#include <memory>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/model/path.cpp b/mvvm/model/mvvm/model/path.cpp
index b015622bea918d55bf2618eedcdf623c96a9fd37..8eab5ff41385841ddbcd1117f66d65efe5843e17 100644
--- a/mvvm/model/mvvm/model/path.cpp
+++ b/mvvm/model/mvvm/model/path.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/model/path.h"
 #include <algorithm>
 #include <iterator>
-#include "mvvm/model/path.h"
 #include <numeric>
 #include <sstream>
 
diff --git a/mvvm/model/mvvm/model/propertyitem.cpp b/mvvm/model/mvvm/model/propertyitem.cpp
index 67070635de616f35246ca8a532abaf6857eb84b2..5cea236ed134e4df37de3ccfb9d85313c823c2ec 100644
--- a/mvvm/model/mvvm/model/propertyitem.cpp
+++ b/mvvm/model/mvvm/model/propertyitem.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/model/propertyitem.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/mvvm_types.h"
-#include "mvvm/model/propertyitem.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/model/sessionitem.cpp b/mvvm/model/mvvm/model/sessionitem.cpp
index 1c2329eb885d8eacd0fab631cb0ca5bd7adbca7d..52c80833dc39e84fff3ebc166fd1b0132dd5073e 100644
--- a/mvvm/model/mvvm/model/sessionitem.cpp
+++ b/mvvm/model/mvvm/model/sessionitem.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/model/sessionitem.h"
 #include "mvvm/core/uniqueidgenerator.h"
 #include "mvvm/model/customvariants.h"
-#include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemdata.h"
 #include "mvvm/model/sessionitemtags.h"
 #include "mvvm/model/sessionmodel.h"
diff --git a/mvvm/model/mvvm/model/sessionitem.h b/mvvm/model/mvvm/model/sessionitem.h
index 78ccca9f8fdf6ab9f084d95d25ffaec98da1b104..03de212d4b0b4699b26fd1a5c5eb4810205dd3fe 100644
--- a/mvvm/model/mvvm/model/sessionitem.h
+++ b/mvvm/model/mvvm/model/sessionitem.h
@@ -10,12 +10,12 @@
 #ifndef MVVM_MODEL_SESSIONITEM_H
 #define MVVM_MODEL_SESSIONITEM_H
 
-#include <memory>
 #include "mvvm/core/variant.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/tagrow.h"
 #include "mvvm/model_export.h"
+#include <memory>
 #include <stdexcept>
 #include <type_traits>
 #include <vector>
diff --git a/mvvm/model/mvvm/model/sessionitemcontainer.cpp b/mvvm/model/mvvm/model/sessionitemcontainer.cpp
index 54d99768c9681887801cd6381d016dc7d255dbfe..05bb665e2f9252e0d4a3906b98db57aa1963c793 100644
--- a/mvvm/model/mvvm/model/sessionitemcontainer.cpp
+++ b/mvvm/model/mvvm/model/sessionitemcontainer.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemcontainer.h"
+#include "mvvm/model/sessionitem.h"
 #include "mvvm/utils/containerutils.h"
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/sessionitemdata.cpp b/mvvm/model/mvvm/model/sessionitemdata.cpp
index 7674c8dcf3274fca707f207b91cf697a35fafa90..95d630a1d72d36ce20157408aa29bbed3afe500e 100644
--- a/mvvm/model/mvvm/model/sessionitemdata.cpp
+++ b/mvvm/model/mvvm/model/sessionitemdata.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
-#include "mvvm/model/customvariants.h"
 #include "mvvm/model/sessionitemdata.h"
+#include "mvvm/model/customvariants.h"
+#include <algorithm>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/model/sessionitemtags.cpp b/mvvm/model/mvvm/model/sessionitemtags.cpp
index 9836e548d41d0d558c2b2030b831f8612a7e2eb6..3d5ea386dde8169da2d87b5015525e065a4f8466 100644
--- a/mvvm/model/mvvm/model/sessionitemtags.cpp
+++ b/mvvm/model/mvvm/model/sessionitemtags.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/sessionitemcontainer.h"
 #include "mvvm/model/sessionitemtags.h"
+#include "mvvm/model/sessionitemcontainer.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/sessionmodel.cpp b/mvvm/model/mvvm/model/sessionmodel.cpp
index 6a2a94973b6358c655563d35ff79a25bb38115ab..c3f01d3a5f9193012ee256105c75a97a816aae45 100644
--- a/mvvm/model/mvvm/model/sessionmodel.cpp
+++ b/mvvm/model/mvvm/model/sessionmodel.cpp
@@ -7,6 +7,7 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/model/sessionmodel.h"
 #include "mvvm/commands/commandservice.h"
 #include "mvvm/factories/itemcataloguefactory.h"
 #include "mvvm/model/customvariants.h"
@@ -16,7 +17,6 @@
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/sessionitem.h"
-#include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/model/tagrow.h"
 #include "mvvm/signals/modelmapper.h"
diff --git a/mvvm/model/mvvm/model/sessionmodel.h b/mvvm/model/mvvm/model/sessionmodel.h
index bb29722e7f9dae22a363f6a61b097250e1fe4dfb..71f388ccc98031165d16ace068a477d9c3f68144 100644
--- a/mvvm/model/mvvm/model/sessionmodel.h
+++ b/mvvm/model/mvvm/model/sessionmodel.h
@@ -10,13 +10,13 @@
 #ifndef MVVM_MODEL_SESSIONMODEL_H
 #define MVVM_MODEL_SESSIONMODEL_H
 
-#include <memory>
 #include "mvvm/core/types.h"
 #include "mvvm/core/variant.h"
 #include "mvvm/model/function_types.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/tagrow.h"
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/model/taginfo.cpp b/mvvm/model/mvvm/model/taginfo.cpp
index f287e8f2e32e933e42000b239428227e57427b96..dc2c40d4db4a88edf6b879207867442aa2fc94ab 100644
--- a/mvvm/model/mvvm/model/taginfo.cpp
+++ b/mvvm/model/mvvm/model/taginfo.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
 #include "mvvm/model/taginfo.h"
 #include "mvvm/utils/containerutils.h"
+#include <algorithm>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/project/modelhaschangedcontroller.h b/mvvm/model/mvvm/project/modelhaschangedcontroller.h
index f566ac89c1f70f41f77fef5b631990eb1655f13a..8698227efe83de977ce1a2d689d0a13316701b1f 100644
--- a/mvvm/model/mvvm/project/modelhaschangedcontroller.h
+++ b/mvvm/model/mvvm/project/modelhaschangedcontroller.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_MODELHASCHANGEDCONTROLLER_H
 #define MVVM_PROJECT_MODELHASCHANGEDCONTROLLER_H
 
-#include <functional>
 #include "mvvm/signals/modellistener.h"
+#include <functional>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/project/project.cpp b/mvvm/model/mvvm/project/project.cpp
index 08e15e6115e0b628239a2da42061ca863c8ee080..f368c9cce99ea517bf56aabe4b0a7d857ddefc44 100644
--- a/mvvm/model/mvvm/project/project.cpp
+++ b/mvvm/model/mvvm/project/project.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <functional>
-#include "mvvm/factories/modeldocumentfactory.h"
 #include "mvvm/project/project.h"
+#include "mvvm/factories/modeldocumentfactory.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectchangecontroller.h"
 #include "mvvm/project/projectutils.h"
 #include "mvvm/utils/fileutils.h"
+#include <functional>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/project/project.h b/mvvm/model/mvvm/project/project.h
index 62e1f2ccd7f2547bed8481ee449e38b91c3c8fe8..19515fe585b9ff10873b65d6c39a69a4301844a6 100644
--- a/mvvm/model/mvvm/project/project.h
+++ b/mvvm/model/mvvm/project/project.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_PROJECT_H
 #define MVVM_PROJECT_PROJECT_H
 
-#include <memory>
 #include "mvvm/interfaces/projectinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/project/project_types.h b/mvvm/model/mvvm/project/project_types.h
index 5d2932ea0697bdf0c5363c3025300e292bdf7bd8..b82b1f2cebc297ef86c2f50ffe1ca9089cc958e0 100644
--- a/mvvm/model/mvvm/project/project_types.h
+++ b/mvvm/model/mvvm/project/project_types.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_PROJECT_TYPES_H
 #define MVVM_PROJECT_PROJECT_TYPES_H
 
-#include <functional>
 #include "mvvm/model_export.h"
+#include <functional>
 #include <string>
 #include <vector>
 
diff --git a/mvvm/model/mvvm/project/projectchangecontroller.cpp b/mvvm/model/mvvm/project/projectchangecontroller.cpp
index a34bff9e15154ccb2b79670df8879178706cbfbd..5ad20afb3dd15b2b346a02a82f78bc54c81b305b 100644
--- a/mvvm/model/mvvm/project/projectchangecontroller.cpp
+++ b/mvvm/model/mvvm/project/projectchangecontroller.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/project/projectchangecontroller.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/project/modelhaschangedcontroller.h"
-#include "mvvm/project/projectchangecontroller.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/project/projectchangecontroller.h b/mvvm/model/mvvm/project/projectchangecontroller.h
index b24de5c48a2d293af9368135bdd9e0cccd720588..db8fdf617ff7d04405f3e652b28b70742fed7edc 100644
--- a/mvvm/model/mvvm/project/projectchangecontroller.h
+++ b/mvvm/model/mvvm/project/projectchangecontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PROJECT_PROJECTCHANGECONTROLLER_H
 #define MVVM_PROJECT_PROJECTCHANGECONTROLLER_H
 
+#include "mvvm/model_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/model_export.h"
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/project/projectmanager.cpp b/mvvm/model/mvvm/project/projectmanager.cpp
index f8af93aff70ede3af3a4f2edad0907ae1ad3bd26..e103804de0c808826bafcaf1e837ffa2eb0c93b3 100644
--- a/mvvm/model/mvvm/project/projectmanager.cpp
+++ b/mvvm/model/mvvm/project/projectmanager.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/project/projectmanager.h"
 #include "mvvm/interfaces/projectinterface.h"
 #include "mvvm/project/project_types.h"
-#include "mvvm/project/projectmanager.h"
 #include "mvvm/project/projectutils.h"
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/projectmanager.h b/mvvm/model/mvvm/project/projectmanager.h
index b9bee7329d84837dbcdc4f754efaa782d522bbef..7355b43ec09e2de7fe0a370d1bcbf35929de5f87 100644
--- a/mvvm/model/mvvm/project/projectmanager.h
+++ b/mvvm/model/mvvm/project/projectmanager.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_PROJECTMANAGER_H
 #define MVVM_PROJECT_PROJECTMANAGER_H
 
-#include <memory>
 #include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/project/projectmanagerdecorator.cpp b/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
index 28ecd97c5751c274b80135f3e346dfa48e10d90d..911978a63b436892b504aac00da0950881eed17e 100644
--- a/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
+++ b/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/project/projectmanagerdecorator.h"
 #include "mvvm/interfaces/projectinterface.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectmanager.h"
-#include "mvvm/project/projectmanagerdecorator.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/projectmanagerdecorator.h b/mvvm/model/mvvm/project/projectmanagerdecorator.h
index 80997c8a2792dbf94785dcc1148cb34fc2325185..0876703b60f7545f325b86c68e8223ed4b95ff71 100644
--- a/mvvm/model/mvvm/project/projectmanagerdecorator.h
+++ b/mvvm/model/mvvm/project/projectmanagerdecorator.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_PROJECTMANAGERDECORATOR_H
 #define MVVM_PROJECT_PROJECTMANAGERDECORATOR_H
 
-#include <memory>
 #include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/project/projectutils.cpp b/mvvm/model/mvvm/project/projectutils.cpp
index 1e5b82184891d7e5ec766d2abaf075d176863027..24525a7984134fe492b99635cdab5dca28b1067d 100644
--- a/mvvm/model/mvvm/project/projectutils.cpp
+++ b/mvvm/model/mvvm/project/projectutils.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <cctype>
+#include "mvvm/project/projectutils.h"
 #include "mvvm/interfaces/applicationmodelsinterface.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/project/project.h"
 #include "mvvm/project/project_types.h"
-#include "mvvm/project/projectutils.h"
 #include "mvvm/utils/fileutils.h"
+#include <cctype>
 
 namespace {
 const std::string json_extention = ".json";
diff --git a/mvvm/model/mvvm/project/projectutils.h b/mvvm/model/mvvm/project/projectutils.h
index 5b88cdbf4189737c08b27d8ec2cb8e641d14585e..43db11659e03babab46bf9607c8976b63a3f9f80 100644
--- a/mvvm/model/mvvm/project/projectutils.h
+++ b/mvvm/model/mvvm/project/projectutils.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PROJECT_PROJECTUTILS_H
 #define MVVM_PROJECT_PROJECTUTILS_H
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/mvvm/model/mvvm/serialization/compatibilityutils.cpp b/mvvm/model/mvvm/serialization/compatibilityutils.cpp
index 09b24ad2d401284896512663b56011fd0d3e7172..9c770d692e7b173740e409cff4d320aee4d81b59 100644
--- a/mvvm/model/mvvm/serialization/compatibilityutils.cpp
+++ b/mvvm/model/mvvm/serialization/compatibilityutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/serialization/compatibilityutils.h"
 #include "mvvm/model/groupitem.h"
 #include "mvvm/model/sessionitemcontainer.h"
 #include "mvvm/model/sessionitemdata.h"
-#include "mvvm/serialization/compatibilityutils.h"
 #include <set>
 
 namespace ModelView ::Compatibility {
diff --git a/mvvm/model/mvvm/serialization/compatibilityutils.h b/mvvm/model/mvvm/serialization/compatibilityutils.h
index 3f60d09dfe14fb650560d5a92f4cf0556f28e101..5e7bb99b9f3321fd24b85c24fb61283d187a563a 100644
--- a/mvvm/model/mvvm/serialization/compatibilityutils.h
+++ b/mvvm/model/mvvm/serialization/compatibilityutils.h
@@ -13,8 +13,8 @@
 //! @file compatibilityutils.h
 //! @brief Place for utils to fix back compatibility of serialized projects.
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/serialization/jsondocument.cpp b/mvvm/model/mvvm/serialization/jsondocument.cpp
index 2b595af16c219947c40974e57e16bffa107f6d4f..2a0aaf30429fb82e8f37361d3097dcd2925f32cd 100644
--- a/mvvm/model/mvvm/serialization/jsondocument.cpp
+++ b/mvvm/model/mvvm/serialization/jsondocument.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/serialization/jsondocument.h"
+#include "mvvm/factories/modelconverterfactory.h"
+#include "mvvm/model/sessionmodel.h"
 #include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include "mvvm/factories/modelconverterfactory.h"
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsondocument.h"
 #include <sstream>
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/serialization/jsondocument.h b/mvvm/model/mvvm/serialization/jsondocument.h
index 02f6747aa4a8e9ed381564293aafaadbf720c16e..c954a68a89f70a156fc85ca1dc4012b5362583ba 100644
--- a/mvvm/model/mvvm/serialization/jsondocument.h
+++ b/mvvm/model/mvvm/serialization/jsondocument.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONDOCUMENT_H
 #define MVVM_SERIALIZATION_JSONDOCUMENT_H
 
-#include <memory>
 #include "mvvm/interfaces/modeldocumentinterface.h"
+#include <memory>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonitem_types.h b/mvvm/model/mvvm/serialization/jsonitem_types.h
index 523032f36e364b03aa672b1d8497351ea0a5a4cd..138670b0b0d672068798531c486c6622c62afbfa 100644
--- a/mvvm/model/mvvm/serialization/jsonitem_types.h
+++ b/mvvm/model/mvvm/serialization/jsonitem_types.h
@@ -13,9 +13,9 @@
 //! @file jsonitem_types.h
 //! Collection of custom types involved into SessionItem and JSON mutual convertion.
 
+#include "mvvm/model_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/model_export.h"
 #include <vector>
 
 class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
index 1647750f14724633d49510070248e19bda4f23a2..30db0945f214de061d2dd9e22f34da1c0b4d5212 100644
--- a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitembackupstrategy.h"
 #include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/model/sessionitem.h"
-#include "mvvm/serialization/jsonitembackupstrategy.h"
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
index 10bac8aa2c8a34138058c2072a1e8c1e074f25ae..0af9d74586eced3fd9f9d8b46da935c65b39cb57 100644
--- a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
+++ b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMBACKUPSTRATEGY_H
 #define MVVM_SERIALIZATION_JSONITEMBACKUPSTRATEGY_H
 
-#include <memory>
 #include "mvvm/interfaces/itembackupstrategy.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
index e96e4819ed80da1dfcbeb41f530e76bc77e01004..a2e1ef9386c589f921769f9e7fbfdb463d55a1b6 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
@@ -7,17 +7,17 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemcontainerconverter.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemcontainer.h"
 #include "mvvm/model/sessionitemtags.h"
 #include "mvvm/model/tagrow.h"
 #include "mvvm/serialization/compatibilityutils.h"
 #include "mvvm/serialization/jsonitem_types.h"
-#include "mvvm/serialization/jsonitemcontainerconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsontaginfoconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
index 2a47cb53b40f7749f42366547e088a129c4da077..1710f4b687506850440f1bea0951f4426a56443a 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMCONTAINERCONVERTER_H
 #define MVVM_SERIALIZATION_JSONITEMCONTAINERCONVERTER_H
 
+#include "mvvm/model_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/model_export.h"
 
 class QJsonObject;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
index 38e76cc2ddae1d240a719716beebedb4c1ba9f3a..e441bb3caa0686d439e0adeab018c25e8bc6afe8 100644
--- a/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
@@ -7,18 +7,18 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemconverter.h"
 #include "mvvm/core/uniqueidgenerator.h"
 #include "mvvm/interfaces/itemfactoryinterface.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemdata.h"
 #include "mvvm/model/sessionitemtags.h"
 #include "mvvm/serialization/jsonitem_types.h"
-#include "mvvm/serialization/jsonitemconverter.h"
 #include "mvvm/serialization/jsonitemdataconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsonitemtagsconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h b/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
index 29c523ee6d23f770be1c3d60f5f9a0bea5baba56..8665e5418db3d42987b23a49a27fd2b25e600c1c 100644
--- a/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
+++ b/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMCONVERTERINTERFACE_H
 #define MVVM_SERIALIZATION_JSONITEMCONVERTERINTERFACE_H
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 
 class QJsonObject;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
index be4f63d51a4d2d8cd42f98c7290dcdf590945bb0..9eece22d4fb0e3ef0a29707fc767d03b1366537d 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemcopystrategy.h"
 #include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/model/sessionitem.h"
-#include "mvvm/serialization/jsonitemcopystrategy.h"
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
index c51c0d02cb10e03e39e2e8ef700fe320e3fef013..cbfe7fbf7d4bc5c5823be3d2ea6eaac91ad924c1 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
+++ b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMCOPYSTRATEGY_H
 #define MVVM_SERIALIZATION_JSONITEMCOPYSTRATEGY_H
 
-#include <memory>
 #include "mvvm/interfaces/itemcopystrategy.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
index 46349c38ebacf163f11ce4db6fea9c17e9611a95..718304464b9c381407d8d0fb87af02a43061437a 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemdataconverter.h"
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/sessionitemdata.h"
-#include "mvvm/serialization/jsonitemdataconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsonvariantconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 #include <set>
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverter.h b/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
index d1f08c3b1762eb43cad563decee0043ede5fb014..f3b9ba505dfb142aeae42d4650665b3e0eea5f64 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
@@ -10,10 +10,10 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMDATACONVERTER_H
 #define MVVM_SERIALIZATION_JSONITEMDATACONVERTER_H
 
+#include "mvvm/serialization/jsonitemdataconverterinterface.h"
 #include <QString>
 #include <functional>
 #include <memory>
-#include "mvvm/serialization/jsonitemdataconverterinterface.h"
 
 class QJsonObject;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h b/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
index c9f83cf10483394137f0d31044128611aa4c29c1..d63f67eca4bb43153ee427dc7ecc2e6c7770c469 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMDATACONVERTERINTERFACE_H
 #define MVVM_SERIALIZATION_JSONITEMDATACONVERTERINTERFACE_H
 
-#include <memory>
 #include "mvvm/model_export.h"
+#include <memory>
 
 class QJsonArray;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp b/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
index bdade9ddea290435b34fd3a8d92a6636769efa0f..481706043f3a2cfd2f78f9f469c5c3fa3dc99a1d 100644
--- a/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/serialization/jsonitemformatassistant.h"
 #include <QJsonObject>
 #include <QStringList>
-#include "mvvm/serialization/jsonitemformatassistant.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemformatassistant.h b/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
index 8789b045e14ba83974e08bda90ac8bb2f8fbbc77..dfffecc44a61aa01a6be1185230db85db3249870 100644
--- a/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
+++ b/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMFORMATASSISTANT_H
 #define MVVM_SERIALIZATION_JSONITEMFORMATASSISTANT_H
 
+#include "mvvm/serialization/jsonitemconverterinterface.h"
 #include <QString>
 #include <memory>
-#include "mvvm/serialization/jsonitemconverterinterface.h"
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
index 57d1d706dcfce01d60257c8e3215c74ad8255372..79b4b0fdecde439cda48081e9ed101f2b294e960 100644
--- a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
@@ -7,16 +7,16 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemtagsconverter.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemtags.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/serialization/jsonitem_types.h"
 #include "mvvm/serialization/jsonitemcontainerconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
-#include "mvvm/serialization/jsonitemtagsconverter.h"
 #include "mvvm/serialization/jsontaginfoconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
index 20c13850005779d3de16cd45d61391d023101a5e..b15c79b9c0832d6e115cee45580bbb5df551d1dc 100644
--- a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_SERIALIZATION_JSONITEMTAGSCONVERTER_H
 #define MVVM_SERIALIZATION_JSONITEMTAGSCONVERTER_H
 
+#include "mvvm/model_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/model_export.h"
 
 class QJsonObject;
 
diff --git a/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp b/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
index 823c4f799b5bc5409d3e1dd51a87f26db238b3a1..74dc05851d6c0426a4fcd5d59c5c2cbf4191e160 100644
--- a/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonmodelconverter.h"
 #include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/serialization/jsonitem_types.h"
 #include "mvvm/serialization/jsonitemconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
-#include "mvvm/serialization/jsonmodelconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp b/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
index 31c5e5e89f394ba1e9b6a1cccc9b51b518016c0b..7209cb65bfb88755bb50aa6b2b3d9dfec7dba379 100644
--- a/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/serialization/jsontaginfoconverter.h"
+#include "mvvm/model/taginfo.h"
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QStringList>
-#include "mvvm/model/taginfo.h"
-#include "mvvm/serialization/jsontaginfoconverter.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsontaginfoconverter.h b/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
index 5c84053dc2304e2659ad93ade13b705958f4f462..3d64e561c6597a313ec542a20ce46306afc7de6c 100644
--- a/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
+++ b/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SERIALIZATION_JSONTAGINFOCONVERTER_H
 #define MVVM_SERIALIZATION_JSONTAGINFOCONVERTER_H
 
-#include <QString>
 #include "mvvm/serialization/jsontaginfoconverterinterface.h"
+#include <QString>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/serialization/jsonutils.cpp b/mvvm/model/mvvm/serialization/jsonutils.cpp
index 3c1c676a9e333c9f2c935abbea718ce40692dcf1..ccf74cfec80d8fea34e5e1ba940b8c248876de21 100644
--- a/mvvm/model/mvvm/serialization/jsonutils.cpp
+++ b/mvvm/model/mvvm/serialization/jsonutils.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QJsonDocument>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonutils.h"
 #include "mvvm/factories/modelconverterfactory.h"
 #include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsonutils.h"
 #include "mvvm/utils/reallimits.h"
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <stdexcept>
 
 namespace {
diff --git a/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp b/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
index b4f62eff4674c8b4febbdd8f888dcbf518e51323..ae49494749e8dea41bd9681e6697b8976b61edfe 100644
--- a/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonvariantconverter.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/variant_constants.h"
 #include "mvvm/serialization/jsonutils.h"
-#include "mvvm/serialization/jsonvariantconverter.h"
 #include "mvvm/utils/reallimits.h"
+#include <QJsonArray>
+#include <QJsonObject>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonvariantconverter.h b/mvvm/model/mvvm/serialization/jsonvariantconverter.h
index bbeb458df6fd33907bd83486ffea669b88c81354..2e526434fdc76f43353372c5bba1c3415ba69946 100644
--- a/mvvm/model/mvvm/serialization/jsonvariantconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonvariantconverter.h
@@ -10,10 +10,10 @@
 #ifndef MVVM_SERIALIZATION_JSONVARIANTCONVERTER_H
 #define MVVM_SERIALIZATION_JSONVARIANTCONVERTER_H
 
-#include <functional>
-#include <map>
 #include "mvvm/core/variant.h"
 #include "mvvm/serialization/jsonvariantconverterinterface.h"
+#include <functional>
+#include <map>
 #include <string>
 
 class QJsonObject;
diff --git a/mvvm/model/mvvm/signals/callback_types.h b/mvvm/model/mvvm/signals/callback_types.h
index 91f678665f5ed65477ce513455d920433b114dfd..b558794f9d403bb42169edcf6d8cbcff148a0439 100644
--- a/mvvm/model/mvvm/signals/callback_types.h
+++ b/mvvm/model/mvvm/signals/callback_types.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SIGNALS_CALLBACK_TYPES_H
 #define MVVM_SIGNALS_CALLBACK_TYPES_H
 
-#include <functional>
 #include "mvvm/model/tagrow.h"
+#include <functional>
 #include <string>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/signals/callbackcontainer.h b/mvvm/model/mvvm/signals/callbackcontainer.h
index d84eff4b2c9c87be16a86d2412be2896381be516..22305b9c4c9d678f0ae6cda8a2f7dcf99d714299 100644
--- a/mvvm/model/mvvm/signals/callbackcontainer.h
+++ b/mvvm/model/mvvm/signals/callbackcontainer.h
@@ -10,11 +10,11 @@
 #ifndef MVVM_SIGNALS_CALLBACKCONTAINER_H
 #define MVVM_SIGNALS_CALLBACKCONTAINER_H
 
+#include "mvvm/model_export.h"
+#include "mvvm/signals/callback_types.h"
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "mvvm/model_export.h"
-#include "mvvm/signals/callback_types.h"
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/signals/itemmapper.cpp b/mvvm/model/mvvm/signals/itemmapper.cpp
index 2f9dbd65d8a09b621751382c5fb116e6b5e4a5bd..f2e7a114033ecdd5093ce3cf9016a449404524ed 100644
--- a/mvvm/model/mvvm/signals/itemmapper.cpp
+++ b/mvvm/model/mvvm/signals/itemmapper.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/signals/itemmapper.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/callbackcontainer.h"
-#include "mvvm/signals/itemmapper.h"
 #include "mvvm/signals/modelmapper.h"
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/signals/itemmapper.h b/mvvm/model/mvvm/signals/itemmapper.h
index 574c32a1b218d79ee41dd5aaa264220f69a7ad27..4a39330c86a6b2593240b6ce3d44b4831307ba3e 100644
--- a/mvvm/model/mvvm/signals/itemmapper.h
+++ b/mvvm/model/mvvm/signals/itemmapper.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_SIGNALS_ITEMMAPPER_H
 #define MVVM_SIGNALS_ITEMMAPPER_H
 
-#include <memory>
 #include "mvvm/interfaces/itemlistenerinterface.h"
 #include "mvvm/signals/modellistener.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/signals/modellistenerbase.cpp b/mvvm/model/mvvm/signals/modellistenerbase.cpp
index 1887593ce9cd1117ff03d80a29a68aba3e6583e4..82925360cca1ec31a0151a6a446adcd653e8a4ec 100644
--- a/mvvm/model/mvvm/signals/modellistenerbase.cpp
+++ b/mvvm/model/mvvm/signals/modellistenerbase.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/modellistenerbase.h"
+#include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/modelmapper.h"
 #include <stdexcept>
 
diff --git a/mvvm/model/mvvm/signals/modelmapper.cpp b/mvvm/model/mvvm/signals/modelmapper.cpp
index 1e6c614b1afc03f0104eab0d6c25e2179d7d1480..b5151ceccc62385ee60f7d1692d9ad4a7ee6c3fa 100644
--- a/mvvm/model/mvvm/signals/modelmapper.cpp
+++ b/mvvm/model/mvvm/signals/modelmapper.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/signals/callbackcontainer.h"
 #include "mvvm/signals/modelmapper.h"
+#include "mvvm/signals/callbackcontainer.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/signals/modelmapper.h b/mvvm/model/mvvm/signals/modelmapper.h
index 0302db2e568e47757a15de05f3f611843b7257b0..fcfa1cfe887ba34540f4b950445a5047cbc83b35 100644
--- a/mvvm/model/mvvm/signals/modelmapper.h
+++ b/mvvm/model/mvvm/signals/modelmapper.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_SIGNALS_MODELMAPPER_H
 #define MVVM_SIGNALS_MODELMAPPER_H
 
-#include <memory>
 #include "mvvm/interfaces/modellistenerinterface.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/standarditems/axisitems.h b/mvvm/model/mvvm/standarditems/axisitems.h
index 3883107461019aa3ca8f6219d3284ffa42282b27..1e0b08aa47cb4ce79eae165e03d5ff1225503df5 100644
--- a/mvvm/model/mvvm/standarditems/axisitems.h
+++ b/mvvm/model/mvvm/standarditems/axisitems.h
@@ -13,8 +13,8 @@
 //! @file axisitems.h
 //! Collection of axis items for 1D and 2D data/plotting support.
 
-#include <memory>
 #include "mvvm/model/compounditem.h"
+#include <memory>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/model/mvvm/standarditems/colormapitem.cpp b/mvvm/model/mvvm/standarditems/colormapitem.cpp
index 19aea3e59b03d47650a49104b1c6abd315151dc1..ed47571a00b9f0d17065863b3af8edfb361ca175 100644
--- a/mvvm/model/mvvm/standarditems/colormapitem.cpp
+++ b/mvvm/model/mvvm/standarditems/colormapitem.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/colormapitem.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/data2ditem.h"
 #include "mvvm/standarditems/linkeditem.h"
 #include "mvvm/standarditems/plottableitems.h"
diff --git a/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp b/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
index 0e41f51274beacb3b2c6bdf132baa6960024b20a..aefb21babccba22b060a6d27aa6dd7948c0b9899 100644
--- a/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
+#include "mvvm/standarditems/colormapviewportitem.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/colormapitem.h"
-#include "mvvm/standarditems/colormapviewportitem.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include <algorithm>
 #include <vector>
 
 namespace {
diff --git a/mvvm/model/mvvm/standarditems/data1ditem.cpp b/mvvm/model/mvvm/standarditems/data1ditem.cpp
index 5a49edd74df867550fd0d46ac0b1c35bb9c86905..b26e33de413228d56466529d12f4658467553095 100644
--- a/mvvm/model/mvvm/standarditems/data1ditem.cpp
+++ b/mvvm/model/mvvm/standarditems/data1ditem.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
+#include "mvvm/standarditems/axisitems.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/data2ditem.cpp b/mvvm/model/mvvm/standarditems/data2ditem.cpp
index a97f7c57d81a53eb0b7e97ee9d0fe318faaf427b..8cfc6481e0a990c812ab89897d1abc9519f50500 100644
--- a/mvvm/model/mvvm/standarditems/data2ditem.cpp
+++ b/mvvm/model/mvvm/standarditems/data2ditem.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "mvvm/standarditems/axisitems.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/graphitem.cpp b/mvvm/model/mvvm/standarditems/graphitem.cpp
index 914acb57d75267d1b09cf3a40ab953d6e82f7fcb..ccf926be0892806b21af0d9b338f6cfe21990bce 100644
--- a/mvvm/model/mvvm/standarditems/graphitem.cpp
+++ b/mvvm/model/mvvm/standarditems/graphitem.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
+#include "mvvm/standarditems/graphitem.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/data1ditem.h"
-#include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/linkeditem.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/standarditems/graphviewportitem.cpp b/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
index 04d217e408b29c398bdcc8b1e39c8c8e989d392a..70c84bcab9ae6b5fad022348e06eddc8561d7eb3 100644
--- a/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
-#include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include "mvvm/standarditems/graphitem.h"
+#include <algorithm>
 #include <vector>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/linkeditem.cpp b/mvvm/model/mvvm/standarditems/linkeditem.cpp
index d0fa49651d639252aff5570f8f94efd447836c5a..47b8786f54664218dbe711efcf9d8771758739c8 100644
--- a/mvvm/model/mvvm/standarditems/linkeditem.cpp
+++ b/mvvm/model/mvvm/standarditems/linkeditem.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/customvariants.h"
 #include "mvvm/standarditems/linkeditem.h"
+#include "mvvm/model/customvariants.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/standarditems/plottableitems.cpp b/mvvm/model/mvvm/standarditems/plottableitems.cpp
index 81ec4cffc6fa3f1a07d89bb0d62b6548f5f2631b..3feb0cc3827c767fd9073206d5249fd11038b158 100644
--- a/mvvm/model/mvvm/standarditems/plottableitems.cpp
+++ b/mvvm/model/mvvm/standarditems/plottableitems.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <QColor>
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "mvvm/model/comboproperty.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/standarditems/vectoritem.cpp b/mvvm/model/mvvm/standarditems/vectoritem.cpp
index a0a4fb8898d41a403d90301b911a286c0314bf1d..04698c1eaf352cd1a3faf4436a6a5c45295a7c7f 100644
--- a/mvvm/model/mvvm/standarditems/vectoritem.cpp
+++ b/mvvm/model/mvvm/standarditems/vectoritem.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/signals/itemmapper.h"
-#include "mvvm/standarditems/vectoritem.h"
 #include <sstream>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/viewportitem.cpp b/mvvm/model/mvvm/standarditems/viewportitem.cpp
index 1112b48fa90c279537c323b5a0526cfea0493624..f1b250186c3c168c64d5790653aff9b02151b117 100644
--- a/mvvm/model/mvvm/standarditems/viewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/viewportitem.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/standarditems/viewportitem.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
-#include "mvvm/standarditems/viewportitem.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/model/mvvm/utils/binutils.cpp b/mvvm/model/mvvm/utils/binutils.cpp
index 09f1feb489b90b8a74d90ef96c1eb956c6694cd2..d04f8be9664e68fdac655b955225ca1c52bfaf1a 100644
--- a/mvvm/model/mvvm/utils/binutils.cpp
+++ b/mvvm/model/mvvm/utils/binutils.cpp
@@ -1,6 +1,6 @@
+#include "mvvm/utils/binutils.h"
 #include <fstream>
 #include <iostream>
-#include "mvvm/utils/binutils.h"
 
 namespace {
 //! Returns buffer size
diff --git a/mvvm/model/mvvm/utils/containerutils.h b/mvvm/model/mvvm/utils/containerutils.h
index 95095394912be2c4a3dd73804ee748845cb5cb1a..a705fd03ae2800e1a3c38557746b127dbe4b9a6b 100644
--- a/mvvm/model/mvvm/utils/containerutils.h
+++ b/mvvm/model/mvvm/utils/containerutils.h
@@ -10,11 +10,11 @@
 #ifndef MVVM_UTILS_CONTAINERUTILS_H
 #define MVVM_UTILS_CONTAINERUTILS_H
 
+#include "mvvm/model_export.h"
 #include <algorithm>
 #include <complex>
 #include <iterator>
 #include <memory>
-#include "mvvm/model_export.h"
 #include <string>
 #include <type_traits>
 #include <unordered_set>
diff --git a/mvvm/model/mvvm/utils/fileutils.cpp b/mvvm/model/mvvm/utils/fileutils.cpp
index fd1a69f57920d03f24f00615cff0e8ebce393aa8..27f27a9d4d03ff7dac96ebb26a1400e56451e7a9 100644
--- a/mvvm/model/mvvm/utils/fileutils.cpp
+++ b/mvvm/model/mvvm/utils/fileutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/utils/fileutils.h"
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include "mvvm/utils/fileutils.h"
 #include <stdexcept>
 
 #ifdef ENABLE_FILESYSTEM
diff --git a/mvvm/model/mvvm/utils/numericutils.cpp b/mvvm/model/mvvm/utils/numericutils.cpp
index ee25ca902ed8831b866a5f15e4475e60e51d683e..5ac2eef15fcdd61826e6da88c3a6406e7284e4f0 100644
--- a/mvvm/model/mvvm/utils/numericutils.cpp
+++ b/mvvm/model/mvvm/utils/numericutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/utils/numericutils.h"
 #include <algorithm>
 #include <cmath>
 #include <limits>
-#include "mvvm/utils/numericutils.h"
 #include <random>
 
 using namespace ModelView;
diff --git a/mvvm/model/mvvm/utils/progresshandler.h b/mvvm/model/mvvm/utils/progresshandler.h
index 79795952a9a035474bdc3dd7157758daec9b0c42..51cfeca1ec284b72fb303a9c95b97b51862f3b31 100644
--- a/mvvm/model/mvvm/utils/progresshandler.h
+++ b/mvvm/model/mvvm/utils/progresshandler.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_UTILS_PROGRESSHANDLER_H
 #define MVVM_UTILS_PROGRESSHANDLER_H
 
+#include "mvvm/model_export.h"
 #include <functional>
 #include <mutex>
-#include "mvvm/model_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/model/mvvm/utils/reallimits.cpp b/mvvm/model/mvvm/utils/reallimits.cpp
index 55a6d3919fbd8b46fdc7c896531f91be0ab203ce..f8be3308d82fbece8a7fd35d315ba81834688786 100644
--- a/mvvm/model/mvvm/utils/reallimits.cpp
+++ b/mvvm/model/mvvm/utils/reallimits.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <limits>
-#include "mvvm/utils/numericutils.h"
 #include "mvvm/utils/reallimits.h"
+#include "mvvm/utils/numericutils.h"
+#include <limits>
 
 namespace {
 const double lmin = std::numeric_limits<double>::lowest();
diff --git a/mvvm/model/mvvm/utils/stringutils.cpp b/mvvm/model/mvvm/utils/stringutils.cpp
index 90832b7bd6f5b1379d739228234fb5e1e651d5e9..5da8cd348f5f645d08476de04813038a79ea758f 100644
--- a/mvvm/model/mvvm/utils/stringutils.cpp
+++ b/mvvm/model/mvvm/utils/stringutils.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/utils/stringutils.h"
 #include <algorithm>
 #include <cmath>
 #include <iomanip>
 #include <iterator>
-#include "mvvm/utils/stringutils.h"
 #include <sstream>
 #include <string_view>
 
diff --git a/mvvm/model/mvvm/utils/threadsafestack.h b/mvvm/model/mvvm/utils/threadsafestack.h
index e74dd94555479c3baf42f70274001595faecc798..b2b23b990a3c44d4cdf8da31ed7a09f7bf81bd31 100644
--- a/mvvm/model/mvvm/utils/threadsafestack.h
+++ b/mvvm/model/mvvm/utils/threadsafestack.h
@@ -10,11 +10,11 @@
 #ifndef MVVM_UTILS_THREADSAFESTACK_H
 #define MVVM_UTILS_THREADSAFESTACK_H
 
+#include "mvvm/model_export.h"
 #include <atomic>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include "mvvm/model_export.h"
 #include <stack>
 #include <stdexcept>
 #include <thread>
diff --git a/mvvm/tests/libtestmachinery/folderbasedtest.cpp b/mvvm/tests/libtestmachinery/folderbasedtest.cpp
index d28942b23232dda1552e1ecdc0bd754dda9ae008..d69eeb74bf33ed792a82179c8df5fa94fb4fd2fd 100644
--- a/mvvm/tests/libtestmachinery/folderbasedtest.cpp
+++ b/mvvm/tests/libtestmachinery/folderbasedtest.cpp
@@ -8,31 +8,27 @@
 // ************************************************************************** //
 
 #include "folderbasedtest.h"
-#include "test_utils.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
 
-FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir)
-{
+FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir) {
     TestUtils::CreateTestDirectory(m_test_dir);
 }
 
-std::string FolderBasedTest::testDir() const
-{
+std::string FolderBasedTest::testDir() const {
     return m_test_dir;
 }
 
 //! Return full path to the test folder. Located in CMAKE_BINARY_DIR/test_output/<m_test_dir>.
 
-std::string FolderBasedTest::testPath() const
-{
+std::string FolderBasedTest::testPath() const {
     return TestUtils::TestDirectoryPath(m_test_dir);
 }
 
 //! Creates an empty directory in main test folder.
 //! Remove recursively previous one with the same name, if exist.
 
-std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const
-{
+std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const {
     auto path = ModelView::Utils::join(testPath(), subdir);
     ModelView::Utils::remove_all(path);
     ModelView::Utils::create_directory(path);
diff --git a/mvvm/tests/libtestmachinery/folderbasedtest.h b/mvvm/tests/libtestmachinery/folderbasedtest.h
index 761ef56633f52c649e0d2b66dc1015390ace303a..5576219141f038455638a1acbc491e30a6aebe3e 100644
--- a/mvvm/tests/libtestmachinery/folderbasedtest.h
+++ b/mvvm/tests/libtestmachinery/folderbasedtest.h
@@ -15,8 +15,7 @@
 
 //! Convenience class which creates a directory on disk for test content.
 
-class FolderBasedTest : public ::testing::Test
-{
+class FolderBasedTest : public ::testing::Test {
 public:
     FolderBasedTest(const std::string& test_dir);
     ~FolderBasedTest();
diff --git a/mvvm/tests/libtestmachinery/google_test.h b/mvvm/tests/libtestmachinery/google_test.h
index a9ecb9868d5c02a400009b6309ca4b12b1722fda..a2f026cdd0c807b8600a4807712264fa95765a8e 100644
--- a/mvvm/tests/libtestmachinery/google_test.h
+++ b/mvvm/tests/libtestmachinery/google_test.h
@@ -10,8 +10,8 @@
 #ifndef GOOGLETEST_H
 #define GOOGLETEST_H
 
-#include <gtest/gtest.h>
-#include "mvvm/model/customvariants.h"
 #include "mvvm/model/comparators.h"
+#include "mvvm/model/customvariants.h"
+#include <gtest/gtest.h>
 
 #endif
diff --git a/mvvm/tests/libtestmachinery/mockinterfaces.h b/mvvm/tests/libtestmachinery/mockinterfaces.h
index 9e6e08b4998f342e0a1eb20678122bab3e96601c..8d151700a89996ce5d517de7f7db3985eecd1ef0 100644
--- a/mvvm/tests/libtestmachinery/mockinterfaces.h
+++ b/mvvm/tests/libtestmachinery/mockinterfaces.h
@@ -10,15 +10,15 @@
 #ifndef MOCKINTERFACES_h
 #define MOCKINTERFACES_h
 
-#include <string>
 #include "mvvm/model/tagrow.h"
+#include <string>
 
 //! Various common utils for unit tests.
 
 namespace ModelView {
 class SessionItem;
 class SessionModel;
-}
+} // namespace ModelView
 
 //! Interface for testing callbacks comming from SessionItem within gmock framework.
 
diff --git a/mvvm/tests/libtestmachinery/mockwidgets.cpp b/mvvm/tests/libtestmachinery/mockwidgets.cpp
index 5836ff1444c69a216680aca324eddeb6f11877ee..45d10a955db270dff64abafa51d3a434ce23430d 100644
--- a/mvvm/tests/libtestmachinery/mockwidgets.cpp
+++ b/mvvm/tests/libtestmachinery/mockwidgets.cpp
@@ -16,19 +16,16 @@
 
 // ----------------------------------------------------------------------------
 
-MockWidgetForItem::MockWidgetForItem(ModelView::SessionItem* item) : m_item(nullptr)
-{
+MockWidgetForItem::MockWidgetForItem(ModelView::SessionItem* item) : m_item(nullptr) {
     setItem(item);
 }
 
-MockWidgetForItem::~MockWidgetForItem()
-{
+MockWidgetForItem::~MockWidgetForItem() {
     if (m_item)
         m_item->mapper()->unsubscribe(this);
 }
 
-void MockWidgetForItem::setItem(ModelView::SessionItem* item)
-{
+void MockWidgetForItem::setItem(ModelView::SessionItem* item) {
     if (m_item == item)
         return;
 
@@ -79,19 +76,16 @@ void MockWidgetForItem::setItem(ModelView::SessionItem* item)
 
 // ----------------------------------------------------------------------------
 
-MockWidgetForModel::MockWidgetForModel(ModelView::SessionModel* model) : m_model(nullptr)
-{
+MockWidgetForModel::MockWidgetForModel(ModelView::SessionModel* model) : m_model(nullptr) {
     setModel(model);
 }
 
-MockWidgetForModel::~MockWidgetForModel()
-{
+MockWidgetForModel::~MockWidgetForModel() {
     if (m_model)
         m_model->mapper()->unsubscribe(this);
 }
 
-void MockWidgetForModel::setModel(ModelView::SessionModel* model)
-{
+void MockWidgetForModel::setModel(ModelView::SessionModel* model) {
     if (m_model == model)
         return;
 
diff --git a/mvvm/tests/libtestmachinery/mockwidgets.h b/mvvm/tests/libtestmachinery/mockwidgets.h
index 9feb671df5d0be9f47721f7ca7f3a07dec1f0653..3d45f9fc35e4159f13af4a1581c0a0f51cad2b22 100644
--- a/mvvm/tests/libtestmachinery/mockwidgets.h
+++ b/mvvm/tests/libtestmachinery/mockwidgets.h
@@ -13,16 +13,14 @@
 #include "mockinterfaces.h"
 #include <gmock/gmock.h>
 
-namespace ModelView
-{
+namespace ModelView {
 class SessionItem;
 class SessionModel;
 } // namespace ModelView
 
 //! Mock class for CallbackContainer.
 
-class CallbackMockWidget
-{
+class CallbackMockWidget {
 public:
     MOCK_METHOD1(onItemDestroy, void(ModelView::SessionItem* item));
     MOCK_METHOD2(onDataChange, void(ModelView::SessionItem* item, int role));
@@ -30,8 +28,7 @@ public:
 
 //! Mock widget to test ItemMapper functionality.
 
-class MockWidgetForItem : public ItemTestWidgetInterface
-{
+class MockWidgetForItem : public ItemTestWidgetInterface {
 public:
     MockWidgetForItem(ModelView::SessionItem* item);
     ~MockWidgetForItem();
@@ -52,8 +49,7 @@ private:
 
 //! Mock class to test ModelMapper functionality.
 
-class MockWidgetForModel : public ModelTestWidgetInterface
-{
+class MockWidgetForModel : public ModelTestWidgetInterface {
 public:
     MockWidgetForModel(ModelView::SessionModel* model);
     ~MockWidgetForModel();
diff --git a/mvvm/tests/libtestmachinery/test_utils.cpp b/mvvm/tests/libtestmachinery/test_utils.cpp
index fa3cd68ec3ae1172e3cb1ede6b693e6c712ded89..5ba36354c08bfae57a1a25ad82c985373d46ef73 100644
--- a/mvvm/tests/libtestmachinery/test_utils.cpp
+++ b/mvvm/tests/libtestmachinery/test_utils.cpp
@@ -8,75 +8,64 @@
 // ************************************************************************** //
 
 #include "test_utils.h"
+#include "mvvm/model/sessionmodel.h"
+#include "mvvm/serialization/jsonconverterinterfaces.h"
+#include "mvvm/serialization/jsonutils.h"
+#include "mvvm/utils/fileutils.h"
 #include "testconfig.h" // this file is auto generated by the build system in build directory
 #include <QFile>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QString>
 #include <QTextStream>
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsonconverterinterfaces.h"
-#include "mvvm/serialization/jsonutils.h"
-#include "mvvm/utils/fileutils.h"
-#include <string>
 #include <stdexcept>
-
+#include <string>
 
 using namespace ModelView;
 
-namespace
-{
+namespace {
 void SaveDocument(const QJsonDocument& document, const std::string& fileName);
 }
 
-std::string TestUtils::TestOutputDir()
-{
+std::string TestUtils::TestOutputDir() {
     return TestConfig::TestOutputDir(); // defined in auto-generated testconfig.h
 }
 
-std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir)
-{
+std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir) {
     std::string result = TestDirectoryPath(test_sub_dir);
     Utils::create_directory(result);
     return result;
 }
 
-std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir)
-{
+std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir) {
     return TestOutputDir() + std::string("/") + test_sub_dir;
 }
 
-std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name)
-{
+std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name) {
 
     return TestDirectoryPath(test_sub_dir) + std::string("/") + file_name;
 }
 
-void TestUtils::SaveJson(const QJsonObject& object, const std::string& fileName)
-{
+void TestUtils::SaveJson(const QJsonObject& object, const std::string& fileName) {
     QJsonDocument document(object);
     SaveDocument(document, fileName);
 }
 
-void TestUtils::SaveJson(const QJsonArray& object, const std::string& fileName)
-{
+void TestUtils::SaveJson(const QJsonArray& object, const std::string& fileName) {
     QJsonDocument document(object);
     SaveDocument(document, fileName);
 }
 
-QString TestUtils::JsonToString(const QJsonObject& object)
-{
+QString TestUtils::JsonToString(const QJsonObject& object) {
     QJsonDocument document(object);
     return QString(document.toJson(QJsonDocument::Compact));
 }
 
-QString TestUtils::ModelToJsonString(SessionModel& model)
-{
+QString TestUtils::ModelToJsonString(SessionModel& model) {
     return QString::fromStdString(JsonUtils::ModelToJsonString(model));
 }
 
-QJsonDocument TestUtils::LoadJson(const std::string& fileName)
-{
+QJsonDocument TestUtils::LoadJson(const std::string& fileName) {
     QFile jsonFile(QString::fromStdString(fileName));
 
     if (!jsonFile.open(QIODevice::ReadOnly))
@@ -85,8 +74,7 @@ QJsonDocument TestUtils::LoadJson(const std::string& fileName)
     return QJsonDocument().fromJson(jsonFile.readAll());
 }
 
-std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName) {
     std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
 
     QFile file(QString::fromStdString(filename));
@@ -101,8 +89,7 @@ std::string TestUtils::CreateTestFile(const std::string& dirname, const std::str
     return filename;
 }
 
-std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName) {
     std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
 
     QFile file(QString::fromStdString(filename));
@@ -112,11 +99,9 @@ std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::st
     return filename;
 }
 
-namespace
-{
+namespace {
 
-void SaveDocument(const QJsonDocument& document, const std::string& fileName)
-{
+void SaveDocument(const QJsonDocument& document, const std::string& fileName) {
     QFile saveFile(QString::fromStdString(fileName));
 
     if (!saveFile.open(QIODevice::WriteOnly))
diff --git a/mvvm/tests/libtestmachinery/test_utils.h b/mvvm/tests/libtestmachinery/test_utils.h
index e09a2e50593f416ac8aa38e48c01a809308699f4..fabbea39bed5a4c61bafdbf87ea4024472bc3101 100644
--- a/mvvm/tests/libtestmachinery/test_utils.h
+++ b/mvvm/tests/libtestmachinery/test_utils.h
@@ -10,9 +10,9 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 
+#include "mvvm/model/customvariants.h"
 #include <QString>
 #include <memory>
-#include "mvvm/model/customvariants.h"
 
 //! @file test_utils.h
 //! @brief Collection of utility functions for various unit tests.
@@ -20,15 +20,13 @@
 class QJsonObject;
 class QJsonArray;
 
-namespace ModelView
-{
+namespace ModelView {
 class SessionModel;
 }
 
 //! Various common utils for unit tests.
 
-namespace TestUtils
-{
+namespace TestUtils {
 
 //! Returns full path to the main test folder, as defined by CMake at compile time.
 //! Shoud point to CMAKE_BINARY_DIR/test_output
@@ -65,8 +63,7 @@ std::string CreateEmptyFile(const std::string& dirname, const std::string& fileN
 
 //! Deletes items in the container and cleans container afterwards.
 
-template <typename T> void clean_items(T& items)
-{
+template <typename T> void clean_items(T& items) {
     for (auto item : items)
         delete item;
     items.clear();
@@ -74,8 +71,7 @@ template <typename T> void clean_items(T& items)
 
 //! Creates vector of unique_ptr of given type.
 
-template <typename B, typename D> auto create_row(int ncolumns)
-{
+template <typename B, typename D> auto create_row(int ncolumns) {
     std::vector<std::unique_ptr<B>> result;
     for (int i = 0; i < ncolumns; ++i)
         result.emplace_back(std::make_unique<D>());
@@ -84,8 +80,7 @@ template <typename B, typename D> auto create_row(int ncolumns)
 
 //! Creates vector of pointers from vector of unique_ptr.
 
-template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>& vec)
-{
+template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>& vec) {
     std::vector<T*> result;
     std::transform(vec.begin(), vec.end(), std::back_inserter(result),
                    [](auto& x) { return x.get(); });
@@ -94,8 +89,7 @@ template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>
 
 //! Creates vector of T from argument list. Used in EXPECT_EQ macros for convenience.
 
-template <typename T, typename... Args> std::vector<T> toVector(Args&&... args)
-{
+template <typename T, typename... Args> std::vector<T> toVector(Args&&... args) {
     std::vector<T> v;
     (v.push_back(T(args)), ...);
     return v;
diff --git a/mvvm/tests/libtestmachinery/toyitems.cpp b/mvvm/tests/libtestmachinery/toyitems.cpp
index b416fb4035bce99eb7b556f7d2e45a40dce9848d..a4e5846f6efcd3a2198f42a9867cff07c79a20f5 100644
--- a/mvvm/tests/libtestmachinery/toyitems.cpp
+++ b/mvvm/tests/libtestmachinery/toyitems.cpp
@@ -8,23 +8,21 @@
 // ************************************************************************** //
 
 #include "toyitems.h"
-#include <QColor>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/signals/itemmapper.h"
 #include "mvvm/standarditems/vectoritem.h"
+#include <QColor>
 #include <stdexcept>
 
 using namespace ToyItems;
 
-MultiLayerItem::MultiLayerItem() : CompoundItem(Constants::MultiLayerItemType)
-{
+MultiLayerItem::MultiLayerItem() : CompoundItem(Constants::MultiLayerItemType) {
     registerTag(ModelView::TagInfo::universalTag(T_LAYERS, {Constants::LayerItemType}),
                 /*set_as_default*/ true);
 }
 
-LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType)
-{
+LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType) {
     addProperty(P_THICKNESS, 42.0);
     addProperty(P_COLOR, QColor(Qt::green));
     registerTag(ModelView::TagInfo::universalTag(T_PARTICLES, {Constants::ParticleItemType}),
@@ -33,16 +31,14 @@ LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType)
 
 // ----------------------------------------------------------------------------
 
-ParticleItem::ParticleItem() : CompoundItem(Constants::ParticleItemType)
-{
+ParticleItem::ParticleItem() : CompoundItem(Constants::ParticleItemType) {
     addProperty<ModelView::VectorItem>(P_POSITION);
     addProperty<ShapeGroupItem>(P_SHAPES);
 }
 
 // ----------------------------------------------------------------------------
 
-LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType)
-{
+LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType) {
     addProperty(P_ROTATION_ANLE, 90.0);
     addProperty(P_INTEGRATION, true);
 
@@ -52,8 +48,7 @@ LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType)
     update_appearance();
 }
 
-void LatticeItem::activate()
-{
+void LatticeItem::activate() {
     auto onIntegrationFlagChange = [this](SessionItem*, std::string property) {
         if (property == P_INTEGRATION)
             update_appearance();
@@ -61,39 +56,34 @@ void LatticeItem::activate()
     mapper()->setOnPropertyChange(onIntegrationFlagChange, this);
 }
 
-void LatticeItem::update_appearance()
-{
+void LatticeItem::update_appearance() {
     auto angle_item = getItem(P_ROTATION_ANLE);
     angle_item->setEnabled(!property<bool>(P_INTEGRATION));
 }
 
 // ----------------------------------------------------------------------------
 
-CylinderItem::CylinderItem() : CompoundItem(Constants::CylinderItemType)
-{
+CylinderItem::CylinderItem() : CompoundItem(Constants::CylinderItemType) {
     addProperty(P_RADIUS, 8.0);
     addProperty(P_HEIGHT, 10.0);
 }
 
 // ----------------------------------------------------------------------------
 
-SphereItem::SphereItem() : CompoundItem(Constants::SphereItemType)
-{
+SphereItem::SphereItem() : CompoundItem(Constants::SphereItemType) {
     addProperty(P_RADIUS, 8.0);
 }
 
 // ----------------------------------------------------------------------------
 
-AnysoPyramidItem::AnysoPyramidItem() : CompoundItem(Constants::AnysoPyramidItemType)
-{
+AnysoPyramidItem::AnysoPyramidItem() : CompoundItem(Constants::AnysoPyramidItemType) {
     addProperty(P_LENGTH, 8.0);
     addProperty(P_WIDTH, 8.0);
     addProperty(P_HEIGHT, 8.0);
     addProperty(P_ALPHA, 8.0);
 }
 
-ShapeGroupItem::ShapeGroupItem() : GroupItem(Constants::ShapeGroupItemType)
-{
+ShapeGroupItem::ShapeGroupItem() : GroupItem(Constants::ShapeGroupItemType) {
     registerItem<CylinderItem>("Cylinder");
     registerItem<SphereItem>("Full sphere", /*make_selected*/ true);
     registerItem<AnysoPyramidItem>("Anysotropical pyramid");
diff --git a/mvvm/tests/libtestmachinery/toyitems.h b/mvvm/tests/libtestmachinery/toyitems.h
index db8df1a8735f3d28881ea32ae990c3a231b17d87..2820c0cc40b937057b46b7f54b3ac11b013c0131 100644
--- a/mvvm/tests/libtestmachinery/toyitems.h
+++ b/mvvm/tests/libtestmachinery/toyitems.h
@@ -12,17 +12,15 @@
 
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/groupitem.h"
-#include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/itempool.h"
+#include "mvvm/model/sessionmodel.h"
 #include <string>
 
 //! Collection of toy items and models for testing purposes.
 
-namespace ToyItems
-{
+namespace ToyItems {
 
-namespace Constants
-{
+namespace Constants {
 
 const ModelView::model_type MultiLayerItemType = "MultiLayer";
 const ModelView::model_type LayerItemType = "Layer";
@@ -36,11 +34,9 @@ const ModelView::model_type AnysoPyramidItemType = "AnysoPyramid";
 const ModelView::model_type ShapeGroupItemType = "ShapeGroup";
 } // namespace Constants
 
-
 //! Represents multilayer with collection of layers.
 
-class MultiLayerItem : public ModelView::CompoundItem
-{
+class MultiLayerItem : public ModelView::CompoundItem {
 public:
     static inline const std::string T_LAYERS = "T_LAYERS";
     MultiLayerItem();
@@ -48,8 +44,7 @@ public:
 
 //! Represents a layer, with thickness and color, and possibly populated with particles.
 
-class LayerItem : public ModelView::CompoundItem
-{
+class LayerItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_THICKNESS = "Thickness";
     static inline const std::string P_COLOR = "Color";
@@ -59,8 +54,7 @@ public:
 
 //! Represents a particle, with a position, and a selection of possible shapes.
 
-class ParticleItem : public ModelView::CompoundItem
-{
+class ParticleItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_POSITION = "Position";
     static inline const std::string P_SHAPES = "Shapes";
@@ -70,8 +64,7 @@ public:
 
 //! Represents a lattice.
 
-class LatticeItem : public ModelView::CompoundItem
-{
+class LatticeItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_ROTATION_ANLE = "Rotation";
     static inline const std::string P_INTEGRATION = "Integration";
@@ -87,8 +80,7 @@ private:
 
 //! Represents a cylindrical shape.
 
-class CylinderItem : public ModelView::CompoundItem
-{
+class CylinderItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_RADIUS = "Radius";
     static inline const std::string P_HEIGHT = "Height";
@@ -98,8 +90,7 @@ public:
 
 //! Represents a shpere.
 
-class SphereItem : public ModelView::CompoundItem
-{
+class SphereItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_RADIUS = "Radius";
 
@@ -108,8 +99,7 @@ public:
 
 //! Represents an anysotropical pyramid.
 
-class AnysoPyramidItem : public ModelView::CompoundItem
-{
+class AnysoPyramidItem : public ModelView::CompoundItem {
 public:
     static inline const std::string P_LENGTH = "Length";
     static inline const std::string P_WIDTH = "Width";
@@ -121,8 +111,7 @@ public:
 
 //! Represents a group item holding a collection of shapes.
 
-class ShapeGroupItem : public ModelView::GroupItem
-{
+class ShapeGroupItem : public ModelView::GroupItem {
 public:
     ShapeGroupItem();
 };
diff --git a/mvvm/tests/libtestmachinery/toymodel.cpp b/mvvm/tests/libtestmachinery/toymodel.cpp
index 2b0bf3a0edaec6c1f1b4f49125cb6d6ffdcaffaa..1188d7c905b76773be1b91dec5798692e0ebfecf 100644
--- a/mvvm/tests/libtestmachinery/toymodel.cpp
+++ b/mvvm/tests/libtestmachinery/toymodel.cpp
@@ -8,13 +8,11 @@
 // ************************************************************************** //
 
 #include "toymodel.h"
-#include "toyitems.h"
 #include "mvvm/model/itemcatalogue.h"
+#include "toyitems.h"
 
-namespace
-{
-std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue()
-{
+namespace {
+std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue() {
     auto result = std::make_unique<ModelView::ItemCatalogue>();
     result->registerItem<ToyItems::MultiLayerItem>();
     result->registerItem<ToyItems::LayerItem>();
@@ -28,13 +26,11 @@ std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue()
 }
 } // namespace
 
-ToyItems::SampleModel::SampleModel() : SessionModel("ToyModel")
-{
+ToyItems::SampleModel::SampleModel() : SessionModel("ToyModel") {
     setItemCatalogue(CreateItemCatalogue());
 }
 
 ToyItems::SampleModel::SampleModel(std::shared_ptr<ModelView::ItemPool> pool)
-    : SessionModel("ToyModel", pool)
-{
+    : SessionModel("ToyModel", pool) {
     setItemCatalogue(CreateItemCatalogue());
 }
diff --git a/mvvm/tests/libtestmachinery/toymodel.h b/mvvm/tests/libtestmachinery/toymodel.h
index e75db44a01bf34f77cc832b7c2f398f7dff3978a..5d392154027f92fc7df18402e07b70df98d022bc 100644
--- a/mvvm/tests/libtestmachinery/toymodel.h
+++ b/mvvm/tests/libtestmachinery/toymodel.h
@@ -10,16 +10,14 @@
 #ifndef TOYMODEL_H
 #define TOYMODEL_H
 
-#include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/itempool.h"
+#include "mvvm/model/sessionmodel.h"
 
 //! Collection of toy items and models for testing purposes.
 
-namespace ToyItems
-{
+namespace ToyItems {
 
-class SampleModel : public ModelView::SessionModel
-{
+class SampleModel : public ModelView::SessionModel {
 public:
     SampleModel();
     SampleModel(std::shared_ptr<ModelView::ItemPool> pool);
diff --git a/mvvm/tests/libtestmachinery/widgetbasedtest.cpp b/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
index 0ef681a54e94161973d8c870be78661292d713a9..4c9772a4e51153e89f84f6c41e4b878d79953777 100644
--- a/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
+++ b/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
@@ -12,8 +12,7 @@
 
 QApplication* WidgetBasedTest::m_app = nullptr;
 
-namespace
-{
+namespace {
 // faking argc and argv
 char progname[] = "testview";
 char* argv[] = {&progname[0], nullptr};
@@ -22,13 +21,11 @@ int argc = 1;
 
 WidgetBasedTest::WidgetBasedTest() {}
 
-void WidgetBasedTest::SetUpTestSuite()
-{
+void WidgetBasedTest::SetUpTestSuite() {
     m_app = new QApplication(argc, argv);
 }
 
-void WidgetBasedTest::TearDownTestSuite()
-{
+void WidgetBasedTest::TearDownTestSuite() {
     delete m_app;
     m_app = 0;
 }
diff --git a/mvvm/tests/libtestmachinery/widgetbasedtest.h b/mvvm/tests/libtestmachinery/widgetbasedtest.h
index e5b7137d2270ceb94dcb22d51407887dad15b49f..87ce5ddff3e8d9a836e5ba1d0208b2c34761bbcb 100644
--- a/mvvm/tests/libtestmachinery/widgetbasedtest.h
+++ b/mvvm/tests/libtestmachinery/widgetbasedtest.h
@@ -16,8 +16,7 @@ class QApplication;
 
 //! Convenience class to setup QApplication for tests involving QWidget creation.
 
-class WidgetBasedTest : public ::testing::Test
-{
+class WidgetBasedTest : public ::testing::Test {
 public:
     WidgetBasedTest();
 
diff --git a/mvvm/tests/testintegration/TestAll.cpp b/mvvm/tests/testintegration/TestAll.cpp
index fd90e66746f1d987ca9bff214459f7e3867c42e9..b304450576d7127bf094f221abcb3608fcf56c63 100644
--- a/mvvm/tests/testintegration/TestAll.cpp
+++ b/mvvm/tests/testintegration/TestAll.cpp
@@ -12,8 +12,7 @@
 #include <QApplication>
 #include <QStandardItem>
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
 
     ModelView::Comparators::registerComparators();
diff --git a/mvvm/tests/testintegration/standarditemserialization.test.cpp b/mvvm/tests/testintegration/standarditemserialization.test.cpp
index d5c860182dcacbc4f6294d9adcee080061b2d22b..25934fa4dbd018912935ddca7ba255b0ba6ceebe 100644
--- a/mvvm/tests/testintegration/standarditemserialization.test.cpp
+++ b/mvvm/tests/testintegration/standarditemserialization.test.cpp
@@ -8,18 +8,17 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QDebug>
-#include <QJsonObject>
 #include "mvvm/model/modelutils.h"
 #include "mvvm/serialization/jsonmodelconverter.h"
 #include "mvvm/standarditems/standarditemincludes.h"
+#include <QDebug>
+#include <QJsonObject>
 
 using namespace ModelView;
 
 //! Testing serialization of ToyItems using json converters.
 
-class StandardItemsSerializationTest : public ::testing::Test
-{
+class StandardItemsSerializationTest : public ::testing::Test {
 public:
     ~StandardItemsSerializationTest();
 };
@@ -28,8 +27,7 @@ StandardItemsSerializationTest::~StandardItemsSerializationTest() = default;
 
 //! Checking that serialization works (not crashing) for all defined standard items.
 
-TEST_F(StandardItemsSerializationTest, allItems)
-{
+TEST_F(StandardItemsSerializationTest, allItems) {
     SessionModel model;
     model.insertItem<ColorMapItem>();
     model.insertItem<ColorMapViewportItem>();
@@ -55,8 +53,7 @@ TEST_F(StandardItemsSerializationTest, allItems)
 
 //! Creating graph with data. It has to be identical after serialization.
 
-TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization)
-{
+TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization) {
     // preparing model, data item and graph pointing to it
     SessionModel model;
     auto graph_item = model.insertItem<GraphItem>();
@@ -82,8 +79,7 @@ TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization)
 
 //! Creating viewport with one graph. Serializing and restoring the model.
 
-TEST_F(StandardItemsSerializationTest, graphViewPortItemSerialization)
-{
+TEST_F(StandardItemsSerializationTest, graphViewPortItemSerialization) {
     SessionModel model;
     auto viewport_item = model.insertItem<GraphViewportItem>();
     auto graph_item = model.insertItem<GraphItem>(viewport_item);
diff --git a/mvvm/tests/testintegration/toyitemslattice.test.cpp b/mvvm/tests/testintegration/toyitemslattice.test.cpp
index 96b6da3a269fc180565773602152ed9d6672a3d3..6b896e1ee0ed14b9e0ca4d70ce7c4758e70fb86d 100644
--- a/mvvm/tests/testintegration/toyitemslattice.test.cpp
+++ b/mvvm/tests/testintegration/toyitemslattice.test.cpp
@@ -16,8 +16,7 @@ using namespace ToyItems;
 
 //! Test toy LatticeItem.
 
-class ToyItemsLatticeTest : public ::testing::Test
-{
+class ToyItemsLatticeTest : public ::testing::Test {
 public:
     ~ToyItemsLatticeTest();
 };
@@ -26,8 +25,7 @@ ToyItemsLatticeTest::~ToyItemsLatticeTest() = default;
 
 //! Business logice (enabled/disabled).
 
-TEST_F(ToyItemsLatticeTest, ToyItemsLatticeTest)
-{
+TEST_F(ToyItemsLatticeTest, ToyItemsLatticeTest) {
     ToyItems::SampleModel model;
     auto lattice = model.insertItem<LatticeItem>();
 
diff --git a/mvvm/tests/testintegration/toyitemsserialization.test.cpp b/mvvm/tests/testintegration/toyitemsserialization.test.cpp
index 867dc466d2a7e882a0957b806cb6ba29cd031cf5..bca4fa5e5dbb72dc75ed58a60c49a43f158a8296 100644
--- a/mvvm/tests/testintegration/toyitemsserialization.test.cpp
+++ b/mvvm/tests/testintegration/toyitemsserialization.test.cpp
@@ -8,19 +8,18 @@
 // ************************************************************************** //
 
 #include "google_test.h"
+#include "mvvm/model/modelutils.h"
+#include "mvvm/serialization/jsonmodelconverter.h"
 #include "toyitems.h"
 #include "toymodel.h"
 #include <QJsonObject>
-#include "mvvm/model/modelutils.h"
-#include "mvvm/serialization/jsonmodelconverter.h"
 
 using namespace ModelView;
 using namespace ToyItems;
 
 //! Testing serialization of ToyItems using json converters.
 
-class ToyItemsSerializationTest : public ::testing::Test
-{
+class ToyItemsSerializationTest : public ::testing::Test {
 public:
     ~ToyItemsSerializationTest();
 };
@@ -30,8 +29,7 @@ ToyItemsSerializationTest::~ToyItemsSerializationTest() = default;
 //! Checking ShapeGroupItem in a model.
 //! Serialization/deserelization should give an item identical to original.
 
-TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel)
-{
+TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel) {
     // model with single group item
     SampleModel model;
     auto group = model.insertItem<ShapeGroupItem>();
@@ -48,8 +46,7 @@ TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel)
 //! Checking ShapeGroupItem in a model.
 //! Serialization/deserelization should give an item identical to original.
 
-TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel)
-{
+TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel) {
     SampleModel model;
     auto group = model.insertItem<ShapeGroupItem>();
 
@@ -73,8 +70,7 @@ TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel)
 
 //! Insert all supported items in a model and check that after serialization
 
-TEST_F(ToyItemsSerializationTest, allItemsInAModel)
-{
+TEST_F(ToyItemsSerializationTest, allItemsInAModel) {
     SampleModel model;
     model.insertItem<ToyItems::MultiLayerItem>();
     model.insertItem<ToyItems::LayerItem>();
diff --git a/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp b/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
index f96859d15ab85bf46b9146e2e09ef8b84b53d4e8..b1652f8c6d76bfd33a3d789a1a87bb85216b411e 100644
--- a/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
+++ b/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
@@ -8,20 +8,19 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/propertyviewmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
 //! Tests of toy ShapeGroup in the context of model and viewmodel.
 
-class ToyItemsShapeGroupTest : public ::testing::Test
-{
+class ToyItemsShapeGroupTest : public ::testing::Test {
 public:
     ~ToyItemsShapeGroupTest();
 };
@@ -30,8 +29,7 @@ ToyItemsShapeGroupTest::~ToyItemsShapeGroupTest() = default;
 
 //! Toy multilayer as produced bo toy SampleModel.
 
-TEST_F(ToyItemsShapeGroupTest, initialState)
-{
+TEST_F(ToyItemsShapeGroupTest, initialState) {
     ToyItems::ShapeGroupItem item;
 
     EXPECT_EQ(item.currentIndex(), 1);
@@ -53,8 +51,7 @@ TEST_F(ToyItemsShapeGroupTest, initialState)
               std::vector<std::string>({"Cylinder", "Full sphere", "Anysotropical pyramid"}));
 }
 
-TEST_F(ToyItemsShapeGroupTest, setCurrentType)
-{
+TEST_F(ToyItemsShapeGroupTest, setCurrentType) {
     ToyItems::ShapeGroupItem item;
     item.setCurrentType(ToyItems::Constants::CylinderItemType);
 
@@ -72,15 +69,13 @@ TEST_F(ToyItemsShapeGroupTest, setCurrentType)
               std::vector<std::string>({"Cylinder", "Full sphere", "Anysotropical pyramid"}));
 }
 
-TEST_F(ToyItemsShapeGroupTest, currentItemNoConst)
-{
+TEST_F(ToyItemsShapeGroupTest, currentItemNoConst) {
     ToyItems::ShapeGroupItem item;
     item.currentItem()->setProperty(ToyItems::SphereItem::P_RADIUS, 42.0);
     EXPECT_EQ(item.currentItem()->property<double>(ToyItems::SphereItem::P_RADIUS), 42.0);
 }
 
-TEST_F(ToyItemsShapeGroupTest, inModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inModelContext) {
     ToyItems::SampleModel model;
     auto item = model.insertItem<ToyItems::ShapeGroupItem>();
     ASSERT_TRUE(item != nullptr);
@@ -102,8 +97,7 @@ TEST_F(ToyItemsShapeGroupTest, inModelContext)
     EXPECT_EQ(item->children().at(2)->model(), &model);
 }
 
-TEST_F(ToyItemsShapeGroupTest, setDataInModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, setDataInModelContext) {
     ToyItems::SampleModel model;
     auto item = model.insertItem<ToyItems::ShapeGroupItem>();
     ASSERT_TRUE(item != nullptr);
@@ -124,8 +118,7 @@ TEST_F(ToyItemsShapeGroupTest, setDataInModelContext)
 
 //! ViewLabelItem and ViewDataItem from ShapeItem.
 
-TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup)
-{
+TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup) {
     ToyItems::SampleModel model;
 
     auto groupItem = model.insertItem<ToyItems::ShapeGroupItem>();
@@ -140,8 +133,7 @@ TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup)
 
 //! ShapeGroup item in DefaultViewModel.
 
-TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext) {
     ToyItems::SampleModel model;
     auto groupItem = model.insertItem<ToyItems::ShapeGroupItem>();
 
@@ -191,8 +183,7 @@ TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext)
 
 //! ShapeGroup item in PropertyViewModel.
 
-TEST_F(ToyItemsShapeGroupTest, inPropertyViewModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inPropertyViewModelContext) {
     ToyItems::SampleModel model;
     auto parent = model.insertItem<SessionItem>();
     parent->registerTag(
diff --git a/mvvm/tests/testintegration/undoscenario.test.cpp b/mvvm/tests/testintegration/undoscenario.test.cpp
index 9d819d62c13565ead9ae60184c58a091e0704196..8c4858e8852d5731f390d3fa69e4f6bc495fb878 100644
--- a/mvvm/tests/testintegration/undoscenario.test.cpp
+++ b/mvvm/tests/testintegration/undoscenario.test.cpp
@@ -8,18 +8,17 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "qcustomplot.h"
 #include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
+#include "qcustomplot.h"
 
 using namespace ModelView;
 
 //! Testing various undo/redo scenario.
 
-class UndoScenarioTest : public ::testing::Test
-{
+class UndoScenarioTest : public ::testing::Test {
 public:
     ~UndoScenarioTest();
 };
@@ -29,8 +28,7 @@ UndoScenarioTest::~UndoScenarioTest() = default;
 //! Check undo/redo of ViewportAxisItem range, when it is listened by the controller.
 //! Real-life bug.
 
-TEST_F(UndoScenarioTest, undoViewportSetRange)
-{
+TEST_F(UndoScenarioTest, undoViewportSetRange) {
     // initialzing model, custom plot and controller
     SessionModel model;
     auto axisItem = model.insertItem<ViewportAxisItem>();
diff --git a/mvvm/tests/testmodel/callbackcontainer.test.cpp b/mvvm/tests/testmodel/callbackcontainer.test.cpp
index 5ff52908fb6792a531e34231bbf5820fd5875237..f119f636ca1e37da636fcb0fc4b519d516bb875b 100644
--- a/mvvm/tests/testmodel/callbackcontainer.test.cpp
+++ b/mvvm/tests/testmodel/callbackcontainer.test.cpp
@@ -9,10 +9,10 @@
 
 #include "google_test.h"
 #include "mockwidgets.h"
-#include <memory>
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/signals/callbackcontainer.h"
+#include <memory>
 
 using namespace ModelView;
 using ::testing::_;
diff --git a/mvvm/tests/testmodel/compounditem.test.cpp b/mvvm/tests/testmodel/compounditem.test.cpp
index 57557ea0a926ce6c7395d4c0c9faedbe4550fa09..26365fe46ad7a278f36a9d81261e6c266c382115 100644
--- a/mvvm/tests/testmodel/compounditem.test.cpp
+++ b/mvvm/tests/testmodel/compounditem.test.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <memory>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/sessionmodel.h"
+#include "test_utils.h"
+#include <memory>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/containeritem.test.cpp b/mvvm/tests/testmodel/containeritem.test.cpp
index 1877bd534bfd9cecaab223a2a097c6a5b2b0bd7e..9c5cae8d5511771486580982c4e0ed47cc44c694 100644
--- a/mvvm/tests/testmodel/containeritem.test.cpp
+++ b/mvvm/tests/testmodel/containeritem.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
+#include "mvvm/standarditems/containeritem.h"
 #include "test_utils.h"
 #include <memory>
-#include "mvvm/standarditems/containeritem.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/containerutils.test.cpp b/mvvm/tests/testmodel/containerutils.test.cpp
index b5dfc014e649b65a8cc69e890599228062adbf8b..c543316b197ce8c0b7cd5cf24e78842b21ecd947 100644
--- a/mvvm/tests/testmodel/containerutils.test.cpp
+++ b/mvvm/tests/testmodel/containerutils.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <complex>
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/utils/containerutils.h"
+#include <complex>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/customvariants.test.cpp b/mvvm/tests/testmodel/customvariants.test.cpp
index 6ba172ee70e6478d38f51fa811487a174177f61a..c0ec1838a10a3dee375b93f4e627deb976b962e0 100644
--- a/mvvm/tests/testmodel/customvariants.test.cpp
+++ b/mvvm/tests/testmodel/customvariants.test.cpp
@@ -8,9 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QColor>
-#include <functional>
-#include <memory>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
@@ -19,6 +16,9 @@
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/model/variant_constants.h"
+#include <QColor>
+#include <functional>
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/fileutils.test.cpp b/mvvm/tests/testmodel/fileutils.test.cpp
index 95be68b36bfc40ea89b6df7ee9537f72334b2e6f..033f83555cfee4cdcba78b5aded33aa2b8c86e26 100644
--- a/mvvm/tests/testmodel/fileutils.test.cpp
+++ b/mvvm/tests/testmodel/fileutils.test.cpp
@@ -9,9 +9,9 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
+#include "mvvm/utils/fileutils.h"
 #include "test_utils.h"
 #include <QDir>
-#include "mvvm/utils/fileutils.h"
 #include <stdexcept>
 #include <string>
 
diff --git a/mvvm/tests/testmodel/graphitem.test.cpp b/mvvm/tests/testmodel/graphitem.test.cpp
index 4f97d7ca851eca1863f2df3727f9e68049ca2026..9f45e8559577572602e8f9c1908507934449218b 100644
--- a/mvvm/tests/testmodel/graphitem.test.cpp
+++ b/mvvm/tests/testmodel/graphitem.test.cpp
@@ -9,13 +9,13 @@
 
 #include "google_test.h"
 #include "mockwidgets.h"
-#include <QColor>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/linkeditem.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
 
 using namespace ModelView;
 using ::testing::_;
diff --git a/mvvm/tests/testmodel/itemconverterfactory.test.cpp b/mvvm/tests/testmodel/itemconverterfactory.test.cpp
index 85211edbd872001f7aab31d64c87017bf071ce5f..dcfd4d5b6bf116d7f0a73f9790ae6046fad7f163 100644
--- a/mvvm/tests/testmodel/itemconverterfactory.test.cpp
+++ b/mvvm/tests/testmodel/itemconverterfactory.test.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QJsonObject>
 #include "mvvm/factories/itemconverterfactory.h"
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
+#include "test_utils.h"
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/itemlistener.test.cpp b/mvvm/tests/testmodel/itemlistener.test.cpp
index dbbe33e9cf82fd77008d484970252221f39356bc..a2923d14e20f40948df9a98abe167c02387da271 100644
--- a/mvvm/tests/testmodel/itemlistener.test.cpp
+++ b/mvvm/tests/testmodel/itemlistener.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/itemlistener.h"
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/itemmanager.test.cpp b/mvvm/tests/testmodel/itemmanager.test.cpp
index 6fcaba603cfaf1c472fcd6e25f523edf04640e5d..d3339641619193021618a930c093a8106ae610e3 100644
--- a/mvvm/tests/testmodel/itemmanager.test.cpp
+++ b/mvvm/tests/testmodel/itemmanager.test.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/itemmanager.h"
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/itempool.test.cpp b/mvvm/tests/testmodel/itempool.test.cpp
index 4d6616e3aa18e702761f443f6f42fbcbb1d1daf0..2c33284e315ad44bf9aa468756349314e04b2767 100644
--- a/mvvm/tests/testmodel/itempool.test.cpp
+++ b/mvvm/tests/testmodel/itempool.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/sessionitem.h"
+#include <memory>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/itemutils.test.cpp b/mvvm/tests/testmodel/itemutils.test.cpp
index 8d2c3b58fe13207fb58ad5eb6fafdbe6a2fcd66a..b6df97e68bfe66e94c75d601a4d5cf010946bd0e 100644
--- a/mvvm/tests/testmodel/itemutils.test.cpp
+++ b/mvvm/tests/testmodel/itemutils.test.cpp
@@ -8,7 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/propertyitem.h"
@@ -16,6 +15,7 @@
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/jsondocument.test.cpp b/mvvm/tests/testmodel/jsondocument.test.cpp
index 2bcb224419856d57ca3d657f9aeb7216819305ed..cd99cd5cedb20e209e76ffc6f6b1dfe8b6079075 100644
--- a/mvvm/tests/testmodel/jsondocument.test.cpp
+++ b/mvvm/tests/testmodel/jsondocument.test.cpp
@@ -9,12 +9,12 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/serialization/jsondocument.h"
+#include "test_utils.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp b/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
index b6f9e2a8c89970f86c2a9338b61fb0889dab85a4..9e6dc2dc0c17587feabf2be7ae46db18afaa3832 100644
--- a/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
@@ -9,10 +9,6 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitemcontainer.h"
@@ -21,6 +17,10 @@
 #include "mvvm/serialization/jsonitemcontainerconverter.h"
 #include "mvvm/serialization/jsonitemdataconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/jsonitemconverter.test.cpp b/mvvm/tests/testmodel/jsonitemconverter.test.cpp
index b2e65275d08257c70db78d677b1db74df097b9f7..fbb22913b449ee51303fee0d926fd26e44d5c48e 100644
--- a/mvvm/tests/testmodel/jsonitemconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemconverter.test.cpp
@@ -9,10 +9,6 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/propertyitem.h"
@@ -21,6 +17,10 @@
 #include "mvvm/serialization/jsonitem_types.h"
 #include "mvvm/serialization/jsonitemconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp b/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
index d6eb902105ab4b85672d950787b8c53357c5ef8e..79606943826fcba82e9cf465163835dec2580289 100644
--- a/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
@@ -9,15 +9,15 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonObject>
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/sessionitemdata.h"
 #include "mvvm/serialization/jsonitemdataconverter.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsonvariantconverter.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonObject>
 #include <string>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp b/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
index 879834caf413355764529916e418f8b2d24fa999..458910ecdcb452b772394ce893097ecdfed22db8 100644
--- a/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QJsonArray>
-#include <QJsonObject>
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsonvariantconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/jsonmodelconverter.test.cpp b/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
index d8043891eca842838d01bc4922ba318406a4d8fe..438879330e238a14ab048b1778ca0aa818ee7cfa 100644
--- a/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
@@ -9,10 +9,6 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
@@ -21,6 +17,10 @@
 #include "mvvm/serialization/jsonitem_types.h"
 #include "mvvm/serialization/jsonitemformatassistant.h"
 #include "mvvm/serialization/jsonmodelconverter.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp b/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
index 659c93583e5ab3fc5576d2984afc34e7befc3f11..dae960e349ebc9ca8e7c3908890e08ceaa6be6fd 100644
--- a/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
@@ -9,12 +9,12 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
+#include "mvvm/model/taginfo.h"
+#include "mvvm/serialization/jsontaginfoconverter.h"
 #include "test_utils.h"
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include "mvvm/model/taginfo.h"
-#include "mvvm/serialization/jsontaginfoconverter.h"
 #include <string>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonutils.test.cpp b/mvvm/tests/testmodel/jsonutils.test.cpp
index ccd1d24087e8dc0ddd0547e78542b13e5aeb9422..cd28b71ab65829ee0abe22b3bf5fc11742f2ceb4 100644
--- a/mvvm/tests/testmodel/jsonutils.test.cpp
+++ b/mvvm/tests/testmodel/jsonutils.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <limits>
 #include "mvvm/serialization/jsonutils.h"
 #include "mvvm/utils/reallimits.h"
+#include <limits>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/jsonvariantconverter.test.cpp b/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
index 647b4e4c74ffd361c9832d7487c2fa458486fc64..a4a6cdf878c4f75bf0fa102dcd05c439f6fce920 100644
--- a/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
@@ -9,17 +9,17 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QColor>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/variant_constants.h"
 #include "mvvm/serialization/jsonvariantconverter.h"
 #include "mvvm/utils/reallimits.h"
+#include "test_utils.h"
+#include <QColor>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <vector>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/modellistener.test.cpp b/mvvm/tests/testmodel/modellistener.test.cpp
index 6604c210266e543834c7d23d11c086b4e5b90ce8..debf14d8d46f8c4f8b0cc10b24585074f8cf36b5 100644
--- a/mvvm/tests/testmodel/modellistener.test.cpp
+++ b/mvvm/tests/testmodel/modellistener.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/modellistener.h"
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/modelutils.test.cpp b/mvvm/tests/testmodel/modelutils.test.cpp
index 53c69d9a948af3427fc871281aa4a050cc55b6bf..bbe4e8f06205d2b768e617f5d94e51e5cf6f365d 100644
--- a/mvvm/tests/testmodel/modelutils.test.cpp
+++ b/mvvm/tests/testmodel/modelutils.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
+#include "mvvm/model/modelutils.h"
 #include "toyitems.h"
 #include "toymodel.h"
-#include "mvvm/model/modelutils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/numericutils.test.cpp b/mvvm/tests/testmodel/numericutils.test.cpp
index f1944e1b03238f655730ec5269f1854902b45212..e5ebf1699893ba021a19562347634315eaafd059 100644
--- a/mvvm/tests/testmodel/numericutils.test.cpp
+++ b/mvvm/tests/testmodel/numericutils.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <cmath>
 #include "mvvm/utils/numericutils.h"
+#include <cmath>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/path.test.cpp b/mvvm/tests/testmodel/path.test.cpp
index 1254a8e5e57646eac43cf4be7645b889a0befbf2..4806a7c95de9813f3ea2fcc1be73727e1300560f 100644
--- a/mvvm/tests/testmodel/path.test.cpp
+++ b/mvvm/tests/testmodel/path.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/modelutils.h"
 #include "mvvm/model/path.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
+#include <memory>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/plottableitems.test.cpp b/mvvm/tests/testmodel/plottableitems.test.cpp
index 67dcf1cb8aedeff2b38ea675c552ea7a81fecd87..89dcf17a5cabd337809cf6b7708b858db5726660 100644
--- a/mvvm/tests/testmodel/plottableitems.test.cpp
+++ b/mvvm/tests/testmodel/plottableitems.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QColor>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/project.test.cpp b/mvvm/tests/testmodel/project.test.cpp
index cd92a94373bb735ce0cd702b500ff7a38509c43b..3b0f3348920373ec00a22879c5a6bfc708a69117 100644
--- a/mvvm/tests/testmodel/project.test.cpp
+++ b/mvvm/tests/testmodel/project.test.cpp
@@ -9,13 +9,13 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <cctype>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/project/project.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
+#include <cctype>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/projectmanager.test.cpp b/mvvm/tests/testmodel/projectmanager.test.cpp
index 3af9ab0c886de7c289bdc4a60216de6e0cdcbafe..63e9786f464f744c82113a86266b7c1e868711a0 100644
--- a/mvvm/tests/testmodel/projectmanager.test.cpp
+++ b/mvvm/tests/testmodel/projectmanager.test.cpp
@@ -9,13 +9,13 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <cctype>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectmanager.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
+#include <cctype>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp b/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
index 577dccc119b97cf27741ec4e98cc3582f35435eb..1a0f180a9b1813b1e06237e14a0192e26b2b5f6e 100644
--- a/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
+++ b/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
@@ -9,12 +9,12 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include <cctype>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectmanagerdecorator.h"
 #include "mvvm/utils/fileutils.h"
+#include <cctype>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/projectutils.test.cpp b/mvvm/tests/testmodel/projectutils.test.cpp
index b5d6f15bc9fa4e0230bf52b4aae31416082df1a9..a0b816f5942b2f0f9a20c639e0d594e32104924d 100644
--- a/mvvm/tests/testmodel/projectutils.test.cpp
+++ b/mvvm/tests/testmodel/projectutils.test.cpp
@@ -9,7 +9,6 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/interfaces/applicationmodelsinterface.h"
 #include "mvvm/interfaces/projectinterface.h"
 #include "mvvm/model/propertyitem.h"
@@ -17,6 +16,7 @@
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectutils.h"
 #include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/reallimits.test.cpp b/mvvm/tests/testmodel/reallimits.test.cpp
index 77f8a87356ecf530f79ba1d011bd4fad8a5123f8..5d7120e2910fc926a69ba5ede6deb44dd5b06f1c 100644
--- a/mvvm/tests/testmodel/reallimits.test.cpp
+++ b/mvvm/tests/testmodel/reallimits.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <limits>
 #include "mvvm/utils/reallimits.h"
+#include <limits>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/sessionitem.test.cpp b/mvvm/tests/testmodel/sessionitem.test.cpp
index ab49bc65e7ed22a781600d634bf37989cb97638e..06801726f43c32a3f7c9c3a6a3edb5029b299dd5 100644
--- a/mvvm/tests/testmodel/sessionitem.test.cpp
+++ b/mvvm/tests/testmodel/sessionitem.test.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <memory>
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/model/variant_constants.h"
+#include "test_utils.h"
+#include <memory>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionitemcontainer.test.cpp b/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
index cbd0dd6b04efca78c0f0825e4ca2e05f1a63f4ef..f1d6c88cbc593a64237e2a132853db72010be488 100644
--- a/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
+++ b/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemcontainer.h"
+#include "test_utils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/sessionitemtags.test.cpp b/mvvm/tests/testmodel/sessionitemtags.test.cpp
index e88ec463fe0097a85a7cd702bff49845ce64a6f5..ed93c8de4f7620e837d05727358883f66c710f32 100644
--- a/mvvm/tests/testmodel/sessionitemtags.test.cpp
+++ b/mvvm/tests/testmodel/sessionitemtags.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionitemtags.h"
 #include "mvvm/model/taginfo.h"
+#include "test_utils.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionmodel.test.cpp b/mvvm/tests/testmodel/sessionmodel.test.cpp
index 410f74e4d5feb14258f8c9c1e5bfaa61638f81aa..665f1556fa74e07ea05e94e41b01a1e218f34fda 100644
--- a/mvvm/tests/testmodel/sessionmodel.test.cpp
+++ b/mvvm/tests/testmodel/sessionmodel.test.cpp
@@ -8,7 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <memory>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/itemutils.h"
@@ -16,6 +15,7 @@
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
+#include <memory>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testmodel/stringutils.test.cpp b/mvvm/tests/testmodel/stringutils.test.cpp
index a8a847407ed109cb9eb06669905109e41c89ecbe..7e2d5594b1bd299bb96084b5a52356ec65c41727 100644
--- a/mvvm/tests/testmodel/stringutils.test.cpp
+++ b/mvvm/tests/testmodel/stringutils.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/utils/stringutils.h"
+#include "test_utils.h"
 
 using namespace ModelView;
 using namespace TestUtils;
diff --git a/mvvm/tests/testmodel/threadsafestack.test.cpp b/mvvm/tests/testmodel/threadsafestack.test.cpp
index 69fe3e440fa2468c8e515bb81b8d901a1e64f4ba..4af8f82a925880aafad566e7f11c07f3104de676 100644
--- a/mvvm/tests/testmodel/threadsafestack.test.cpp
+++ b/mvvm/tests/testmodel/threadsafestack.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <future>
 #include "mvvm/utils/threadsafestack.h"
+#include <future>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testmodel/undostack.test.cpp b/mvvm/tests/testmodel/undostack.test.cpp
index 585800d536452f083276a35424d3a2b8d780a84b..8a44fa3c6fb95a8a8f8af76b542fa0504241724f 100644
--- a/mvvm/tests/testmodel/undostack.test.cpp
+++ b/mvvm/tests/testmodel/undostack.test.cpp
@@ -8,8 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
 #include "mvvm/commands/commandadapter.h"
 #include "mvvm/commands/setvaluecommand.h"
 #include "mvvm/commands/undostack.h"
@@ -22,6 +20,8 @@
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
+#include "toyitems.h"
+#include "toymodel.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/axistitlecontroller.test.cpp b/mvvm/tests/testview/axistitlecontroller.test.cpp
index 9aa40836d9b9e6594da0c6fe6c5c25bcb9c52e5a..f39622ed986c2a3b667bcca6dc0ce29dc232ae6f 100644
--- a/mvvm/tests/testview/axistitlecontroller.test.cpp
+++ b/mvvm/tests/testview/axistitlecontroller.test.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "qcustomplot.h"
-#include <QFont>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/axistitlecontroller.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QFont>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/colormapplotcontroller.test.cpp b/mvvm/tests/testview/colormapplotcontroller.test.cpp
index 7ad1a56ca3b31350db7b2eb84f6885d03bd1acee..657d3b306a795d95da6794e58eaf8c8bf98b4142 100644
--- a/mvvm/tests/testview/colormapplotcontroller.test.cpp
+++ b/mvvm/tests/testview/colormapplotcontroller.test.cpp
@@ -9,14 +9,14 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/colormapplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/colormapitem.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp b/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
index 4c7fcd4b8a7d227fcc433bb6ec2af930e816215a..5faa3e4fb883067c2633295e6b9aaf0d2714dd81 100644
--- a/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
+++ b/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
@@ -9,7 +9,6 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/colormapviewportplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
@@ -17,6 +16,7 @@
 #include "mvvm/standarditems/colormapviewportitem.h"
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
 #include <qcustomplot.h>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testview/customplotsceneadapter.test.cpp b/mvvm/tests/testview/customplotsceneadapter.test.cpp
index 3056f213e59b62bdf601551b3d78973dffb1a188..218e996ac2e199d1116a79526d57003df2463aba 100644
--- a/mvvm/tests/testview/customplotsceneadapter.test.cpp
+++ b/mvvm/tests/testview/customplotsceneadapter.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "qcustomplot.h"
 #include "mvvm/plotting/customplotsceneadapter.h"
+#include "qcustomplot.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/data1dplotcontroller.test.cpp b/mvvm/tests/testview/data1dplotcontroller.test.cpp
index 6851a83138bf181139800ccf0b59cf25283508b9..dec0fee193b94ee913a4f6d7e087834e4a6d1cb7 100644
--- a/mvvm/tests/testview/data1dplotcontroller.test.cpp
+++ b/mvvm/tests/testview/data1dplotcontroller.test.cpp
@@ -9,12 +9,12 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
-#include <algorithm>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/data1dplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
+#include "qcustomplot.h"
+#include <algorithm>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testview/data2dplotcontroller.test.cpp b/mvvm/tests/testview/data2dplotcontroller.test.cpp
index d6d995a2740ac2768333d6bf05ec8857dc5795d0..5e6998de2c7f618326802f76e5a638c1ec357d79 100644
--- a/mvvm/tests/testview/data2dplotcontroller.test.cpp
+++ b/mvvm/tests/testview/data2dplotcontroller.test.cpp
@@ -9,12 +9,12 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/data2dplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testview/graphplotcontroller.test.cpp b/mvvm/tests/testview/graphplotcontroller.test.cpp
index 9c9b3ac68ca7cb16b3cb44ab458e7f62a11ceb70..5c4893df3eedf304ab1dfc6b37594c67fe1e0557 100644
--- a/mvvm/tests/testview/graphplotcontroller.test.cpp
+++ b/mvvm/tests/testview/graphplotcontroller.test.cpp
@@ -9,8 +9,6 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/graphplotcontroller.h"
@@ -18,6 +16,8 @@
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/graphviewportplotcontroller.test.cpp b/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
index ae9d32f1b7190c9de10e8e69c3ddd225b3c06b63..ff0aaaa341e2d8abd25b4f7de66f79e9f7650783 100644
--- a/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
+++ b/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
@@ -9,7 +9,6 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
 #include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/graphviewportplotcontroller.h"
@@ -17,6 +16,7 @@
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include "qcustomplot.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/pencontroller.test.cpp b/mvvm/tests/testview/pencontroller.test.cpp
index ee587e3d1c50128ebb11e62628c612dd774cdedd..caeb9582086dd24c41334e1b87c6ce37b271c304 100644
--- a/mvvm/tests/testview/pencontroller.test.cpp
+++ b/mvvm/tests/testview/pencontroller.test.cpp
@@ -9,10 +9,10 @@
 
 #include "customplot_test_utils.h"
 #include "google_test.h"
-#include "qcustomplot.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/pencontroller.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
 
 #include <stdexcept>
 
diff --git a/mvvm/tests/testview/propertyflatview.test.cpp b/mvvm/tests/testview/propertyflatview.test.cpp
index f6b94bd80c3cc1fdca568b25734e05a13bafa335..5953d35f42a5a20e99e8f4c4c30a32c83b9bf794 100644
--- a/mvvm/tests/testview/propertyflatview.test.cpp
+++ b/mvvm/tests/testview/propertyflatview.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QGridLayout>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/widgets/propertyflatview.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QGridLayout>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp b/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
index 5cf764e76cf273286fa2fc8f9d6659d8f262f4a5..a340d54825918156035898dc6fab2017f24e717c 100644
--- a/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
+++ b/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
@@ -10,12 +10,12 @@
 #include "customplot_test_utils.h"
 #include "google_test.h"
 #include "mockwidgets.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 using ::testing::_;
diff --git a/mvvm/tests/testview/widgetutils.test.cpp b/mvvm/tests/testview/widgetutils.test.cpp
index fe9c99e7f20ab60b5fc26f16d0a48143be771c36..edf7e83f2819a703d6d94a48185d68e021ba4e1d 100644
--- a/mvvm/tests/testview/widgetutils.test.cpp
+++ b/mvvm/tests/testview/widgetutils.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
+#include "mvvm/widgets/widgetutils.h"
 #include "test_utils.h"
 #include <QDebug>
 #include <QDir>
-#include "mvvm/widgets/widgetutils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/TestToyLayerItem.cpp b/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
index c79ba03fbfed6f4eb71ffc90072caeb96a5cc11f..c14128f6e98318301486e3d476e3cdcba66dfd45 100644
--- a/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp b/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
index 58dbaa60a83ceef3561f977cd24996a10b265966..d0052f43c84586672a88095afd49089f4362f407 100644
--- a/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/TestToyParticleItem.cpp b/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
index fc69ed769e7729fbd7176ea9fadf62f9ad5b4822..42c8c0e64f0ddedad1acac3868530faa288702f7 100644
--- a/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
 #include "mvvm/model/itemutils.h"
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp b/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
index 3074f2424d08cb7565c0574d39457ec08fbd1f03..dff7315cb2bf5a68dfbb86af831245f70eecb589 100644
--- a/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
+++ b/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
@@ -8,10 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "widgetbasedtest.h"
-#include <QSpinBox>
-#include <QStandardItemModel>
-#include <limits>
 #include "mvvm/editors/booleditor.h"
 #include "mvvm/editors/coloreditor.h"
 #include "mvvm/editors/combopropertyeditor.h"
@@ -31,6 +27,10 @@
 #include "mvvm/utils/reallimits.h"
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
+#include "widgetbasedtest.h"
+#include <QSpinBox>
+#include <QStandardItemModel>
+#include <limits>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp b/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
index 3dc8fb1df34b2c2ef52012683133d5d09563e31d..3793b646b9a76199132721c02edaeaa15470fcb7 100644
--- a/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
@@ -9,10 +9,6 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
-#include <QJsonObject>
-#include <QSignalSpy>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
@@ -28,6 +24,10 @@
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QDebug>
+#include <QJsonObject>
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp b/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
index b810b9591fdab1fa99f009907b8880513750d334..bcb9ae95cc54e43f7e9cf3d2c6d6592dfb006c8f 100644
--- a/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
+++ b/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/labeldatarowstrategy.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
 
 namespace {
 const int expected_column_count = 2;
diff --git a/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp b/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
index 0e8aa72c2e2891f0e9f61cd427bc93e66a97b01b..46b5d82ac28704bca79bbd66c95a0b5b44241774 100644
--- a/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
+++ b/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/propertiesrowstrategy.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
index 17ba5698a4117a7bf2f60f89ca224304ac2f9f57..610e10d2a240c49660eeab0cdf21335f0a45906a 100644
--- a/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/propertyflatviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
index 03aa346c69314b1d3511e4dc59498bda98725899..f51808445885f871d3d7c9455412b0c5f685e487 100644
--- a/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/propertytableviewmodel.h"
+#include "toyitems.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
index 2858d3aef579240d0c536cb16f13b7159cfd9a23..0cc6342a47a38c29e0497f33805c2cd12cd7a6c4 100644
--- a/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/propertyviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/scientificspinbox.test.cpp b/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
index f1ea2becab790a3dccf86b1b8b5d00d6d52ea5b3..587e05fa76a43e2c4195c530fd8d97490d9a3d68 100644
--- a/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
+++ b/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <limits>
 #include "mvvm/editors/scientificspinbox.h"
+#include <limits>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp b/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
index 1b828f7c15dfffe7588784720db6d60635f2a8c0..0ea8669c589c0b0ec6ef070b1efe68718856aec2 100644
--- a/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
+++ b/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/standardchildrenstrategies.h"
+#include "toyitems.h"
+#include "toymodel.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/standardviewitems.test.cpp b/mvvm/tests/testviewmodel/standardviewitems.test.cpp
index 60c2d80b0cded772dd47953bbc013c928f1b6fb9..882776b6bfcf016aaa2724b76d73f984edbf9320 100644
--- a/mvvm/tests/testviewmodel/standardviewitems.test.cpp
+++ b/mvvm/tests/testviewmodel/standardviewitems.test.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QColor>
-#include <memory>
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include <QColor>
+#include <memory>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp b/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
index 351f6b1971a965570c9641a6103b7b2a94a5ca9e..aacc02faad5e01b950bdac21b6203e973107abb7 100644
--- a/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
@@ -8,15 +8,15 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/taginfo.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/viewitem.test.cpp b/mvvm/tests/testviewmodel/viewitem.test.cpp
index a5354c9bd177ab91cbda50bbf9009e721138ffad..1b76b39a939539f33170ffd4075af59db5ef776d 100644
--- a/mvvm/tests/testviewmodel/viewitem.test.cpp
+++ b/mvvm/tests/testviewmodel/viewitem.test.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/viewmodel/viewitem.h"
+#include "test_utils.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodelbase.test.cpp b/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
index 7c98d59eab9bf5c1e7efbe32b4b1a9bfe7194bc1..1816c44d1342f62d096e110a92ff939ecd28cd29 100644
--- a/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
@@ -8,12 +8,12 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
-#include <QStandardItemModel>
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelbase.h"
+#include "test_utils.h"
+#include <QSignalSpy>
+#include <QStandardItemModel>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp b/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
index 7ce89ab181c270e04db76529c1b031430eac0dcd..c889c9140514f12cd48d906ae1d38e7f3a5ce216 100644
--- a/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
@@ -8,8 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/vectoritem.h"
@@ -18,6 +16,8 @@
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelbase.h"
 #include "mvvm/viewmodel/viewmodelcontroller.h"
+#include "test_utils.h"
+#include <QSignalSpy>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp b/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
index 5317c92d42a7ad02e2c2b29b016218be3904640d..46627a0f80aa6b4c55d303ffaadc4ea3156bc851 100644
--- a/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
@@ -8,15 +8,15 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "widgetbasedtest.h"
-#include <QDataWidgetMapper>
-#include <QStyleOptionViewItem>
 #include "mvvm/editors/customeditor.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/vectoritem.h"
 #include "mvvm/viewmodel/defaultviewmodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
+#include "widgetbasedtest.h"
+#include <QDataWidgetMapper>
+#include <QStyleOptionViewItem>
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp b/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
index 7523dca8b36c431ce12aab1fe5a66c6af6af7e2c..46d16dc3d609816810fba5f19635afb490e3968e 100644
--- a/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include "test_utils.h"
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/model/propertyitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/viewmodel/labeldatarowstrategy.h"
 #include "mvvm/viewmodel/standardchildrenstrategies.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/tests/testviewmodel/viewmodelutils.test.cpp b/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
index 9ac3272b28fc9ea9f6afafb9e85d4bc831009f36..0bd3ab405dde801323623c437c36f42a7c0661bd 100644
--- a/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
@@ -8,9 +8,6 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <QColor>
-#include <QModelIndexList>
-#include <QStandardItemModel>
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
@@ -18,6 +15,9 @@
 #include "mvvm/viewmodel/propertytableviewmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include <QColor>
+#include <QModelIndexList>
+#include <QStandardItemModel>
 
 namespace {
 QList<QStandardItem*> get_items(std::vector<int> data) {
diff --git a/mvvm/view/mvvm/plotting/axistitlecontroller.cpp b/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
index b5d2b613304c7d49d422de8f25d1adbfeb637eee..e589d3182ebd7fc47eba7cee53a5679a3cfab9e8 100644
--- a/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
+++ b/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
 #include "mvvm/plotting/axistitlecontroller.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/axistitlecontroller.h b/mvvm/view/mvvm/plotting/axistitlecontroller.h
index bed3f985ceb1bdd53c3c3bfc3a96735c67e52c83..cbf1cb84edaa84f81b153a99ba368f40d30da1f7 100644
--- a/mvvm/view/mvvm/plotting/axistitlecontroller.h
+++ b/mvvm/view/mvvm/plotting/axistitlecontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_AXISTITLECONTROLLER_H
 #define MVVM_PLOTTING_AXISTITLECONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPAxis;
 
diff --git a/mvvm/view/mvvm/plotting/colormapcanvas.cpp b/mvvm/view/mvvm/plotting/colormapcanvas.cpp
index 940c9fd7e217f7d79f8de3bec7af75af4cd55a7d..522d8ae3ec7e7d5d18a87fbb545a06df3a6fd52f 100644
--- a/mvvm/view/mvvm/plotting/colormapcanvas.cpp
+++ b/mvvm/view/mvvm/plotting/colormapcanvas.cpp
@@ -7,7 +7,6 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
 #include "mvvm/plotting/colormapcanvas.h"
 #include "mvvm/plotting/colormapviewportplotcontroller.h"
 #include "mvvm/plotting/customplotsceneadapter.h"
@@ -15,6 +14,7 @@
 #include "mvvm/plotting/statusstringreporterfactory.h"
 #include "mvvm/standarditems/colormapviewportitem.h"
 #include "mvvm/widgets/statuslabel.h"
+#include "qcustomplot.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/plotting/colormapcanvas.h b/mvvm/view/mvvm/plotting/colormapcanvas.h
index 6b60aba1dabf3793fef8ed384e0f3c561b3abc75..699f4192695c053dc89aeb2f69cd91cf983ebd4d 100644
--- a/mvvm/view/mvvm/plotting/colormapcanvas.h
+++ b/mvvm/view/mvvm/plotting/colormapcanvas.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_COLORMAPCANVAS_H
 #define MVVM_PLOTTING_COLORMAPCANVAS_H
 
+#include "mvvm/view_export.h"
 #include <QWidget>
 #include <memory>
-#include "mvvm/view_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp b/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
index 92a47214df89f8eaff35d9ee2340bd45b2fa87d5..55933a52cb135457142f2e7f75fc175812932fd7 100644
--- a/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
+++ b/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
 #include "mvvm/plotting/colormapinfoformatter.h"
 #include "mvvm/utils/stringutils.h"
+#include "qcustomplot.h"
 #include <sstream>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp b/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
index 32603832fe949100fe93609ff1dbf7f598356009..81a0b3efa4d0f45b716733205ce4f431cfe782b4 100644
--- a/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
-#include <map>
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/plotting/colormapplotcontroller.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/plotting/data2dplotcontroller.h"
 #include "mvvm/standarditems/colormapitem.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <map>
 
 namespace {
 using gradient_map_t = std::map<std::string, QCPColorGradient::GradientPreset>;
diff --git a/mvvm/view/mvvm/plotting/colormapplotcontroller.h b/mvvm/view/mvvm/plotting/colormapplotcontroller.h
index 200cf154884407b933d479fb55fae446ea3478f2..582d75ef569bf93bd139c4d2012f2bdc26768b41 100644
--- a/mvvm/view/mvvm/plotting/colormapplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colormapplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_COLORMAPPLOTCONTROLLER_H
 #define MVVM_PLOTTING_COLORMAPPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCustomPlot;
 class QCPColorScale;
diff --git a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
index efe8fa77168b91156a54136f6bcce08c3312e07c..b72378c3d90bfb324494d2e4cc42af2024302af5 100644
--- a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <list>
-#include "mvvm/plotting/colormapplotcontroller.h"
 #include "mvvm/plotting/colormapviewportplotcontroller.h"
+#include "mvvm/plotting/colormapplotcontroller.h"
 #include "mvvm/plotting/colorscaleplotcontroller.h"
 #include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/colormapitem.h"
 #include "mvvm/standarditems/colormapviewportitem.h"
+#include <list>
 #include <qcustomplot.h>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
index 3f30fea8f543a82d3c850761464befbcabcd8af9..46968220dc86a0d2dfba03677cc5dc0793b2ce6e 100644
--- a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_COLORMAPVIEWPORTPLOTCONTROLLER_H
 #define MVVM_PLOTTING_COLORMAPVIEWPORTPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
index a3c62a56e5030fd24324f85d2bf4ca4a4a6eee5c..8fb9793bc1204825e33750d35fea68b89c052fc9 100644
--- a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
 #include "mvvm/plotting/colorscaleplotcontroller.h"
 #include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
+#include "qcustomplot.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
index b802f28d40aea7e834337ac7fb3d4137bebc84ff..67f454bb126e96f4775bc86c071264476f825669 100644
--- a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_COLORSCALEPLOTCONTROLLER_H
 #define MVVM_PLOTTING_COLORSCALEPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPColorScale;
 
diff --git a/mvvm/view/mvvm/plotting/customplotproxywidget.cpp b/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
index c7669b5fb7df5a75d09fb5a98f0d7215548a3c84..5e858581753ba062a89d6aca46bab5161a0ea88f 100644
--- a/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
+++ b/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/plotting/customplotproxywidget.h"
 #include <QEvent>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneWheelEvent>
 #include <QWidget>
-#include "mvvm/plotting/customplotproxywidget.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/plotting/customplotproxywidget.h b/mvvm/view/mvvm/plotting/customplotproxywidget.h
index e4296b9c770f2f4c305a155451ce7e48dfe3b758..7cf53140f80893784308026328781b9b2482a09a 100644
--- a/mvvm/view/mvvm/plotting/customplotproxywidget.h
+++ b/mvvm/view/mvvm/plotting/customplotproxywidget.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PLOTTING_CUSTOMPLOTPROXYWIDGET_H
 #define MVVM_PLOTTING_CUSTOMPLOTPROXYWIDGET_H
 
-#include <QGraphicsProxyWidget>
 #include "mvvm/view_export.h"
+#include <QGraphicsProxyWidget>
 
 class QWidget;
 
diff --git a/mvvm/view/mvvm/plotting/customplotsceneadapter.h b/mvvm/view/mvvm/plotting/customplotsceneadapter.h
index 97d6b1d20e5b8089f76de881392d8c97f36ef24d..d6bae5d0f728cff2b5212e755011ab1116fd6bc6 100644
--- a/mvvm/view/mvvm/plotting/customplotsceneadapter.h
+++ b/mvvm/view/mvvm/plotting/customplotsceneadapter.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_PLOTTING_CUSTOMPLOTSCENEADAPTER_H
 #define MVVM_PLOTTING_CUSTOMPLOTSCENEADAPTER_H
 
-#include <memory>
 #include "mvvm/plotting/sceneadapterinterface.h"
+#include <memory>
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp b/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
index 91b528ec118d253eb101a183943f5bb8bc6a3f07..3e988dabc9ea0c738b907ed1b49fe3e99faab9d5 100644
--- a/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
 #include "mvvm/plotting/data1dplotcontroller.h"
 #include "mvvm/standarditems/data1ditem.h"
+#include "qcustomplot.h"
 #include <stdexcept>
 
 namespace {
diff --git a/mvvm/view/mvvm/plotting/data1dplotcontroller.h b/mvvm/view/mvvm/plotting/data1dplotcontroller.h
index d8d3a603aee1d205f672379a24ede8b0e8f6dff0..c0036e2ca927953839e7540ff411a783a4e79959 100644
--- a/mvvm/view/mvvm/plotting/data1dplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/data1dplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_DATA1DPLOTCONTROLLER_H
 #define MVVM_PLOTTING_DATA1DPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPGraph;
 
diff --git a/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp b/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
index 20ed1cd33d3d0a7fe88dd7d5fdfe1d2dd76a7197..caea348c427869e2fcec11287fb5b8cf844b047c 100644
--- a/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
-#include <algorithm>
 #include "mvvm/plotting/data2dplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <algorithm>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/data2dplotcontroller.h b/mvvm/view/mvvm/plotting/data2dplotcontroller.h
index 5b5e29ed11c84504d946d4c898cb416418f484a7..0b8042dbaa042eed3d3b6580702fcb3a49f95d39 100644
--- a/mvvm/view/mvvm/plotting/data2dplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/data2dplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_DATA2DPLOTCONTROLLER_H
 #define MVVM_PLOTTING_DATA2DPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPColorMap;
 
diff --git a/mvvm/view/mvvm/plotting/graphcanvas.cpp b/mvvm/view/mvvm/plotting/graphcanvas.cpp
index d548143105d88b5255b0371410f10dbb90838f9d..423d6bc848f5c4ccfd5468ddac87adbce8ff5b96 100644
--- a/mvvm/view/mvvm/plotting/graphcanvas.cpp
+++ b/mvvm/view/mvvm/plotting/graphcanvas.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
-#include <QBoxLayout>
-#include "mvvm/plotting/customplotsceneadapter.h"
 #include "mvvm/plotting/graphcanvas.h"
+#include "mvvm/plotting/customplotsceneadapter.h"
 #include "mvvm/plotting/graphviewportplotcontroller.h"
 #include "mvvm/plotting/statusstringreporter.h"
 #include "mvvm/plotting/statusstringreporterfactory.h"
 #include "mvvm/standarditems/graphviewportitem.h"
 #include "mvvm/widgets/statuslabel.h"
+#include "qcustomplot.h"
+#include <QBoxLayout>
 
 namespace {
 
diff --git a/mvvm/view/mvvm/plotting/graphcanvas.h b/mvvm/view/mvvm/plotting/graphcanvas.h
index b7b0d4b8d65f3a4989a996f5535c4176534302de..a656e64a17be7c67e6a80a944fd51348cd5a56fc 100644
--- a/mvvm/view/mvvm/plotting/graphcanvas.h
+++ b/mvvm/view/mvvm/plotting/graphcanvas.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_GRAPHCANVAS_H
 #define MVVM_PLOTTING_GRAPHCANVAS_H
 
+#include "mvvm/view_export.h"
 #include <QWidget>
 #include <memory>
-#include "mvvm/view_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/view/mvvm/plotting/graphplotcontroller.cpp b/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
index 56217c3bba8bed0b8067b0385935a6dfd5b671ce..91c3b26d2841fe252651d7fa439c7636e394c9df 100644
--- a/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
+#include "mvvm/plotting/graphplotcontroller.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/plotting/data1dplotcontroller.h"
-#include "mvvm/plotting/graphplotcontroller.h"
 #include "mvvm/plotting/pencontroller.h"
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/plotting/graphplotcontroller.h b/mvvm/view/mvvm/plotting/graphplotcontroller.h
index 4139e85280a0d3774459725c99725ca89251d1a3..2044fc53c6fda20a103a49b22b7f73e04a436988 100644
--- a/mvvm/view/mvvm/plotting/graphplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/graphplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_GRAPHPLOTCONTROLLER_H
 #define MVVM_PLOTTING_GRAPHPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
index 8cafb3015e637f923e253a3b99d2cf6ade9cfc69..3704640eeb13eb3be498fd8351c6d86149695cbd 100644
--- a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <list>
-#include "mvvm/plotting/graphplotcontroller.h"
 #include "mvvm/plotting/graphviewportplotcontroller.h"
+#include "mvvm/plotting/graphplotcontroller.h"
 #include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
+#include <list>
 #include <qcustomplot.h>
 #include <stdexcept>
 
diff --git a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
index 6e1103fb411764881f74eb3099aeffd2b1402757..20c283d55eb57e66ce3e40b200ef2b44ff89fd95 100644
--- a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_GRAPHVIEWPORTPLOTCONTROLLER_H
 #define MVVM_PLOTTING_GRAPHVIEWPORTPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/mousemovereporter.cpp b/mvvm/view/mvvm/plotting/mousemovereporter.cpp
index 4b1888578293b45710e5e17779217cf80c6f1798..cc40bcad2753b1c0a2ce5234dc9f3aafa2464296 100644
--- a/mvvm/view/mvvm/plotting/mousemovereporter.cpp
+++ b/mvvm/view/mvvm/plotting/mousemovereporter.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <QMouseEvent>
 #include "mvvm/plotting/mousemovereporter.h"
 #include "mvvm/plotting/mouseposinfo.h"
+#include <QMouseEvent>
 #include <qcustomplot.h>
 #include <stdexcept>
 
diff --git a/mvvm/view/mvvm/plotting/mousemovereporter.h b/mvvm/view/mvvm/plotting/mousemovereporter.h
index b7ba01ef0233918e72e09648f662f45dd7854040..fab98fed9f3408c5d667a1d860998101751f01ef 100644
--- a/mvvm/view/mvvm/plotting/mousemovereporter.h
+++ b/mvvm/view/mvvm/plotting/mousemovereporter.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_MOUSEMOVEREPORTER_H
 #define MVVM_PLOTTING_MOUSEMOVEREPORTER_H
 
+#include "mvvm/view_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/view_export.h"
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/pencontroller.cpp b/mvvm/view/mvvm/plotting/pencontroller.cpp
index 186df2e329bd70fe5ec399267201b71e1dcf8cbc..3bd2a0561e0ff86a339ddd1013c5eaa8343bcc0d 100644
--- a/mvvm/view/mvvm/plotting/pencontroller.cpp
+++ b/mvvm/view/mvvm/plotting/pencontroller.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
-#include "mvvm/model/comboproperty.h"
 #include "mvvm/plotting/pencontroller.h"
+#include "mvvm/model/comboproperty.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/pencontroller.h b/mvvm/view/mvvm/plotting/pencontroller.h
index f5732bede7ed8f75f74d5affc4639c5fb03bbb80..ffbe122e9ef5088c8870d4342124a3f30a9e8db9 100644
--- a/mvvm/view/mvvm/plotting/pencontroller.h
+++ b/mvvm/view/mvvm/plotting/pencontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_PENCONTROLLER_H
 #define MVVM_PLOTTING_PENCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPGraph;
 
diff --git a/mvvm/view/mvvm/plotting/statusstringreporter.cpp b/mvvm/view/mvvm/plotting/statusstringreporter.cpp
index dad75916f7751c76727fcb8dc219cd6bc2ce804d..c62b02a97bb3daa3956e1fd3d028375beaf933d8 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporter.cpp
+++ b/mvvm/view/mvvm/plotting/statusstringreporter.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/plotting/statusstringreporter.h"
 #include "mvvm/plotting/mousemovereporter.h"
 #include "mvvm/plotting/mouseposinfo.h"
 #include "mvvm/plotting/statusstringformatterinterface.h"
-#include "mvvm/plotting/statusstringreporter.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/statusstringreporter.h b/mvvm/view/mvvm/plotting/statusstringreporter.h
index 127ce71de54157e903500bde13a038a694200385..491aa716e3207e21ed6e93ecb544b72002713e85 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporter.h
+++ b/mvvm/view/mvvm/plotting/statusstringreporter.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_STATUSSTRINGREPORTER_H
 #define MVVM_PLOTTING_STATUSSTRINGREPORTER_H
 
+#include "mvvm/view_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/view_export.h"
 #include <string>
 
 class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp b/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
index db3f39611f1aa472828e6c22f0866cd5f6cf2705..8b8b2c40736e4f452124ec255dd4f9812a47c5b2 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
+++ b/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/plotting/statusstringreporterfactory.h"
 #include "mvvm/plotting/colormapinfoformatter.h"
 #include "mvvm/plotting/graphinfoformatter.h"
 #include "mvvm/plotting/statusstringreporter.h"
-#include "mvvm/plotting/statusstringreporterfactory.h"
 
 namespace ModelView {
 
diff --git a/mvvm/view/mvvm/plotting/statusstringreporterfactory.h b/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
index 6c245dd3a64baad9094e13b498daa730c7547f47..68be69c3f4d339ae7029c6cf7f0deb36a8b08e2b 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
+++ b/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
@@ -12,9 +12,9 @@
 
 //! Contains factory methods to create StatusStringReporter
 
+#include "mvvm/view_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/view_export.h"
 
 class QCustomPlot;
 
diff --git a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
index ffaa2510d7a6f3b87c807fc060d3436b4da95ef7..73159663380e6c8497ef7de7119f478ba76745ef 100644
--- a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include "qcustomplot.h"
-#include <QObject>
+#include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/plotting/axistitlecontroller.h"
 #include "mvvm/plotting/customplotutils.h"
-#include "mvvm/plotting/viewportaxisplotcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QObject>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
index 9a11292e29540631e413343b48f031dc664570f1..894b12e36eb563658ceed618365b2f8afbc2fc38 100644
--- a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_PLOTTING_VIEWPORTAXISPLOTCONTROLLER_H
 #define MVVM_PLOTTING_VIEWPORTAXISPLOTCONTROLLER_H
 
-#include <memory>
 #include "mvvm/signals/itemlistener.h"
 #include "mvvm/view_export.h"
+#include <memory>
 
 class QCPAxis;
 
diff --git a/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp b/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
index 85c246dc16c8b8c5f096061246b7adcca3b6ee00..d33dded72344340f8040f34ebf836b83cf141d43 100644
--- a/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
+++ b/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/adjustingscrollarea.h"
 #include <QEvent>
 #include <QScrollBar>
-#include "mvvm/widgets/adjustingscrollarea.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/adjustingscrollarea.h b/mvvm/view/mvvm/widgets/adjustingscrollarea.h
index 5c05fa72e28bed6237e8d67bebd97ccadc8f0518..f8bc8d09e3b1e23e4d4d6c405191ad0cc97f1b05 100644
--- a/mvvm/view/mvvm/widgets/adjustingscrollarea.h
+++ b/mvvm/view/mvvm/widgets/adjustingscrollarea.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_ADJUSTINGSCROLLAREA_H
 #define MVVM_WIDGETS_ADJUSTINGSCROLLAREA_H
 
-#include <QScrollArea>
 #include "mvvm/view_export.h"
+#include <QScrollArea>
 
 namespace ModelView {
 
diff --git a/mvvm/view/mvvm/widgets/allitemstreeview.cpp b/mvvm/view/mvvm/widgets/allitemstreeview.cpp
index bca6df54855ba5f7574bf7104e710ffa1737fe58..81b21ea9a6f2f8c268ae1373992ccef099d7fccf 100644
--- a/mvvm/view/mvvm/widgets/allitemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/allitemstreeview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/allitemstreeview.h"
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/allitemstreeview.h"
 
 namespace ModelView {
 AllItemsTreeView::AllItemsTreeView(SessionModel* model, QWidget* parent) : ItemsTreeView(parent) {
diff --git a/mvvm/view/mvvm/widgets/collapsiblebar.cpp b/mvvm/view/mvvm/widgets/collapsiblebar.cpp
index 5d9e6ab59bb4c63502ee19e6c29caec69d434aab..11b874bdfa57917e8d7784efb739a9678440c155 100644
--- a/mvvm/view/mvvm/widgets/collapsiblebar.cpp
+++ b/mvvm/view/mvvm/widgets/collapsiblebar.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/collapsiblebar.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLabel>
 #include <QMouseEvent>
-#include "mvvm/widgets/collapsiblebar.h"
-#include "mvvm/widgets/widgetutils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/collapsiblebar.h b/mvvm/view/mvvm/widgets/collapsiblebar.h
index 89c5fe4699f129cf72266f0e727533620ffaa0ae..20057ce5211e26120caa6a2f90a5e3ea235c48e9 100644
--- a/mvvm/view/mvvm/widgets/collapsiblebar.h
+++ b/mvvm/view/mvvm/widgets/collapsiblebar.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_COLLAPSIBLEBAR_H
 #define MVVM_WIDGETS_COLLAPSIBLEBAR_H
 
-#include <QFrame>
 #include "mvvm/view_export.h"
+#include <QFrame>
 
 class QLabel;
 class QString;
diff --git a/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp b/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
index ec5a8a3bc9ee79db12dc2c2db6d0f1923082ad18..a18b91998f1a87df0d7a6856840038ab2ab7b8f8 100644
--- a/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
+++ b/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/collapsiblelistwidget.h"
+#include "mvvm/widgets/collapsiblebar.h"
 #include <QSplitter>
 #include <QVBoxLayout>
-#include "mvvm/widgets/collapsiblebar.h"
-#include "mvvm/widgets/collapsiblelistwidget.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/collapsiblelistwidget.h b/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
index c160978035551c855e204366e7076f482c27a9ec..f338b45018d0991ba06cf4cb9ed79bbffcb74438 100644
--- a/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
+++ b/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_COLLAPSIBLELISTWIDGET_H
 #define MVVM_WIDGETS_COLLAPSIBLELISTWIDGET_H
 
-#include <QWidget>
 #include "mvvm/view_export.h"
+#include <QWidget>
 
 class QSplitter;
 class QString;
diff --git a/mvvm/view/mvvm/widgets/itemstreeview.cpp b/mvvm/view/mvvm/widgets/itemstreeview.cpp
index 7332e4265c150137ba42a1e4bf42268664ed1923..b3b5b1687223bab591ebefafde698cf04304c58b 100644
--- a/mvvm/view/mvvm/widgets/itemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/itemstreeview.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <QTreeView>
-#include <QVBoxLayout>
+#include "mvvm/widgets/itemstreeview.h"
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
-#include "mvvm/widgets/itemstreeview.h"
+#include <QTreeView>
+#include <QVBoxLayout>
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/itemstreeview.h b/mvvm/view/mvvm/widgets/itemstreeview.h
index cf56c5651a7b9fa24c9f715f0397058cecd8d670..525ab4ad88f2bb971d4e5d36095c1f40040ad14e 100644
--- a/mvvm/view/mvvm/widgets/itemstreeview.h
+++ b/mvvm/view/mvvm/widgets/itemstreeview.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_WIDGETS_ITEMSTREEVIEW_H
 #define MVVM_WIDGETS_ITEMSTREEVIEW_H
 
+#include "mvvm/view_export.h"
 #include <QWidget>
 #include <memory>
-#include "mvvm/view_export.h"
 
 class QTreeView;
 class QItemSelection;
diff --git a/mvvm/view/mvvm/widgets/itemstreeviewinterface.h b/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
index 84111136798896286c1780fa70f53d9ff7441afc..1dbf42361311fc79068852ed20c800747fdbdf9d 100644
--- a/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
+++ b/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_ITEMSTREEVIEWINTERFACE_H
 #define MVVM_WIDGETS_ITEMSTREEVIEWINTERFACE_H
 
-#include <QWidget>
 #include "mvvm/view_export.h"
+#include <QWidget>
 
 class QTreeView;
 
diff --git a/mvvm/view/mvvm/widgets/layoututils.cpp b/mvvm/view/mvvm/widgets/layoututils.cpp
index 59ce36254d0e89edc77180f7326ca92e7bb55035..c53e988f440c252239c8119b7ba9bf4b626e82d0 100644
--- a/mvvm/view/mvvm/widgets/layoututils.cpp
+++ b/mvvm/view/mvvm/widgets/layoututils.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/layoututils.h"
 #include <QBoxLayout>
 #include <QGridLayout>
 #include <QLayoutItem>
 #include <QWidget>
-#include "mvvm/widgets/layoututils.h"
 
 namespace {
 void remove(QGridLayout* layout, int row, int column, bool deleteWidgets);
diff --git a/mvvm/view/mvvm/widgets/propertyflatview.cpp b/mvvm/view/mvvm/widgets/propertyflatview.cpp
index 1c2fb898388d0e8a11cb4852a4696720a86637f7..f312d4159b6973fa3966841f9800b91d2ffbe3b2 100644
--- a/mvvm/view/mvvm/widgets/propertyflatview.cpp
+++ b/mvvm/view/mvvm/widgets/propertyflatview.cpp
@@ -7,10 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <QDataWidgetMapper>
-#include <QDebug>
-#include <QGridLayout>
-#include <QLabel>
+#include "mvvm/widgets/propertyflatview.h"
 #include "mvvm/editors/customeditor.h"
 #include "mvvm/editors/defaulteditorfactory.h"
 #include "mvvm/factories/viewmodelfactory.h"
@@ -20,7 +17,10 @@
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
 #include "mvvm/widgets/layoututils.h"
-#include "mvvm/widgets/propertyflatview.h"
+#include <QDataWidgetMapper>
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/propertyflatview.h b/mvvm/view/mvvm/widgets/propertyflatview.h
index f2abce6e99d4fe0e61e4085f3f8d2c094b7168c1..e7916eb75b87fc938ddd7e78cc6b50e10a18cf68 100644
--- a/mvvm/view/mvvm/widgets/propertyflatview.h
+++ b/mvvm/view/mvvm/widgets/propertyflatview.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_WIDGETS_PROPERTYFLATVIEW_H
 #define MVVM_WIDGETS_PROPERTYFLATVIEW_H
 
+#include "mvvm/view_export.h"
 #include <QWidget>
 #include <memory>
-#include "mvvm/view_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/view/mvvm/widgets/propertytreeview.cpp b/mvvm/view/mvvm/widgets/propertytreeview.cpp
index 514a4a00415d3e9059f2eb7008427c1ca63d00de..8414f4ba2a8c118033f876ade321246fe644d394 100644
--- a/mvvm/view/mvvm/widgets/propertytreeview.cpp
+++ b/mvvm/view/mvvm/widgets/propertytreeview.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <QTreeView>
+#include "mvvm/widgets/propertytreeview.h"
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/propertytreeview.h"
+#include <QTreeView>
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/statuslabel.cpp b/mvvm/view/mvvm/widgets/statuslabel.cpp
index 0cecd623abdf586a845584971fe2bbe51706d011..69e1670cf1eb77d28c14898c094c7a6d25cf26c1 100644
--- a/mvvm/view/mvvm/widgets/statuslabel.cpp
+++ b/mvvm/view/mvvm/widgets/statuslabel.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/statuslabel.h"
+#include "mvvm/editors/styleutils.h"
+#include "mvvm/widgets/widgetutils.h"
 #include <QColor>
 #include <QFont>
 #include <QPainter>
-#include "mvvm/editors/styleutils.h"
-#include "mvvm/widgets/statuslabel.h"
-#include "mvvm/widgets/widgetutils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/view/mvvm/widgets/statuslabel.h b/mvvm/view/mvvm/widgets/statuslabel.h
index a6347ac907986247458d4985fa504e2e1d7de79e..2368b25a3f81bed420cca4b098436caaa0114b80 100644
--- a/mvvm/view/mvvm/widgets/statuslabel.h
+++ b/mvvm/view/mvvm/widgets/statuslabel.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_STATUSLABEL_H
 #define MVVM_WIDGETS_STATUSLABEL_H
 
-#include <QFrame>
 #include "mvvm/view_export.h"
+#include <QFrame>
 
 class QPaintEvent;
 
diff --git a/mvvm/view/mvvm/widgets/topitemstreeview.cpp b/mvvm/view/mvvm/widgets/topitemstreeview.cpp
index 50ce0f3e39e31534b83cca1b0b8aa77bdaa87fb8..3bfb946b22c88be17e04cd93e5967923c6baf700 100644
--- a/mvvm/view/mvvm/widgets/topitemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/topitemstreeview.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/topitemstreeview.h"
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/topitemstreeview.h"
 
 namespace ModelView {
 TopItemsTreeView::TopItemsTreeView(SessionModel* model, QWidget* parent) : ItemsTreeView(parent) {
diff --git a/mvvm/view/mvvm/widgets/widgetutils.cpp b/mvvm/view/mvvm/widgets/widgetutils.cpp
index acdb8eeb936d407c1e177e77adbb91131a79f411..315cfa5b8d7d6aee2bb51565c7042ef5b6ab94da 100644
--- a/mvvm/view/mvvm/widgets/widgetutils.cpp
+++ b/mvvm/view/mvvm/widgets/widgetutils.cpp
@@ -7,6 +7,8 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/widgets/widgetutils.h"
+#include "mvvm/utils/numericutils.h"
 #include <QApplication>
 #include <QColor>
 #include <QDir>
@@ -14,8 +16,6 @@
 #include <QLabel>
 #include <QMainWindow>
 #include <QSize>
-#include "mvvm/utils/numericutils.h"
-#include "mvvm/widgets/widgetutils.h"
 
 namespace {
 
diff --git a/mvvm/view/mvvm/widgets/widgetutils.h b/mvvm/view/mvvm/widgets/widgetutils.h
index 4a968a631d71cc6ce976d3a91073130f0553e490..17b67f6bc1cd66999a03cf4031aa307401c7bb7d 100644
--- a/mvvm/view/mvvm/widgets/widgetutils.h
+++ b/mvvm/view/mvvm/widgets/widgetutils.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_WIDGETS_UTILS_H
 #define MVVM_WIDGETS_UTILS_H
 
+#include "mvvm/view_export.h"
 #include <QString>
 #include <QStringList>
-#include "mvvm/view_export.h"
 #include <string>
 #include <vector>
 
diff --git a/mvvm/viewmodel/mvvm/editors/booleditor.cpp b/mvvm/viewmodel/mvvm/editors/booleditor.cpp
index e3051bf8cf7694709517fae61b99fd0264fccda1..280de2fbf1c342ecc9895701d69897e037039b61 100644
--- a/mvvm/viewmodel/mvvm/editors/booleditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/booleditor.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/booleditor.h"
 #include <QCheckBox>
 #include <QHBoxLayout>
-#include "mvvm/editors/booleditor.h"
 #include <stdexcept>
 
 namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/coloreditor.cpp b/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
index 2a8f4e3987107b48c843ff25f9ae8f2ada155d65..93707c65443f6ea0292ef10dc4d8b090f6035552 100644
--- a/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <QColorDialog>
-#include <QHBoxLayout>
-#include <QLabel>
 #include "mvvm/editors/coloreditor.h"
 #include "mvvm/editors/customeventfilters.h"
 #include "mvvm/editors/styleutils.h"
 #include "mvvm/model/customvariants.h"
+#include <QColorDialog>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp b/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
index 6ff7415809393e1c604620e165fc945779913e84..5969ba30d9d52cf5de1f9d2679d4ef8548de2468 100644
--- a/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QComboBox>
-#include <QVBoxLayout>
 #include "mvvm/editors/combopropertyeditor.h"
 #include "mvvm/model/comboproperty.h"
+#include <QComboBox>
+#include <QVBoxLayout>
 
 namespace {
 QStringList toList(const std::vector<std::string>& container) {
diff --git a/mvvm/viewmodel/mvvm/editors/customeditor.h b/mvvm/viewmodel/mvvm/editors/customeditor.h
index e41c0fbb6097c19f536bca73c0361f7feb887ea5..13286c69b1393a5029e88204163a7ad40b4a39da 100644
--- a/mvvm/viewmodel/mvvm/editors/customeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/customeditor.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_EDITORS_CUSTOMEDITOR_H
 #define MVVM_EDITORS_CUSTOMEDITOR_H
 
-#include <QWidget>
 #include "mvvm/core/variant.h"
 #include "mvvm/viewmodel_export.h"
+#include <QWidget>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp b/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
index 45c3a93f69dae379e2f949a29e49186823dc5cb0..8ca9be8a8f8508642d34fdc29aeb6f03c170f4d4 100644
--- a/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
+++ b/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/customeventfilters.h"
 #include <QAbstractSpinBox>
 #include <QComboBox>
 #include <QEvent>
-#include "mvvm/editors/customeventfilters.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/editors/customeventfilters.h b/mvvm/viewmodel/mvvm/editors/customeventfilters.h
index da4c96b72f884ffb6d01120493807a735f2f132b..c05c3c63aa4c7ddd34b139ddf4a2492acbe73a51 100644
--- a/mvvm/viewmodel/mvvm/editors/customeventfilters.h
+++ b/mvvm/viewmodel/mvvm/editors/customeventfilters.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_EDITORS_CUSTOMEVENTFILTERS_H
 #define MVVM_EDITORS_CUSTOMEVENTFILTERS_H
 
-#include <QObject>
 #include "mvvm/viewmodel_export.h"
+#include <QObject>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
index 9eba0a7ebb1134bee1c35f7ec7e5a1ee9360a3bd..72a12faa6ccf2ed100ce0803c4e761a23093fb52 100644
--- a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
+++ b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/editors/customeditor.h"
 #include "mvvm/editors/defaulteditorfactory.h"
+#include "mvvm/editors/customeditor.h"
 #include "mvvm/editors/editor_constants.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/sessionitem.h"
diff --git a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
index 5809152946355d965ba37425312e95ccca317273..60e472d37c8757b995c53b53ed7fd0bb2cd5e678 100644
--- a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
+++ b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
@@ -13,10 +13,10 @@
 //! @file defaulteditorfactory.h
 //! Defines DefaultEditorFactory and auxiliary classes for custom view model delegates.
 
-#include <map>
-#include <memory>
 #include "mvvm/editors/editorbuilders.h"
 #include "mvvm/interfaces/editorfactoryinterface.h"
+#include <map>
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp b/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
index 3605808b14de5a63240e1202d9743197178e4b96..0540d970dc2ad4e51fe4ec9d436e97412306f053 100644
--- a/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QDoubleSpinBox>
-#include <QVBoxLayout>
 #include "mvvm/editors/doubleeditor.h"
 #include "mvvm/utils/numericutils.h"
+#include <QDoubleSpinBox>
+#include <QVBoxLayout>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp b/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
index ef4f147c3a021aee4661dbe0beb23dcad7a2d5b3..ce32e99558379b2e8f6dca361fdc97aa3a9ec1fd 100644
--- a/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
+++ b/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
@@ -7,13 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <cmath>
+#include "mvvm/editors/editorbuilders.h"
 #include "mvvm/editors/booleditor.h"
 #include "mvvm/editors/coloreditor.h"
 #include "mvvm/editors/combopropertyeditor.h"
 #include "mvvm/editors/doubleeditor.h"
 #include "mvvm/editors/editor_constants.h"
-#include "mvvm/editors/editorbuilders.h"
 #include "mvvm/editors/externalpropertyeditor.h"
 #include "mvvm/editors/integereditor.h"
 #include "mvvm/editors/scientificdoubleeditor.h"
@@ -22,6 +21,7 @@
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/utils/reallimits.h"
+#include <cmath>
 
 namespace {
 double singleStep(int decimals) {
diff --git a/mvvm/viewmodel/mvvm/editors/editorbuilders.h b/mvvm/viewmodel/mvvm/editors/editorbuilders.h
index c20446197b05fc7998e58abf831bc5f15b5fe88b..ce70043e926ad039f2a900734416c3050f70691c 100644
--- a/mvvm/viewmodel/mvvm/editors/editorbuilders.h
+++ b/mvvm/viewmodel/mvvm/editors/editorbuilders.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_EDITORS_EDITORBUILDERS_H
 #define MVVM_EDITORS_EDITORBUILDERS_H
 
+#include "mvvm/viewmodel_export.h"
 #include <functional>
 #include <memory>
-#include "mvvm/viewmodel_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
index d8702f18961e23f7a7bf60283ea29c15432cf68e..e66092d8e0f4e102c5d220fab01ce6f12c63bc86 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/externalpropertycomboeditor.h"
+#include "mvvm/model/externalproperty.h"
 #include <QColor>
 #include <QComboBox>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
-#include "mvvm/editors/externalpropertycomboeditor.h"
-#include "mvvm/model/externalproperty.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
index 5eff44573e08bd05348aa875d09ca7259ded0478..8b11362556a95d1d3acb5d001dbdecab4530ae89 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
@@ -10,8 +10,8 @@
 #ifndef EXTERNALPROPERTYCOMBOEDITOR_H
 #define EXTERNALPROPERTYCOMBOEDITOR_H
 
-#include <functional>
 #include "mvvm/editors/customeditor.h"
+#include <functional>
 #include <vector>
 
 class QComboBox;
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
index 931d07983979496955e70d641face6e006ed71e6..fd9699895d795b548e30765a10997d5a9375e405 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
@@ -7,15 +7,15 @@
 //
 // ************************************************************************** //
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMessageBox>
-#include <QToolButton>
-#include "mvvm/editors/customeventfilters.h"
 #include "mvvm/editors/externalpropertyeditor.h"
+#include "mvvm/editors/customeventfilters.h"
 #include "mvvm/editors/styleutils.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMessageBox>
+#include <QToolButton>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
index f77a5c2ac781d3056bc1bb87dd7f0e8d048a26c3..a7986319fd03e0fed1034badc749cfeafedeffef 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_EDITORS_EXTERNALPROPERTYEDITOR_H
 #define MVVM_EDITORS_EXTERNALPROPERTYEDITOR_H
 
-#include <functional>
 #include "mvvm/editors/customeditor.h"
+#include <functional>
 
 class QLabel;
 
diff --git a/mvvm/viewmodel/mvvm/editors/integereditor.cpp b/mvvm/viewmodel/mvvm/editors/integereditor.cpp
index 5e322db9e42be88f7364610c290f805852f6614a..0e1c9ebf7381c60bd41f2f77f1a0180e5f78cee4 100644
--- a/mvvm/viewmodel/mvvm/editors/integereditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/integereditor.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/integereditor.h"
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <cmath>
-#include "mvvm/editors/integereditor.h"
 #include <stdexcept>
 
 namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp b/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
index 899f90319fb8bca8c8701a9ce00bcfab0aa33523..ad63f8c17e8302fc67108db860427c719963ac15 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/scientificdoubleeditor.h"
+#include "mvvm/utils/numericutils.h"
 #include <QDoubleValidator>
 #include <QLineEdit>
 #include <QVBoxLayout>
-#include "mvvm/editors/scientificdoubleeditor.h"
-#include "mvvm/utils/numericutils.h"
 #include <stdexcept>
 
 namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp b/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
index f0d7b16c0224e90bbdb61fec34f6a23567f4c95b..0e00059f993338c007d04c777b6d76764a2c9700 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/editors/scientificspinbox.h"
+#include "mvvm/editors/editor_constants.h"
 #include <QLineEdit>
 #include <cmath>
 #include <limits>
-#include "mvvm/editors/editor_constants.h"
-#include "mvvm/editors/scientificspinbox.h"
 
 namespace {
 const double upper_switch = 1000;
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinbox.h b/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
index 21be03bc9c426b4398403191322191f8c4515db9..dea670f3a5161e9f90eab9c11a8a26fe9a67dcc5 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_WIDGETS_SCIENTIFICSPINBOX_H
 #define MVVM_WIDGETS_SCIENTIFICSPINBOX_H
 
-#include <QAbstractSpinBox>
 #include "mvvm/viewmodel_export.h"
+#include <QAbstractSpinBox>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp b/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
index eaba7fe06c33151287df08a8427aab7042e03898..58335932e68c9309e3aba82a2e469fad6cba063e 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <QVBoxLayout>
-#include "mvvm/editors/scientificspinbox.h"
 #include "mvvm/editors/scientificspinboxeditor.h"
+#include "mvvm/editors/scientificspinbox.h"
 #include "mvvm/utils/numericutils.h"
+#include <QVBoxLayout>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp b/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
index a339debcc5a414317e850a22c36a8d8a5a905083..4b96d766c24c520973336f1af9d124b6ee429336 100644
--- a/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
@@ -13,6 +13,10 @@
 // https://gist.github.com/mistic100/c3b7f3eabc65309687153fe3e0a9a720
 // ----------------------------------------------------------------------------
 
+#include "mvvm/editors/selectablecomboboxeditor.h"
+#include "mvvm/editors/customeventfilters.h"
+#include "mvvm/model/comboproperty.h"
+#include "mvvm/utils/containerutils.h"
 #include <QAbstractItemView>
 #include <QComboBox>
 #include <QLineEdit>
@@ -21,10 +25,6 @@
 #include <QStandardItemModel>
 #include <QStyledItemDelegate>
 #include <QVBoxLayout>
-#include "mvvm/editors/customeventfilters.h"
-#include "mvvm/editors/selectablecomboboxeditor.h"
-#include "mvvm/model/comboproperty.h"
-#include "mvvm/utils/containerutils.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
index 44be7052f7f275fc5517ea25f94115716a278c46..d3ef503fdf0b6275958e71999a05814e0c3d2bf6 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_FACTORIES_VIEWMODELCONTROLLERBUILDER_H
 #define MVVM_FACTORIES_VIEWMODELCONTROLLERBUILDER_H
 
-#include <memory>
 #include "mvvm/viewmodel/viewmodelcontroller.h"
 #include "mvvm/viewmodel_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
index 7687e9ad4a9c4491d075c6e5bb174b615d085172..a148c561020b091d4fc6e35b1368d58f3e91b567 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_FACTORIES_VIEWMODELCONTROLLERFACTORY_H
 #define MVVM_FACTORIES_VIEWMODELCONTROLLERFACTORY_H
 
-#include <memory>
 #include "mvvm/factories/viewmodelcontrollerbuilder.h"
 #include "mvvm/viewmodel_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h b/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
index 098757c4bcf74ab46a11b2e3f4c60cb1cffe155a..c99f782fb549f2e5e7b3c7ebe73c9921e17eaf7b 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
@@ -10,10 +10,10 @@
 #ifndef MVVM_VIEWMODEL_STANDARDVIEWMODELS_H
 #define MVVM_VIEWMODEL_STANDARDVIEWMODELS_H
 
-#include <memory>
 #include "mvvm/factories/viewmodelcontrollerfactory.h"
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel_export.h"
+#include <memory>
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h b/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
index 7645d81d3afec0446dbe0d2ead3c15de15ba6606..c11c87429e2471342e7dbfdf0e4160a30e1ed01f 100644
--- a/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
+++ b/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
@@ -10,8 +10,8 @@
 #ifndef MVVM_EDITORS_EDITORFACTORYINTERFACE_H
 #define MVVM_EDITORS_EDITORFACTORYINTERFACE_H
 
-#include <memory>
 #include "mvvm/viewmodel_export.h"
+#include <memory>
 #include <string>
 
 class QModelIndex;
diff --git a/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h b/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
index e10771d259ed05e386de0653028a84bf1b1ff5b2..b88cdfd616dd0b90080bfcd218b509ff4aa9e578 100644
--- a/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
+++ b/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_INTERFACES_ROWSTRATEGYINTERFACE_H
 #define MVVM_INTERFACES_ROWSTRATEGYINTERFACE_H
 
+#include "mvvm/viewmodel_export.h"
 #include <QStringList>
 #include <memory>
-#include "mvvm/viewmodel_export.h"
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp b/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
index 19d46f458995c2673d415c76e31e7c71ab9a23c3..8aaac1d2172ac18e56374dbb96faf2a8b182c013 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
@@ -7,14 +7,14 @@
 //
 // ************************************************************************** //
 
-#include <QModelIndex>
-#include <QStyleOptionViewItem>
+#include "mvvm/viewmodel/defaultcelldecorator.h"
 #include "mvvm/editors/editor_constants.h"
 #include "mvvm/editors/scientificspinbox.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
-#include "mvvm/viewmodel/defaultcelldecorator.h"
+#include <QModelIndex>
+#include <QStyleOptionViewItem>
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp b/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
index e460cfbde86a4d16a67c37d3be027fa451c75605..1d5329e4600d59f0ec6099ad54372dbdc014a150 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/labeldatarowstrategy.h"
+#include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp b/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
index f52769c7c7526c4b35a5e82a6f17d4742d692b2d..8c22ead1b87014407922e5e6d7d79023f39eceb9 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/viewmodel/propertiesrowstrategy.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/sessionitem.h"
-#include "mvvm/viewmodel/propertiesrowstrategy.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
index 029c810e3d85e0ef3d132736aa07105f3dbaebab..398890b4de0279e448f56188dd2abaefbcac2adb 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/viewmodel/standardchildrenstrategies.h"
 #include "mvvm/model/groupitem.h"
 #include "mvvm/model/itemutils.h"
-#include "mvvm/viewmodel/standardchildrenstrategies.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
index 6c28926f728492433c449762b8153d082f8a0b65..2a858df71440eace4726c63f45a408094c41e3cc 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/standardviewitems.h"
+#include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
index 157180392840a0c8bf65fc65dec3d6a20b162a68..80d1ebd1e8ee2d27a0112f06874cf06011b0cf66 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
 #include "mvvm/model/groupitem.h"
 #include "mvvm/viewmodel/labeldatarowstrategy.h"
 #include "mvvm/viewmodel/propertiesrowstrategy.h"
 #include "mvvm/viewmodel/standardchildrenstrategies.h"
 #include "mvvm/viewmodel/standardviewitems.h"
-#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp b/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
index ade7ca84fc2be774cef074b87923ef24cd73772a..acc855187051352e14ef9c6be706fe7d9f705cf3 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
 #include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
 
 using namespace ModelView;
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
index ac5c0087fbe49e3e0888a4fc9c7e74b2ca31744a..d36f97ee63fa7587640e8369ddd3a8d78e23bba4 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <algorithm>
+#include "mvvm/viewmodel/viewitem.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/utils/containerutils.h"
-#include "mvvm/viewmodel/viewitem.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include <algorithm>
 #include <stdexcept>
 #include <vector>
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewitem.h b/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
index ec1dbd90eaf7030f90e40a4323e34c6d3381cb47..dd0442794e8933c67bc7c363a15627be010c8861 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_VIEWMODEL_VIEWITEM_H
 #define MVVM_VIEWMODEL_VIEWITEM_H
 
-#include <memory>
 #include "mvvm/core/variant.h"
 #include "mvvm/viewmodel_export.h"
+#include <memory>
 #include <vector>
 
 namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
index 738d142a1e69def14eea6e970c0ecc49a47643a6..2d22d1b567597a4d47c304e47f918a492ef28274 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
+#include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
-#include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodelcontroller.h"
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
index 1a3709123768485bf6255ec8acd86532cddf9183..f4cbf5c004a1bebe25da0ee7d717b707f47a0a53 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelbase.h"
+#include "mvvm/viewmodel/standardviewitems.h"
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
index 2f7b0b16152b068ab5c4d75fa10436d135ebbd1a..ecea1b35991edb183c6f38532e8ec6a0216694b3 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_VIEWMODEL_VIEWMODELBASE_H
 #define MVVM_VIEWMODEL_VIEWMODELBASE_H
 
+#include "mvvm/viewmodel_export.h"
 #include <QAbstractItemModel>
 #include <memory>
-#include "mvvm/viewmodel_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
index 26bf0ec6c46153aca331e47d889d3ea869eee811..5d534a6df1915564ab23eccbd30eff94ba1d2bb1 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <map>
+#include "mvvm/viewmodel/viewmodelcontroller.h"
 #include "mvvm/interfaces/childrenstrategyinterface.h"
 #include "mvvm/interfaces/rowstrategyinterface.h"
 #include "mvvm/model/itemutils.h"
@@ -18,8 +18,8 @@
 #include "mvvm/utils/containerutils.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelbase.h"
-#include "mvvm/viewmodel/viewmodelcontroller.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
+#include <map>
 #include <stdexcept>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
index 5f0ce702ef68c4441809d4f41c453dfcc89ee31e..cf9fb5f8accaba81f1bdb4dde0fdd4693f3677d5 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
@@ -10,11 +10,11 @@
 #ifndef MVVM_VIEWMODEL_REFVIEWMODELCONTROLLER_H
 #define MVVM_VIEWMODEL_REFVIEWMODELCONTROLLER_H
 
-#include <QStringList>
-#include <memory>
 #include "mvvm/model/tagrow.h"
 #include "mvvm/signals/modellistener.h"
 #include "mvvm/viewmodel_export.h"
+#include <QStringList>
+#include <memory>
 #include <vector>
 
 class QStandardItem;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
index 21fc2561c466929ebc907309e114cb6bab6ae8f9..94a7c0b2740893bcf4e613ab192cf3be4539d30d 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <QApplication>
+#include "mvvm/viewmodel/viewmodeldelegate.h"
 #include "mvvm/editors/customeditor.h"
 #include "mvvm/editors/defaulteditorfactory.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/viewmodel/defaultcelldecorator.h"
-#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QApplication>
 
 namespace {
 const double scale_default_height_factor{1.2};
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
index 03394577d3a029a8c15f9ed62623efd39b07dc92..21cfa4b9471e271fd417fab88cfd1a761d0206b3 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
@@ -10,9 +10,9 @@
 #ifndef MVVM_VIEWMODEL_VIEWMODELDELEGATE_H
 #define MVVM_VIEWMODEL_VIEWMODELDELEGATE_H
 
+#include "mvvm/viewmodel_export.h"
 #include <QStyledItemDelegate>
 #include <memory>
-#include "mvvm/viewmodel_export.h"
 
 namespace ModelView {
 
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
index ee18a56d0ee03e05e48c820c93db47647e9c72b0..fd4a57d02582bf202bbe9c3316b2e35643d44c86 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
@@ -7,8 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <QStandardItemModel>
-#include <iterator>
+#include "mvvm/viewmodel/viewmodelutils.h"
 #include "mvvm/model/customvariants.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemutils.h"
@@ -16,7 +15,8 @@
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/viewmodel/viewitem.h"
 #include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/viewmodel/viewmodelutils.h"
+#include <QStandardItemModel>
+#include <iterator>
 #include <set>
 
 using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
index 94c5df64543e1e4788f3974f29b827b307ebd9a4..b582458ac1e9f09ee9a8f717d09ee8e1e386622e 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
@@ -10,11 +10,11 @@
 #ifndef MVVM_VIEWMODEL_VIEWMODELUTILS_H
 #define MVVM_VIEWMODEL_VIEWMODELUTILS_H
 
+#include "mvvm/viewmodel_export.h"
 #include <QModelIndex>
 #include <QModelIndexList>
 #include <QVector>
 #include <functional>
-#include "mvvm/viewmodel_export.h"
 #include <vector>
 
 class QStandardItemModel;