diff --git a/Core/Correlations/FTDecay1D.h b/Core/Correlations/FTDecay1D.h
index 1a6de9bd76b346a7205a79c232e16341156f97ba..977f31d385a36865891b9b1b612766e8700c272b 100644
--- a/Core/Correlations/FTDecay1D.h
+++ b/Core/Correlations/FTDecay1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -100,4 +100,4 @@ private:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
diff --git a/Core/Correlations/FTDecay2D.h b/Core/Correlations/FTDecay2D.h
index 315d8e40d1d3d7df4356d0673e03cce5dd184b8b..a7c1cd57f911aafaa9a93c647b74292595f481cc 100644
--- a/Core/Correlations/FTDecay2D.h
+++ b/Core/Correlations/FTDecay2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -103,4 +103,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
diff --git a/Core/Correlations/FTDistributions1D.h b/Core/Correlations/FTDistributions1D.h
index 4702ae179a28ee01937d04bd9b38dac345b6565e..85987b95377ca266c17f2c1ac9922c8a114cfd79 100644
--- a/Core/Correlations/FTDistributions1D.h
+++ b/Core/Correlations/FTDistributions1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Correlations/IDistribution1DSampler.h"
@@ -176,4 +176,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
diff --git a/Core/Correlations/FTDistributions2D.h b/Core/Correlations/FTDistributions2D.h
index 59fba08a01221d0c0d43a2dbe8c732cd4decb45d..b9af89f7d0f49405cc48c23e8724134bd576e929 100644
--- a/Core/Correlations/FTDistributions2D.h
+++ b/Core/Correlations/FTDistributions2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -156,4 +156,4 @@ protected:
     const double& m_eta;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
diff --git a/Core/Correlations/IDistribution1DSampler.h b/Core/Correlations/IDistribution1DSampler.h
index 8ec301b8c18a24bab900a56407e5c1a19e713885..db8ca13d39ac8de5f4ee696147e9c48cd2761e48 100644
--- a/Core/Correlations/IDistribution1DSampler.h
+++ b/Core/Correlations/IDistribution1DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -76,4 +76,4 @@ private:
     double m_omega;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
diff --git a/Core/Correlations/IDistribution2DSampler.h b/Core/Correlations/IDistribution2DSampler.h
index c47f538393607e7fe8c4da70533ca828622f9133..6415d938c5b375d92b59474d814806de39f68ae7 100644
--- a/Core/Correlations/IDistribution2DSampler.h
+++ b/Core/Correlations/IDistribution2DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <utility>
@@ -79,4 +79,4 @@ private:
     double m_omega_x, m_omega_y;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
diff --git a/Core/Correlations/ILayout.h b/Core/Correlations/ILayout.h
index 9f236f1a2416137ca50e9604097aa777d7293867..2f5c0adf9cbfe814561a6246bfdd85331fd43ba2 100644
--- a/Core/Correlations/ILayout.h
+++ b/Core/Correlations/ILayout.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
-#define BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
+#define BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/SafePointerVector.h"
@@ -63,4 +63,4 @@ protected:
     double m_weight;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
diff --git a/Core/Correlations/IPeakShape.h b/Core/Correlations/IPeakShape.h
index 0f369626916478b23a9257d1c6626193b9f2ab61..0067487823f85b75ea90ab4b63c642ec84595acc 100644
--- a/Core/Correlations/IPeakShape.h
+++ b/Core/Correlations/IPeakShape.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
-#define BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
+#define BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/Integrator.h"
@@ -197,4 +197,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
diff --git a/Core/Export/OrderedMap.h b/Core/Export/OrderedMap.h
index 585e22be315627af3f8b6d5e2ed67676a9b64d3f..616a930c708e4a1693d08a2df0a67ff0f1cb49bf 100644
--- a/Core/Export/OrderedMap.h
+++ b/Core/Export/OrderedMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
-#define BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#ifndef BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
+#define BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
 
 #include "Core/Basics/Assert.h"
 #include <iostream>
@@ -108,4 +108,4 @@ private:
     list_t m_list;
 };
 
-#endif // BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#endif // BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
diff --git a/Core/HardParticle/FormFactorCosineRipple.h b/Core/HardParticle/FormFactorCosineRipple.h
index 2bf7ebd90d3af8532846f28f2329bba0005728f2..863396cc1772fc03d0b78d613b9b9b5d53085961 100644
--- a/Core/HardParticle/FormFactorCosineRipple.h
+++ b/Core/HardParticle/FormFactorCosineRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
 
 #include "Core/HardParticle/IProfileRipple.h"
 
@@ -59,4 +59,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
diff --git a/Core/HardParticle/FormFactorSawtoothRipple.h b/Core/HardParticle/FormFactorSawtoothRipple.h
index d335a40670f55b9cc6d613b33dfe9b3ecc81940a..3637acaa3b7a9289db55669bde40e75cac49e4dd 100644
--- a/Core/HardParticle/FormFactorSawtoothRipple.h
+++ b/Core/HardParticle/FormFactorSawtoothRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
 
 #include "Core/HardParticle/IProfileRipple.h"
 
