From ae0e5394f6f2f75e7f02a6491b82d6d535c869b7 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 4 Jul 2021 10:06:35 +0200
Subject: [PATCH] clang-format

---
 Core/Computation/RoughMultiLayerComputation.cpp             | 4 ++--
 Core/Export/SampleToPython.cpp                              | 4 ++--
 GUI/Models/TransformFromDomain.cpp                          | 2 +-
 GUI/Models/TransformToDomain.h                              | 2 +-
 Sample/Fresnel/IFresnelMap.cpp                              | 2 +-
 Sample/Multilayer/MultiLayer.cpp                            | 4 ++--
 Sample/Multilayer/MultilayerUtils.cpp                       | 2 +-
 Sample/Processed/MaterialSlicer.cpp                         | 2 +-
 Sample/Processed/ProcessedSample.cpp                        | 4 ++--
 Sample/Processed/ProfileHelper.cpp                          | 2 +-
 Sample/Slice/Slice.cpp                                      | 2 +-
 Sample/Specular/SpecularMagneticStrategy.cpp                | 2 +-
 Sample/Specular/SpecularScalarStrategy.cpp                  | 2 +-
 Sample/StandardSamples/CylindersBuilder.cpp                 | 2 +-
 Sample/StandardSamples/FeNiBilayerBuilder.cpp               | 2 +-
 Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp      | 2 +-
 Sample/StandardSamples/MagneticLayersBuilder.cpp            | 2 +-
 Sample/StandardSamples/MagneticParticlesBuilder.cpp         | 4 ++--
 Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp | 2 +-
 Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp   | 2 +-
 Sample/StandardSamples/ResonatorBuilder.cpp                 | 2 +-
 Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp     | 2 +-
 Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp         | 2 +-
 Tests/Performance/Core/Mesocrystal.cpp                      | 2 +-
 Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp          | 2 +-
 Tests/UnitTests/Core/Sample/MaterialTest.cpp                | 2 +-
 Tests/UnitTests/Core/Sample/MultiLayerTest.cpp              | 4 ++--
 Tests/UnitTests/Core/Sample/RTTest.cpp                      | 4 ++--
 gui2/quicksimeditor/quicksimutils.cpp                       | 2 +-
 29 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 30470d4f1b3..db4757389c5 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -16,12 +16,12 @@
 #include "Base/Math/Constants.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/Fresnel/IFresnelMap.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 1cc492c3f10..7ac385260f4 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -22,6 +22,8 @@
 #include "Core/Export/PyFmt2.h"
 #include "Sample/Aggregate/InterferenceFunctions.h"
 #include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Crystal.h"
@@ -30,8 +32,6 @@
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/Particle/ParticleCoreShell.h"
 #include "Sample/Scattering/IFormFactor.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include <iomanip>
 #include <map>
 #include <set>
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 1de625ebcd8..743c3d13c3e 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -51,9 +51,9 @@
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/RangedDistributions.h"
 #include "Sample/Aggregate/InterferenceFunctions.h"
-#include "Sample/Multilayer/Layer.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Interface/LayerRoughness.h"
+#include "Sample/Multilayer/Layer.h"
 
 using namespace node_progeny;
 
diff --git a/GUI/Models/TransformToDomain.h b/GUI/Models/TransformToDomain.h
index 6e9e2ee6608..2a410e0d8b4 100644
--- a/GUI/Models/TransformToDomain.h
+++ b/GUI/Models/TransformToDomain.h
@@ -20,10 +20,10 @@
 #include "Param/Distrib/ParameterDistribution.h"
 #include "Sample/Aggregate/IInterferenceFunction.h"
 #include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/IParticle.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 class AngularSpecScan;
