From 54ac9bbbbbd0151e310c9834d3cf8b7fcfa9f5c5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 13 Dec 2022 13:29:13 +0100
Subject: [PATCH] + #endif comment in no-SWIG header block

---
 Base/Const/PhysicalConstants.h                            | 3 +--
 Base/Element/DepthProbeElement.h                          | 3 +--
 Base/Element/IElement.h                                   | 3 +--
 Base/Element/PolMatrices.h                                | 3 +--
 Base/Math/Bessel.h                                        | 3 +--
 Base/Math/Constants.h                                     | 3 +--
 Base/Math/FourierTransform.h                              | 3 +--
 Base/Math/Functions.h                                     | 3 +--
 Base/Math/IntegratorGK.h                                  | 3 +--
 Base/Math/IntegratorMCMiser.h                             | 3 +--
 Base/Math/Numeric.h                                       | 3 +--
 Base/Pixel/IPixel.h                                       | 3 +--
 Base/Pixel/RectangularPixel.h                             | 3 +--
 Base/Pixel/SphericalPixel.h                               | 3 +--
 Base/Progress/DelayedProgressCounter.h                    | 3 +--
 Base/Progress/ProgressHandler.h                           | 3 +--
 Base/Py/PyCore.h                                          | 3 +--
 Base/Py/PyFmt.h                                           | 3 +--
 Base/Py/PyObject.h                                        | 3 +--
 Base/Py/PyUtils.h                                         | 3 +--
 Base/Types/CloneableVector.h                              | 3 +--
 Base/Types/OwningVector.h                                 | 3 +--
 Base/Util/Algorithms.h                                    | 3 +--
 Base/Util/Assert.h                                        | 3 +--
 Base/Util/FileSystemUtils.h                               | 3 +--
 Base/Util/StringUtils.h                                   | 3 +--
 Base/Util/SysUtils.h                                      | 3 +--
 Base/Vector/WavevectorInfo.h                              | 3 +--
 Device/Coord/AxisNames.h                                  | 3 +--
 Device/Coord/CoordSystem1D.h                              | 3 +--
 Device/Coord/CoordSystem2D.h                              | 3 +--
 Device/Coord/ICoordSystem.h                               | 3 +--
 Device/Data/ArrayUtils.h                                  | 3 +--
 Device/Detector/SimulationAreaIterator.h                  | 3 +--
 Device/IO/DataFormatUtils.h                               | 3 +--
 Device/IO/ReadReflectometry.h                             | 3 +--
 Device/IO/ReadWriteINT.h                                  | 3 +--
 Device/IO/ReadWriteNumpyTXT.h                             | 3 +--
 Device/IO/ReadWriteTiff.h                                 | 3 +--
 Device/IO/boost_streams.h                                 | 3 +--
 Device/Mask/InfinitePlane.h                               | 3 +--
 Device/Resolution/ConvolutionDetectorResolution.h         | 3 +--
 Device/Resolution/Convolve.h                              | 3 +--
 Fit/Adapter/GSLLevenbergMarquardtMinimizer.h              | 3 +--
 Fit/Adapter/GSLMultiMinimizer.h                           | 3 +--
 Fit/Adapter/GeneticMinimizer.h                            | 3 +--
 Fit/Adapter/IFunctionAdapter.h                            | 3 +--
 Fit/Adapter/MinimizerAdapter.h                            | 3 +--
 Fit/Adapter/Minuit2Minimizer.h                            | 3 +--
 Fit/Adapter/ObjectiveFunctionAdapter.h                    | 3 +--
 Fit/Adapter/Report.h                                      | 3 +--
 Fit/Adapter/ResidualFunctionAdapter.h                     | 3 +--
 Fit/Adapter/RootResidualFunction.h                        | 3 +--
 Fit/Adapter/RootScalarFunction.h                          | 3 +--
 Fit/Adapter/ScalarFunctionAdapter.h                       | 3 +--
 Fit/Adapter/SimAnMinimizer.h                              | 3 +--
 Fit/Kernel/Kernel.h                                       | 3 +--
 Fit/Minimizer/MinimizerOptions.h                          | 3 +--
 Fit/Minimizer/Types.h                                     | 3 +--
 Fit/TestEngine/MinimizerTestPlan.h                        | 3 +--
 Fit/Tools/MinimizerUtils.h                                | 3 +--
 Fit/Tools/MultiOption.h                                   | 3 +--
 Fit/Tools/OptionContainer.h                               | 3 +--
 Fit/Tools/StringUtils.h                                   | 3 +--
 Fit/Tools/WallclockTimer.h                                | 3 +--
 Param/Distrib/DistributionHandler.h                       | 3 +--
 Param/Node/NodeUtils.h                                    | 3 +--
 Resample/Coherence/CoheringSubparticles.h                 | 3 +--
 Resample/Element/DiffuseElement.h                         | 3 +--
 Resample/Element/SpecularElement.h                        | 3 +--
 Resample/Flux/IFlux.h                                     | 3 +--
 Resample/Flux/MatrixFlux.h                                | 3 +--
 Resample/Flux/ScalarFlux.h                                | 3 +--
 Resample/Interparticle/DecouplingApproximationStrategy.h  | 3 +--
 Resample/Interparticle/IInterparticleStrategy.h           | 3 +--
 Resample/Interparticle/SSCAStrategy.h                     | 3 +--
 Resample/Particle/IReParticle.h                           | 3 +--
 Resample/Particle/ReCompound.h                            | 3 +--
 Resample/Particle/ReMesocrystal.h                         | 3 +--
 Resample/Particle/ReParticle.h                            | 3 +--
 Resample/Processed/ReLayout.h                             | 3 +--
 Resample/Processed/ReSample.h                             | 3 +--
 Resample/Processed/Slicer.h                               | 3 +--
 Resample/Slice/KzComputation.h                            | 3 +--
 Resample/Slice/ProfileHelper.h                            | 3 +--
 Resample/Slice/Slice.h                                    | 3 +--
 Resample/Slice/SliceStack.h                               | 3 +--
 Resample/Slice/ZLimits.h                                  | 3 +--
 Resample/Specular/ComputeFluxMagnetic.h                   | 3 +--
 Resample/Specular/ComputeFluxScalar.h                     | 3 +--
 Resample/Specular/TransitionMagneticNevot.h               | 3 +--
 Resample/Specular/TransitionMagneticTanh.h                | 3 +--
 Sample/Aggregate/Interferences.h                          | 3 +--
 Sample/ComponentBuilder/FormFactorComponents.h            | 3 +--
 Sample/ComponentBuilder/IRegistry.h                       | 3 +--
 Sample/ComponentBuilder/Profile2DComponents.h             | 3 +--
 Sample/Correlations/IDistribution1DSampler.h              | 3 +--
 Sample/Correlations/IDistribution2DSampler.h              | 3 +--
 Sample/HardParticle/HardParticles.h                       | 3 +--
 Sample/HardParticle/Ripples.h                             | 3 +--
 Sample/Interface/LayerInterface.h                         | 3 +--
 Sample/LibFF/SomeFormFactors.h                            | 3 +--
 Sample/Material/Admixtures.h                              | 3 +--
 Sample/Material/MaterialUtils.h                           | 3 +--
 Sample/Multilayer/PyImport.h                              | 3 +--
 Sample/Particle/PolyhedralUtil.h                          | 3 +--
 Sample/Shapes/BoxNet.h                                    | 3 +--
 Sample/Shapes/DoubleEllipse.h                             | 3 +--
 Sample/Shapes/IShape3D.h                                  | 3 +--
 Sample/Shapes/RippleCosineNet.h                           | 3 +--
 Sample/Shapes/RippleSawtoothNet.h                         | 3 +--
 Sample/Shapes/TruncatedEllipsoidNet.h                     | 3 +--
 Sample/SoftParticle/SoftParticles.h                       | 3 +--
 Sample/StandardSamples/BoxCompositionBuilder.h            | 3 +--
 Sample/StandardSamples/BoxesSquareLatticeBuilder.h        | 3 +--
 Sample/StandardSamples/CompoundBuilder.h                  | 3 +--
 Sample/StandardSamples/CoreAndShellBuilder.h              | 3 +--
 Sample/StandardSamples/CustomMorphologyBuilder.h          | 3 +--
 Sample/StandardSamples/CylindersAndPrismsBuilder.h        | 3 +--
 Sample/StandardSamples/CylindersBuilder.h                 | 3 +--
 Sample/StandardSamples/FeNiBilayerBuilder.h               | 3 +--
 Sample/StandardSamples/HomogeneousMultilayerBuilder.h     | 3 +--
 Sample/StandardSamples/LatticeBuilder.h                   | 3 +--
 Sample/StandardSamples/LayersWithAbsorptionBuilder.h      | 3 +--
 Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h | 3 +--
 Sample/StandardSamples/MagneticLayersBuilder.h            | 3 +--
 Sample/StandardSamples/MagneticParticlesBuilder.h         | 3 +--
 Sample/StandardSamples/MesocrystalBuilder.h               | 3 +--
 Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h | 3 +--
 Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h   | 3 +--
 Sample/StandardSamples/MultipleLayoutBuilder.h            | 3 +--
 Sample/StandardSamples/ParacrystalBuilder.h               | 3 +--
 Sample/StandardSamples/ParticleDistributionsBuilder.h     | 3 +--
 Sample/StandardSamples/ParticleInVacuumBuilder.h          | 3 +--
 Sample/StandardSamples/PercusYevickBuilder.h              | 3 +--
 Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h      | 3 +--
 Sample/StandardSamples/ReferenceMaterials.h               | 3 +--
 Sample/StandardSamples/ResonatorBuilder.h                 | 3 +--
 Sample/StandardSamples/RipplesBuilder.h                   | 3 +--
 Sample/StandardSamples/RotatedPyramidsBuilder.h           | 3 +--
 Sample/StandardSamples/SizeDistributionModelsBuilder.h    | 3 +--
 Sample/StandardSamples/SlicedCompositionBuilder.h         | 3 +--
 Sample/StandardSamples/SlicedCylindersBuilder.h           | 3 +--
 Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h     | 3 +--
 Sample/StandardSamples/TransformationsBuilder.h           | 3 +--
 Sample/StandardSamples/TwoDimLatticeBuilder.h             | 3 +--
 Sim/Computation/ComputationStatus.h                       | 3 +--
 Sim/Computation/DWBAComputation.h                         | 3 +--
 Sim/Computation/DepthProbeComputation.h                   | 3 +--
 Sim/Computation/IComputation.h                            | 3 +--
 Sim/Computation/SpecularComputation.h                     | 3 +--
 Sim/Contrib/GISASSpecularContribution.h                   | 3 +--
 Sim/Contrib/ParticleLayoutContribution.h                  | 3 +--
 Sim/Contrib/RoughMultiLayerContribution.h                 | 3 +--
 Sim/Export/ComponentKeyHandler.h                          | 3 +--
 Sim/Export/MaterialKeyHandler.h                           | 3 +--
 Sim/Export/PyFmt2.h                                       | 3 +--
 Sim/Export/PyFmtLimits.h                                  | 3 +--
 Sim/Export/SampleToPython.h                               | 3 +--
 Sim/Export/SimulationToPython.h                           | 3 +--
 Sim/Fitting/FitObserver.h                                 | 3 +--
 Sim/Fitting/FitPrintService.h                             | 3 +--
 Sim/Fitting/FitStatus.h                                   | 3 +--
 Sim/Fitting/FitTypes.h                                    | 3 +--
 Sim/Fitting/ObjectiveMetric.h                             | 3 +--
 Sim/Fitting/ObjectiveMetricUtils.h                        | 3 +--
 Sim/Fitting/SimDataPair.h                                 | 3 +--
 Tests/Functional/Suite/MakeSimulations.h                  | 3 +--
 168 files changed, 168 insertions(+), 336 deletions(-)

