diff --git a/Sample/HardParticle/Cone.cpp b/Sample/HardParticle/Cone.cpp
index 97d522ddc95607e53d3e0eee968e98518041ebea..14952893d6d045f3dc53d8fdfeacfd54de305f5b 100644
--- a/Sample/HardParticle/Cone.cpp
+++ b/Sample/HardParticle/Cone.cpp
@@ -14,13 +14,13 @@
 
 #include "Sample/HardParticle/Cone.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 Cone::Cone(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/Cylinder.cpp b/Sample/HardParticle/Cylinder.cpp
index ac6edec95f0ea737dd9ab2168edbbb3cf87773e2..1dadfafc8bfd486fe391fd01bee7e437708ee94e 100644
--- a/Sample/HardParticle/Cylinder.cpp
+++ b/Sample/HardParticle/Cylinder.cpp
@@ -14,11 +14,11 @@
 
 #include "Sample/HardParticle/Cylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 Cylinder::Cylinder(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/EllipsoidalCylinder.cpp b/Sample/HardParticle/EllipsoidalCylinder.cpp
index 6c16ce704b8d59627d25f98f0c89b506b69f7ce7..7b84f54b42ebc7707c968cf874711cf270f2f96e 100644
--- a/Sample/HardParticle/EllipsoidalCylinder.cpp
+++ b/Sample/HardParticle/EllipsoidalCylinder.cpp
@@ -14,11 +14,11 @@
 
 #include "Sample/HardParticle/EllipsoidalCylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 EllipsoidalCylinder::EllipsoidalCylinder(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/HemiEllipsoid.cpp b/Sample/HardParticle/HemiEllipsoid.cpp
index b61dad4e0ef575487078eb585661aaf0820ed9e3..9a6d633fda2c400bebe1b5bab35cd9733c249bea 100644
--- a/Sample/HardParticle/HemiEllipsoid.cpp
+++ b/Sample/HardParticle/HemiEllipsoid.cpp
@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/HemiEllipsoid.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 HemiEllipsoid::HemiEllipsoid(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/HorizontalCylinder.cpp b/Sample/HardParticle/HorizontalCylinder.cpp
index 0628ea619654351adc69a0a4c237df1d45cea7d5..55472fa39357dadd1a6422d45ca0d6829d543c86 100644
--- a/Sample/HardParticle/HorizontalCylinder.cpp
+++ b/Sample/HardParticle/HorizontalCylinder.cpp
@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/HorizontalCylinder.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/DoubleEllipse.h"
+#include <numbers>
+using std::numbers::pi;
 
 HorizontalCylinder::HorizontalCylinder(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/Sphere.cpp b/Sample/HardParticle/Sphere.cpp
index 30eebcdc15344e1eadacb81d6275960d055266c2..e453b99bcfe715d464dc7ebc46d269167ec55356 100644
--- a/Sample/HardParticle/Sphere.cpp
+++ b/Sample/HardParticle/Sphere.cpp
@@ -13,13 +13,13 @@
 //  ************************************************************************************************
 
 #include "Sample/HardParticle/Sphere.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Types/Span.h"
 #include "Base/Util/Assert.h"
 #include "Sample/HardParticle/TruncatedSphere.h"
 #include "Sample/LibFF/SomeFormFactors.h"
 #include "Sample/Scattering/Rotations.h"
+#include <numbers>
+using std::numbers::pi;
 
 Sphere::Sphere(const std::vector<double> P, bool position_at_center)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/Spheroid.cpp b/Sample/HardParticle/Spheroid.cpp
index 75d1b30b6ab81680677e5480d5da637b239d3b9a..56e056654fe9cbf34daeff55310d8b371f50e081 100644
--- a/Sample/HardParticle/Spheroid.cpp
+++ b/Sample/HardParticle/Spheroid.cpp
@@ -13,13 +13,13 @@
 //  ************************************************************************************************
 
 #include "Sample/HardParticle/Spheroid.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/Functions.h"
 #include "Base/Util/Assert.h"
 #include "Sample/HardParticle/TruncatedSpheroid.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 Spheroid::Spheroid(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/TruncatedSphere.cpp b/Sample/HardParticle/TruncatedSphere.cpp
index acf6455ab53f118ca2f2e4832eefe89ef5289b02..81ada1780bc609503af1370f628eadad76cbf7b8 100644
--- a/Sample/HardParticle/TruncatedSphere.cpp
+++ b/Sample/HardParticle/TruncatedSphere.cpp
@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/TruncatedSphere.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 TruncatedSphere::TruncatedSphere(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/HardParticle/TruncatedSpheroid.cpp b/Sample/HardParticle/TruncatedSpheroid.cpp
index 21ba5a9105b0a4a78584a687a9f9803bf22cae68..b75e76e6d6aac43426595334010dd3b81cb9d018 100644
--- a/Sample/HardParticle/TruncatedSpheroid.cpp
+++ b/Sample/HardParticle/TruncatedSpheroid.cpp
@@ -14,12 +14,12 @@
 
 #include "Sample/HardParticle/TruncatedSpheroid.h"
 #include "Base/Math/Bessel.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Math/IntegratorGK.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 TruncatedSpheroid::TruncatedSpheroid(const std::vector<double> P)
     : IFormFactor(P)
diff --git a/Sample/SoftParticle/Gauss.cpp b/Sample/SoftParticle/Gauss.cpp
index 8b8d685815484ccc3c47fc12e8bf0b1689d2c764..ee3a1343d95fdeb268c98bec794cfb02876d08b2 100644
--- a/Sample/SoftParticle/Gauss.cpp
+++ b/Sample/SoftParticle/Gauss.cpp
@@ -13,12 +13,12 @@
 //  ************************************************************************************************
 
 #include "Sample/SoftParticle/Gauss.h"
-#include <numbers>
-using std::numbers::pi;
 #include "Base/Util/Assert.h"
 #include "Sample/Shapes/BoxNet.h"
 #include "Sample/Shapes/TruncatedEllipsoidNet.h"
 #include <limits>
+#include <numbers>
+using std::numbers::pi;
 
 GaussSphere::GaussSphere(const std::vector<double> P)
     : IFormFactor(P)