diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index 7f23dd4e5f59dd353c1a6cda456b447be2b79939..7091b176715f023001dfc2f0fd2209bc66cfe2bd 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
 #define BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H
 
-#include "Device/Data/Datafield.h"
 #include "Base/Util/Assert.h"
+#include "Device/Data/Datafield.h"
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Util/ComboProperty.h"
 #include "Wrap/WinDllMacros.h"
diff --git a/GUI/Model/Model/ParameterTuningModel.cpp b/GUI/Model/Model/ParameterTuningModel.cpp
index 7f4c33111e96666b3a99974111a916fca8bee07e..e6f7a846f871512f5c6f9540272d30308c1c27ae 100644
--- a/GUI/Model/Model/ParameterTuningModel.cpp
+++ b/GUI/Model/Model/ParameterTuningModel.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
+#include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Model/FitParameterHelper.h"
-#include "GUI/Model/Model/ParameterTuningModel.h"
 #include "GUI/Support/XML/UtilXML.h"
 #include <QMimeData>
 
diff --git a/GUI/View/Common/ItemStackPresenter.h b/GUI/View/Common/ItemStackPresenter.h
index 75af26baccf31ec9e1df587c9050fca4fef6b2f0..5b7775929f11284adc1e0aa3a260738db9528255 100644
--- a/GUI/View/Common/ItemStackPresenter.h
+++ b/GUI/View/Common/ItemStackPresenter.h
@@ -33,7 +33,7 @@ public:
 
     //! Shows the widget for given item (and hides previous one).
     //! If no widget yet exists, it will be created.
-    void setItem(QObject *item, QObject* model = nullptr);
+    void setItem(QObject* item, QObject* model = nullptr);
 
     T* currentWidget();
     T* itemWidget(QObject* item);
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index d77262b1bd538d03d1414477e8a8ec80fc31c924..ae10bafdbfcce153089bee48554839c908375236 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -24,7 +24,7 @@ namespace {
 const bool reuse_widget = true;
 }
 
-JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget* parent)
+JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent)
     : QWidget(parent)
     , m_stackedWidget(new ItemStackPresenter<ParameterTuningWidget>(reuse_widget))
     , m_jobModel(jobModel)
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index 2eb0769c3468281950619bfced3cdd95a2ff36fa..695186f845fb8c41f1060b576896f7f60cde43ac 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -84,7 +84,7 @@ void ParameterTuningWidget::setJobOrRealItem(QObject* job_item)
     updateJobStatus();
 }
 
-void ParameterTuningWidget::setModel(QObject *jobModel)
+void ParameterTuningWidget::setModel(QObject* jobModel)
 {
     m_jobModel = dynamic_cast<JobModel*>(jobModel);
     ASSERT(m_jobModel);
diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/Fit/ParameterTuningWidget.h
index 2d98764f9672cbc0b25ebe3100f206861580e7dc..a7ba09092a8f43253a51741c68729a85b29a0fe9 100644
--- a/GUI/View/Fit/ParameterTuningWidget.h
+++ b/GUI/View/Fit/ParameterTuningWidget.h
@@ -36,7 +36,7 @@ public:
     explicit ParameterTuningWidget(QWidget* parent = nullptr);
 
     void setJobOrRealItem(QObject* job_item) override;
-    void setModel(QObject *jobModel);
+    void setModel(QObject* jobModel);
     QItemSelectionModel* selectionModel();
 
     QVector<ParameterItem*> selectedParameterItems();
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.h b/GUI/View/Mask/MaskEditorPropertyPanel.h
index 61e40846d7ad8667092349ecf3ba11b6f99e54eb..575c12c1a0a61717be2ea568c36b88bc1ac19dc9 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.h
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.h
@@ -17,10 +17,10 @@
 
 #include "GUI/View/Common/DataAccessWidget.h"
 #include "GUI/View/Mask/MaskEditorFlags.h"
+#include <QFormLayout>
+#include <QListView>
 #include <QModelIndex>
 #include <functional>
-#include <QListView>
-#include <QFormLayout>
 
 class IntensityDataItem;
 class IntensityDataPropertyWidget;