diff --git a/Base/Const/PhysicalConstants.h b/Base/Const/PhysicalConstants.h
index a7c73e267a5..97c9ab5545e 100644
--- a/Base/Const/PhysicalConstants.h
+++ b/Base/Const/PhysicalConstants.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_CONST_PHYSICALCONSTANTS_H
 #define BORNAGAIN_BASE_CONST_PHYSICALCONSTANTS_H
diff --git a/Base/Element/DepthProbeElement.h b/Base/Element/DepthProbeElement.h
index 02ba32db6aa..b2c2a92d19d 100644
--- a/Base/Element/DepthProbeElement.h
+++ b/Base/Element/DepthProbeElement.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
 #define BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
diff --git a/Base/Element/IElement.h b/Base/Element/IElement.h
index f13670c362c..0a1cad272f2 100644
--- a/Base/Element/IElement.h
+++ b/Base/Element/IElement.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_ELEMENT_IELEMENT_H
 #define BORNAGAIN_BASE_ELEMENT_IELEMENT_H
diff --git a/Base/Element/PolMatrices.h b/Base/Element/PolMatrices.h
index 817c07e659a..05c338767b6 100644
--- a/Base/Element/PolMatrices.h
+++ b/Base/Element/PolMatrices.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_ELEMENT_POLMATRICES_H
 #define BORNAGAIN_BASE_ELEMENT_POLMATRICES_H
diff --git a/Base/Math/Bessel.h b/Base/Math/Bessel.h
index 841f9a5d17d..9b18d1ee49e 100644
--- a/Base/Math/Bessel.h
+++ b/Base/Math/Bessel.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_BESSEL_H
 #define BORNAGAIN_BASE_MATH_BESSEL_H
diff --git a/Base/Math/Constants.h b/Base/Math/Constants.h
index 2a208023404..7bd976b860c 100644
--- a/Base/Math/Constants.h
+++ b/Base/Math/Constants.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_CONSTANTS_H
 #define BORNAGAIN_BASE_MATH_CONSTANTS_H
diff --git a/Base/Math/FourierTransform.h b/Base/Math/FourierTransform.h
index 30db4b8c757..61eaf103a37 100644
--- a/Base/Math/FourierTransform.h
+++ b/Base/Math/FourierTransform.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_FOURIERTRANSFORM_H
 #define BORNAGAIN_BASE_MATH_FOURIERTRANSFORM_H
diff --git a/Base/Math/Functions.h b/Base/Math/Functions.h
index e80025d461e..3686099fc7d 100644
--- a/Base/Math/Functions.h
+++ b/Base/Math/Functions.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_FUNCTIONS_H
 #define BORNAGAIN_BASE_MATH_FUNCTIONS_H
diff --git a/Base/Math/IntegratorGK.h b/Base/Math/IntegratorGK.h
index 2c2f8b4552f..e315d77d1b8 100644
--- a/Base/Math/IntegratorGK.h
+++ b/Base/Math/IntegratorGK.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_INTEGRATORGK_H
 #define BORNAGAIN_BASE_MATH_INTEGRATORGK_H
diff --git a/Base/Math/IntegratorMCMiser.h b/Base/Math/IntegratorMCMiser.h
index fd760aef911..40e65f53c40 100644
--- a/Base/Math/IntegratorMCMiser.h
+++ b/Base/Math/IntegratorMCMiser.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_INTEGRATORMCMISER_H
 #define BORNAGAIN_BASE_MATH_INTEGRATORMCMISER_H
diff --git a/Base/Math/Numeric.h b/Base/Math/Numeric.h
index 04d3da72186..3ea2433b887 100644
--- a/Base/Math/Numeric.h
+++ b/Base/Math/Numeric.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_MATH_NUMERIC_H
 #define BORNAGAIN_BASE_MATH_NUMERIC_H
diff --git a/Base/Pixel/IPixel.h b/Base/Pixel/IPixel.h
index feca6d87235..8968285a393 100644
--- a/Base/Pixel/IPixel.h
+++ b/Base/Pixel/IPixel.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PIXEL_IPIXEL_H
 #define BORNAGAIN_BASE_PIXEL_IPIXEL_H
diff --git a/Base/Pixel/RectangularPixel.h b/Base/Pixel/RectangularPixel.h
index f11c1612f02..910b3fc1619 100644
--- a/Base/Pixel/RectangularPixel.h
+++ b/Base/Pixel/RectangularPixel.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PIXEL_RECTANGULARPIXEL_H
 #define BORNAGAIN_BASE_PIXEL_RECTANGULARPIXEL_H
diff --git a/Base/Pixel/SphericalPixel.h b/Base/Pixel/SphericalPixel.h
index cde289a3782..f5c4c947efe 100644
--- a/Base/Pixel/SphericalPixel.h
+++ b/Base/Pixel/SphericalPixel.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PIXEL_SPHERICALPIXEL_H
 #define BORNAGAIN_BASE_PIXEL_SPHERICALPIXEL_H
diff --git a/Base/Progress/DelayedProgressCounter.h b/Base/Progress/DelayedProgressCounter.h
index 18b9a19103c..cf416ee32c0 100644
--- a/Base/Progress/DelayedProgressCounter.h
+++ b/Base/Progress/DelayedProgressCounter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PROGRESS_DELAYEDPROGRESSCOUNTER_H
 #define BORNAGAIN_BASE_PROGRESS_DELAYEDPROGRESSCOUNTER_H