@@ -59,4 +59,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
diff --git a/Core/HardParticle/IProfileRipple.h b/Core/HardParticle/IProfileRipple.h
index 03060794493f01604d5f8514525986c2e492ba90..c8c2be88181d753c809dda67b3366a70761f74a2 100644
--- a/Core/HardParticle/IProfileRipple.h
+++ b/Core/HardParticle/IProfileRipple.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -83,4 +83,4 @@ private:
     complex_t factor_yz(complex_t qy, complex_t qz) const final;
 };
 
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
diff --git a/Core/Multilayer/SpecularSimulationElement.h b/Core/Multilayer/SpecularSimulationElement.h
index cc632d70c3318a38fc175bd1fde1fffef9e6239c..ade4a2f685e3cc540d2d7425657bd522442dd467 100644
--- a/Core/Multilayer/SpecularSimulationElement.h
+++ b/Core/Multilayer/SpecularSimulationElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
-#define BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/SimulationElement/PolarizationHandler.h"
@@ -67,4 +67,4 @@ private:
     std::function<std::vector<complex_t>(const std::vector<Slice>&)> m_kz_computation;
 };
 
-#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
diff --git a/Core/Parametrization/Distributions.cpp b/Core/Parametrization/Distributions.cpp
index 211c42bc8d8891193b802190f6e92ddea7d65270..9b2debaad75a76720029b4ffe55088a399576044 100644
--- a/Core/Parametrization/Distributions.cpp
+++ b/Core/Parametrization/Distributions.cpp
@@ -16,8 +16,8 @@
 #include "Core/Basics/Exceptions.h"
 #include "Core/Basics/MathConstants.h"
 #include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
 #include "Core/Parametrization/ParameterSample.h"
+#include "Core/Parametrization/RealParameter.h"
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/Core/RT/ILayerRTCoefficients.h b/Core/RT/ILayerRTCoefficients.h
index 2ef9d2f726f6e90b5caad3f9abcf5382334f7652..dfeba8d7162f05a9d0aef2b22d565d91e3e8667a 100644
--- a/Core/RT/ILayerRTCoefficients.h
+++ b/Core/RT/ILayerRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Basics/Exceptions.h"
@@ -62,4 +62,4 @@ public:
     }
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients.h b/Core/RT/MatrixRTCoefficients.h
index 75335d0855d23e6e8e5318c1283fe848c249dbdf..b8c6424a9458c18e98516a3499f71533b4cf7cde 100644
--- a/Core/RT/MatrixRTCoefficients.h
+++ b/Core/RT/MatrixRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
 
 #include "Core/RT/ILayerRTCoefficients.h"
 
@@ -67,4 +67,4 @@ public:
                                      //!< lambda=0
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients_v2.h b/Core/RT/MatrixRTCoefficients_v2.h
index bd04b2044ee57560e2df92f3afffc4d6c6f0aa68..46aad9b26f74b2695ccd80d9d600bb0369465242 100644
--- a/Core/RT/MatrixRTCoefficients_v2.h
+++ b/Core/RT/MatrixRTCoefficients_v2.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
 
 #include "Core/RT/ILayerRTCoefficients.h"
 #include "Core/Vector/Vectors3D.h"
@@ -65,4 +65,4 @@ private:
                          //!< the second eigenmode
 };
 
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
diff --git a/Core/RT/ScalarRTCoefficients.h b/Core/RT/ScalarRTCoefficients.h
index 206fcabcfdbe09e80972b697fd49b57ef91338ff..9f1d4bffee66739c81dfb96881a4a0a5c895efb3 100644
--- a/Core/RT/ScalarRTCoefficients.h
+++ b/Core/RT/ScalarRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/RT/ILayerRTCoefficients.h"
@@ -139,4 +139,4 @@ inline complex_t ScalarRTCoefficients::getScalarT() const
     return t_r(0);
 }
 
-#endif // BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
diff --git a/Core/Simulation/SimulationFactory.h b/Core/Simulation/SimulationFactory.h
index 4af257cb2c79e6be81899463c6cdd88c1d62ee60..af9421d159b426c66888da653efcdb47a5f389ff 100644
--- a/Core/Simulation/SimulationFactory.h
+++ b/Core/Simulation/SimulationFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
+#define BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
 
 #include "Core/Simulation/GISASSimulation.h"
 #include "Fit/TestEngine/IFactory.h"
@@ -29,4 +29,4 @@ public:
     SimulationFactory();
 };
 
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#endif // BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
diff --git a/Core/Simulation/StandardSimulations.h b/Core/Simulation/StandardSimulations.h
index 2af738b7c9139814c4bfbd1ae86211357bcf7894..9593bf24549f6acedf3819dd3594a5a51900f186 100644
--- a/Core/Simulation/StandardSimulations.h
+++ b/Core/Simulation/StandardSimulations.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#ifndef BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
+#define BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -82,4 +82,4 @@ BA_CORE_API_ DepthProbeSimulation* BasicDepthProbe();
 
 } // namespace StandardSimulations
 
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#endif // BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H