diff --git a/Sample/Fresnel/IFresnelMap.cpp b/Sample/Fresnel/IFresnelMap.cpp
index e4b77d0ba62..1c1cdcbb75b 100644
--- a/Sample/Fresnel/IFresnelMap.cpp
+++ b/Sample/Fresnel/IFresnelMap.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "Sample/Fresnel/IFresnelMap.h"
+#include "Sample/Slice/ISpecularStrategy.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
-#include "Sample/Slice/ISpecularStrategy.h"
 
 IFresnelMap::IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
                          bool useCache)
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index ad35513db32..5aeceba786f 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -16,11 +16,11 @@
 #include "Base/Utils/Assert.h"
 #include "Fit/Param/RealLimits.h"
 #include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer::MultiLayer() : m_crossCorrLength(0)
 {
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index 7832959fe95..2bddd69f7ff 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -13,10 +13,10 @@
 //  ************************************************************************************************
 
 #include "Sample/Multilayer/MultilayerUtils.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerInterface.h"
 
 const LayerRoughness* SampleUtils::Multilayer::LayerTopRoughness(const MultiLayer& multilayer,
                                                                  size_t i)
diff --git a/Sample/Processed/MaterialSlicer.cpp b/Sample/Processed/MaterialSlicer.cpp
index d6569dc33ef..c387245347c 100644
--- a/Sample/Processed/MaterialSlicer.cpp
+++ b/Sample/Processed/MaterialSlicer.cpp
@@ -14,10 +14,10 @@
 
 #include "Sample/Processed/MaterialSlicer.h"
 #include "Base/Utils/Assert.h"
+#include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Material/MaterialBySLDImpl.h"
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Material/RefractiveMaterialImpl.h"
-#include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Processed/ProcessedLayout.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
diff --git a/Sample/Processed/ProcessedSample.cpp b/Sample/Processed/ProcessedSample.cpp
index 02b100ccd19..0a31458a956 100644
--- a/Sample/Processed/ProcessedSample.cpp
+++ b/Sample/Processed/ProcessedSample.cpp
@@ -17,6 +17,7 @@
 #include "Base/Utils/Assert.h"
 #include "Sample/Fresnel/MatrixFresnelMap.h"
 #include "Sample/Fresnel/ScalarFresnelMap.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
@@ -25,7 +26,6 @@
 #include "Sample/Processed/ProcessedLayout.h"
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/Scattering/ZLimits.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include "Sample/Specular/SpecularStrategyBuilder.h"
@@ -129,7 +129,7 @@ std::unique_ptr<IFresnelMap> fresnelify(const MultiLayer& sample, const SliceSta
         return std::make_unique<MatrixFresnelMap>(
             fresnelStack, SampleUtils::SpecularStrategyBuilder::buildMagnetic(sample), useCache);
     return std::make_unique<ScalarFresnelMap>(
-            fresnelStack, SampleUtils::SpecularStrategyBuilder::buildScalar(sample), useCache);
+        fresnelStack, SampleUtils::SpecularStrategyBuilder::buildScalar(sample), useCache);
 }
 
 } // namespace
diff --git a/Sample/Processed/ProfileHelper.cpp b/Sample/Processed/ProfileHelper.cpp
index 6b30ae7a9a2..a2eb2a13164 100644
--- a/Sample/Processed/ProfileHelper.cpp
+++ b/Sample/Processed/ProfileHelper.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Sample/Processed/ProfileHelper.h"
-#include "Sample/Processed/ProcessedSample.h"
 #include "Sample/Interface/LayerRoughness.h"
+#include "Sample/Processed/ProcessedSample.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Slice/Slice.cpp b/Sample/Slice/Slice.cpp
index 57ad513fac4..50a85c35593 100644
--- a/Sample/Slice/Slice.cpp
+++ b/Sample/Slice/Slice.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Sample/Slice/Slice.h"
-#include "Sample/Material/MaterialUtils.h"
 #include "Sample/Interface/LayerRoughness.h"
