diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 3aa14e6622ed2b94e3b43483c965b154d65277cb..7d74ec2794b50e0bd3d400442f2ff638e4538d45 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -17,8 +17,8 @@
 
 #include "GUI/View/Common/DataAccessWidget.h"
 
-class IntensityDataItem;
 class ColorMapCanvas;
+class IntensityDataItem;
 class QAction;
 
 //! The IntensityDataCanvas class represents IntensityDataItem as color map,
diff --git a/GUI/View/SampleDesigner/CompoundForm.h b/GUI/View/SampleDesigner/CompoundForm.h
index fc76beabe2ab0fd4fa425ae61c88d1da48834590..05c5e9dafa46ac87b29851b3fb8fe4b208cc43f9 100644
--- a/GUI/View/SampleDesigner/CompoundForm.h
+++ b/GUI/View/SampleDesigner/CompoundForm.h
@@ -18,9 +18,9 @@
 #include <QFormLayout>
 #include <QGroupBox>
 
-class SampleEditorController;
 class CompoundItem;
 class ItemWithParticles;
+class SampleEditorController;
 
 //! Form for editing a particle composition
 class CompoundForm : public QGroupBox {
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.h b/GUI/View/SampleDesigner/CoreAndShellForm.h
index 9269a68487b1735e3c2212abb2578b1fa387cc91..f67e430f701bb5eb7d9a94679239ab92289f7b18 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.h
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.h
@@ -19,9 +19,9 @@
 #include <QGroupBox>
 #include <memory>
 
+class CoreAndShellItem;
 class FormLayouter;
 class GroupBoxCollapser;
-class CoreAndShellItem;
 class SampleEditorController;
 
 //! Form for editing a core/shell particle
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.h b/GUI/View/SampleDesigner/ParticleLayoutForm.h
index 498520d6224c3539b0aca3359137ecb07ca50202..c44fd7ca31abdd76e8130069a28ed5146b530ade 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.h
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.h
@@ -19,13 +19,13 @@
 #include <QGroupBox>
 #include <QList>
 
-class SampleEditorController;
-class ParticleLayoutItem;
-class LayerForm;
-class ItemWithParticles;
 class DoubleSpinBox;
-class LayerItem;
 class GroupBoxCollapser;
+class ItemWithParticles;
+class LayerForm;
+class LayerItem;
+class ParticleLayoutItem;
+class SampleEditorController;
 
 //! Form for editing a particle layout
 class ParticleLayoutForm : public QGroupBox {
diff --git a/GUI/View/SampleDesigner/SampleForm.h b/GUI/View/SampleDesigner/SampleForm.h
index d2771a9f29c6915c8fab25c6c2df6d04b1cf7883..726ee12f470eab2cdfc979ef42868903d6d6445c 100644
--- a/GUI/View/SampleDesigner/SampleForm.h
+++ b/GUI/View/SampleDesigner/SampleForm.h
@@ -18,10 +18,10 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-class SampleItem;
-class SampleEditorController;
-class LayerItem;
 class LayerForm;
+class LayerItem;
+class SampleEditorController;
+class SampleItem;
 
 //! Form to present/edit a sample
 class SampleForm : public QWidget {