diff --git a/Base/Progress/ProgressHandler.h b/Base/Progress/ProgressHandler.h
index 87d633e367e..61f8ef1b50a 100644
--- a/Base/Progress/ProgressHandler.h
+++ b/Base/Progress/ProgressHandler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PROGRESS_PROGRESSHANDLER_H
 #define BORNAGAIN_BASE_PROGRESS_PROGRESSHANDLER_H
diff --git a/Base/Py/PyCore.h b/Base/Py/PyCore.h
index 87ea5646bea..84df540fb15 100644
--- a/Base/Py/PyCore.h
+++ b/Base/Py/PyCore.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PY_PYCORE_H
 #define BORNAGAIN_BASE_PY_PYCORE_H
diff --git a/Base/Py/PyFmt.h b/Base/Py/PyFmt.h
index 83d82883c35..2de2c02880e 100644
--- a/Base/Py/PyFmt.h
+++ b/Base/Py/PyFmt.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PY_PYFMT_H
 #define BORNAGAIN_BASE_PY_PYFMT_H
diff --git a/Base/Py/PyObject.h b/Base/Py/PyObject.h
index 52e56f1d519..e79ece136ba 100644
--- a/Base/Py/PyObject.h
+++ b/Base/Py/PyObject.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PY_PYOBJECT_H
 #define BORNAGAIN_BASE_PY_PYOBJECT_H
diff --git a/Base/Py/PyUtils.h b/Base/Py/PyUtils.h
index 5fa1954ecaf..2e3c4a3e5b9 100644
--- a/Base/Py/PyUtils.h
+++ b/Base/Py/PyUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_PY_PYUTILS_H
 #define BORNAGAIN_BASE_PY_PYUTILS_H
diff --git a/Base/Types/CloneableVector.h b/Base/Types/CloneableVector.h
index 4150b5fecdf..6001c65a22b 100644
--- a/Base/Types/CloneableVector.h
+++ b/Base/Types/CloneableVector.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
 #define BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
diff --git a/Base/Types/OwningVector.h b/Base/Types/OwningVector.h
index 55e7f75917b..a6f0ec31e83 100644
--- a/Base/Types/OwningVector.h
+++ b/Base/Types/OwningVector.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
 #define BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
diff --git a/Base/Util/Algorithms.h b/Base/Util/Algorithms.h
index f7512524be8..f9a9875db4d 100644
--- a/Base/Util/Algorithms.h
+++ b/Base/Util/Algorithms.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_ALGORITHMS_H
 #define BORNAGAIN_BASE_UTIL_ALGORITHMS_H
diff --git a/Base/Util/Assert.h b/Base/Util/Assert.h
index 89d53195d4d..155b9f72433 100644
--- a/Base/Util/Assert.h
+++ b/Base/Util/Assert.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_ASSERT_H
 #define BORNAGAIN_BASE_UTIL_ASSERT_H
diff --git a/Base/Util/FileSystemUtils.h b/Base/Util/FileSystemUtils.h
index e10da5577a4..72e2c19cf56 100644
--- a/Base/Util/FileSystemUtils.h
+++ b/Base/Util/FileSystemUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
 #define BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
diff --git a/Base/Util/StringUtils.h b/Base/Util/StringUtils.h
index 0063c07a393..90b12c45670 100644
--- a/Base/Util/StringUtils.h
+++ b/Base/Util/StringUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_STRINGUTILS_H
 #define BORNAGAIN_BASE_UTIL_STRINGUTILS_H
diff --git a/Base/Util/SysUtils.h b/Base/Util/SysUtils.h
index cd17cd667b4..fbc62383865 100644
--- a/Base/Util/SysUtils.h
+++ b/Base/Util/SysUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_SYSUTILS_H
 #define BORNAGAIN_BASE_UTIL_SYSUTILS_H
diff --git a/Base/Vector/WavevectorInfo.h b/Base/Vector/WavevectorInfo.h
index 39d124c2251..632ff9e0fd0 100644
--- a/Base/Vector/WavevectorInfo.h
+++ b/Base/Vector/WavevectorInfo.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
 #define BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
diff --git a/Device/Coord/AxisNames.h b/Device/Coord/AxisNames.h
index 66d5405819e..f7e89e79da7 100644
--- a/Device/Coord/AxisNames.h
+++ b/Device/Coord/AxisNames.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_COORD_AXISNAMES_H
 #define BORNAGAIN_DEVICE_COORD_AXISNAMES_H
diff --git a/Device/Coord/CoordSystem1D.h b/Device/Coord/CoordSystem1D.h
index f954f6aadc9..08065754885 100644
--- a/Device/Coord/CoordSystem1D.h
+++ b/Device/Coord/CoordSystem1D.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_COORD_COORDSYSTEM1D_H
 #define BORNAGAIN_DEVICE_COORD_COORDSYSTEM1D_H
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index 84965bcad6f..376610191bf 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_COORD_COORDSYSTEM2D_H
 #define BORNAGAIN_DEVICE_COORD_COORDSYSTEM2D_H
diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h
index 2cb36590166..6769871cc91 100644
--- a/Device/Coord/ICoordSystem.h
+++ b/Device/Coord/ICoordSystem.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H
 #define BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H
diff --git a/Device/Data/ArrayUtils.h b/Device/Data/ArrayUtils.h
index fb091a85460..acc6f888b95 100644
--- a/Device/Data/ArrayUtils.h
+++ b/Device/Data/ArrayUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
 #define BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
diff --git a/Device/Detector/SimulationAreaIterator.h b/Device/Detector/SimulationAreaIterator.h
index 0898abe122e..efc20447bc0 100644
--- a/Device/Detector/SimulationAreaIterator.h
+++ b/Device/Detector/SimulationAreaIterator.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
 #define BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
diff --git a/Device/IO/DataFormatUtils.h b/Device/IO/DataFormatUtils.h
index 8f577cfe136..2fc28d1ac88 100644
--- a/Device/IO/DataFormatUtils.h
+++ b/Device/IO/DataFormatUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_DATAFORMATUTILS_H
 #define BORNAGAIN_DEVICE_IO_DATAFORMATUTILS_H
diff --git a/Device/IO/ReadReflectometry.h b/Device/IO/ReadReflectometry.h
index e2afa12accf..e455a8c7a94 100644
--- a/Device/IO/ReadReflectometry.h
+++ b/Device/IO/ReadReflectometry.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_READREFLECTOMETRY_H
 #define BORNAGAIN_DEVICE_IO_READREFLECTOMETRY_H
diff --git a/Device/IO/ReadWriteINT.h b/Device/IO/ReadWriteINT.h
index 62fa535a2d1..0601d3311e1 100644
--- a/Device/IO/ReadWriteINT.h
+++ b/Device/IO/ReadWriteINT.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_READWRITEINT_H
 #define BORNAGAIN_DEVICE_IO_READWRITEINT_H
diff --git a/Device/IO/ReadWriteNumpyTXT.h b/Device/IO/ReadWriteNumpyTXT.h
index 7d2b14f97f0..c5b713730f5 100644
--- a/Device/IO/ReadWriteNumpyTXT.h
+++ b/Device/IO/ReadWriteNumpyTXT.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_READWRITENUMPYTXT_H
 #define BORNAGAIN_DEVICE_IO_READWRITENUMPYTXT_H
diff --git a/Device/IO/ReadWriteTiff.h b/Device/IO/ReadWriteTiff.h
index d99064b04c4..01a14c1817f 100644
--- a/Device/IO/ReadWriteTiff.h
+++ b/Device/IO/ReadWriteTiff.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_READWRITETIFF_H
 #define BORNAGAIN_DEVICE_IO_READWRITETIFF_H
diff --git a/Device/IO/boost_streams.h b/Device/IO/boost_streams.h
index a40d7f793ea..e38b6bb8be2 100644
--- a/Device/IO/boost_streams.h
+++ b/Device/IO/boost_streams.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_IO_BOOST_STREAMS_H
 #define BORNAGAIN_DEVICE_IO_BOOST_STREAMS_H
diff --git a/Device/Mask/InfinitePlane.h b/Device/Mask/InfinitePlane.h
index 0eccf4fc190..6a916525208 100644
--- a/Device/Mask/InfinitePlane.h
+++ b/Device/Mask/InfinitePlane.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_MASK_INFINITEPLANE_H
 #define BORNAGAIN_DEVICE_MASK_INFINITEPLANE_H
