diff --git a/GUI/Model/Descriptor/DoubleDescriptor.h b/GUI/Model/Descriptor/DoubleDescriptor.h
index b4be832cabdf596424f9441399c4ce142806fd53..16d5b0c39637f26c8c5cc396984f674be3d6a1b5 100644
--- a/GUI/Model/Descriptor/DoubleDescriptor.h
+++ b/GUI/Model/Descriptor/DoubleDescriptor.h
@@ -25,11 +25,11 @@
 //! Describes properties of a double value which are necessary to allow GUI representation, editing
 //! the value, undo/redo, unit conversion.
 //!
-//! By using this class, the underlying data scheme is hidden from the user of the data. The underlying implementation can be a simple double member,
-//! or any other construction to hold a double value.
-//! It could also describe a value which is not even represented by an existing double, but is only
-//! a calculated value. In this case it might apply that there is no setter possible, which is still
-//! allowed as long as care is taken not trying to call the setter.
+//! By using this class, the underlying data scheme is hidden from the user of the data. The
+//! underlying implementation can be a simple double member, or any other construction to hold a
+//! double value. It could also describe a value which is not even represented by an existing
+//! double, but is only a calculated value. In this case it might apply that there is no setter
+//! possible, which is still allowed as long as care is taken not trying to call the setter.
 //!
 //! Note that this class does not provide (*implement*) a double value, but *provide information*
 //! about a double value. For implementing a double value, please see DoubleProperty.
diff --git a/GUI/Model/Descriptor/SelectionDescriptor.h b/GUI/Model/Descriptor/SelectionDescriptor.h
index 69515a4c60effb9b2fc2b4bba7f59be70e6e1f23..697ea680ed7ff31bbc582675473fed42d872765f 100644
--- a/GUI/Model/Descriptor/SelectionDescriptor.h
+++ b/GUI/Model/Descriptor/SelectionDescriptor.h
@@ -36,13 +36,15 @@ public:
 //!
 //! Usually a selection is presented as a combo box.
 //!
-//! SelectionDescriptor operate on a SelectionProperty. Please refer to this class for more information.
+//! SelectionDescriptor operate on a SelectionProperty. Please refer to this class for more
+//! information.
 //!
 //! The template parameter defines the type of the current item. This can be a pointer to a common
 //! base class (like RotationItem*), but it also can be a std::variant<...>, which is useful if
 //! no dedicated common base class exists (like for the roughness items LayerZeroRoughnessItem and
 //! LayerBasicRoughnessItem).
-//! If used with a ComboProperty holder, the template parameter can be a QString, so currentItem() returns the currently selected string.
+//! If used with a ComboProperty holder, the template parameter can be a QString, so currentItem()
+//! returns the currently selected string.
 //!
 //! Note that this class does not provide (*implement*) a selection, but *provide
 //! information* about a selection. For implementing a selection, please see SelectionProperty.
diff --git a/GUI/Model/Descriptor/UIntDescriptor.h b/GUI/Model/Descriptor/UIntDescriptor.h
index c991a1634626d879cf13d55501e8142adc0ceac8..4fff26ab0e5add1fa95fbb67dfaa33a142ab4e34 100644
--- a/GUI/Model/Descriptor/UIntDescriptor.h
+++ b/GUI/Model/Descriptor/UIntDescriptor.h
@@ -24,8 +24,9 @@
 //! Describes properties of a uint value which are necessary to allow GUI representation, editing
 //! the value, undo/redo, unit conversion.
 //!
-//! By using this class, the underlying data scheme is hidden from the user of the data. The underlying implementation
-//! can be a simple uint member, or any other construction to hold a uint value.
+//! By using this class, the underlying data scheme is hidden from the user of the data. The
+//! underlying implementation can be a simple uint member, or any other construction to hold a uint
+//! value.
 class UIntDescriptor {
 public:
     UIntDescriptor() = default;
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index 64e40231872f18b98dc4e69aeb65dc7825bb9ab9..cdc46e774583ecfd7ed2b11d4d26cb9de27e6b82 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
+#include "GUI/Model/Device/SpecularBeamInclinationItem.h"
 #include "Base/Axis/IAxis.h"
 #include "Base/Const/Units.h"
 #include "GUI/Model/CatDevice/DistributionItemCatalog.h"
 #include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/Device/SpecularBeamInclinationItem.h"
 #include "GUI/Support/XML/Serialize.h"
 #include "GUI/Support/XML/UtilXML.h"
 
diff --git a/GUI/View/SampleDesigner/FormLayouter.cpp b/GUI/View/SampleDesigner/FormLayouter.cpp
index bfce9d8809c95bfaf667b6009d53c78383be2228..519cba1bd357d92c4218de1bbfccb9a94992a350 100644
--- a/GUI/View/SampleDesigner/FormLayouter.cpp
+++ b/GUI/View/SampleDesigner/FormLayouter.cpp
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
+#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Descriptor/UIntDescriptor.h"
 #include "GUI/Model/Descriptor/VectorDescriptor.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
-#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"