+#include "Sample/Material/MaterialUtils.h"
 #include "Sample/Slice/SliceStack.h"
 
 Slice::Slice(const ZLimits& zRange, const Material& material, const kvector_t& B_field,
diff --git a/Sample/Specular/SpecularMagneticStrategy.cpp b/Sample/Specular/SpecularMagneticStrategy.cpp
index ccc900c35e8..a8c86143a14 100644
--- a/Sample/Specular/SpecularMagneticStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticStrategy.cpp
@@ -14,8 +14,8 @@
 
 #include "Sample/Specular/SpecularMagneticStrategy.h"
 #include "Base/Const/PhysicalConstants.h"
-#include "Sample/Slice/KzComputation.h"
 #include "Sample/Interface/LayerRoughness.h"
+#include "Sample/Slice/KzComputation.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 3d00c676eb3..9cd7406ccb9 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "Sample/Specular/SpecularScalarStrategy.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Slice/KzComputation.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include <Eigen/Dense>
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index d83885177e9..0387188f1fa 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -17,10 +17,10 @@
 #include "Fit/Param/RealLimits.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorCylinder.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
index 89e47280775..93cf0db6fb1 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
@@ -16,10 +16,10 @@
 #include "Sample/StandardSamples/FeNiBilayerBuilder.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Base/Const/Units.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 auto constexpr rhoMconst = -PhysConsts::m_n * PhysConsts::g_factor_n * PhysConsts::mu_N
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index 74f6619c7b7..14074f7a95b 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -16,11 +16,11 @@
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorFullSphere.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/SampleBuilderEngine/FormFactorComponents.h"
-#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 namespace {
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSamples/MagneticLayersBuilder.cpp
index eccbf86d9ce..958e13d5c9c 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSamples/MagneticLayersBuilder.cpp
@@ -17,11 +17,11 @@
 #include "Base/Utils/Assert.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorFullSphere.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 32ce8ea21d3..b51100f5e15 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -17,12 +17,12 @@
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorCylinder.h"
 #include "Sample/HardParticle/FormFactorFullSphere.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 // ----------------------------------------------------------------------------
 // Magnetic cylinders and zero magnetic field
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
index 5326271dcc4..c6730349e89 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
-#include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Interface/LayerRoughness.h"
+#include "Sample/Multilayer/MultiLayer.h"
 
 MultiLayer* MultiLayerWithNCRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index 7c6da53f4ab..2b5c5856473 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -14,10 +14,10 @@
 
 #include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
 #include "Base/Const/Units.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* MultiLayerWithRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/ResonatorBuilder.cpp b/Sample/StandardSamples/ResonatorBuilder.cpp
index 418ed423e80..017908c9bab 100644
--- a/Sample/StandardSamples/ResonatorBuilder.cpp
+++ b/Sample/StandardSamples/ResonatorBuilder.cpp
@@ -15,10 +15,10 @@
 #include "Sample/StandardSamples/ResonatorBuilder.h"
 #include "Base/Const/Units.h"
 #include "Fit/Param/RealLimits.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 ResonatorBuilder::ResonatorBuilder(double ti_thickness)
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
index 87955b58941..456481f36b8 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
@@ -14,10 +14,10 @@
 
 #include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
 #include "Base/Const/Units.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* ThickAbsorptiveSampleBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
index 26205e48be9..3bd783b6567 100644
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
@@ -14,9 +14,9 @@
 
 #include "Sample/StandardSamples/TwoLayerRoughnessBuilder.h"
 #include "Base/Const/Units.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 MultiLayer* TwoLayerRoughnessBuilder::buildSample() const
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index 1bf3c6c738a..af3d57dbf67 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -18,6 +18,7 @@
 #include "Device/Detector/RectangularDetector.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorCylinder.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Lattice/BakeLattice.h"
 #include "Sample/Lattice/ISelectionRule.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
@@ -27,7 +28,6 @@
 #include "Sample/Particle/Particle.h"
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
 #include <iostream>
 
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
index 4ba98f4fe63..96ccce1041f 100644
--- a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
@@ -1,7 +1,7 @@
 #include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <memory>
 
diff --git a/Tests/UnitTests/Core/Sample/MaterialTest.cpp b/Tests/UnitTests/Core/Sample/MaterialTest.cpp
index 2d3066932d3..d11d66093ed 100644
--- a/Tests/UnitTests/Core/Sample/MaterialTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MaterialTest.cpp
@@ -1,9 +1,9 @@
 #include "Base/Const/Units.h"
 #include "Base/Vector/Transform3D.h"
+#include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Material/MaterialBySLDImpl.h"
 #include "Sample/Material/RefractiveMaterialImpl.h"
 #include "Sample/Material/WavevectorInfo.h"
-#include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Scattering/Rotations.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index b34e08af35f..700f26d764f 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -2,11 +2,11 @@
 #include "Base/Const/Units.h"
 #include "Base/Math/Constants.h"
 #include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class MultiLayerTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index ff93dc23e34..019041e63d1 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -1,12 +1,12 @@
 #include "Base/Math/Constants.h"
 #include "Sample/Aggregate/ParticleLayout.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Interface/LayerInterface.h"
-#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index 86e0c6af60b..2c4ee95538a 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -18,8 +18,8 @@
 #include "gui2/model/sampleitems.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/sessionmodel.h"
-#include <Sample/Material/MaterialFactoryFuncs.h>
 #include <Sample/Interface/LayerRoughness.h>
+#include <Sample/Material/MaterialFactoryFuncs.h>
 #include <Sample/Slice/Slice.h>
 #include <stdexcept>
 
-- 
GitLab