diff --git a/Device/Resolution/ConvolutionDetectorResolution.h b/Device/Resolution/ConvolutionDetectorResolution.h
index 1745d6fc088..f9fc3cc31d6 100644
--- a/Device/Resolution/ConvolutionDetectorResolution.h
+++ b/Device/Resolution/ConvolutionDetectorResolution.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_RESOLUTION_CONVOLUTIONDETECTORRESOLUTION_H
 #define BORNAGAIN_DEVICE_RESOLUTION_CONVOLUTIONDETECTORRESOLUTION_H
diff --git a/Device/Resolution/Convolve.h b/Device/Resolution/Convolve.h
index ce957c0b36e..e1ee311ee57 100644
--- a/Device/Resolution/Convolve.h
+++ b/Device/Resolution/Convolve.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
 #define BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
diff --git a/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
index 9e213a6fb3b..633f95c7e3e 100644
--- a/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
 #define BORNAGAIN_FIT_ADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
diff --git a/Fit/Adapter/GSLMultiMinimizer.h b/Fit/Adapter/GSLMultiMinimizer.h
index 50cfe3a9cb3..47144552b6a 100644
--- a/Fit/Adapter/GSLMultiMinimizer.h
+++ b/Fit/Adapter/GSLMultiMinimizer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_GSLMULTIMINIMIZER_H
 #define BORNAGAIN_FIT_ADAPTER_GSLMULTIMINIMIZER_H
diff --git a/Fit/Adapter/GeneticMinimizer.h b/Fit/Adapter/GeneticMinimizer.h
index f262de411a3..a43432547df 100644
--- a/Fit/Adapter/GeneticMinimizer.h
+++ b/Fit/Adapter/GeneticMinimizer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_GENETICMINIMIZER_H
 #define BORNAGAIN_FIT_ADAPTER_GENETICMINIMIZER_H
diff --git a/Fit/Adapter/IFunctionAdapter.h b/Fit/Adapter/IFunctionAdapter.h
index 2be5ba4ddf7..77a9be2123e 100644
--- a/Fit/Adapter/IFunctionAdapter.h
+++ b/Fit/Adapter/IFunctionAdapter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_IFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ADAPTER_IFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/MinimizerAdapter.h b/Fit/Adapter/MinimizerAdapter.h
index df74c6d649b..60c5f9492d0 100644
--- a/Fit/Adapter/MinimizerAdapter.h
+++ b/Fit/Adapter/MinimizerAdapter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_MINIMIZERADAPTER_H
 #define BORNAGAIN_FIT_ADAPTER_MINIMIZERADAPTER_H
diff --git a/Fit/Adapter/Minuit2Minimizer.h b/Fit/Adapter/Minuit2Minimizer.h
index df0c9ee4fae..6b64be2fd18 100644
--- a/Fit/Adapter/Minuit2Minimizer.h
+++ b/Fit/Adapter/Minuit2Minimizer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_MINUIT2MINIMIZER_H
 #define BORNAGAIN_FIT_ADAPTER_MINUIT2MINIMIZER_H
diff --git a/Fit/Adapter/ObjectiveFunctionAdapter.h b/Fit/Adapter/ObjectiveFunctionAdapter.h
index a9dfdc6935b..82e304d2b21 100644
--- a/Fit/Adapter/ObjectiveFunctionAdapter.h
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_OBJECTIVEFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ADAPTER_OBJECTIVEFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/Report.h b/Fit/Adapter/Report.h
index 8b1d12089a2..30ccbd28c4d 100644
--- a/Fit/Adapter/Report.h
+++ b/Fit/Adapter/Report.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_REPORT_H
 #define BORNAGAIN_FIT_ADAPTER_REPORT_H
diff --git a/Fit/Adapter/ResidualFunctionAdapter.h b/Fit/Adapter/ResidualFunctionAdapter.h
index 4a9be343a3d..40b03d763bc 100644
--- a/Fit/Adapter/ResidualFunctionAdapter.h
+++ b/Fit/Adapter/ResidualFunctionAdapter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_RESIDUALFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ADAPTER_RESIDUALFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/RootResidualFunction.h b/Fit/Adapter/RootResidualFunction.h
index e1ebe4a3528..6f29146ee21 100644
--- a/Fit/Adapter/RootResidualFunction.h
+++ b/Fit/Adapter/RootResidualFunction.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_ROOTRESIDUALFUNCTION_H
 #define BORNAGAIN_FIT_ADAPTER_ROOTRESIDUALFUNCTION_H
diff --git a/Fit/Adapter/RootScalarFunction.h b/Fit/Adapter/RootScalarFunction.h
index fd3db0b242d..3b2fa817824 100644
--- a/Fit/Adapter/RootScalarFunction.h
+++ b/Fit/Adapter/RootScalarFunction.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_ROOTSCALARFUNCTION_H
 #define BORNAGAIN_FIT_ADAPTER_ROOTSCALARFUNCTION_H
diff --git a/Fit/Adapter/ScalarFunctionAdapter.h b/Fit/Adapter/ScalarFunctionAdapter.h
index bf72d50b1f6..d0588088993 100644
--- a/Fit/Adapter/ScalarFunctionAdapter.h
+++ b/Fit/Adapter/ScalarFunctionAdapter.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_SCALARFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ADAPTER_SCALARFUNCTIONADAPTER_H
diff --git a/Fit/Adapter/SimAnMinimizer.h b/Fit/Adapter/SimAnMinimizer.h
index 38ad18b0bef..a050459eae6 100644
--- a/Fit/Adapter/SimAnMinimizer.h
+++ b/Fit/Adapter/SimAnMinimizer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_ADAPTER_SIMANMINIMIZER_H
 #define BORNAGAIN_FIT_ADAPTER_SIMANMINIMIZER_H
diff --git a/Fit/Kernel/Kernel.h b/Fit/Kernel/Kernel.h
index 9067aaba355..a623a0c10f8 100644
--- a/Fit/Kernel/Kernel.h
+++ b/Fit/Kernel/Kernel.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_KERNEL_KERNEL_H
 #define BORNAGAIN_FIT_KERNEL_KERNEL_H
diff --git a/Fit/Minimizer/MinimizerOptions.h b/Fit/Minimizer/MinimizerOptions.h
index c806b9b7a94..0a798981d69 100644
--- a/Fit/Minimizer/MinimizerOptions.h
+++ b/Fit/Minimizer/MinimizerOptions.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZEROPTIONS_H
 #define BORNAGAIN_FIT_MINIMIZER_MINIMIZEROPTIONS_H
diff --git a/Fit/Minimizer/Types.h b/Fit/Minimizer/Types.h
index 2ae44be5bbb..d51c04db3f9 100644
--- a/Fit/Minimizer/Types.h
+++ b/Fit/Minimizer/Types.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_MINIMIZER_TYPES_H
 #define BORNAGAIN_FIT_MINIMIZER_TYPES_H
diff --git a/Fit/TestEngine/MinimizerTestPlan.h b/Fit/TestEngine/MinimizerTestPlan.h
index bd3c266a87b..01ebe00d9e0 100644
--- a/Fit/TestEngine/MinimizerTestPlan.h
+++ b/Fit/TestEngine/MinimizerTestPlan.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TESTENGINE_MINIMIZERTESTPLAN_H
 #define BORNAGAIN_FIT_TESTENGINE_MINIMIZERTESTPLAN_H
diff --git a/Fit/Tools/MinimizerUtils.h b/Fit/Tools/MinimizerUtils.h
index a60f7a858a3..966985a110a 100644
--- a/Fit/Tools/MinimizerUtils.h
+++ b/Fit/Tools/MinimizerUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
 #define BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
diff --git a/Fit/Tools/MultiOption.h b/Fit/Tools/MultiOption.h
index c24bc393510..8a26302f07f 100644
--- a/Fit/Tools/MultiOption.h
+++ b/Fit/Tools/MultiOption.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
 #define BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
diff --git a/Fit/Tools/OptionContainer.h b/Fit/Tools/OptionContainer.h
index 44fce8139ee..acc736955a2 100644
--- a/Fit/Tools/OptionContainer.h
+++ b/Fit/Tools/OptionContainer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TOOLS_OPTIONCONTAINER_H
 #define BORNAGAIN_FIT_TOOLS_OPTIONCONTAINER_H
diff --git a/Fit/Tools/StringUtils.h b/Fit/Tools/StringUtils.h
index 0889d56c356..f095b27e84e 100644
--- a/Fit/Tools/StringUtils.h
+++ b/Fit/Tools/StringUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
 #define BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
diff --git a/Fit/Tools/WallclockTimer.h b/Fit/Tools/WallclockTimer.h
index 8a893814673..bbaf6f1fa5b 100644
--- a/Fit/Tools/WallclockTimer.h
+++ b/Fit/Tools/WallclockTimer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
 #define BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
diff --git a/Param/Distrib/DistributionHandler.h b/Param/Distrib/DistributionHandler.h
index 2008e17c697..c073528bd7b 100644
--- a/Param/Distrib/DistributionHandler.h
+++ b/Param/Distrib/DistributionHandler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONHANDLER_H
 #define BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONHANDLER_H
diff --git a/Param/Node/NodeUtils.h b/Param/Node/NodeUtils.h
index 3f39f1a3c11..35291e25c11 100644
--- a/Param/Node/NodeUtils.h
+++ b/Param/Node/NodeUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_PARAM_NODE_NODEUTILS_H
 #define BORNAGAIN_PARAM_NODE_NODEUTILS_H
diff --git a/Resample/Coherence/CoheringSubparticles.h b/Resample/Coherence/CoheringSubparticles.h
index aa086657ea1..f157625d17b 100644
--- a/Resample/Coherence/CoheringSubparticles.h
+++ b/Resample/Coherence/CoheringSubparticles.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_COHERENCE_COHERINGSUBPARTICLES_H
 #define BORNAGAIN_RESAMPLE_COHERENCE_COHERINGSUBPARTICLES_H
diff --git a/Resample/Element/DiffuseElement.h b/Resample/Element/DiffuseElement.h
index deda91f33ff..8539e93d09f 100644
--- a/Resample/Element/DiffuseElement.h
+++ b/Resample/Element/DiffuseElement.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_ELEMENT_DIFFUSEELEMENT_H
 #define BORNAGAIN_RESAMPLE_ELEMENT_DIFFUSEELEMENT_H
diff --git a/Resample/Element/SpecularElement.h b/Resample/Element/SpecularElement.h
index b25c5465466..90979ff44cb 100644
--- a/Resample/Element/SpecularElement.h
+++ b/Resample/Element/SpecularElement.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_ELEMENT_SPECULARELEMENT_H
 #define BORNAGAIN_RESAMPLE_ELEMENT_SPECULARELEMENT_H
diff --git a/Resample/Flux/IFlux.h b/Resample/Flux/IFlux.h
index dd8e96a71c2..53527435b4e 100644
--- a/Resample/Flux/IFlux.h
+++ b/Resample/Flux/IFlux.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_FLUX_IFLUX_H
 #define BORNAGAIN_RESAMPLE_FLUX_IFLUX_H
diff --git a/Resample/Flux/MatrixFlux.h b/Resample/Flux/MatrixFlux.h
index 2653224cabf..f0cab3fd361 100644
--- a/Resample/Flux/MatrixFlux.h
+++ b/Resample/Flux/MatrixFlux.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_FLUX_MATRIXFLUX_H
 #define BORNAGAIN_RESAMPLE_FLUX_MATRIXFLUX_H
diff --git a/Resample/Flux/ScalarFlux.h b/Resample/Flux/ScalarFlux.h
index 8ff88a9dc8b..f79b9452505 100644
--- a/Resample/Flux/ScalarFlux.h
+++ b/Resample/Flux/ScalarFlux.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_FLUX_SCALARFLUX_H
 #define BORNAGAIN_RESAMPLE_FLUX_SCALARFLUX_H
diff --git a/Resample/Interparticle/DecouplingApproximationStrategy.h b/Resample/Interparticle/DecouplingApproximationStrategy.h
index 4d69b16fc28..98f949683b1 100644
--- a/Resample/Interparticle/DecouplingApproximationStrategy.h
+++ b/Resample/Interparticle/DecouplingApproximationStrategy.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_INTERPARTICLE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
 #define BORNAGAIN_RESAMPLE_INTERPARTICLE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
diff --git a/Resample/Interparticle/IInterparticleStrategy.h b/Resample/Interparticle/IInterparticleStrategy.h
index 6f07fdd4dfe..ec893e49ccd 100644
--- a/Resample/Interparticle/IInterparticleStrategy.h
+++ b/Resample/Interparticle/IInterparticleStrategy.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_INTERPARTICLE_IINTERPARTICLESTRATEGY_H
 #define BORNAGAIN_RESAMPLE_INTERPARTICLE_IINTERPARTICLESTRATEGY_H
diff --git a/Resample/Interparticle/SSCAStrategy.h b/Resample/Interparticle/SSCAStrategy.h
index 3e8cded744b..21a78bd7a2a 100644
--- a/Resample/Interparticle/SSCAStrategy.h
+++ b/Resample/Interparticle/SSCAStrategy.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_INTERPARTICLE_SSCASTRATEGY_H
 #define BORNAGAIN_RESAMPLE_INTERPARTICLE_SSCASTRATEGY_H
diff --git a/Resample/Particle/IReParticle.h b/Resample/Particle/IReParticle.h
index db3f32b5990..10c73204215 100644
--- a/Resample/Particle/IReParticle.h
+++ b/Resample/Particle/IReParticle.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PARTICLE_IREPARTICLE_H
 #define BORNAGAIN_RESAMPLE_PARTICLE_IREPARTICLE_H
diff --git a/Resample/Particle/ReCompound.h b/Resample/Particle/ReCompound.h
index 71e8cbf08d8..2b634aeb62a 100644
--- a/Resample/Particle/ReCompound.h
+++ b/Resample/Particle/ReCompound.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PARTICLE_RECOMPOUND_H
 #define BORNAGAIN_RESAMPLE_PARTICLE_RECOMPOUND_H
diff --git a/Resample/Particle/ReMesocrystal.h b/Resample/Particle/ReMesocrystal.h
index e92922a5f89..50783f66de9 100644
--- a/Resample/Particle/ReMesocrystal.h
+++ b/Resample/Particle/ReMesocrystal.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef BORNAGAIN_RESAMPLE_PARTICLE_REMESOCRYSTAL_H
 #define BORNAGAIN_RESAMPLE_PARTICLE_REMESOCRYSTAL_H
 
diff --git a/Resample/Particle/ReParticle.h b/Resample/Particle/ReParticle.h
index 39069f7f974..b91b01d688d 100644
--- a/Resample/Particle/ReParticle.h
+++ b/Resample/Particle/ReParticle.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PARTICLE_REPARTICLE_H
 #define BORNAGAIN_RESAMPLE_PARTICLE_REPARTICLE_H
diff --git a/Resample/Processed/ReLayout.h b/Resample/Processed/ReLayout.h
index 4bf1dc17cf1..f12a65568bd 100644
--- a/Resample/Processed/ReLayout.h
+++ b/Resample/Processed/ReLayout.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PROCESSED_RELAYOUT_H
 #define BORNAGAIN_RESAMPLE_PROCESSED_RELAYOUT_H
diff --git a/Resample/Processed/ReSample.h b/Resample/Processed/ReSample.h
index af73fa07592..b088ebe5c47 100644
--- a/Resample/Processed/ReSample.h
+++ b/Resample/Processed/ReSample.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PROCESSED_RESAMPLE_H
 #define BORNAGAIN_RESAMPLE_PROCESSED_RESAMPLE_H
diff --git a/Resample/Processed/Slicer.h b/Resample/Processed/Slicer.h
index 219abe5f1bb..674249c8bea 100644
--- a/Resample/Processed/Slicer.h
+++ b/Resample/Processed/Slicer.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
 #define BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
diff --git a/Resample/Slice/KzComputation.h b/Resample/Slice/KzComputation.h
index b6926f95922..1c5fb4258c9 100644
--- a/Resample/Slice/KzComputation.h
+++ b/Resample/Slice/KzComputation.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SLICE_KZCOMPUTATION_H
 #define BORNAGAIN_RESAMPLE_SLICE_KZCOMPUTATION_H
diff --git a/Resample/Slice/ProfileHelper.h b/Resample/Slice/ProfileHelper.h
index 349723914a0..2c84d967e71 100644
--- a/Resample/Slice/ProfileHelper.h
+++ b/Resample/Slice/ProfileHelper.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SLICE_PROFILEHELPER_H
 #define BORNAGAIN_RESAMPLE_SLICE_PROFILEHELPER_H
diff --git a/Resample/Slice/Slice.h b/Resample/Slice/Slice.h
index 3df5bff9530..0d4c91765bf 100644
--- a/Resample/Slice/Slice.h
+++ b/Resample/Slice/Slice.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SLICE_SLICE_H
 #define BORNAGAIN_RESAMPLE_SLICE_SLICE_H
diff --git a/Resample/Slice/SliceStack.h b/Resample/Slice/SliceStack.h
index b7ee475cc31..7c0b64c4d49 100644
--- a/Resample/Slice/SliceStack.h
+++ b/Resample/Slice/SliceStack.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SLICE_SLICESTACK_H
 #define BORNAGAIN_RESAMPLE_SLICE_SLICESTACK_H
diff --git a/Resample/Slice/ZLimits.h b/Resample/Slice/ZLimits.h
index 5d26810d9d3..aebd8447e3e 100644
--- a/Resample/Slice/ZLimits.h
+++ b/Resample/Slice/ZLimits.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SLICE_ZLIMITS_H
 #define BORNAGAIN_RESAMPLE_SLICE_ZLIMITS_H
diff --git a/Resample/Specular/ComputeFluxMagnetic.h b/Resample/Specular/ComputeFluxMagnetic.h
index 256cac3e3b7..cae8f7a0b2d 100644
--- a/Resample/Specular/ComputeFluxMagnetic.h
+++ b/Resample/Specular/ComputeFluxMagnetic.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
 #define BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
diff --git a/Resample/Specular/ComputeFluxScalar.h b/Resample/Specular/ComputeFluxScalar.h
index 49683c18216..3b20aed286b 100644
--- a/Resample/Specular/ComputeFluxScalar.h
+++ b/Resample/Specular/ComputeFluxScalar.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXSCALAR_H
 #define BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXSCALAR_H
diff --git a/Resample/Specular/TransitionMagneticNevot.h b/Resample/Specular/TransitionMagneticNevot.h
index 690c4bd81b2..3e89893cd12 100644
--- a/Resample/Specular/TransitionMagneticNevot.h
+++ b/Resample/Specular/TransitionMagneticNevot.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SPECULAR_TRANSITIONMAGNETICNEVOT_H
 #define BORNAGAIN_RESAMPLE_SPECULAR_TRANSITIONMAGNETICNEVOT_H
diff --git a/Resample/Specular/TransitionMagneticTanh.h b/Resample/Specular/TransitionMagneticTanh.h
index 5461b001026..57394a2adcc 100644
--- a/Resample/Specular/TransitionMagneticTanh.h
+++ b/Resample/Specular/TransitionMagneticTanh.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_RESAMPLE_SPECULAR_TRANSITIONMAGNETICTANH_H
 #define BORNAGAIN_RESAMPLE_SPECULAR_TRANSITIONMAGNETICTANH_H
diff --git a/Sample/Aggregate/Interferences.h b/Sample/Aggregate/Interferences.h
index 744b5709e38..bfe70d8dd93 100644
--- a/Sample/Aggregate/Interferences.h
+++ b/Sample/Aggregate/Interferences.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCES_H
 #define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCES_H
diff --git a/Sample/ComponentBuilder/FormFactorComponents.h b/Sample/ComponentBuilder/FormFactorComponents.h
index 3603ded1c6b..ba248f97c4b 100644
--- a/Sample/ComponentBuilder/FormFactorComponents.h
+++ b/Sample/ComponentBuilder/FormFactorComponents.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_COMPONENTBUILDER_FORMFACTORCOMPONENTS_H
 #define BORNAGAIN_SAMPLE_COMPONENTBUILDER_FORMFACTORCOMPONENTS_H
diff --git a/Sample/ComponentBuilder/IRegistry.h b/Sample/ComponentBuilder/IRegistry.h
index 7d9dd87a730..8b97cfd8132 100644
--- a/Sample/ComponentBuilder/IRegistry.h
+++ b/Sample/ComponentBuilder/IRegistry.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_COMPONENTBUILDER_IREGISTRY_H
 #define BORNAGAIN_SAMPLE_COMPONENTBUILDER_IREGISTRY_H
diff --git a/Sample/ComponentBuilder/Profile2DComponents.h b/Sample/ComponentBuilder/Profile2DComponents.h
index 362edaabf9e..e6cfee4688b 100644
--- a/Sample/ComponentBuilder/Profile2DComponents.h
+++ b/Sample/ComponentBuilder/Profile2DComponents.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_COMPONENTBUILDER_PROFILE2DCOMPONENTS_H
 #define BORNAGAIN_SAMPLE_COMPONENTBUILDER_PROFILE2DCOMPONENTS_H
diff --git a/Sample/Correlations/IDistribution1DSampler.h b/Sample/Correlations/IDistribution1DSampler.h
index 07368761958..39022535eef 100644
--- a/Sample/Correlations/IDistribution1DSampler.h
+++ b/Sample/Correlations/IDistribution1DSampler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
 #define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
diff --git a/Sample/Correlations/IDistribution2DSampler.h b/Sample/Correlations/IDistribution2DSampler.h
index 9cbca8e25fc..9f11dd5b6a9 100644
--- a/Sample/Correlations/IDistribution2DSampler.h
+++ b/Sample/Correlations/IDistribution2DSampler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
 #define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
diff --git a/Sample/HardParticle/HardParticles.h b/Sample/HardParticle/HardParticles.h
index b2d415e5bd2..6e16663079e 100644
--- a/Sample/HardParticle/HardParticles.h
+++ b/Sample/HardParticle/HardParticles.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_HARDPARTICLES_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_HARDPARTICLES_H
diff --git a/Sample/HardParticle/Ripples.h b/Sample/HardParticle/Ripples.h
index 27844a3c79f..3371f80523d 100644
--- a/Sample/HardParticle/Ripples.h
+++ b/Sample/HardParticle/Ripples.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_HARDPARTICLE_RIPPLES_H
 #define BORNAGAIN_SAMPLE_HARDPARTICLE_RIPPLES_H
diff --git a/Sample/Interface/LayerInterface.h b/Sample/Interface/LayerInterface.h
index 1aa7568a908..ce6e53111de 100644
--- a/Sample/Interface/LayerInterface.h
+++ b/Sample/Interface/LayerInterface.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
 #define BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
diff --git a/Sample/LibFF/SomeFormFactors.h b/Sample/LibFF/SomeFormFactors.h
index 3b91fc1a006..fa45f733db1 100644
--- a/Sample/LibFF/SomeFormFactors.h
+++ b/Sample/LibFF/SomeFormFactors.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_LIBFF_SOMEFORMFACTORS_H
 #define BORNAGAIN_SAMPLE_LIBFF_SOMEFORMFACTORS_H
diff --git a/Sample/Material/Admixtures.h b/Sample/Material/Admixtures.h
index 431e380ea7f..787dfec0319 100644
--- a/Sample/Material/Admixtures.h
+++ b/Sample/Material/Admixtures.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_MATERIAL_ADMIXTURES_H
 #define BORNAGAIN_SAMPLE_MATERIAL_ADMIXTURES_H
diff --git a/Sample/Material/MaterialUtils.h b/Sample/Material/MaterialUtils.h
index 9e4eea1e047..655b28801b8 100644
--- a/Sample/Material/MaterialUtils.h
+++ b/Sample/Material/MaterialUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
 #define BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
diff --git a/Sample/Multilayer/PyImport.h b/Sample/Multilayer/PyImport.h
index ed407d63278..30240614ce9 100644
--- a/Sample/Multilayer/PyImport.h
+++ b/Sample/Multilayer/PyImport.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_MULTILAYER_PYIMPORT_H
 #define BORNAGAIN_SAMPLE_MULTILAYER_PYIMPORT_H
diff --git a/Sample/Particle/PolyhedralUtil.h b/Sample/Particle/PolyhedralUtil.h
index d94871290f8..1e030da80a5 100644
--- a/Sample/Particle/PolyhedralUtil.h
+++ b/Sample/Particle/PolyhedralUtil.h
@@ -15,8 +15,7 @@
 // Cannot be exposed to Swig unless we have the default constructor
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_PARTICLE_POLYHEDRALUTIL_H
 #define BORNAGAIN_SAMPLE_PARTICLE_POLYHEDRALUTIL_H
diff --git a/Sample/Shapes/BoxNet.h b/Sample/Shapes/BoxNet.h
index 7ecb9e28f73..ab2c6440f37 100644
--- a/Sample/Shapes/BoxNet.h
+++ b/Sample/Shapes/BoxNet.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_BOXNET_H
 #define BORNAGAIN_SAMPLE_SHAPES_BOXNET_H
diff --git a/Sample/Shapes/DoubleEllipse.h b/Sample/Shapes/DoubleEllipse.h
index 08d61c75a85..52c37ffa282 100644
--- a/Sample/Shapes/DoubleEllipse.h
+++ b/Sample/Shapes/DoubleEllipse.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
 #define BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
diff --git a/Sample/Shapes/IShape3D.h b/Sample/Shapes/IShape3D.h
index caaf773109d..871025951a1 100644
--- a/Sample/Shapes/IShape3D.h
+++ b/Sample/Shapes/IShape3D.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_ISHAPE3D_H
 #define BORNAGAIN_SAMPLE_SHAPES_ISHAPE3D_H
diff --git a/Sample/Shapes/RippleCosineNet.h b/Sample/Shapes/RippleCosineNet.h
index 2e81d62f9c9..6c3b400ae9e 100644
--- a/Sample/Shapes/RippleCosineNet.h
+++ b/Sample/Shapes/RippleCosineNet.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINENET_H
 #define BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINENET_H
diff --git a/Sample/Shapes/RippleSawtoothNet.h b/Sample/Shapes/RippleSawtoothNet.h
index f69f742762e..5d70f8c8459 100644
--- a/Sample/Shapes/RippleSawtoothNet.h
+++ b/Sample/Shapes/RippleSawtoothNet.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTHNET_H
 #define BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTHNET_H
diff --git a/Sample/Shapes/TruncatedEllipsoidNet.h b/Sample/Shapes/TruncatedEllipsoidNet.h
index 92610abb9d2..8f699006357 100644
--- a/Sample/Shapes/TruncatedEllipsoidNet.h
+++ b/Sample/Shapes/TruncatedEllipsoidNet.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOIDNET_H
 #define BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOIDNET_H
diff --git a/Sample/SoftParticle/SoftParticles.h b/Sample/SoftParticle/SoftParticles.h
index 7be7ba25c79..9f0e30ed621 100644
--- a/Sample/SoftParticle/SoftParticles.h
+++ b/Sample/SoftParticle/SoftParticles.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_SOFTPARTICLE_SOFTPARTICLES_H
 #define BORNAGAIN_SAMPLE_SOFTPARTICLE_SOFTPARTICLES_H
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.h b/Sample/StandardSamples/BoxCompositionBuilder.h
index 44d5ff1cb53..429c4adffc7 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.h
+++ b/Sample/StandardSamples/BoxCompositionBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h b/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
index 2c6039cae5c..ebf536d9b45 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+++ b/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
diff --git a/Sample/StandardSamples/CompoundBuilder.h b/Sample/StandardSamples/CompoundBuilder.h
index 704d8ff8ccb..58ba56009fb 100644
--- a/Sample/StandardSamples/CompoundBuilder.h
+++ b/Sample/StandardSamples/CompoundBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
diff --git a/Sample/StandardSamples/CoreAndShellBuilder.h b/Sample/StandardSamples/CoreAndShellBuilder.h
index 6800fc37615..bf7143602b4 100644
--- a/Sample/StandardSamples/CoreAndShellBuilder.h
+++ b/Sample/StandardSamples/CoreAndShellBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.h b/Sample/StandardSamples/CustomMorphologyBuilder.h
index a046d835738..bb7a4c32b5f 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.h
+++ b/Sample/StandardSamples/CustomMorphologyBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.h b/Sample/StandardSamples/CylindersAndPrismsBuilder.h
index 1e00118aa9e..4033f718a4d 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Sample/StandardSamples/CylindersAndPrismsBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
diff --git a/Sample/StandardSamples/CylindersBuilder.h b/Sample/StandardSamples/CylindersBuilder.h
index 8bfc058f811..190700b3f65 100644
--- a/Sample/StandardSamples/CylindersBuilder.h
+++ b/Sample/StandardSamples/CylindersBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.h b/Sample/StandardSamples/FeNiBilayerBuilder.h
index 9b9aa83dec9..d9c0a8c7880 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.h
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.h
@@ -15,8 +15,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h b/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
index 36b938befcf..dc77b0f1926 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+++ b/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
diff --git a/Sample/StandardSamples/LatticeBuilder.h b/Sample/StandardSamples/LatticeBuilder.h
index 7e985a92510..f246be0f2b3 100644
--- a/Sample/StandardSamples/LatticeBuilder.h
+++ b/Sample/StandardSamples/LatticeBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h b/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
index 730808a3f73..caa0c023bf4 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
index 13a8b2f9e0c..2e1dfaf6a98 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+++ b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.h b/Sample/StandardSamples/MagneticLayersBuilder.h
index df4aeead574..bccc5453d96 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.h
+++ b/Sample/StandardSamples/MagneticLayersBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.h b/Sample/StandardSamples/MagneticParticlesBuilder.h
index 469984db84b..bdc7c667f4c 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.h
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
diff --git a/Sample/StandardSamples/MesocrystalBuilder.h b/Sample/StandardSamples/MesocrystalBuilder.h
index 2ca175b26b6..7ac8cd140ea 100644
--- a/Sample/StandardSamples/MesocrystalBuilder.h
+++ b/Sample/StandardSamples/MesocrystalBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
index 24f225cd3ad..e6a07e8a20b 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
index c464f30f6f3..05a5f75fff9 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.h b/Sample/StandardSamples/MultipleLayoutBuilder.h
index cab1f32e4af..bd3b241085e 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.h
+++ b/Sample/StandardSamples/MultipleLayoutBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
diff --git a/Sample/StandardSamples/ParacrystalBuilder.h b/Sample/StandardSamples/ParacrystalBuilder.h
index ef0993c6ca6..6b6ba7c8b4d 100644
--- a/Sample/StandardSamples/ParacrystalBuilder.h
+++ b/Sample/StandardSamples/ParacrystalBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.h b/Sample/StandardSamples/ParticleDistributionsBuilder.h
index 67e2f99875a..71f68f8c551 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Sample/StandardSamples/ParticleDistributionsBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.h b/Sample/StandardSamples/ParticleInVacuumBuilder.h
index 8faeec1f48a..f9cb731fe29 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.h
+++ b/Sample/StandardSamples/ParticleInVacuumBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
diff --git a/Sample/StandardSamples/PercusYevickBuilder.h b/Sample/StandardSamples/PercusYevickBuilder.h
index 25377baf8dd..d2dda4e9638 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.h
+++ b/Sample/StandardSamples/PercusYevickBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
index d558e075b35..d2aff12c0de 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+++ b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/ReferenceMaterials.h b/Sample/StandardSamples/ReferenceMaterials.h
index bb42b173b20..349c463fdec 100644
--- a/Sample/StandardSamples/ReferenceMaterials.h
+++ b/Sample/StandardSamples/ReferenceMaterials.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
diff --git a/Sample/StandardSamples/ResonatorBuilder.h b/Sample/StandardSamples/ResonatorBuilder.h
index f4543c4507b..710a1535d24 100644
--- a/Sample/StandardSamples/ResonatorBuilder.h
+++ b/Sample/StandardSamples/ResonatorBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
diff --git a/Sample/StandardSamples/RipplesBuilder.h b/Sample/StandardSamples/RipplesBuilder.h
index 94486fe553c..5723194a3d8 100644
--- a/Sample/StandardSamples/RipplesBuilder.h
+++ b/Sample/StandardSamples/RipplesBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.h b/Sample/StandardSamples/RotatedPyramidsBuilder.h
index 70cc017d851..a1e03b08a97 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Sample/StandardSamples/RotatedPyramidsBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.h b/Sample/StandardSamples/SizeDistributionModelsBuilder.h
index 55b82f73bf5..eb64e85d342 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Sample/StandardSamples/SizeDistributionModelsBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.h b/Sample/StandardSamples/SlicedCompositionBuilder.h
index 71074e7cd4c..fa0e172a4a9 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.h
+++ b/Sample/StandardSamples/SlicedCompositionBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.h b/Sample/StandardSamples/SlicedCylindersBuilder.h
index ff388b7b3d9..4482b36d13a 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.h
+++ b/Sample/StandardSamples/SlicedCylindersBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
index 8e8cc2fa408..fe1b73c6e61 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
diff --git a/Sample/StandardSamples/TransformationsBuilder.h b/Sample/StandardSamples/TransformationsBuilder.h
index cac21f5eda2..65d006679c8 100644
--- a/Sample/StandardSamples/TransformationsBuilder.h
+++ b/Sample/StandardSamples/TransformationsBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.h b/Sample/StandardSamples/TwoDimLatticeBuilder.h
index 28af754ce74..a4651422fea 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Sample/StandardSamples/TwoDimLatticeBuilder.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
 #define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
diff --git a/Sim/Computation/ComputationStatus.h b/Sim/Computation/ComputationStatus.h
index 7f79604042d..07c7aab1ac4 100644
--- a/Sim/Computation/ComputationStatus.h
+++ b/Sim/Computation/ComputationStatus.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_COMPUTATION_COMPUTATIONSTATUS_H
 #define BORNAGAIN_SIM_COMPUTATION_COMPUTATIONSTATUS_H
diff --git a/Sim/Computation/DWBAComputation.h b/Sim/Computation/DWBAComputation.h
index ea074ca36cd..ac2dbf420c9 100644
--- a/Sim/Computation/DWBAComputation.h
+++ b/Sim/Computation/DWBAComputation.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_COMPUTATION_DWBACOMPUTATION_H
 #define BORNAGAIN_SIM_COMPUTATION_DWBACOMPUTATION_H
diff --git a/Sim/Computation/DepthProbeComputation.h b/Sim/Computation/DepthProbeComputation.h
index f7ca6e50b51..70954b69d35 100644
--- a/Sim/Computation/DepthProbeComputation.h
+++ b/Sim/Computation/DepthProbeComputation.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_COMPUTATION_DEPTHPROBECOMPUTATION_H
 #define BORNAGAIN_SIM_COMPUTATION_DEPTHPROBECOMPUTATION_H
diff --git a/Sim/Computation/IComputation.h b/Sim/Computation/IComputation.h
index 3accdf85dd5..f1cfab88561 100644
--- a/Sim/Computation/IComputation.h
+++ b/Sim/Computation/IComputation.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_COMPUTATION_ICOMPUTATION_H
 #define BORNAGAIN_SIM_COMPUTATION_ICOMPUTATION_H
diff --git a/Sim/Computation/SpecularComputation.h b/Sim/Computation/SpecularComputation.h
index 564fea49845..f4e4688bf1e 100644
--- a/Sim/Computation/SpecularComputation.h
+++ b/Sim/Computation/SpecularComputation.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_COMPUTATION_SPECULARCOMPUTATION_H
 #define BORNAGAIN_SIM_COMPUTATION_SPECULARCOMPUTATION_H
diff --git a/Sim/Contrib/GISASSpecularContribution.h b/Sim/Contrib/GISASSpecularContribution.h
index fc92a27aeeb..900170a16c4 100644
--- a/Sim/Contrib/GISASSpecularContribution.h
+++ b/Sim/Contrib/GISASSpecularContribution.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_CONTRIB_GISASSPECULARCONTRIBUTION_H
 #define BORNAGAIN_SIM_CONTRIB_GISASSPECULARCONTRIBUTION_H
diff --git a/Sim/Contrib/ParticleLayoutContribution.h b/Sim/Contrib/ParticleLayoutContribution.h
index 8022642d8c8..891ffdb4174 100644
--- a/Sim/Contrib/ParticleLayoutContribution.h
+++ b/Sim/Contrib/ParticleLayoutContribution.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_CONTRIB_PARTICLELAYOUTCONTRIBUTION_H
 #define BORNAGAIN_SIM_CONTRIB_PARTICLELAYOUTCONTRIBUTION_H
diff --git a/Sim/Contrib/RoughMultiLayerContribution.h b/Sim/Contrib/RoughMultiLayerContribution.h
index a32fbc92e0e..24cfb1da7fe 100644
--- a/Sim/Contrib/RoughMultiLayerContribution.h
+++ b/Sim/Contrib/RoughMultiLayerContribution.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_CONTRIB_ROUGHMULTILAYERCONTRIBUTION_H
 #define BORNAGAIN_SIM_CONTRIB_ROUGHMULTILAYERCONTRIBUTION_H
diff --git a/Sim/Export/ComponentKeyHandler.h b/Sim/Export/ComponentKeyHandler.h
index 4bce5784a63..8ea9fd59b8a 100644
--- a/Sim/Export/ComponentKeyHandler.h
+++ b/Sim/Export/ComponentKeyHandler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_COMPONENTKEYHANDLER_H
 #define BORNAGAIN_SIM_EXPORT_COMPONENTKEYHANDLER_H
diff --git a/Sim/Export/MaterialKeyHandler.h b/Sim/Export/MaterialKeyHandler.h
index 9b71f77f8d6..9aa0a700b7e 100644
--- a/Sim/Export/MaterialKeyHandler.h
+++ b/Sim/Export/MaterialKeyHandler.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_MATERIALKEYHANDLER_H
 #define BORNAGAIN_SIM_EXPORT_MATERIALKEYHANDLER_H
diff --git a/Sim/Export/PyFmt2.h b/Sim/Export/PyFmt2.h
index a4bfc80fa62..907fe51f37a 100644
--- a/Sim/Export/PyFmt2.h
+++ b/Sim/Export/PyFmt2.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_PYFMT2_H
 #define BORNAGAIN_SIM_EXPORT_PYFMT2_H
diff --git a/Sim/Export/PyFmtLimits.h b/Sim/Export/PyFmtLimits.h
index fb74fbc1b02..2d57478b768 100644
--- a/Sim/Export/PyFmtLimits.h
+++ b/Sim/Export/PyFmtLimits.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_PYFMTLIMITS_H
 #define BORNAGAIN_SIM_EXPORT_PYFMTLIMITS_H
diff --git a/Sim/Export/SampleToPython.h b/Sim/Export/SampleToPython.h
index c449a0f167a..adcfe1dd70c 100644
--- a/Sim/Export/SampleToPython.h
+++ b/Sim/Export/SampleToPython.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_SAMPLETOPYTHON_H
 #define BORNAGAIN_SIM_EXPORT_SAMPLETOPYTHON_H
diff --git a/Sim/Export/SimulationToPython.h b/Sim/Export/SimulationToPython.h
index b4cc574374f..b306f0e7757 100644
--- a/Sim/Export/SimulationToPython.h
+++ b/Sim/Export/SimulationToPython.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_EXPORT_SIMULATIONTOPYTHON_H
 #define BORNAGAIN_SIM_EXPORT_SIMULATIONTOPYTHON_H
diff --git a/Sim/Fitting/FitObserver.h b/Sim/Fitting/FitObserver.h
index dcd77ce2670..db14f75736a 100644
--- a/Sim/Fitting/FitObserver.h
+++ b/Sim/Fitting/FitObserver.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_FITOBSERVER_H
 #define BORNAGAIN_SIM_FITTING_FITOBSERVER_H
diff --git a/Sim/Fitting/FitPrintService.h b/Sim/Fitting/FitPrintService.h
index 54c82299030..1fe956d7355 100644
--- a/Sim/Fitting/FitPrintService.h
+++ b/Sim/Fitting/FitPrintService.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_FITPRINTSERVICE_H
 #define BORNAGAIN_SIM_FITTING_FITPRINTSERVICE_H
diff --git a/Sim/Fitting/FitStatus.h b/Sim/Fitting/FitStatus.h
index 8432cf0bd6c..85f7a10a75a 100644
--- a/Sim/Fitting/FitStatus.h
+++ b/Sim/Fitting/FitStatus.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_FITSTATUS_H
 #define BORNAGAIN_SIM_FITTING_FITSTATUS_H
diff --git a/Sim/Fitting/FitTypes.h b/Sim/Fitting/FitTypes.h
index 74f3137ee82..3ff664a6af9 100644
--- a/Sim/Fitting/FitTypes.h
+++ b/Sim/Fitting/FitTypes.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_FITTYPES_H
 #define BORNAGAIN_SIM_FITTING_FITTYPES_H
diff --git a/Sim/Fitting/ObjectiveMetric.h b/Sim/Fitting/ObjectiveMetric.h
index fbe69463b0a..ea15a52421e 100644
--- a/Sim/Fitting/ObjectiveMetric.h
+++ b/Sim/Fitting/ObjectiveMetric.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_OBJECTIVEMETRIC_H
 #define BORNAGAIN_SIM_FITTING_OBJECTIVEMETRIC_H
diff --git a/Sim/Fitting/ObjectiveMetricUtils.h b/Sim/Fitting/ObjectiveMetricUtils.h
index 5124db2ed90..9d2ebb43055 100644
--- a/Sim/Fitting/ObjectiveMetricUtils.h
+++ b/Sim/Fitting/ObjectiveMetricUtils.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTILS_H
 #define BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTILS_H
diff --git a/Sim/Fitting/SimDataPair.h b/Sim/Fitting/SimDataPair.h
index acd82725a31..c051ce31a34 100644
--- a/Sim/Fitting/SimDataPair.h
+++ b/Sim/Fitting/SimDataPair.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H
 #define BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H
diff --git a/Tests/Functional/Suite/MakeSimulations.h b/Tests/Functional/Suite/MakeSimulations.h
index cdd2f847268..c3db913ea4c 100644
--- a/Tests/Functional/Suite/MakeSimulations.h
+++ b/Tests/Functional/Suite/MakeSimulations.h
@@ -14,8 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
+#endif // SWIG
 #ifndef USER_API
 #ifndef BORNAGAIN_TESTS_FUNCTIONAL_SUITE_MAKESIMULATIONS_H
 #define BORNAGAIN_TESTS_FUNCTIONAL_SUITE_MAKESIMULATIONS_H
-- 
GitLab