From 54ade2c110040b5fa568e23c313edb5830f6d5ce Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 6 Jul 2020 22:04:14 +0200
Subject: [PATCH] Include guards now made of full path

As recommended by
https://google.github.io/styleguide/cppguide.html#The__define_Guard
---
 Core/Aggregate/FTDecayFunctions.h                           | 6 +++---
 Core/Aggregate/FTDistributions1D.h                          | 6 +++---
 Core/Aggregate/FTDistributions2D.h                          | 6 +++---
 Core/Aggregate/FormFactorCoherentPart.h                     | 6 +++---
 Core/Aggregate/FormFactorCoherentSum.h                      | 6 +++---
 Core/Aggregate/IDistribution1DSampler.h                     | 6 +++---
 Core/Aggregate/IDistribution2DSampler.h                     | 6 +++---
 Core/Aggregate/IInterferenceFunction.h                      | 6 +++---
 Core/Aggregate/ILayout.h                                    | 6 +++---
 Core/Aggregate/IPeakShape.h                                 | 6 +++---
 Core/Aggregate/InterferenceFunction1DLattice.h              | 6 +++---
 Core/Aggregate/InterferenceFunction2DLattice.h              | 6 +++---
 Core/Aggregate/InterferenceFunction2DParaCrystal.h          | 6 +++---
 Core/Aggregate/InterferenceFunction2DSuperLattice.h         | 6 +++---
 Core/Aggregate/InterferenceFunction3DLattice.h              | 6 +++---
 Core/Aggregate/InterferenceFunctionFinite2DLattice.h        | 6 +++---
 Core/Aggregate/InterferenceFunctionFinite3DLattice.h        | 6 +++---
 Core/Aggregate/InterferenceFunctionHardDisk.h               | 6 +++---
 Core/Aggregate/InterferenceFunctionNone.h                   | 6 +++---
 Core/Aggregate/InterferenceFunctionRadialParaCrystal.h      | 6 +++---
 Core/Aggregate/InterferenceFunctionTwin.h                   | 6 +++---
 Core/Aggregate/ParticleLayout.h                             | 6 +++---
 Core/Basics/Algorithms.h                                    | 6 +++---
 Core/Basics/BornAgainNamespace.h                            | 6 +++---
 Core/Basics/Complex.h                                       | 6 +++---
 Core/Basics/Exceptions.h                                    | 6 +++---
 Core/Basics/ICloneable.h                                    | 6 +++---
 Core/Basics/INamed.h                                        | 6 +++---
 Core/Basics/ISingleton.h                                    | 6 +++---
 Core/Basics/MathConstants.h                                 | 6 +++---
 Core/Basics/PhysicalConstants.h                             | 6 +++---
 Core/Beam/Beam.h                                            | 6 +++---
 Core/Beam/FootprintFactorGaussian.h                         | 6 +++---
 Core/Beam/FootprintFactorSquare.h                           | 6 +++---
 Core/Beam/IFootprintFactor.h                                | 6 +++---
 Core/Binning/Bin.h                                          | 6 +++---
 Core/Binning/ConstKBinAxis.h                                | 6 +++---
 Core/Binning/CustomBinAxis.h                                | 6 +++---
 Core/Binning/FixedBinAxis.h                                 | 6 +++---
 Core/Binning/IAxis.h                                        | 6 +++---
 Core/Binning/IPixel.h                                       | 6 +++---
 Core/Binning/PointwiseAxis.h                                | 6 +++---
 Core/Binning/VariableBinAxis.h                              | 6 +++---
 Core/Computation/ComputationStatus.h                        | 6 +++---
 Core/Computation/ConstantBackground.h                       | 6 +++---
 Core/Computation/DWBAComputation.h                          | 6 +++---
 Core/Computation/DWBASingleComputation.h                    | 6 +++---
 Core/Computation/DelayedProgressCounter.h                   | 6 +++---
 Core/Computation/DepthProbeComputation.h                    | 6 +++---
 Core/Computation/DepthProbeComputationTerm.h                | 6 +++---
 Core/Computation/GISASSpecularComputation.h                 | 6 +++---
 Core/Computation/IBackground.h                              | 6 +++---
 Core/Computation/IComputation.h                             | 6 +++---
 Core/Computation/MultiLayerUtils.h                          | 6 +++---
 Core/Computation/ParticleLayoutComputation.h                | 6 +++---
 Core/Computation/PoissonNoiseBackground.h                   | 6 +++---
 Core/Computation/ProcessedLayout.h                          | 6 +++---
 Core/Computation/ProcessedSample.h                          | 6 +++---
 Core/Computation/ProfileHelper.h                            | 6 +++---
 Core/Computation/ProgressHandler.h                          | 6 +++---
 Core/Computation/RoughMultiLayerComputation.h               | 6 +++---
 Core/Computation/Slice.h                                    | 6 +++---
 Core/Computation/SpecularComputation.h                      | 6 +++---
 Core/Computation/SpecularComputationTerm.h                  | 6 +++---
 Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h      | 6 +++---
 .../DecoratedFormFactor/FormFactorDecoratorPositionFactor.h | 6 +++---
 Core/DecoratedFormFactor/FormFactorDecoratorRotation.h      | 6 +++---
 Core/DecoratedFormFactor/IFormFactorDecorator.h             | 6 +++---
 Core/Export/ExportToPython.h                                | 6 +++---
 Core/Export/INodeUtils.h                                    | 6 +++---
 Core/Export/PythonFormatting.h                              | 6 +++---
 Core/Export/SampleLabelHandler.h                            | 6 +++---
 Core/Export/SampleToPython.h                                | 6 +++---
 Core/Export/SimulationToPython.h                            | 6 +++---
 Core/Fitting/FitObjective.h                                 | 6 +++---
 Core/Fitting/FitObserver.h                                  | 6 +++---
 Core/Fitting/FitPrintService.h                              | 6 +++---
 Core/Fitting/FitStatus.h                                    | 6 +++---
 Core/Fitting/FitTypes.h                                     | 6 +++---
 Core/Fitting/IObserver.h                                    | 6 +++---
 Core/Fitting/IterationInfo.h                                | 6 +++---
 Core/Fitting/ObjectiveMetric.h                              | 6 +++---
 Core/Fitting/ObjectiveMetricUtils.h                         | 6 +++---
 Core/Fitting/PyFittingCallbacks.h                           | 6 +++---
 Core/Fitting/SimDataPair.h                                  | 6 +++---
 Core/HardParticle/FormFactorAnisoPyramid.h                  | 6 +++---
 Core/HardParticle/FormFactorBar.h                           | 6 +++---
 Core/HardParticle/FormFactorBox.h                           | 6 +++---
 Core/HardParticle/FormFactorCantellatedCube.h               | 6 +++---
 Core/HardParticle/FormFactorCone.h                          | 6 +++---
 Core/HardParticle/FormFactorCone6.h                         | 6 +++---
 Core/HardParticle/FormFactorCuboctahedron.h                 | 6 +++---
 Core/HardParticle/FormFactorCylinder.h                      | 6 +++---
 Core/HardParticle/FormFactorDodecahedron.h                  | 6 +++---
 Core/HardParticle/FormFactorDot.h                           | 6 +++---
 Core/HardParticle/FormFactorEllipsoidalCylinder.h           | 6 +++---
 Core/HardParticle/FormFactorFullSphere.h                    | 6 +++---
 Core/HardParticle/FormFactorFullSpheroid.h                  | 6 +++---
 Core/HardParticle/FormFactorHemiEllipsoid.h                 | 6 +++---
 Core/HardParticle/FormFactorIcosahedron.h                   | 6 +++---
 Core/HardParticle/FormFactorLongBoxGauss.h                  | 6 +++---
 Core/HardParticle/FormFactorLongBoxLorentz.h                | 6 +++---
 Core/HardParticle/FormFactorPolyhedron.h                    | 6 +++---
 Core/HardParticle/FormFactorPrism3.h                        | 6 +++---
 Core/HardParticle/FormFactorPrism6.h                        | 6 +++---
 Core/HardParticle/FormFactorPyramid.h                       | 6 +++---
 Core/HardParticle/FormFactorRipple1.h                       | 6 +++---
 Core/HardParticle/FormFactorRipple2.h                       | 6 +++---
 Core/HardParticle/FormFactorTetrahedron.h                   | 6 +++---
 Core/HardParticle/FormFactorTriangle.h                      | 6 +++---
 Core/HardParticle/FormFactorTruncatedCube.h                 | 6 +++---
 Core/HardParticle/FormFactorTruncatedSphere.h               | 6 +++---
 Core/HardParticle/FormFactorTruncatedSpheroid.h             | 6 +++---
 Core/HardParticle/ProfileBar.h                              | 6 +++---
 Core/HardParticle/ProfileRipple1.h                          | 6 +++---
 Core/HardParticle/ProfileRipple2.h                          | 6 +++---
 Core/InputOutput/DataFormatUtils.h                          | 6 +++---
 Core/InputOutput/IntensityDataIOFactory.h                   | 6 +++---
 Core/InputOutput/OutputDataReadFactory.h                    | 6 +++---
 Core/InputOutput/OutputDataReadStrategy.h                   | 6 +++---
 Core/InputOutput/OutputDataReader.h                         | 6 +++---
 Core/InputOutput/OutputDataWriteFactory.h                   | 6 +++---
 Core/InputOutput/OutputDataWriteStrategy.h                  | 6 +++---
 Core/InputOutput/OutputDataWriter.h                         | 6 +++---
 Core/InputOutput/TiffHandler.h                              | 6 +++---
 Core/InputOutput/boost_streams.h                            | 6 +++---
 Core/Instrument/AngularSpecScan.h                           | 6 +++---
 Core/Instrument/ArrayUtils.h                                | 6 +++---
 Core/Instrument/AxisNames.h                                 | 6 +++---
 Core/Instrument/ChiSquaredModule.h                          | 6 +++---
 Core/Instrument/ConvolutionDetectorResolution.h             | 6 +++---
 Core/Instrument/Convolve.h                                  | 6 +++---
 Core/Instrument/CumulativeValue.h                           | 6 +++---
 Core/Instrument/DetectionProperties.h                       | 6 +++---
 Core/Instrument/DetectorContext.h                           | 6 +++---
 Core/Instrument/DetectorFunctions.h                         | 6 +++---
 Core/Instrument/DetectorMask.h                              | 6 +++---
 Core/Instrument/FourierTransform.h                          | 6 +++---
 Core/Instrument/Histogram1D.h                               | 6 +++---
 Core/Instrument/Histogram2D.h                               | 6 +++---
 Core/Instrument/IChiSquaredModule.h                         | 6 +++---
 Core/Instrument/IDetector.h                                 | 6 +++---
 Core/Instrument/IDetector2D.h                               | 6 +++---
 Core/Instrument/IDetectorResolution.h                       | 6 +++---
 Core/Instrument/IHistogram.h                                | 6 +++---
 Core/Instrument/IIntensityFunction.h                        | 6 +++---
 Core/Instrument/IIntensityNormalizer.h                      | 6 +++---
 Core/Instrument/IResolutionFunction2D.h                     | 6 +++---
 Core/Instrument/ISpecularScan.h                             | 6 +++---
 Core/Instrument/IUnitConverter.h                            | 6 +++---
 Core/Instrument/Instrument.h                                | 6 +++---
 Core/Instrument/IntensityDataFunctions.h                    | 6 +++---
 Core/Instrument/IsGISAXSDetector.h                          | 6 +++---
 Core/Instrument/LLData.h                                    | 6 +++---
 Core/Instrument/OutputData.h                                | 6 +++---
 Core/Instrument/OutputDataIterator.h                        | 6 +++---
 Core/Instrument/PyArrayImportUtils.h                        | 6 +++---
 Core/Instrument/QSpecScan.h                                 | 6 +++---
 Core/Instrument/RectangularDetector.h                       | 6 +++---
 Core/Instrument/RegionOfInterest.h                          | 6 +++---
 Core/Instrument/ResolutionFunction2DGaussian.h              | 6 +++---
 Core/Instrument/ScanResolution.h                            | 6 +++---
 Core/Instrument/SimpleUnitConverters.h                      | 6 +++---
 Core/Instrument/SimulationArea.h                            | 6 +++---
 Core/Instrument/SimulationAreaIterator.h                    | 6 +++---
 Core/Instrument/SimulationResult.h                          | 6 +++---
 Core/Instrument/SpecularDetector1D.h                        | 6 +++---
 Core/Instrument/SphericalDetector.h                         | 6 +++---
 Core/Instrument/UnitConverter1D.h                           | 6 +++---
 Core/Instrument/UnitConverterUtils.h                        | 6 +++---
 Core/Instrument/VarianceFunctions.h                         | 6 +++---
 Core/Lattice/ILatticeOrientation.h                          | 6 +++---
 Core/Lattice/ISelectionRule.h                               | 6 +++---
 Core/Lattice/Lattice.h                                      | 6 +++---
 Core/Lattice/Lattice1DParameters.h                          | 6 +++---
 Core/Lattice/Lattice2D.h                                    | 6 +++---
 Core/Lattice/LatticeUtils.h                                 | 6 +++---
 Core/Mask/Ellipse.h                                         | 6 +++---
 Core/Mask/IShape2D.h                                        | 6 +++---
 Core/Mask/InfinitePlane.h                                   | 6 +++---
 Core/Mask/Line.h                                            | 6 +++---
 Core/Mask/Polygon.h                                         | 6 +++---
 Core/Mask/Rectangle.h                                       | 6 +++---
 Core/Material/BaseMaterialImpl.h                            | 6 +++---
 Core/Material/MagneticMaterialImpl.h                        | 6 +++---
 Core/Material/Material.h                                    | 6 +++---
 Core/Material/MaterialBySLDImpl.h                           | 6 +++---
 Core/Material/MaterialFactoryFuncs.h                        | 6 +++---
 Core/Material/MaterialUtils.h                               | 6 +++---
 Core/Material/RefractiveMaterialImpl.h                      | 6 +++---
 Core/Multilayer/DecouplingApproximationStrategy.h           | 6 +++---
 Core/Multilayer/FormFactorBAPol.h                           | 6 +++---
 Core/Multilayer/FormFactorDWBA.h                            | 6 +++---
 Core/Multilayer/FormFactorDWBAPol.h                         | 6 +++---
 Core/Multilayer/IFresnelMap.h                               | 6 +++---
 Core/Multilayer/IInterferenceFunctionStrategy.h             | 6 +++---
 Core/Multilayer/ILayerRTCoefficients.h                      | 6 +++---
 Core/Multilayer/IMultiLayerBuilder.h                        | 6 +++---
 Core/Multilayer/ISpecularStrategy.h                         | 6 +++---
 Core/Multilayer/InterferenceFunctionUtils.h                 | 6 +++---
 Core/Multilayer/KzComputation.h                             | 6 +++---
 Core/Multilayer/Layer.h                                     | 6 +++---
 Core/Multilayer/LayerFillLimits.h                           | 6 +++---
 Core/Multilayer/LayerInterface.h                            | 6 +++---
 Core/Multilayer/LayerRoughness.h                            | 6 +++---
 Core/Multilayer/LayoutStrategyBuilder.h                     | 6 +++---
 Core/Multilayer/MatrixFresnelMap.h                          | 6 +++---
 Core/Multilayer/MatrixRTCoefficients.h                      | 6 +++---
 Core/Multilayer/MatrixRTCoefficients_v2.h                   | 6 +++---
 Core/Multilayer/MultiLayer.h                                | 6 +++---
 Core/Multilayer/MultiLayerFuncs.h                           | 6 +++---
 Core/Multilayer/RoughnessModels.h                           | 6 +++---
 Core/Multilayer/SSCAHelper.h                                | 6 +++---
 Core/Multilayer/SSCApproximationStrategy.h                  | 6 +++---
 Core/Multilayer/SampleBuilderNode.h                         | 6 +++---
 Core/Multilayer/SampleProvider.h                            | 6 +++---
 Core/Multilayer/ScalarFresnelMap.h                          | 6 +++---
 Core/Multilayer/ScalarRTCoefficients.h                      | 6 +++---
 Core/Multilayer/SpecularMagneticOldStrategy.h               | 6 +++---
 Core/Multilayer/SpecularMagneticStrategy.h                  | 6 +++---
 Core/Multilayer/SpecularScalarNCStrategy.h                  | 6 +++---
 Core/Multilayer/SpecularScalarStrategy.h                    | 6 +++---
 Core/Multilayer/SpecularScalarTanhStrategy.h                | 6 +++---
 Core/Multilayer/SpecularStrategyBuilder.h                   | 6 +++---
 Core/Parametrization/DistributionHandler.h                  | 6 +++---
 Core/Parametrization/Distributions.h                        | 6 +++---
 Core/Parametrization/INode.h                                | 6 +++---
 Core/Parametrization/INodeVisitor.h                         | 6 +++---
 Core/Parametrization/IParameter.h                           | 6 +++---
 Core/Parametrization/IParameterized.h                       | 6 +++---
 Core/Parametrization/IterationStrategy.h                    | 6 +++---
 Core/Parametrization/NodeIterator.h                         | 6 +++---
 Core/Parametrization/NodeUtils.h                            | 6 +++---
 Core/Parametrization/ParameterDistribution.h                | 6 +++---
 Core/Parametrization/ParameterPattern.h                     | 6 +++---
 Core/Parametrization/ParameterPool.h                        | 6 +++---
 Core/Parametrization/ParameterSample.h                      | 6 +++---
 Core/Parametrization/ParameterUtils.h                       | 6 +++---
 Core/Parametrization/RangedDistributions.h                  | 6 +++---
 Core/Parametrization/RealParameter.h                        | 6 +++---
 Core/Parametrization/SimulationOptions.h                    | 6 +++---
 Core/Parametrization/ThreadInfo.h                           | 6 +++---
 Core/Parametrization/Unit.h                                 | 6 +++---
 Core/Parametrization/Units.h                                | 6 +++---
 Core/Particle/Crystal.h                                     | 6 +++---
 Core/Particle/FormFactorCoreShell.h                         | 6 +++---
 Core/Particle/FormFactorCrystal.h                           | 6 +++---
 Core/Particle/FormFactorWeighted.h                          | 6 +++---
 Core/Particle/HomogeneousRegion.h                           | 6 +++---
 Core/Particle/IAbstractParticle.h                           | 6 +++---
 Core/Particle/IClusteredParticles.h                         | 6 +++---
 Core/Particle/IParticle.h                                   | 6 +++---
 Core/Particle/MesoCrystal.h                                 | 6 +++---
 Core/Particle/Particle.h                                    | 6 +++---
 Core/Particle/ParticleComposition.h                         | 6 +++---
 Core/Particle/ParticleCoreShell.h                           | 6 +++---
 Core/Particle/ParticleDistribution.h                        | 6 +++---
 Core/Particle/SlicedFormFactorList.h                        | 6 +++---
 Core/Particle/SlicedParticle.h                              | 6 +++---
 Core/Particle/TRange.h                                      | 6 +++---
 Core/Particle/ZLimits.h                                     | 6 +++---
 Core/Scattering/IFormFactor.h                               | 6 +++---
 Core/Scattering/IFormFactorBorn.h                           | 6 +++---
 Core/Scattering/ISample.h                                   | 6 +++---
 Core/Scattering/Rotations.h                                 | 6 +++---
 Core/Shapes/Box.h                                           | 6 +++---
 Core/Shapes/DoubleEllipse.h                                 | 6 +++---
 Core/Shapes/IShape.h                                        | 6 +++---
 Core/Shapes/RippleCosine.h                                  | 6 +++---
 Core/Shapes/RippleSawtooth.h                                | 6 +++---
 Core/Shapes/TruncatedEllipsoid.h                            | 6 +++---
 Core/Simulation/DepthProbeSimulation.h                      | 6 +++---
 Core/Simulation/GISASSimulation.h                           | 6 +++---
 Core/Simulation/MPISimulation.h                             | 6 +++---
 Core/Simulation/OffSpecSimulation.h                         | 6 +++---
 Core/Simulation/Simulation.h                                | 6 +++---
 Core/Simulation/Simulation2D.h                              | 6 +++---
 Core/Simulation/SpecularSimulation.h                        | 6 +++---
 Core/SimulationElement/DepthProbeElement.h                  | 6 +++---
 Core/SimulationElement/PolarizationHandler.h                | 6 +++---
 Core/SimulationElement/SimulationElement.h                  | 6 +++---
 Core/SimulationElement/SpecularSimulationElement.h          | 6 +++---
 Core/SoftParticle/FormFactorDebyeBueche.h                   | 6 +++---
 Core/SoftParticle/FormFactorGauss.h                         | 6 +++---
 Core/SoftParticle/FormFactorLorentz.h                       | 6 +++---
 Core/SoftParticle/FormFactorOrnsteinZernike.h               | 6 +++---
 Core/SoftParticle/FormFactorSphereGaussianRadius.h          | 6 +++---
 Core/SoftParticle/FormFactorSphereLogNormalRadius.h         | 6 +++---
 Core/SoftParticle/FormFactorSphereUniformRadius.h           | 6 +++---
 Core/StandardSamples/BoxCompositionBuilder.h                | 6 +++---
 Core/StandardSamples/BoxesSquareLatticeBuilder.h            | 6 +++---
 Core/StandardSamples/CoreShellParticleBuilder.h             | 6 +++---
 Core/StandardSamples/CustomMorphologyBuilder.h              | 6 +++---
 Core/StandardSamples/CylindersAndPrismsBuilder.h            | 6 +++---
 Core/StandardSamples/CylindersBuilder.h                     | 6 +++---
 Core/StandardSamples/HomogeneousMultilayerBuilder.h         | 6 +++---
 Core/StandardSamples/IFactory.h                             | 6 +++---
 Core/StandardSamples/IRegistry.h                            | 6 +++---
 Core/StandardSamples/LatticeBuilder.h                       | 6 +++---
 Core/StandardSamples/LayersWithAbsorptionBuilder.h          | 6 +++---
 Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h     | 6 +++---
 Core/StandardSamples/MagneticLayersBuilder.h                | 6 +++---
 Core/StandardSamples/MagneticParticlesBuilder.h             | 6 +++---
 Core/StandardSamples/MesoCrystalBuilder.h                   | 6 +++---
 Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h     | 6 +++---
 Core/StandardSamples/MultiLayerWithRoughnessBuilder.h       | 6 +++---
 Core/StandardSamples/MultipleLayoutBuilder.h                | 6 +++---
 Core/StandardSamples/ParaCrystalBuilder.h                   | 6 +++---
 Core/StandardSamples/ParticleCompositionBuilder.h           | 6 +++---
 Core/StandardSamples/ParticleDistributionsBuilder.h         | 6 +++---
 Core/StandardSamples/ParticleInTheAirBuilder.h              | 6 +++---
 Core/StandardSamples/PercusYevickBuilder.h                  | 6 +++---
 Core/StandardSamples/PlainMultiLayerBySLDBuilder.h          | 6 +++---
 Core/StandardSamples/ResonatorBuilder.h                     | 6 +++---
 Core/StandardSamples/RipplesBuilder.h                       | 6 +++---
 Core/StandardSamples/RotatedPyramidsBuilder.h               | 6 +++---
 Core/StandardSamples/SampleBuilderFactory.h                 | 6 +++---
 Core/StandardSamples/SampleComponents.h                     | 6 +++---
 Core/StandardSamples/SimulationFactory.h                    | 6 +++---
 Core/StandardSamples/SizeDistributionModelsBuilder.h        | 6 +++---
 Core/StandardSamples/SlicedCylindersBuilder.h               | 6 +++---
 Core/StandardSamples/SlicedParticleBuilder.h                | 6 +++---
 Core/StandardSamples/StandardSimulations.h                  | 6 +++---
 Core/StandardSamples/ThickAbsorptiveSampleBuilder.h         | 6 +++---
 Core/StandardSamples/TransformationsBuilder.h               | 6 +++---
 Core/StandardSamples/TwoDimLatticeBuilder.h                 | 6 +++---
 Core/StandardSamples/TwoLayerRoughnessBuilder.h             | 6 +++---
 Core/Tools/FileSystemUtils.h                                | 6 +++---
 Core/Tools/Integrator.h                                     | 6 +++---
 Core/Tools/IntegratorMCMiser.h                              | 6 +++---
 Core/Tools/MathFunctions.h                                  | 6 +++---
 Core/Tools/Numeric.h                                        | 6 +++---
 Core/Tools/OrderedMap.h                                     | 6 +++---
 Core/Tools/Precomputed.h                                    | 6 +++---
 Core/Tools/PyEmbeddedUtils.h                                | 6 +++---
 Core/Tools/PyImport.h                                       | 6 +++---
 Core/Tools/PyObject.h                                       | 6 +++---
 Core/Tools/PythonCore.h                                     | 6 +++---
 Core/Tools/SafePointerVector.h                              | 6 +++---
 Core/Tools/SpectrumUtils.h                                  | 6 +++---
 Core/Tools/SysUtils.h                                       | 6 +++---
 Core/Tools/fp_exception_glibc_extension.h                   | 6 +++---
 Core/Vector/BasicVector3D.h                                 | 6 +++---
 Core/Vector/EigenCore.h                                     | 6 +++---
 Core/Vector/Transform3D.h                                   | 6 +++---
 Core/Vector/Vectors3D.h                                     | 6 +++---
 Core/Vector/WavevectorInfo.h                                | 6 +++---
 Core/includeIncludes/FormFactors.h                          | 6 +++---
 Core/includeIncludes/HardParticles.h                        | 6 +++---
 Core/includeIncludes/InterferenceFunctions.h                | 6 +++---
 Core/includeIncludes/SoftParticles.h                        | 6 +++---
 Fit/Kernel/FitOptions.h                                     | 6 +++---
 Fit/Kernel/IFunctionAdapter.h                               | 6 +++---
 Fit/Kernel/Kernel.h                                         | 6 +++---
 Fit/Kernel/KernelTypes.h                                    | 6 +++---
 Fit/Kernel/Minimizer.h                                      | 6 +++---
 Fit/Kernel/MinimizerResult.h                                | 6 +++---
 Fit/Kernel/Parameter.h                                      | 6 +++---
 Fit/Kernel/Parameters.h                                     | 6 +++---
 Fit/Kernel/PyCallback.h                                     | 6 +++---
 Fit/Minimizer/IMinimizer.h                                  | 6 +++---
 Fit/Minimizer/MinimizerCatalogue.h                          | 6 +++---
 Fit/Minimizer/MinimizerConstants.h                          | 6 +++---
 Fit/Minimizer/MinimizerFactory.h                            | 6 +++---
 Fit/Minimizer/MinimizerInfo.h                               | 6 +++---
 Fit/Minimizer/MinimizerOptions.h                            | 6 +++---
 Fit/Minimizer/TestMinimizer.h                               | 6 +++---
 Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h            | 6 +++---
 Fit/RootAdapter/GSLMultiMinimizer.h                         | 6 +++---
 Fit/RootAdapter/GeneticMinimizer.h                          | 6 +++---
 Fit/RootAdapter/MinimizerResultUtils.h                      | 6 +++---
 Fit/RootAdapter/Minuit2Minimizer.h                          | 6 +++---
 Fit/RootAdapter/ObjectiveFunctionAdapter.h                  | 6 +++---
 Fit/RootAdapter/ResidualFunctionAdapter.h                   | 6 +++---
 Fit/RootAdapter/RootMinimizerAdapter.h                      | 6 +++---
 Fit/RootAdapter/RootResidualFunction.h                      | 6 +++---
 Fit/RootAdapter/RootScalarFunction.h                        | 6 +++---
 Fit/RootAdapter/ScalarFunctionAdapter.h                     | 6 +++---
 Fit/RootAdapter/SimAnMinimizer.h                            | 6 +++---
 Fit/Tools/AttLimits.h                                       | 6 +++---
 Fit/Tools/Attributes.h                                      | 6 +++---
 Fit/Tools/MinimizerUtils.h                                  | 6 +++---
 Fit/Tools/MultiOption.h                                     | 6 +++---
 Fit/Tools/OptionContainer.h                                 | 6 +++---
 Fit/Tools/RealLimits.h                                      | 6 +++---
 Fit/Tools/StringUtils.h                                     | 6 +++---
 Fit/Tools/WallclockTimer.h                                  | 6 +++---
 GUI/ba3d/def.h                                              | 6 +++---
 GUI/ba3d/model/geometry.h                                   | 6 +++---
 GUI/ba3d/model/geometry_inc.h                               | 6 +++---
 GUI/ba3d/model/layer.h                                      | 6 +++---
 GUI/ba3d/model/model.h                                      | 6 +++---
 GUI/ba3d/model/object.h                                     | 6 +++---
 GUI/ba3d/model/particles.h                                  | 6 +++---
 GUI/ba3d/view/buffer.h                                      | 6 +++---
 GUI/ba3d/view/camera.h                                      | 6 +++---
 GUI/ba3d/view/canvas.h                                      | 6 +++---
 GUI/ba3d/view/program.h                                     | 6 +++---
 GUI/ba3d/widget.h                                           | 6 +++---
 GUI/coregui/Models/ApplicationModels.h                      | 6 +++---
 GUI/coregui/Models/AxesItems.h                              | 6 +++---
 GUI/coregui/Models/BackgroundItems.h                        | 6 +++---
 GUI/coregui/Models/BeamAngleItems.h                         | 6 +++---
 GUI/coregui/Models/BeamDistributionItem.h                   | 6 +++---
 GUI/coregui/Models/BeamItems.h                              | 6 +++---
 GUI/coregui/Models/BeamWavelengthItem.h                     | 6 +++---
 GUI/coregui/Models/ComboProperty.h                          | 6 +++---
 GUI/coregui/Models/ComponentProxyModel.h                    | 6 +++---
 GUI/coregui/Models/ComponentProxyStrategy.h                 | 6 +++---
 GUI/coregui/Models/Data1DViewItem.h                         | 6 +++---
 GUI/coregui/Models/DataItem.h                               | 6 +++---
 GUI/coregui/Models/DataItemUtils.h                          | 6 +++---
 GUI/coregui/Models/DataProperties.h                         | 6 +++---
 GUI/coregui/Models/DataPropertyContainer.h                  | 6 +++---
 GUI/coregui/Models/DataViewUtils.h                          | 6 +++---
 GUI/coregui/Models/DepthProbeInstrumentItem.h               | 6 +++---
 GUI/coregui/Models/DetectorItems.h                          | 6 +++---
 GUI/coregui/Models/DistributionItems.h                      | 6 +++---
 GUI/coregui/Models/DocumentModel.h                          | 6 +++---
 GUI/coregui/Models/DomainObjectBuilder.h                    | 6 +++---
 GUI/coregui/Models/DomainSimulationBuilder.h                | 6 +++---
 GUI/coregui/Models/FTDecayFunctionItems.h                   | 6 +++---
 GUI/coregui/Models/FTDistributionItems.h                    | 6 +++---
 GUI/coregui/Models/FilterPropertyProxy.h                    | 6 +++---
 GUI/coregui/Models/FitParameterHelper.h                     | 6 +++---
 GUI/coregui/Models/FitParameterItems.h                      | 6 +++---
 GUI/coregui/Models/FitParameterProxyModel.h                 | 6 +++---
 GUI/coregui/Models/FitSuiteItem.h                           | 6 +++---
 GUI/coregui/Models/FootprintItems.h                         | 6 +++---
 GUI/coregui/Models/FormFactorItems.h                        | 6 +++---
 GUI/coregui/Models/GUIDomainSampleVisitor.h                 | 6 +++---
 GUI/coregui/Models/GUIExamplesFactory.h                     | 6 +++---
 GUI/coregui/Models/GUIObjectBuilder.h                       | 6 +++---
 GUI/coregui/Models/GroupInfo.h                              | 6 +++---
 GUI/coregui/Models/GroupInfoCatalogue.h                     | 6 +++---
 GUI/coregui/Models/GroupItem.h                              | 6 +++---
 GUI/coregui/Models/GroupItemController.h                    | 6 +++---
 GUI/coregui/Models/InstrumentItems.h                        | 6 +++---
 GUI/coregui/Models/InstrumentModel.h                        | 6 +++---
 GUI/coregui/Models/IntensityDataItem.h                      | 6 +++---
 GUI/coregui/Models/InterferenceFunctionItems.h              | 6 +++---
 GUI/coregui/Models/ItemCatalogue.h                          | 6 +++---
 GUI/coregui/Models/ItemFactory.h                            | 6 +++---
 GUI/coregui/Models/ItemFileNameUtils.h                      | 6 +++---
 GUI/coregui/Models/JobItem.h                                | 6 +++---
 GUI/coregui/Models/JobItemUtils.h                           | 6 +++---
 GUI/coregui/Models/JobModel.h                               | 6 +++---
 GUI/coregui/Models/JobModelFunctions.h                      | 6 +++---
 GUI/coregui/Models/JobQueueData.h                           | 6 +++---
 GUI/coregui/Models/JobWorker.h                              | 6 +++---
 GUI/coregui/Models/Lattice2DItems.h                         | 6 +++---
 GUI/coregui/Models/LayerItem.h                              | 6 +++---
 GUI/coregui/Models/LayerRoughnessItems.h                    | 6 +++---
 GUI/coregui/Models/MaskItems.h                              | 6 +++---
 GUI/coregui/Models/MaterialDataItems.h                      | 6 +++---
 GUI/coregui/Models/MaterialItem.h                           | 6 +++---
 GUI/coregui/Models/MaterialItemContainer.h                  | 6 +++---
 GUI/coregui/Models/MaterialModel.h                          | 6 +++---
 GUI/coregui/Models/MaterialPropertyController.h             | 6 +++---
 GUI/coregui/Models/MesoCrystalItem.h                        | 6 +++---
 GUI/coregui/Models/MinimizerItem.h                          | 6 +++---
 GUI/coregui/Models/MinimizerItemCatalogue.h                 | 6 +++---
 GUI/coregui/Models/ModelMapper.h                            | 6 +++---
 GUI/coregui/Models/ModelPath.h                              | 6 +++---
 GUI/coregui/Models/ModelUtils.h                             | 6 +++---
 GUI/coregui/Models/MultiLayerItem.h                         | 6 +++---
 GUI/coregui/Models/ParameterTranslators.h                   | 6 +++---
 GUI/coregui/Models/ParameterTreeItems.h                     | 6 +++---
 GUI/coregui/Models/ParameterTreeUtils.h                     | 6 +++---
 GUI/coregui/Models/ParameterTuningModel.h                   | 6 +++---
 GUI/coregui/Models/ParticleCompositionItem.h                | 6 +++---
 GUI/coregui/Models/ParticleCoreShellItem.h                  | 6 +++---
 GUI/coregui/Models/ParticleDistributionItem.h               | 6 +++---
 GUI/coregui/Models/ParticleItem.h                           | 6 +++---
 GUI/coregui/Models/ParticleLayoutItem.h                     | 6 +++---
 GUI/coregui/Models/PointwiseAxisItem.h                      | 6 +++---
 GUI/coregui/Models/ProjectionItems.h                        | 6 +++---
 GUI/coregui/Models/PropertyItem.h                           | 6 +++---
 GUI/coregui/Models/ProxyModelStrategy.h                     | 6 +++---
 GUI/coregui/Models/RealDataItem.h                           | 6 +++---
 GUI/coregui/Models/RealDataModel.h                          | 6 +++---
 GUI/coregui/Models/RealLimitsItems.h                        | 6 +++---
 GUI/coregui/Models/RectangularDetectorItem.h                | 6 +++---
 GUI/coregui/Models/ResolutionFunctionItems.h                | 6 +++---
 GUI/coregui/Models/RotationItems.h                          | 6 +++---
 GUI/coregui/Models/SampleModel.h                            | 6 +++---
 GUI/coregui/Models/SampleValidator.h                        | 6 +++---
 GUI/coregui/Models/SessionDecorationModel.h                 | 6 +++---
 GUI/coregui/Models/SessionFlags.h                           | 6 +++---
 GUI/coregui/Models/SessionGraphicsItem.h                    | 6 +++---
 GUI/coregui/Models/SessionItem.h                            | 6 +++---
 GUI/coregui/Models/SessionItemData.h                        | 6 +++---
 GUI/coregui/Models/SessionItemTags.h                        | 6 +++---
 GUI/coregui/Models/SessionItemUtils.h                       | 6 +++---
 GUI/coregui/Models/SessionModel.h                           | 6 +++---
 GUI/coregui/Models/SessionModelDelegate.h                   | 6 +++---
 GUI/coregui/Models/SessionXML.h                             | 6 +++---
 GUI/coregui/Models/SimulationOptionsItem.h                  | 6 +++---
 GUI/coregui/Models/SpecularBeamInclinationItem.h            | 6 +++---
 GUI/coregui/Models/SpecularDataItem.h                       | 6 +++---
 GUI/coregui/Models/SphericalDetectorItem.h                  | 6 +++---
 GUI/coregui/Models/TransformFromDomain.h                    | 6 +++---
 GUI/coregui/Models/TransformToDomain.h                      | 6 +++---
 GUI/coregui/Models/TransformationItem.h                     | 6 +++---
 GUI/coregui/Models/VectorItem.h                             | 6 +++---
 GUI/coregui/Models/item_constants.h                         | 6 +++---
 GUI/coregui/Views/AccordionWidget/AccordionWidget.h         | 6 +++---
 GUI/coregui/Views/AccordionWidget/ClickableFrame.h          | 6 +++---
 GUI/coregui/Views/AccordionWidget/ContentPane.h             | 6 +++---
 GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h       | 6 +++---
 GUI/coregui/Views/CommonWidgets/ColumnResizer.h             | 6 +++---
 GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h            | 6 +++---
 GUI/coregui/Views/CommonWidgets/DocksController.h           | 6 +++---
 GUI/coregui/Views/CommonWidgets/InfoPanel.h                 | 6 +++---
 GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h          | 6 +++---
 GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h          | 6 +++---
 GUI/coregui/Views/CommonWidgets/ItemComboWidget.h           | 6 +++---
 GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h        | 6 +++---
 GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h        | 6 +++---
 GUI/coregui/Views/CommonWidgets/ItemStackWidget.h           | 6 +++---
 GUI/coregui/Views/CommonWidgets/ModelTreeView.h             | 6 +++---
 GUI/coregui/Views/CommonWidgets/SessionItemController.h     | 6 +++---
 GUI/coregui/Views/CommonWidgets/SessionItemWidget.h         | 6 +++---
 GUI/coregui/Views/CommonWidgets/StatusLabel.h               | 6 +++---
 GUI/coregui/Views/CommonWidgets/UpdateTimer.h               | 6 +++---
 GUI/coregui/Views/CommonWidgets/detailsbutton.h             | 6 +++---
 GUI/coregui/Views/CommonWidgets/detailswidget.h             | 6 +++---
 GUI/coregui/Views/FitWidgets/FitActivityPanel.h             | 6 +++---
 GUI/coregui/Views/FitWidgets/FitComparisonController.h      | 6 +++---
 GUI/coregui/Views/FitWidgets/FitComparisonViewController.h  | 6 +++---
 GUI/coregui/Views/FitWidgets/FitComparisonWidget.h          | 6 +++---
 GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h        | 6 +++---
 GUI/coregui/Views/FitWidgets/FitFlowWidget.h                | 6 +++---
 GUI/coregui/Views/FitWidgets/FitLog.h                       | 6 +++---
 GUI/coregui/Views/FitWidgets/FitLogFlags.h                  | 6 +++---
 GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h          | 6 +++---
 GUI/coregui/Views/FitWidgets/FitParameterWidget.h           | 6 +++---
 GUI/coregui/Views/FitWidgets/FitProgressInfo.h              | 6 +++---
 GUI/coregui/Views/FitWidgets/FitResultsWidget.h             | 6 +++---
 GUI/coregui/Views/FitWidgets/FitSessionController.h         | 6 +++---
 GUI/coregui/Views/FitWidgets/FitSessionManager.h            | 6 +++---
 GUI/coregui/Views/FitWidgets/FitSessionWidget.h             | 6 +++---
 GUI/coregui/Views/FitWidgets/FitWorker.h                    | 6 +++---
 GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h            | 6 +++---
 GUI/coregui/Views/FitWidgets/GUIFitObserver.h               | 6 +++---
 GUI/coregui/Views/FitWidgets/HistogramPlot.h                | 6 +++---
 GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h      | 6 +++---
 GUI/coregui/Views/FitWidgets/RunFitControlWidget.h          | 6 +++---
 GUI/coregui/Views/FitWidgets/plot_constants.h               | 6 +++---
 GUI/coregui/Views/ImportDataView.h                          | 6 +++---
 .../ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h    | 6 +++---
 .../CsvImportAssistant/CsvImportAssistant.h                 | 6 +++---
 .../ImportDataWidgets/CsvImportAssistant/CsvImportTable.h   | 6 +++---
 .../ImportDataWidgets/CsvImportAssistant/CsvNamespace.h     | 6 +++---
 .../Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h  | 6 +++---
 .../ImportDataWidgets/CsvImportAssistant/DataSelector.h     | 6 +++---
 .../ImportDataWidgets/CsvImportAssistant/TableContextMenu.h | 6 +++---
 GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h       | 6 +++---
 GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h | 6 +++---
 GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h    | 6 +++---
 GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h     | 6 +++---
 .../Views/ImportDataWidgets/RealDataPropertiesWidget.h      | 6 +++---
 .../Views/ImportDataWidgets/RealDataSelectorActions.h       | 6 +++---
 GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h  | 6 +++---
 .../Views/ImportDataWidgets/RealDataSelectorToolBar.h       | 6 +++---
 .../Views/ImportDataWidgets/RealDataSelectorWidget.h        | 6 +++---
 GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h         | 6 +++---
 GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h          | 6 +++---
 GUI/coregui/Views/InfoWidgets/DistributionDialog.h          | 6 +++---
 GUI/coregui/Views/InfoWidgets/DistributionEditor.h          | 6 +++---
 GUI/coregui/Views/InfoWidgets/DistributionWidget.h          | 6 +++---
 GUI/coregui/Views/InfoWidgets/GroupInfoBox.h                | 6 +++---
 GUI/coregui/Views/InfoWidgets/OverlayLabelController.h      | 6 +++---
 GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h          | 6 +++---
 GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h    | 6 +++---
 GUI/coregui/Views/InfoWidgets/PySampleWidget.h              | 6 +++---
 GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h     | 6 +++---
 GUI/coregui/Views/InfoWidgets/WarningSign.h                 | 6 +++---
 GUI/coregui/Views/InfoWidgets/WarningSignWidget.h           | 6 +++---
 GUI/coregui/Views/InstrumentView.h                          | 6 +++---
 .../Views/InstrumentWidgets/DepthProbeInstrumentEditor.h    | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h  | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h     | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h     | 6 +++---
 .../Views/InstrumentWidgets/ExtendedDetectorDialog.h        | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h       | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h   | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h | 6 +++---
 .../Views/InstrumentWidgets/InstrumentEditorWidget.h        | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h   | 6 +++---
 .../Views/InstrumentWidgets/InstrumentSelectorWidget.h      | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h     | 6 +++---
 .../Views/InstrumentWidgets/OffSpecInstrumentEditor.h       | 6 +++---
 .../Views/InstrumentWidgets/PolarizationAnalysisEditor.h    | 6 +++---
 .../Views/InstrumentWidgets/RectangularDetectorEditor.h     | 6 +++---
 GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h    | 6 +++---
 .../Views/InstrumentWidgets/SpecularInstrumentEditor.h      | 6 +++---
 .../Views/InstrumentWidgets/SphericalDetectorEditor.h       | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/ColorMap.h           | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h     | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h      | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h   | 6 +++---
 .../Views/IntensityDataWidgets/IntensityDataCanvas.h        | 6 +++---
 .../Views/IntensityDataWidgets/IntensityDataFFTPresenter.h  | 6 +++---
 .../IntensityDataWidgets/IntensityDataProjectionsWidget.h   | 6 +++---
 .../IntensityDataWidgets/IntensityDataPropertyWidget.h      | 6 +++---
 .../Views/IntensityDataWidgets/IntensityDataWidget.h        | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/Plot1D.h             | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h      | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h    | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h    | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h   | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h  | 6 +++---
 .../Views/IntensityDataWidgets/SaveProjectionsAssistant.h   | 6 +++---
 GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h     | 6 +++---
 .../Views/IntensityDataWidgets/ScientificPlotEvent.h        | 6 +++---
 GUI/coregui/Views/JobView.h                                 | 6 +++---
 GUI/coregui/Views/JobWidgets/JobListViewDelegate.h          | 6 +++---
 GUI/coregui/Views/JobWidgets/JobListWidget.h                | 6 +++---
 GUI/coregui/Views/JobWidgets/JobMessagePanel.h              | 6 +++---
 GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h          | 6 +++---
 GUI/coregui/Views/JobWidgets/JobProgressAssistant.h         | 6 +++---
 GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h          | 6 +++---
 GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h           | 6 +++---
 GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/JobResultsPresenter.h          | 6 +++---
 GUI/coregui/Views/JobWidgets/JobSelectorActions.h           | 6 +++---
 GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h           | 6 +++---
 GUI/coregui/Views/JobWidgets/JobSelectorWidget.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/JobViewActivities.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/JobViewDocks.h                 | 6 +++---
 GUI/coregui/Views/JobWidgets/JobViewFlags.h                 | 6 +++---
 GUI/coregui/Views/JobWidgets/JobViewStatusBar.h             | 6 +++---
 GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h      | 6 +++---
 GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h        | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsEditor.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h     | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h      | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h     | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h           | 6 +++---
 GUI/coregui/Views/JobWidgets/ProjectionsWidget.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/ScientificSpinBox.h            | 6 +++---
 GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h         | 6 +++---
 GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h        | 6 +++---
 GUI/coregui/Views/MaskWidgets/EllipseView.h                 | 6 +++---
 GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h               | 6 +++---
 GUI/coregui/Views/MaskWidgets/IShape2DView.h                | 6 +++---
 GUI/coregui/Views/MaskWidgets/IntensityDataView.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/LineViews.h                   | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskAllView.h                 | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskContainerView.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h          | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditor.h                  | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorActions.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h            | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h             | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h            | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h     | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h            | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h        | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h          | 6 +++---
 GUI/coregui/Views/MaskWidgets/MaskViewFactory.h             | 6 +++---
 GUI/coregui/Views/MaskWidgets/PolygonPointView.h            | 6 +++---
 GUI/coregui/Views/MaskWidgets/PolygonView.h                 | 6 +++---
 GUI/coregui/Views/MaskWidgets/RectangleBaseView.h           | 6 +++---
 GUI/coregui/Views/MaskWidgets/RectangleView.h               | 6 +++---
 GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h        | 6 +++---
 GUI/coregui/Views/MaskWidgets/SizeHandleElement.h           | 6 +++---
 GUI/coregui/Views/MaterialEditor/ExternalProperty.h         | 6 +++---
 GUI/coregui/Views/MaterialEditor/MaterialEditor.h           | 6 +++---
 GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h     | 6 +++---
 GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h    | 6 +++---
 GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h        | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentEditor.h          | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentFlatView.h        | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h     | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentTreeView.h        | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentUtils.h           | 6 +++---
 GUI/coregui/Views/PropertyEditor/ComponentView.h            | 6 +++---
 GUI/coregui/Views/PropertyEditor/CustomEditors.h            | 6 +++---
 GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h | 6 +++---
 GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h    | 6 +++---
 GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h       | 6 +++---
 GUI/coregui/Views/PropertyEditor/TestComponentView.h        | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h       | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h    | 6 +++---
 .../Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h    | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h       | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h       | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h  | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h        | 6 +++---
 .../Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h      | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h         | 6 +++---
 .../Views/RealSpaceWidgets/RealSpacePositionBuilder.h       | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h       | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h          | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h        | 6 +++---
 GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h          | 6 +++---
 GUI/coregui/Views/SampleDesigner/ConnectableView.h          | 6 +++---
 GUI/coregui/Views/SampleDesigner/DesignerHelper.h           | 6 +++---
 GUI/coregui/Views/SampleDesigner/DesignerMimeData.h         | 6 +++---
 GUI/coregui/Views/SampleDesigner/DesignerScene.h            | 6 +++---
 GUI/coregui/Views/SampleDesigner/DesignerView.h             | 6 +++---
 GUI/coregui/Views/SampleDesigner/ILayerView.h               | 6 +++---
 GUI/coregui/Views/SampleDesigner/IView.h                    | 6 +++---
 .../Views/SampleDesigner/InterferenceFunctionViews.h        | 6 +++---
 GUI/coregui/Views/SampleDesigner/ItemTreeView.h             | 6 +++---
 GUI/coregui/Views/SampleDesigner/LayerView.h                | 6 +++---
 GUI/coregui/Views/SampleDesigner/MesoCrystalView.h          | 6 +++---
 GUI/coregui/Views/SampleDesigner/MultiLayerView.h           | 6 +++---
 GUI/coregui/Views/SampleDesigner/NodeEditor.h               | 6 +++---
 GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h     | 6 +++---
 GUI/coregui/Views/SampleDesigner/NodeEditorPort.h           | 6 +++---
 GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h  | 6 +++---
 GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h    | 6 +++---
 GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h | 6 +++---
 GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h       | 6 +++---
 GUI/coregui/Views/SampleDesigner/ParticleView.h             | 6 +++---
 GUI/coregui/Views/SampleDesigner/RealSpacePanel.h           | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleDesigner.h           | 6 +++---
 GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h     | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleToolBar.h            | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h         | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleViewActions.h        | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleViewAligner.h        | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleViewDocks.h          | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleViewFactory.h        | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleViewStatusBar.h      | 6 +++---
 GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h          | 6 +++---
 GUI/coregui/Views/SampleDesigner/ScriptPanel.h              | 6 +++---
 GUI/coregui/Views/SampleDesigner/TransformationView.h       | 6 +++---
 GUI/coregui/Views/SampleDesigner/ViewTypes.h                | 6 +++---
 GUI/coregui/Views/SampleView.h                              | 6 +++---
 GUI/coregui/Views/SessionModelView.h                        | 6 +++---
 GUI/coregui/Views/SimulationView.h                          | 6 +++---
 GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h    | 6 +++---
 .../Views/SimulationWidgets/SimulationDataSelectorWidget.h  | 6 +++---
 .../Views/SimulationWidgets/SimulationOptionsWidget.h       | 6 +++---
 .../Views/SimulationWidgets/SimulationSetupAssistant.h      | 6 +++---
 GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h | 6 +++---
 GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h        | 6 +++---
 GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h  | 6 +++---
 GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h  | 6 +++---
 GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h        | 6 +++---
 GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h  | 6 +++---
 GUI/coregui/Views/TestView.h                                | 6 +++---
 GUI/coregui/Views/WelcomeView.h                             | 6 +++---
 GUI/coregui/Views/widgetbox/deviceprofile_p.h               | 6 +++---
 GUI/coregui/Views/widgetbox/formwindowbase_p.h              | 6 +++---
 GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h           | 6 +++---
 GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h       | 6 +++---
 GUI/coregui/Views/widgetbox/qdesigner_utils_p.h             | 6 +++---
 GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h         | 6 +++---
 GUI/coregui/Views/widgetbox/qsimpleresource_p.h             | 6 +++---
 GUI/coregui/Views/widgetbox/shared_enums_p.h                | 6 +++---
 GUI/coregui/Views/widgetbox/shared_global_p.h               | 6 +++---
 GUI/coregui/Views/widgetbox/sheet_delegate_p.h              | 6 +++---
 GUI/coregui/Views/widgetbox/spacer_widget_p.h               | 6 +++---
 GUI/coregui/Views/widgetbox/ui4_p.h                         | 6 +++---
 GUI/coregui/Views/widgetbox/widgetbox.h                     | 6 +++---
 GUI/coregui/Views/widgetbox/widgetbox_global.h              | 6 +++---
 GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h     | 6 +++---
 GUI/coregui/Views/widgetbox/widgetboxtreewidget.h           | 6 +++---
 GUI/coregui/mainwindow/AppSvc.h                             | 6 +++---
 GUI/coregui/mainwindow/AutosaveController.h                 | 6 +++---
 GUI/coregui/mainwindow/OutputDataIOHistory.h                | 6 +++---
 GUI/coregui/mainwindow/OutputDataIOService.h                | 6 +++---
 GUI/coregui/mainwindow/ProjectFlags.h                       | 6 +++---
 GUI/coregui/mainwindow/ProjectUtils.h                       | 6 +++---
 GUI/coregui/mainwindow/PyImportAssistant.h                  | 6 +++---
 GUI/coregui/mainwindow/SaveLoadInterface.h                  | 6 +++---
 GUI/coregui/mainwindow/SaveService.h                        | 6 +++---
 GUI/coregui/mainwindow/SaveThread.h                         | 6 +++---
 GUI/coregui/mainwindow/SplashScreen.h                       | 6 +++---
 GUI/coregui/mainwindow/StyledToolBar.h                      | 6 +++---
 GUI/coregui/mainwindow/UpdateNotifier.h                     | 6 +++---
 GUI/coregui/mainwindow/UpdateNotifierWidget.h               | 6 +++---
 GUI/coregui/mainwindow/aboutapplicationdialog.h             | 6 +++---
 GUI/coregui/mainwindow/actionmanager.h                      | 6 +++---
 GUI/coregui/mainwindow/mainwindow.h                         | 6 +++---
 GUI/coregui/mainwindow/mainwindow_constants.h               | 6 +++---
 GUI/coregui/mainwindow/newprojectdialog.h                   | 6 +++---
 GUI/coregui/mainwindow/projectdocument.h                    | 6 +++---
 GUI/coregui/mainwindow/projectmanager.h                     | 6 +++---
 GUI/coregui/mainwindow/tooltipdatabase.h                    | 6 +++---
 GUI/coregui/utils/CustomEventFilters.h                      | 6 +++---
 GUI/coregui/utils/FancyLabel.h                              | 6 +++---
 GUI/coregui/utils/GUIHelpers.h                              | 6 +++---
 GUI/coregui/utils/GUIMessage.h                              | 6 +++---
 GUI/coregui/utils/ImportDataInfo.h                          | 6 +++---
 GUI/coregui/utils/ItemIDFactory.h                           | 6 +++---
 GUI/coregui/utils/LayoutUtils.h                             | 6 +++---
 GUI/coregui/utils/MessageService.h                          | 6 +++---
 GUI/coregui/utils/StyleUtils.h                              | 6 +++---
 GUI/coregui/utils/hostosinfo.h                              | 6 +++---
 GUI/coregui/utils/qstringutils.h                            | 6 +++---
 GUI/main/appoptions.h                                       | 6 +++---
 Tests/Functional/Core/CoreSpecial/BatchSimulation.h         | 6 +++---
 Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h          | 6 +++---
 Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h   | 6 +++---
 Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.h  | 6 +++---
 .../Functional/Core/CoreSpecial/FourierTransformationTest.h | 6 +++---
 .../Core/CoreSpecial/MesoCrystalPerformanceBuilder.h        | 6 +++---
 .../Core/CoreSpecial/MesoCrystalPerformanceTest.h           | 6 +++---
 .../Core/CoreSpecial/MultiThreadPerformanceTest.h           | 6 +++---
 .../Core/CoreSpecial/MultiThreadPerformanceTestComponents.h | 6 +++---
 .../Functional/Core/CoreSpecial/MultilayerPerformanceTest.h | 6 +++---
 Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h   | 6 +++---
 .../Core/SelfConsistenceTest/SelfConsistenceTest.h          | 6 +++---
 .../Core/SelfConsistenceTest/SelfConsistenceTestService.h   | 6 +++---
 Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h     | 6 +++---
 Tests/Functional/Fit/FitObjective/FitObjectiveTest.h        | 6 +++---
 Tests/Functional/Fit/FitObjective/FitObjectiveTestCases.h   | 6 +++---
 Tests/Functional/Fit/FitObjective/FitObjectiveTestFactory.h | 6 +++---
 Tests/Functional/Fit/FitObjective/FitPlan.h                 | 6 +++---
 Tests/Functional/Fit/FitObjective/FitPlanCases.h            | 6 +++---
 Tests/Functional/Fit/FitObjective/FitPlanFactory.h          | 6 +++---
 Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h      | 6 +++---
 Tests/Functional/Fit/Minimizer/FunctionTestPlanFactory.h    | 6 +++---
 Tests/Functional/Fit/Minimizer/MinimizerTest.h              | 6 +++---
 Tests/Functional/Fit/Minimizer/MinimizerTestCases.h         | 6 +++---
 Tests/Functional/Fit/Minimizer/MinimizerTestFactory.h       | 6 +++---
 Tests/Functional/Fit/Minimizer/ResidualTestPlan.h           | 6 +++---
 Tests/Functional/Fit/Minimizer/ScalarTestPlan.h             | 6 +++---
 .../GUI/GUISpecial/CsvImportAssistantPerformanceTest.h      | 6 +++---
 Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h        | 6 +++---
 Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h        | 6 +++---
 Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.h     | 6 +++---
 Tests/Functional/GUI/GUISpecial/GUITranslationTest.h        | 6 +++---
 Tests/Functional/GUI/GUISpecial/TranslationCases.h          | 6 +++---
 Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h      | 6 +++---
 Tests/Functional/Python/PyEmbedded/PyEmbeddedTestFactory.h  | 6 +++---
 Tests/Functional/Python/PyEmbedded/TestCases.h              | 6 +++---
 Tests/Functional/Python/PyStandard/PyStandardTest.h         | 6 +++---
 Tests/Functional/TestMachinery/Benchmark.h                  | 6 +++---
 Tests/Functional/TestMachinery/FunctionalTestFactory.h      | 6 +++---
 Tests/Functional/TestMachinery/IFunctionalTest.h            | 6 +++---
 Tests/Functional/TestMachinery/IMinimizerTest.h             | 6 +++---
 Tests/Functional/TestMachinery/IStandardTest.h              | 6 +++---
 Tests/Functional/TestMachinery/ITestService.h               | 6 +++---
 Tests/Functional/TestMachinery/MinimizerTestPlan.h          | 6 +++---
 Tests/Functional/TestMachinery/ParameterPlan.h              | 6 +++---
 Tests/Functional/TestMachinery/StandardTestCatalogue.h      | 6 +++---
 Tests/Functional/TestMachinery/StandardTestInfo.h           | 6 +++---
 Tests/Functional/TestMachinery/StandardTestService.h        | 6 +++---
 Tests/Functional/TestMachinery/TestService.h                | 6 +++---
 Tests/Functional/TestMachinery/TestUtils.h                  | 6 +++---
 Tests/UnitTests/Core/Fitting/FittingTestHelper.h            | 6 +++---
 Tests/UnitTests/GUI/Comparators.h                           | 6 +++---
 Tests/UnitTests/GUI/TestSessionItemControllerHelper.h       | 6 +++---
 Tests/UnitTests/utilities/google_test.h                     | 6 +++---
 Wrap/WinDllMacros.h                                         | 6 +++---
 unused/ComponentParameter.h                                 | 6 +++---
 unused/MatrixSpecularInfoMapTest.h                          | 6 +++---
 unused/ScalarSpecularInfoMapTest.h                          | 6 +++---
 unused/ScanningMinimizer.h                                  | 6 +++---
 861 files changed, 2583 insertions(+), 2583 deletions(-)

diff --git a/Core/Aggregate/FTDecayFunctions.h b/Core/Aggregate/FTDecayFunctions.h
index 5f2bf70cb1f..aa1ce59c615 100644
--- a/Core/Aggregate/FTDecayFunctions.h
+++ b/Core/Aggregate/FTDecayFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FTDECAYFUNCTIONS_H
-#define FTDECAYFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAYFUNCTIONS_H
+#define BORNAGAIN_CORE_AGGREGATE_FTDECAYFUNCTIONS_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/MathConstants.h"
@@ -187,4 +187,4 @@ protected:
     double m_eta;
 };
 
-#endif // FTDECAYFUNCTIONS_H
+#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAYFUNCTIONS_H
diff --git a/Core/Aggregate/FTDistributions1D.h b/Core/Aggregate/FTDistributions1D.h
index ae2b3f9b29b..19d6a588756 100644
--- a/Core/Aggregate/FTDistributions1D.h
+++ b/Core/Aggregate/FTDistributions1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FTDISTRIBUTIONS1D_H
-#define FTDISTRIBUTIONS1D_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
 
 #include "Core/Aggregate/IDistribution1DSampler.h"
 #include "Core/Basics/ICloneable.h"
@@ -175,4 +175,4 @@ protected:
     double m_eta;
 };
 
-#endif // FTDISTRIBUTIONS1D_H
+#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
diff --git a/Core/Aggregate/FTDistributions2D.h b/Core/Aggregate/FTDistributions2D.h
index 49f91d2c0ef..cf4862b4e0c 100644
--- a/Core/Aggregate/FTDistributions2D.h
+++ b/Core/Aggregate/FTDistributions2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FTDISTRIBUTIONS2D_H
-#define FTDISTRIBUTIONS2D_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
 
 #include "Core/Aggregate/IDistribution2DSampler.h"
 #include "Core/Basics/ICloneable.h"
@@ -158,4 +158,4 @@ protected:
     double m_eta;
 };
 
-#endif // FTDISTRIBUTIONS2D_H
+#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
diff --git a/Core/Aggregate/FormFactorCoherentPart.h b/Core/Aggregate/FormFactorCoherentPart.h
index 59012b1e321..7fb294b7dbf 100644
--- a/Core/Aggregate/FormFactorCoherentPart.h
+++ b/Core/Aggregate/FormFactorCoherentPart.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCOHERENTPART_H
-#define FORMFACTORCOHERENTPART_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTPART_H
+#define BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTPART_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Vector/EigenCore.h"
@@ -51,4 +51,4 @@ private:
     size_t m_layer_index;
 };
 
-#endif // FORMFACTORCOHERENTPART_H
+#endif // BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTPART_H
diff --git a/Core/Aggregate/FormFactorCoherentSum.h b/Core/Aggregate/FormFactorCoherentSum.h
index d2c66121c23..6ade35d94ed 100644
--- a/Core/Aggregate/FormFactorCoherentSum.h
+++ b/Core/Aggregate/FormFactorCoherentSum.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCOHERENTSUM_H
-#define FORMFACTORCOHERENTSUM_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTSUM_H
+#define BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTSUM_H
 
 #include "Core/Aggregate/FormFactorCoherentPart.h"
 #include "Core/Basics/Complex.h"
@@ -48,4 +48,4 @@ private:
     double m_abundance;
 };
 
-#endif // FORMFACTORCOHERENTSUM_H
+#endif // BORNAGAIN_CORE_AGGREGATE_FORMFACTORCOHERENTSUM_H
diff --git a/Core/Aggregate/IDistribution1DSampler.h b/Core/Aggregate/IDistribution1DSampler.h
index 58a6c129634..a7d78ef70e4 100644
--- a/Core/Aggregate/IDistribution1DSampler.h
+++ b/Core/Aggregate/IDistribution1DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IDISTRIBUTION1DSAMPLER_H
-#define IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -76,4 +76,4 @@ private:
     double m_omega;
 };
 
-#endif // IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
diff --git a/Core/Aggregate/IDistribution2DSampler.h b/Core/Aggregate/IDistribution2DSampler.h
index 8f27a6ac9fe..c09bb89ff87 100644
--- a/Core/Aggregate/IDistribution2DSampler.h
+++ b/Core/Aggregate/IDistribution2DSampler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IDISTRIBUTION2DSAMPLER_H
-#define IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <utility>
@@ -79,4 +79,4 @@ private:
     double m_omega_x, m_omega_y;
 };
 
-#endif // IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
diff --git a/Core/Aggregate/IInterferenceFunction.h b/Core/Aggregate/IInterferenceFunction.h
index bb225037cfb..9e9e513d06e 100644
--- a/Core/Aggregate/IInterferenceFunction.h
+++ b/Core/Aggregate/IInterferenceFunction.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IINTERFERENCEFUNCTION_H
-#define IINTERFERENCEFUNCTION_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
+#define BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Vector/Vectors3D.h"
@@ -63,4 +63,4 @@ private:
     double m_position_var;
 };
 
-#endif // IINTERFERENCEFUNCTION_H
+#endif // BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
diff --git a/Core/Aggregate/ILayout.h b/Core/Aggregate/ILayout.h
index 01d1bbfb590..57515f1f94e 100644
--- a/Core/Aggregate/ILayout.h
+++ b/Core/Aggregate/ILayout.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ILAYOUT_H
-#define ILAYOUT_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#define BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/SafePointerVector.h"
@@ -63,4 +63,4 @@ protected:
     double m_weight;
 };
 
-#endif // ILAYOUT_H
+#endif // BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
diff --git a/Core/Aggregate/IPeakShape.h b/Core/Aggregate/IPeakShape.h
index a83b64dd855..4222fd1a39f 100644
--- a/Core/Aggregate/IPeakShape.h
+++ b/Core/Aggregate/IPeakShape.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPEAKSHAPE_H
-#define IPEAKSHAPE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#define BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Tools/Integrator.h"
@@ -195,4 +195,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // IPEAKSHAPE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.h b/Core/Aggregate/InterferenceFunction1DLattice.h
index a4ecf8a9e2b..ee5ce9c6427 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.h
+++ b/Core/Aggregate/InterferenceFunction1DLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTION1DLATTICE_H
-#define INTERFERENCEFUNCTION1DLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Lattice/Lattice1DParameters.h"
@@ -49,4 +49,4 @@ private:
     int m_na; //!< determines the number of reciprocal lattice points to use
 };
 
-#endif // INTERFERENCEFUNCTION1DLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION1DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.h b/Core/Aggregate/InterferenceFunction2DLattice.h
index f4607e59e02..5371e1545ff 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTION2DLATTICE_H
-#define INTERFERENCEFUNCTION2DLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
 
 #include "Core/Aggregate/FTDecayFunctions.h"
 #include "Core/Aggregate/IInterferenceFunction.h"
@@ -86,4 +86,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // INTERFERENCEFUNCTION2DLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.h b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
index ecbce8553fc..a7deb5245d3 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTION2DPARACRYSTAL_H
-#define INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
 
 #include "Core/Aggregate/FTDistributions2D.h"
 #include "Core/Aggregate/IInterferenceFunction.h"
@@ -96,4 +96,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // INTERFERENCEFUNCTION2DPARACRYSTAL_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
diff --git a/Core/Aggregate/InterferenceFunction2DSuperLattice.h b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
index 20babe94936..b128650826c 100644
--- a/Core/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTION2DSUPERLATTICE_H
-#define INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Lattice/Lattice2D.h"
@@ -73,4 +73,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // INTERFERENCEFUNCTION2DSUPERLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunction3DLattice.h b/Core/Aggregate/InterferenceFunction3DLattice.h
index c6440b66fad..9689ac98b6a 100644
--- a/Core/Aggregate/InterferenceFunction3DLattice.h
+++ b/Core/Aggregate/InterferenceFunction3DLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTION3DLATTICE_H
-#define INTERFERENCEFUNCTION3DLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Lattice/Lattice.h"
@@ -52,4 +52,4 @@ private:
     double m_rec_radius; //!< radius in reciprocal space defining the nearest q vectors to use
 };
 
-#endif // INTERFERENCEFUNCTION3DLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION3DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
index c27a2606e48..ce41800c441 100644
--- a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
+++ b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONFINITE2DLATTICE_H
-#define INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Lattice/Lattice2D.h"
@@ -68,4 +68,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // INTERFERENCEFUNCTIONFINITE2DLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunctionFinite3DLattice.h b/Core/Aggregate/InterferenceFunctionFinite3DLattice.h
index 83d348136fc..84e2564fe44 100644
--- a/Core/Aggregate/InterferenceFunctionFinite3DLattice.h
+++ b/Core/Aggregate/InterferenceFunctionFinite3DLattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONFINITE3DLATTICE_H
-#define INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Lattice/Lattice.h"
@@ -51,4 +51,4 @@ private:
     unsigned m_N_1, m_N_2, m_N_3; //!< Size of the finite lattice in lattice units
 };
 
-#endif // INTERFERENCEFUNCTIONFINITE3DLATTICE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE3DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunctionHardDisk.h b/Core/Aggregate/InterferenceFunctionHardDisk.h
index 7438d960fc2..9e0b7f1286d 100644
--- a/Core/Aggregate/InterferenceFunctionHardDisk.h
+++ b/Core/Aggregate/InterferenceFunctionHardDisk.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONHARDDISK_H
-#define INTERFERENCEFUNCTIONHARDDISK_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Tools/Integrator.h"
@@ -53,4 +53,4 @@ private:
     mutable RealIntegrator m_integrator;
 };
 
-#endif // INTERFERENCEFUNCTIONHARDDISK_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
diff --git a/Core/Aggregate/InterferenceFunctionNone.h b/Core/Aggregate/InterferenceFunctionNone.h
index 6184366610e..06134f1ca37 100644
--- a/Core/Aggregate/InterferenceFunctionNone.h
+++ b/Core/Aggregate/InterferenceFunctionNone.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONNONE_H
-#define INTERFERENCEFUNCTIONNONE_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 
@@ -34,4 +34,4 @@ private:
     InterferenceFunctionNone(const InterferenceFunctionNone& other);
 };
 
-#endif // INTERFERENCEFUNCTIONNONE_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONNONE_H
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
index 861de5a73a6..54017b9dd48 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
-#define INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
 
 #include "Core/Aggregate/FTDistributions1D.h"
 #include "Core/Aggregate/IInterferenceFunction.h"
@@ -63,4 +63,4 @@ private:
     double m_domain_size; //!< Size of coherence domain
 };
 
-#endif // INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
diff --git a/Core/Aggregate/InterferenceFunctionTwin.h b/Core/Aggregate/InterferenceFunctionTwin.h
index af3d72dd873..8b1d291de5b 100644
--- a/Core/Aggregate/InterferenceFunctionTwin.h
+++ b/Core/Aggregate/InterferenceFunctionTwin.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONTWIN_H
-#define INTERFERENCEFUNCTIONTWIN_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
+#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 
@@ -44,4 +44,4 @@ private:
     double m_std_dev;
 };
 
-#endif // INTERFERENCEFUNCTIONTWIN_H
+#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONTWIN_H
diff --git a/Core/Aggregate/ParticleLayout.h b/Core/Aggregate/ParticleLayout.h
index ca25594d123..70cd1ecb502 100644
--- a/Core/Aggregate/ParticleLayout.h
+++ b/Core/Aggregate/ParticleLayout.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLELAYOUT_H
-#define PARTICLELAYOUT_H
+#ifndef BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
+#define BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
 
 #include "Core/Aggregate/ILayout.h"
 #include "Core/Scattering/Rotations.h"
@@ -67,4 +67,4 @@ private:
     double m_total_particle_density;
 };
 
-#endif // PARTICLELAYOUT_H
+#endif // BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
diff --git a/Core/Basics/Algorithms.h b/Core/Basics/Algorithms.h
index 2f05a861d81..0a9675e6221 100644
--- a/Core/Basics/Algorithms.h
+++ b/Core/Basics/Algorithms.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ALGORITHMS_H
-#define ALGORITHMS_H
+#ifndef BORNAGAIN_CORE_BASICS_ALGORITHMS_H
+#define BORNAGAIN_CORE_BASICS_ALGORITHMS_H
 
 #include <algorithm>
 #include <cassert>
@@ -61,4 +61,4 @@ double algo::max_value(const Iterator& begin, const Iterator& end, const Evaluat
     return ret;
 }
 
-#endif // ALGORITHMS_H
+#endif // BORNAGAIN_CORE_BASICS_ALGORITHMS_H
diff --git a/Core/Basics/BornAgainNamespace.h b/Core/Basics/BornAgainNamespace.h
index 2da9e6b679c..a410174e9f5 100644
--- a/Core/Basics/BornAgainNamespace.h
+++ b/Core/Basics/BornAgainNamespace.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAINNAMESPACE_H
-#define BORNAGAINNAMESPACE_H
+#ifndef BORNAGAIN_CORE_BASICS_BORNAGAINNAMESPACE_H
+#define BORNAGAIN_CORE_BASICS_BORNAGAINNAMESPACE_H
 
 #include <string>
 
@@ -258,4 +258,4 @@ const std::string UnitsNm2 = "nm^2";
 const std::string UnitsNone = "";
 } // namespace BornAgain
 
-#endif // BORNAGAINNAMESPACE_H
+#endif // BORNAGAIN_CORE_BASICS_BORNAGAINNAMESPACE_H
diff --git a/Core/Basics/Complex.h b/Core/Basics/Complex.h
index 25a7739b88f..13dff4f89e3 100644
--- a/Core/Basics/Complex.h
+++ b/Core/Basics/Complex.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPLEX_H
-#define COMPLEX_H
+#ifndef BORNAGAIN_CORE_BASICS_COMPLEX_H
+#define BORNAGAIN_CORE_BASICS_COMPLEX_H
 
 #include <complex>
 
@@ -31,4 +31,4 @@ inline complex_t exp_I(complex_t z)
     return std::exp(complex_t(-z.imag(), z.real()));
 }
 
-#endif // COMPLEX_H
+#endif // BORNAGAIN_CORE_BASICS_COMPLEX_H
diff --git a/Core/Basics/Exceptions.h b/Core/Basics/Exceptions.h
index b9bbf464333..1c745982d19 100644
--- a/Core/Basics/Exceptions.h
+++ b/Core/Basics/Exceptions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef EXCEPTIONS_H
-#define EXCEPTIONS_H
+#ifndef BORNAGAIN_CORE_BASICS_EXCEPTIONS_H
+#define BORNAGAIN_CORE_BASICS_EXCEPTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <stdexcept>
@@ -119,4 +119,4 @@ void LogExceptionMessage(const std::string& message);
 #endif
 #endif
 
-#endif // EXCEPTIONS_H
+#endif // BORNAGAIN_CORE_BASICS_EXCEPTIONS_H
diff --git a/Core/Basics/ICloneable.h b/Core/Basics/ICloneable.h
index e895e926b6e..5a6fc0718aa 100644
--- a/Core/Basics/ICloneable.h
+++ b/Core/Basics/ICloneable.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ICLONEABLE_H
-#define ICLONEABLE_H
+#ifndef BORNAGAIN_CORE_BASICS_ICLONEABLE_H
+#define BORNAGAIN_CORE_BASICS_ICLONEABLE_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -36,4 +36,4 @@ public:
     virtual void transferToCPP() {} //!< Used for Python overriding of clone (see swig/tweaks.py)
 };
 
-#endif // ICLONEABLE_H
+#endif // BORNAGAIN_CORE_BASICS_ICLONEABLE_H
diff --git a/Core/Basics/INamed.h b/Core/Basics/INamed.h
index 745deb2875b..0bad350b9d9 100644
--- a/Core/Basics/INamed.h
+++ b/Core/Basics/INamed.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INAMED_H
-#define INAMED_H
+#ifndef BORNAGAIN_CORE_BASICS_INAMED_H
+#define BORNAGAIN_CORE_BASICS_INAMED_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -36,4 +36,4 @@ private:
     std::string m_name;
 };
 
-#endif // INAMED_H
+#endif // BORNAGAIN_CORE_BASICS_INAMED_H
diff --git a/Core/Basics/ISingleton.h b/Core/Basics/ISingleton.h
index fc331937fca..575b1a1f4a1 100644
--- a/Core/Basics/ISingleton.h
+++ b/Core/Basics/ISingleton.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISINGLETON_H
-#define ISINGLETON_H
+#ifndef BORNAGAIN_CORE_BASICS_ISINGLETON_H
+#define BORNAGAIN_CORE_BASICS_ISINGLETON_H
 
 #include <iostream>
 #include <mutex>
@@ -60,4 +60,4 @@ private:
 template <class T> T* ISingleton<T>::m_instance = nullptr;
 template <class T> bool ISingleton<T>::m_destroyed = false;
 
-#endif // ISINGLETON_H
+#endif // BORNAGAIN_CORE_BASICS_ISINGLETON_H
diff --git a/Core/Basics/MathConstants.h b/Core/Basics/MathConstants.h
index 866cb434389..433857ffbf0 100644
--- a/Core/Basics/MathConstants.h
+++ b/Core/Basics/MathConstants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATHCONSTANTS_H
-#define MATHCONSTANTS_H
+#ifndef BORNAGAIN_CORE_BASICS_MATHCONSTANTS_H
+#define BORNAGAIN_CORE_BASICS_MATHCONSTANTS_H
 
 // undefine macros that may or may not be defined, depending on compiler settings
 #undef M_E
@@ -48,4 +48,4 @@
 // additionally, we find convenient:
 #define M_TWOPI 6.28318530717958647693
 
-#endif // MATHCONSTANTS_H
+#endif // BORNAGAIN_CORE_BASICS_MATHCONSTANTS_H
diff --git a/Core/Basics/PhysicalConstants.h b/Core/Basics/PhysicalConstants.h
index 2a5dd67cc7a..34881efdcda 100644
--- a/Core/Basics/PhysicalConstants.h
+++ b/Core/Basics/PhysicalConstants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PHYSICALCONSTANTS_H_
-#define PHYSICALCONSTANTS_H_
+#ifndef BORNAGAIN_CORE_BASICS_PHYSICALCONSTANTS_H
+#define BORNAGAIN_CORE_BASICS_PHYSICALCONSTANTS_H
 
 namespace PhysConsts
 {
@@ -27,4 +27,4 @@ constexpr double gamma_n = 1.91304272;     //!< \f$\gamma\f$ factor for neutron
 constexpr double g_factor_n = -3.82608545; //!< neutron g-factor
 } // namespace PhysConsts
 
-#endif /* PHYSICALCONSTANTS_H_ */
+#endif // BORNAGAIN_CORE_BASICS_PHYSICALCONSTANTS_H
diff --git a/Core/Beam/Beam.h b/Core/Beam/Beam.h
index 3af62c41dd3..1ce73201c84 100644
--- a/Core/Beam/Beam.h
+++ b/Core/Beam/Beam.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BEAM_H
-#define BEAM_H
+#ifndef BORNAGAIN_CORE_BEAM_BEAM_H
+#define BORNAGAIN_CORE_BEAM_BEAM_H
 
 #include "Core/Parametrization/INode.h"
 #include "Core/Vector/EigenCore.h"
@@ -83,4 +83,4 @@ private:
     kvector_t m_bloch_vector; //!< Bloch vector encoding the beam's polarization
 };
 
-#endif // BEAM_H
+#endif // BORNAGAIN_CORE_BEAM_BEAM_H
diff --git a/Core/Beam/FootprintFactorGaussian.h b/Core/Beam/FootprintFactorGaussian.h
index a93298d316e..89f15a73acc 100644
--- a/Core/Beam/FootprintFactorGaussian.h
+++ b/Core/Beam/FootprintFactorGaussian.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FOOTPRINTFACTORGAUSSIAN_H
-#define FOOTPRINTFACTORGAUSSIAN_H
+#ifndef BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORGAUSSIAN_H
+#define BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORGAUSSIAN_H
 
 #include "Core/Beam/IFootprintFactor.h"
 
@@ -44,4 +44,4 @@ private:
     void initialize();
 };
 
-#endif /* FOOTPRINTFACTORGAUSSIAN_H */
+#endif // BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORGAUSSIAN_H
diff --git a/Core/Beam/FootprintFactorSquare.h b/Core/Beam/FootprintFactorSquare.h
index 2be9166622c..76b0372f04f 100644
--- a/Core/Beam/FootprintFactorSquare.h
+++ b/Core/Beam/FootprintFactorSquare.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FOOTPRINTFACTORSQUARE_H_
-#define FOOTPRINTFACTORSQUARE_H_
+#ifndef BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORSQUARE_H
+#define BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORSQUARE_H
 
 #include "Core/Beam/IFootprintFactor.h"
 
@@ -42,4 +42,4 @@ private:
     void initialize();
 };
 
-#endif /* FOOTPRINTFACTORSQUARE_H_ */
+#endif // BORNAGAIN_CORE_BEAM_FOOTPRINTFACTORSQUARE_H
diff --git a/Core/Beam/IFootprintFactor.h b/Core/Beam/IFootprintFactor.h
index 251e14e76ae..fbd502a778b 100644
--- a/Core/Beam/IFootprintFactor.h
+++ b/Core/Beam/IFootprintFactor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFOOTPRINTFACTOR_H_
-#define IFOOTPRINTFACTOR_H_
+#ifndef BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
+#define BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -56,4 +56,4 @@ inline std::ostream& operator<<(std::ostream& os, const IFootprintFactor& f_fact
     return os << f_factor.print();
 }
 
-#endif /* IFOOTPRINTFACTOR_H_ */
+#endif // BORNAGAIN_CORE_BEAM_IFOOTPRINTFACTOR_H
diff --git a/Core/Binning/Bin.h b/Core/Binning/Bin.h
index dacd52b7313..1da9f1381f4 100644
--- a/Core/Binning/Bin.h
+++ b/Core/Binning/Bin.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BIN_H
-#define BIN_H
+#ifndef BORNAGAIN_CORE_BINNING_BIN_H
+#define BORNAGAIN_CORE_BINNING_BIN_H
 
 #include "Core/Vector/Vectors3D.h"
 
@@ -61,4 +61,4 @@ public:
     cvector_t m_q_upper; //!< upper bound of the bin
 };
 
-#endif // BIN_H
+#endif // BORNAGAIN_CORE_BINNING_BIN_H
diff --git a/Core/Binning/ConstKBinAxis.h b/Core/Binning/ConstKBinAxis.h
index bb782ca7a0c..73bf8c32e09 100644
--- a/Core/Binning/ConstKBinAxis.h
+++ b/Core/Binning/ConstKBinAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CONSTKBINAXIS_H
-#define CONSTKBINAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_CONSTKBINAXIS_H
+#define BORNAGAIN_CORE_BINNING_CONSTKBINAXIS_H
 
 #include "Core/Binning/VariableBinAxis.h"
 
@@ -45,4 +45,4 @@ protected:
     double m_end;
 };
 
-#endif // CONSTKBINAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_CONSTKBINAXIS_H
diff --git a/Core/Binning/CustomBinAxis.h b/Core/Binning/CustomBinAxis.h
index 0635e364ab0..c1ba1796516 100644
--- a/Core/Binning/CustomBinAxis.h
+++ b/Core/Binning/CustomBinAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CUSTOMBINAXIS_H
-#define CUSTOMBINAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_CUSTOMBINAXIS_H
+#define BORNAGAIN_CORE_BINNING_CUSTOMBINAXIS_H
 
 #include "Core/Binning/VariableBinAxis.h"
 
@@ -49,4 +49,4 @@ protected:
     std::vector<double> m_bin_centers;
 };
 
-#endif // CUSTOMBINAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_CUSTOMBINAXIS_H
diff --git a/Core/Binning/FixedBinAxis.h b/Core/Binning/FixedBinAxis.h
index ae006daa80d..18c8d4e5e29 100644
--- a/Core/Binning/FixedBinAxis.h
+++ b/Core/Binning/FixedBinAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FIXEDBINAXIS_H
-#define FIXEDBINAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_FIXEDBINAXIS_H
+#define BORNAGAIN_CORE_BINNING_FIXEDBINAXIS_H
 
 #include "Core/Binning/IAxis.h"
 
@@ -62,4 +62,4 @@ private:
     double m_end;
 };
 
-#endif // FIXEDBINAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_FIXEDBINAXIS_H
diff --git a/Core/Binning/IAxis.h b/Core/Binning/IAxis.h
index 53dcac306f4..bf99876e972 100644
--- a/Core/Binning/IAxis.h
+++ b/Core/Binning/IAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IAXIS_H
-#define IAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_IAXIS_H
+#define BORNAGAIN_CORE_BINNING_IAXIS_H
 
 #include "Core/Binning/Bin.h"
 #include <vector>
@@ -96,4 +96,4 @@ inline bool HaveSameNameAndShape(const IAxis& left, const IAxis& right)
     return left == right;
 }
 
-#endif // IAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_IAXIS_H
diff --git a/Core/Binning/IPixel.h b/Core/Binning/IPixel.h
index fcd6245aec2..c9295e2fb6a 100644
--- a/Core/Binning/IPixel.h
+++ b/Core/Binning/IPixel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPIXEL_H
-#define IPIXEL_H
+#ifndef BORNAGAIN_CORE_BINNING_IPIXEL_H
+#define BORNAGAIN_CORE_BINNING_IPIXEL_H
 
 #include "Core/Vector/Vectors3D.h"
 #include "Wrap/WinDllMacros.h"
@@ -33,4 +33,4 @@ public:
     virtual double getSolidAngle() const = 0;
 };
 
-#endif // IPIXEL_H
+#endif // BORNAGAIN_CORE_BINNING_IPIXEL_H
diff --git a/Core/Binning/PointwiseAxis.h b/Core/Binning/PointwiseAxis.h
index 41aaf143789..68a7f8f37d1 100644
--- a/Core/Binning/PointwiseAxis.h
+++ b/Core/Binning/PointwiseAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POINTWISEAXIS_H
-#define POINTWISEAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_POINTWISEAXIS_H
+#define BORNAGAIN_CORE_BINNING_POINTWISEAXIS_H
 
 #include "Core/Binning/IAxis.h"
 
@@ -85,4 +85,4 @@ private:
     std::vector<double> m_coordinates;
 };
 
-#endif // POINTWISEAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_POINTWISEAXIS_H
diff --git a/Core/Binning/VariableBinAxis.h b/Core/Binning/VariableBinAxis.h
index 456ce3fcc52..d53b10e9b66 100644
--- a/Core/Binning/VariableBinAxis.h
+++ b/Core/Binning/VariableBinAxis.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef VARIABLEBINAXIS_H
-#define VARIABLEBINAXIS_H
+#ifndef BORNAGAIN_CORE_BINNING_VARIABLEBINAXIS_H
+#define BORNAGAIN_CORE_BINNING_VARIABLEBINAXIS_H
 
 #include "Core/Binning/IAxis.h"
 
@@ -64,4 +64,4 @@ private:
     std::vector<double> m_bin_boundaries; //!< vector containing the bin limits
 };
 
-#endif // VARIABLEBINAXIS_H
+#endif // BORNAGAIN_CORE_BINNING_VARIABLEBINAXIS_H
diff --git a/Core/Computation/ComputationStatus.h b/Core/Computation/ComputationStatus.h
index 967d1952f9e..6861c2b9a75 100644
--- a/Core/Computation/ComputationStatus.h
+++ b/Core/Computation/ComputationStatus.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPUTATIONSTATUS_H
-#define COMPUTATIONSTATUS_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_COMPUTATIONSTATUS_H
+#define BORNAGAIN_CORE_COMPUTATION_COMPUTATIONSTATUS_H
 
 #include <string>
 
@@ -40,4 +40,4 @@ private:
     std::string m_error_message;
 };
 
-#endif // COMPUTATIONSTATUS_H
+#endif // BORNAGAIN_CORE_COMPUTATION_COMPUTATIONSTATUS_H
diff --git a/Core/Computation/ConstantBackground.h b/Core/Computation/ConstantBackground.h
index d528904645b..21881879743 100644
--- a/Core/Computation/ConstantBackground.h
+++ b/Core/Computation/ConstantBackground.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CONSTANTBACKGROUND_H
-#define CONSTANTBACKGROUND_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_CONSTANTBACKGROUND_H
+#define BORNAGAIN_CORE_COMPUTATION_CONSTANTBACKGROUND_H
 
 #include "Core/Computation/IBackground.h"
 
@@ -40,4 +40,4 @@ private:
     double m_background_value;
 };
 
-#endif // CONSTANTBACKGROUND_H
+#endif // BORNAGAIN_CORE_COMPUTATION_CONSTANTBACKGROUND_H
diff --git a/Core/Computation/DWBAComputation.h b/Core/Computation/DWBAComputation.h
index 14f5129f0c9..9245e391bd1 100644
--- a/Core/Computation/DWBAComputation.h
+++ b/Core/Computation/DWBAComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAINCOMPUTATION_H
-#define MAINCOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_DWBACOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_DWBACOMPUTATION_H
 
 #include "Core/Computation/DWBASingleComputation.h"
 #include "Core/Computation/IComputation.h"
@@ -45,4 +45,4 @@ private:
     DWBASingleComputation m_single_computation;
 };
 
-#endif // MAINCOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_DWBACOMPUTATION_H
diff --git a/Core/Computation/DWBASingleComputation.h b/Core/Computation/DWBASingleComputation.h
index 9052dd562ad..508420b7e77 100644
--- a/Core/Computation/DWBASingleComputation.h
+++ b/Core/Computation/DWBASingleComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DWBASINGLECOMPUTATION_H
-#define DWBASINGLECOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_DWBASINGLECOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_DWBASINGLECOMPUTATION_H
 
 #include "Core/Particle/HomogeneousRegion.h"
 #include <map>
@@ -59,4 +59,4 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // DWBASINGLECOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_DWBASINGLECOMPUTATION_H
diff --git a/Core/Computation/DelayedProgressCounter.h b/Core/Computation/DelayedProgressCounter.h
index 3c68a33edfc..0a06a6a028e 100644
--- a/Core/Computation/DelayedProgressCounter.h
+++ b/Core/Computation/DelayedProgressCounter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DELAYEDPROGRESSCOUNTER_H
-#define DELAYEDPROGRESSCOUNTER_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_DELAYEDPROGRESSCOUNTER_H
+#define BORNAGAIN_CORE_COMPUTATION_DELAYEDPROGRESSCOUNTER_H
 
 #include <cstddef>
 
@@ -36,4 +36,4 @@ private:
     size_t m_count;
 };
 
-#endif // DELAYEDPROGRESSCOUNTER_H
+#endif // BORNAGAIN_CORE_COMPUTATION_DELAYEDPROGRESSCOUNTER_H
diff --git a/Core/Computation/DepthProbeComputation.h b/Core/Computation/DepthProbeComputation.h
index e7253a3cfd3..20d09f8653e 100644
--- a/Core/Computation/DepthProbeComputation.h
+++ b/Core/Computation/DepthProbeComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBECOMPUTATION_H
-#define DEPTHPROBECOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATION_H
 
 #include "Core/Computation/DepthProbeComputationTerm.h"
 #include "Core/Computation/IComputation.h"
@@ -44,4 +44,4 @@ private:
     DepthProbeComputationTerm m_computation_term;
 };
 
-#endif // DEPTHPROBECOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATION_H
diff --git a/Core/Computation/DepthProbeComputationTerm.h b/Core/Computation/DepthProbeComputationTerm.h
index 277d1423c41..acf6dd738a8 100644
--- a/Core/Computation/DepthProbeComputationTerm.h
+++ b/Core/Computation/DepthProbeComputationTerm.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBECOMPUTATIONTERM_H
-#define DEPTHPROBECOMPUTATIONTERM_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATIONTERM_H
+#define BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATIONTERM_H
 
 #include <memory>
 
@@ -37,4 +37,4 @@ private:
     std::unique_ptr<DelayedProgressCounter> mP_progress_counter;
 };
 
-#endif // DEPTHPROBECOMPUTATIONTERM_H
+#endif // BORNAGAIN_CORE_COMPUTATION_DEPTHPROBECOMPUTATIONTERM_H
diff --git a/Core/Computation/GISASSpecularComputation.h b/Core/Computation/GISASSpecularComputation.h
index 942dca612d5..eb7e8a6450c 100644
--- a/Core/Computation/GISASSpecularComputation.h
+++ b/Core/Computation/GISASSpecularComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GISASSPECULARCOMPUTATION_H_
-#define GISASSPECULARCOMPUTATION_H_
+#ifndef BORNAGAIN_CORE_COMPUTATION_GISASSPECULARCOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_GISASSPECULARCOMPUTATION_H
 
 class IFresnelMap;
 class SimulationElement;
@@ -32,4 +32,4 @@ private:
     const IFresnelMap* mp_fresnel_map;
 };
 
-#endif // GISASSPECULARCOMPUTATION_H_
+#endif // BORNAGAIN_CORE_COMPUTATION_GISASSPECULARCOMPUTATION_H
diff --git a/Core/Computation/IBackground.h b/Core/Computation/IBackground.h
index d864f70370a..ed6275e6b98 100644
--- a/Core/Computation/IBackground.h
+++ b/Core/Computation/IBackground.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IBACKGROUND_H
-#define IBACKGROUND_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_IBACKGROUND_H
+#define BORNAGAIN_CORE_COMPUTATION_IBACKGROUND_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -31,4 +31,4 @@ public:
     virtual double addBackGround(double element) const = 0;
 };
 
-#endif // IBACKGROUND_H
+#endif // BORNAGAIN_CORE_COMPUTATION_IBACKGROUND_H
diff --git a/Core/Computation/IComputation.h b/Core/Computation/IComputation.h
index b6058b5ed4c..bed0fe1b1b2 100644
--- a/Core/Computation/IComputation.h
+++ b/Core/Computation/IComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ICOMPUTATION_H
-#define ICOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_ICOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_ICOMPUTATION_H
 
 #include "Core/Computation/ComputationStatus.h"
 #include "Core/Parametrization/SimulationOptions.h"
@@ -53,4 +53,4 @@ private:
     virtual void runProtected() = 0;
 };
 
-#endif // ICOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_ICOMPUTATION_H
diff --git a/Core/Computation/MultiLayerUtils.h b/Core/Computation/MultiLayerUtils.h
index 1be12fd79f1..eea900e63ad 100644
--- a/Core/Computation/MultiLayerUtils.h
+++ b/Core/Computation/MultiLayerUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERUTILS_H
-#define MULTILAYERUTILS_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_MULTILAYERUTILS_H
+#define BORNAGAIN_CORE_COMPUTATION_MULTILAYERUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <cstddef>
@@ -51,4 +51,4 @@ BA_CORE_API_ std::vector<ZLimits> ParticleRegions(const MultiLayer& multilayer,
 BA_CORE_API_ bool hasRoughness(const MultiLayer& sample);
 } // namespace MultiLayerUtils
 
-#endif // MULTILAYERUTILS_H
+#endif // BORNAGAIN_CORE_COMPUTATION_MULTILAYERUTILS_H
diff --git a/Core/Computation/ParticleLayoutComputation.h b/Core/Computation/ParticleLayoutComputation.h
index 5ca53c97fcb..596dd908aa5 100644
--- a/Core/Computation/ParticleLayoutComputation.h
+++ b/Core/Computation/ParticleLayoutComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLELAYOUTCOMPUTATION_H
-#define PARTICLELAYOUTCOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_PARTICLELAYOUTCOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_PARTICLELAYOUTCOMPUTATION_H
 
 #include "Core/Particle/HomogeneousRegion.h"
 #include <map>
@@ -48,4 +48,4 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // PARTICLELAYOUTCOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_PARTICLELAYOUTCOMPUTATION_H
diff --git a/Core/Computation/PoissonNoiseBackground.h b/Core/Computation/PoissonNoiseBackground.h
index bf0abf4cc61..c5cbe887172 100644
--- a/Core/Computation/PoissonNoiseBackground.h
+++ b/Core/Computation/PoissonNoiseBackground.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POISSONNOISEBACKGROUND_H
-#define POISSONNOISEBACKGROUND_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_POISSONNOISEBACKGROUND_H
+#define BORNAGAIN_CORE_COMPUTATION_POISSONNOISEBACKGROUND_H
 
 #include "Core/Computation/IBackground.h"
 
@@ -33,4 +33,4 @@ public:
     double addBackGround(double intensity) const override final;
 };
 
-#endif // POISSONNOISEBACKGROUND_H
+#endif // BORNAGAIN_CORE_COMPUTATION_POISSONNOISEBACKGROUND_H
diff --git a/Core/Computation/ProcessedLayout.h b/Core/Computation/ProcessedLayout.h
index 7503aa1748e..a74094cba7c 100644
--- a/Core/Computation/ProcessedLayout.h
+++ b/Core/Computation/ProcessedLayout.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROCESSEDLAYOUT_H
-#define PROCESSEDLAYOUT_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_PROCESSEDLAYOUT_H
+#define BORNAGAIN_CORE_COMPUTATION_PROCESSEDLAYOUT_H
 
 #include <map>
 #include <memory>
@@ -62,4 +62,4 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // PROCESSEDLAYOUT_H
+#endif // BORNAGAIN_CORE_COMPUTATION_PROCESSEDLAYOUT_H
diff --git a/Core/Computation/ProcessedSample.h b/Core/Computation/ProcessedSample.h
index 73f46df33bd..d6751cec5c3 100644
--- a/Core/Computation/ProcessedSample.h
+++ b/Core/Computation/ProcessedSample.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROCESSEDSAMPLE_H
-#define PROCESSEDSAMPLE_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_PROCESSEDSAMPLE_H
+#define BORNAGAIN_CORE_COMPUTATION_PROCESSEDSAMPLE_H
 
 #include "Core/Computation/Slice.h"
 #include "Core/Material/Material.h"
@@ -79,4 +79,4 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // PROCESSEDSAMPLE_H
+#endif // BORNAGAIN_CORE_COMPUTATION_PROCESSEDSAMPLE_H
diff --git a/Core/Computation/ProfileHelper.h b/Core/Computation/ProfileHelper.h
index 9652c4274bd..f657b1e04ff 100644
--- a/Core/Computation/ProfileHelper.h
+++ b/Core/Computation/ProfileHelper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROFILEHELPER_H
-#define PROFILEHELPER_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_PROFILEHELPER_H
+#define BORNAGAIN_CORE_COMPUTATION_PROFILEHELPER_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Material/Material.h"
@@ -45,4 +45,4 @@ private:
     std::vector<double> m_sigmas;
 };
 
-#endif // PROFILEHELPER_H
+#endif // BORNAGAIN_CORE_COMPUTATION_PROFILEHELPER_H
diff --git a/Core/Computation/ProgressHandler.h b/Core/Computation/ProgressHandler.h
index 0747fc6010e..68727dda8e6 100644
--- a/Core/Computation/ProgressHandler.h
+++ b/Core/Computation/ProgressHandler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROGRESSHANDLER_H
-#define PROGRESSHANDLER_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_PROGRESSHANDLER_H
+#define BORNAGAIN_CORE_COMPUTATION_PROGRESSHANDLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <functional>
@@ -61,4 +61,4 @@ private:
     bool defaultMonitorExec(int);
 };
 
-#endif // PROGRESSHANDLER_H
+#endif // BORNAGAIN_CORE_COMPUTATION_PROGRESSHANDLER_H
diff --git a/Core/Computation/RoughMultiLayerComputation.h b/Core/Computation/RoughMultiLayerComputation.h
index ec78398145a..0be243e6771 100644
--- a/Core/Computation/RoughMultiLayerComputation.h
+++ b/Core/Computation/RoughMultiLayerComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROUGHMULTILAYERCOMPUTATION_H
-#define ROUGHMULTILAYERCOMPUTATION_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_ROUGHMULTILAYERCOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_ROUGHMULTILAYERCOMPUTATION_H
 
 #include "Core/Basics/Complex.h"
 
@@ -37,4 +37,4 @@ private:
     complex_t get_sum8terms(size_t ilayer, const SimulationElement& sim_element) const;
 };
 
-#endif // ROUGHMULTILAYERCOMPUTATION_H
+#endif // BORNAGAIN_CORE_COMPUTATION_ROUGHMULTILAYERCOMPUTATION_H
diff --git a/Core/Computation/Slice.h b/Core/Computation/Slice.h
index dc39562d13f..4525b82f7a3 100644
--- a/Core/Computation/Slice.h
+++ b/Core/Computation/Slice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLICE_H
-#define SLICE_H
+#ifndef BORNAGAIN_CORE_COMPUTATION_SLICE_H
+#define BORNAGAIN_CORE_COMPUTATION_SLICE_H
 
 #include "Core/Material/Material.h"
 #include <memory>
@@ -64,4 +64,4 @@ private:
     std::unique_ptr<LayerRoughness> mP_top_roughness;
 };
 
-#endif // SLICE_H
+#endif // BORNAGAIN_CORE_COMPUTATION_SLICE_H
diff --git a/Core/Computation/SpecularComputation.h b/Core/Computation/SpecularComputation.h
index 3044d928a88..7a05c82befb 100644
--- a/Core/Computation/SpecularComputation.h
+++ b/Core/Computation/SpecularComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARCOMPUTATION_H_
-#define SPECULARCOMPUTATION_H_
+#ifndef BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATION_H
+#define BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATION_H
 
 #include "Core/Computation/IComputation.h"
 #include "Core/Computation/SpecularComputationTerm.h"
@@ -46,4 +46,4 @@ private:
     std::unique_ptr<SpecularComputationTerm> m_computation_term;
 };
 
-#endif /* SPECULARCOMPUTATION_H_ */
+#endif // BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATION_H
diff --git a/Core/Computation/SpecularComputationTerm.h b/Core/Computation/SpecularComputationTerm.h
index 7a92cfe450f..faefd62e774 100644
--- a/Core/Computation/SpecularComputationTerm.h
+++ b/Core/Computation/SpecularComputationTerm.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARCOMPUTATIONTERM_H_
-#define SPECULARCOMPUTATIONTERM_H_
+#ifndef BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATIONTERM_H
+#define BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATIONTERM_H
 
 #include "Core/Multilayer/ISpecularStrategy.h"
 
@@ -88,4 +88,4 @@ protected:
                      ISpecularStrategy::single_coeff_t& coeff) const;
 };
 
-#endif /* SPECULARCOMPUTATIONTERM_H_ */
+#endif // BORNAGAIN_CORE_COMPUTATION_SPECULARCOMPUTATIONTERM_H
diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h b/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h
index 0963b9e56b0..2e4eba67997 100644
--- a/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h
+++ b/Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDECORATORMATERIAL_H
-#define FORMFACTORDECORATORMATERIAL_H
+#ifndef BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORMATERIAL_H
+#define BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORMATERIAL_H
 
 #include "Core/DecoratedFormFactor/IFormFactorDecorator.h"
 #include "Core/Material/Material.h"
@@ -53,4 +53,4 @@ private:
     Material m_ambient_material;
 };
 
-#endif // FORMFACTORDECORATORMATERIAL_H
+#endif // BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORMATERIAL_H
diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h
index c1fb3d00f93..62c7cd6a9f6 100644
--- a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h
+++ b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDECORATORPOSITIONFACTOR_H
-#define FORMFACTORDECORATORPOSITIONFACTOR_H
+#ifndef BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORPOSITIONFACTOR_H
+#define BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORPOSITIONFACTOR_H
 
 #include "Core/DecoratedFormFactor/IFormFactorDecorator.h"
 #include "Core/Vector/Vectors3D.h"
@@ -48,4 +48,4 @@ private:
     kvector_t m_position;
 };
 
-#endif // FORMFACTORDECORATORPOSITIONFACTOR_H
+#endif // BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORPOSITIONFACTOR_H
diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h
index 5e03585ad73..82d6b72e7bb 100644
--- a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h
+++ b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDECORATORROTATION_H
-#define FORMFACTORDECORATORROTATION_H
+#ifndef BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORROTATION_H
+#define BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORROTATION_H
 
 #include "Core/DecoratedFormFactor/IFormFactorDecorator.h"
 #include "Core/Scattering/Rotations.h"
@@ -46,4 +46,4 @@ private:
     FormFactorDecoratorRotation(const IFormFactor& form_factor, const Transform3D& transform);
 };
 
-#endif // FORMFACTORDECORATORROTATION_H
+#endif // BORNAGAIN_CORE_DECORATEDFORMFACTOR_FORMFACTORDECORATORROTATION_H
diff --git a/Core/DecoratedFormFactor/IFormFactorDecorator.h b/Core/DecoratedFormFactor/IFormFactorDecorator.h
index d8513060a69..6cd3b18ca19 100644
--- a/Core/DecoratedFormFactor/IFormFactorDecorator.h
+++ b/Core/DecoratedFormFactor/IFormFactorDecorator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFORMFACTORDECORATOR_H
-#define IFORMFACTORDECORATOR_H
+#ifndef BORNAGAIN_CORE_DECORATEDFORMFACTOR_IFORMFACTORDECORATOR_H
+#define BORNAGAIN_CORE_DECORATEDFORMFACTOR_IFORMFACTORDECORATOR_H
 
 #include "Core/Scattering/IFormFactor.h"
 
@@ -55,4 +55,4 @@ protected:
     IFormFactor* mp_form_factor;
 };
 
-#endif // IFORMFACTORDECORATOR_H
+#endif // BORNAGAIN_CORE_DECORATEDFORMFACTOR_IFORMFACTORDECORATOR_H
diff --git a/Core/Export/ExportToPython.h b/Core/Export/ExportToPython.h
index 42b7d5a71da..c57e788d32c 100644
--- a/Core/Export/ExportToPython.h
+++ b/Core/Export/ExportToPython.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef EXPORTTOPYTHON_H
-#define EXPORTTOPYTHON_H
+#ifndef BORNAGAIN_CORE_EXPORT_EXPORTTOPYTHON_H
+#define BORNAGAIN_CORE_EXPORT_EXPORTTOPYTHON_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -32,4 +32,4 @@ BA_CORE_API_ std::string generatePyExportTest(const Simulation& simulation);
 
 } // namespace ExportToPython
 
-#endif // EXPORTTOPYTHON_H
+#endif // BORNAGAIN_CORE_EXPORT_EXPORTTOPYTHON_H
diff --git a/Core/Export/INodeUtils.h b/Core/Export/INodeUtils.h
index f8543c015bc..365fff03c4a 100644
--- a/Core/Export/INodeUtils.h
+++ b/Core/Export/INodeUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INODEUTILS_H
-#define INODEUTILS_H
+#ifndef BORNAGAIN_CORE_EXPORT_INODEUTILS_H
+#define BORNAGAIN_CORE_EXPORT_INODEUTILS_H
 
 #include "Core/Parametrization/INode.h"
 
@@ -50,4 +50,4 @@ template <typename T> std::vector<const T*> AllDescendantsOfType(const INode& no
 }
 } // namespace INodeUtils
 
-#endif // INODEUTILS_H
+#endif // BORNAGAIN_CORE_EXPORT_INODEUTILS_H
diff --git a/Core/Export/PythonFormatting.h b/Core/Export/PythonFormatting.h
index 6b966d9a038..47e34883189 100644
--- a/Core/Export/PythonFormatting.h
+++ b/Core/Export/PythonFormatting.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYTHONFORMATTING_H
-#define PYTHONFORMATTING_H
+#ifndef BORNAGAIN_CORE_EXPORT_PYTHONFORMATTING_H
+#define BORNAGAIN_CORE_EXPORT_PYTHONFORMATTING_H
 
 #include "Core/Vector/Vectors3D.h"
 #include <functional>
@@ -76,4 +76,4 @@ BA_CORE_API_ std::string printAxis(const IAxis& axis, const std::string& units,
 BA_CORE_API_ std::string indent(size_t width = 4u);
 } // namespace PythonFormatting
 
-#endif // PYTHONFORMATTING_H
+#endif // BORNAGAIN_CORE_EXPORT_PYTHONFORMATTING_H
diff --git a/Core/Export/SampleLabelHandler.h b/Core/Export/SampleLabelHandler.h
index 718ecf02373..405a24073fc 100644
--- a/Core/Export/SampleLabelHandler.h
+++ b/Core/Export/SampleLabelHandler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLELABELHANDLER_H
-#define SAMPLELABELHANDLER_H
+#ifndef BORNAGAIN_CORE_EXPORT_SAMPLELABELHANDLER_H
+#define BORNAGAIN_CORE_EXPORT_SAMPLELABELHANDLER_H
 
 #include "Core/Basics/Exceptions.h"
 #include "Core/Tools/OrderedMap.h"
@@ -124,4 +124,4 @@ private:
     roughnesses_t m_LayerRoughnessLabel;
 };
 
-#endif // SAMPLELABELHANDLER_H
+#endif // BORNAGAIN_CORE_EXPORT_SAMPLELABELHANDLER_H
diff --git a/Core/Export/SampleToPython.h b/Core/Export/SampleToPython.h
index 6a2d1778aa9..199e9cb1943 100644
--- a/Core/Export/SampleToPython.h
+++ b/Core/Export/SampleToPython.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLETOPYTHON_H
-#define SAMPLETOPYTHON_H
+#ifndef BORNAGAIN_CORE_EXPORT_SAMPLETOPYTHON_H
+#define BORNAGAIN_CORE_EXPORT_SAMPLETOPYTHON_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -63,4 +63,4 @@ private:
     std::unique_ptr<SampleLabelHandler> m_label;
 };
 
-#endif //  SAMPLETOPYTHON_H
+#endif // BORNAGAIN_CORE_EXPORT_SAMPLETOPYTHON_H
diff --git a/Core/Export/SimulationToPython.h b/Core/Export/SimulationToPython.h
index 2c0c1c04ee0..ef4b0d5912f 100644
--- a/Core/Export/SimulationToPython.h
+++ b/Core/Export/SimulationToPython.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONTOPYTHON_H
-#define SIMULATIONTOPYTHON_H
+#ifndef BORNAGAIN_CORE_EXPORT_SIMULATIONTOPYTHON_H
+#define BORNAGAIN_CORE_EXPORT_SIMULATIONTOPYTHON_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -62,4 +62,4 @@ private:
     std::string defineMain(EMainType mainType = RUN_SIMULATION);
 };
 
-#endif // SIMULATIONTOPYTHON_H
+#endif // BORNAGAIN_CORE_EXPORT_SIMULATIONTOPYTHON_H
diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h
index bb9e5176736..2c41c75351f 100644
--- a/Core/Fitting/FitObjective.h
+++ b/Core/Fitting/FitObjective.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBJECTIVE_H
-#define FITOBJECTIVE_H
+#ifndef BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
+#define BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
 
 #include "Core/Fitting/FitTypes.h"
 #include "Core/Fitting/IterationInfo.h"
@@ -146,4 +146,4 @@ private:
     std::unique_ptr<FitStatus> m_fit_status;
 };
 
-#endif // FITOBJECTIVE_H
+#endif // BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
diff --git a/Core/Fitting/FitObserver.h b/Core/Fitting/FitObserver.h
index 0562dc2ca7e..7c56ec59c5e 100644
--- a/Core/Fitting/FitObserver.h
+++ b/Core/Fitting/FitObserver.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBSERVER_H
-#define FITOBSERVER_H
+#ifndef BORNAGAIN_CORE_FITTING_FITOBSERVER_H
+#define BORNAGAIN_CORE_FITTING_FITOBSERVER_H
 
 #include "Core/Fitting/FitTypes.h"
 #include <functional>
@@ -89,4 +89,4 @@ template <class T> bool FitObserver<T>::need_notify(int every_nth)
     return m_notify_count == 0 || m_notify_count % every_nth == 0 ? true : false;
 }
 
-#endif // FITOBSERVER_H
+#endif // BORNAGAIN_CORE_FITTING_FITOBSERVER_H
diff --git a/Core/Fitting/FitPrintService.h b/Core/Fitting/FitPrintService.h
index c618c8f6c8a..be56ef8665b 100644
--- a/Core/Fitting/FitPrintService.h
+++ b/Core/Fitting/FitPrintService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPRINTSERVICE_H
-#define FITPRINTSERVICE_H
+#ifndef BORNAGAIN_CORE_FITTING_FITPRINTSERVICE_H
+#define BORNAGAIN_CORE_FITTING_FITPRINTSERVICE_H
 
 #include "Fit/Tools/WallclockTimer.h"
 #include "Wrap/WinDllMacros.h"
@@ -40,4 +40,4 @@ private:
     WallclockTimer m_last_call_time;
 };
 
-#endif
+#endif // BORNAGAIN_CORE_FITTING_FITPRINTSERVICE_H
diff --git a/Core/Fitting/FitStatus.h b/Core/Fitting/FitStatus.h
index 8b0a2d593a2..003ebb16425 100644
--- a/Core/Fitting/FitStatus.h
+++ b/Core/Fitting/FitStatus.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITSTATUS_H
-#define FITSTATUS_H
+#ifndef BORNAGAIN_CORE_FITTING_FITSTATUS_H
+#define BORNAGAIN_CORE_FITTING_FITSTATUS_H
 
 #include "Core/Fitting/FitObserver.h"
 #include "Core/Fitting/FitTypes.h"
@@ -66,4 +66,4 @@ private:
     std::unique_ptr<Fit::MinimizerResult> m_minimizer_result;
 };
 
-#endif // FITSTATUS_H
+#endif // BORNAGAIN_CORE_FITTING_FITSTATUS_H
diff --git a/Core/Fitting/FitTypes.h b/Core/Fitting/FitTypes.h
index 343b6f9ee60..7844f04e9b7 100644
--- a/Core/Fitting/FitTypes.h
+++ b/Core/Fitting/FitTypes.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITTYPES_H
-#define FITTYPES_H
+#ifndef BORNAGAIN_CORE_FITTING_FITTYPES_H
+#define BORNAGAIN_CORE_FITTING_FITTYPES_H
 
 #include "Wrap/WinDllMacros.h"
 #include <functional>
@@ -30,4 +30,4 @@ using simulation_builder_t = std::function<std::unique_ptr<Simulation>(const Fit
 
 using fit_observer_t = std::function<void(const FitObjective&)>;
 
-#endif
+#endif // BORNAGAIN_CORE_FITTING_FITTYPES_H
diff --git a/Core/Fitting/IObserver.h b/Core/Fitting/IObserver.h
index 87ec1196d7d..8e5529f708f 100644
--- a/Core/Fitting/IObserver.h
+++ b/Core/Fitting/IObserver.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IOBSERVER_H
-#define IOBSERVER_H
+#ifndef BORNAGAIN_CORE_FITTING_IOBSERVER_H
+#define BORNAGAIN_CORE_FITTING_IOBSERVER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <list>
@@ -54,4 +54,4 @@ private:
     std::list<observer_t> m_observers;
 };
 
-#endif // IOBSERVER_H
+#endif // BORNAGAIN_CORE_FITTING_IOBSERVER_H
diff --git a/Core/Fitting/IterationInfo.h b/Core/Fitting/IterationInfo.h
index 250e4b1822b..04f7f363a9c 100644
--- a/Core/Fitting/IterationInfo.h
+++ b/Core/Fitting/IterationInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITERATIONINFO_H
-#define ITERATIONINFO_H
+#ifndef BORNAGAIN_CORE_FITTING_ITERATIONINFO_H
+#define BORNAGAIN_CORE_FITTING_ITERATIONINFO_H
 
 #include "Fit/Kernel/Parameters.h"
 #include "Wrap/WinDllMacros.h"
@@ -46,4 +46,4 @@ private:
     unsigned m_iteration_count;
 };
 
-#endif // ITERATIONINFO_H
+#endif // BORNAGAIN_CORE_FITTING_ITERATIONINFO_H
diff --git a/Core/Fitting/ObjectiveMetric.h b/Core/Fitting/ObjectiveMetric.h
index e9d7e41c4a7..3da96648ef9 100644
--- a/Core/Fitting/ObjectiveMetric.h
+++ b/Core/Fitting/ObjectiveMetric.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OBJECTIVEMETRIC_H
-#define OBJECTIVEMETRIC_H
+#ifndef BORNAGAIN_CORE_FITTING_OBJECTIVEMETRIC_H
+#define BORNAGAIN_CORE_FITTING_OBJECTIVEMETRIC_H
 
 #include "Core/Basics/ICloneable.h"
 #include <functional>
@@ -199,4 +199,4 @@ public:
     double compute(const SimDataPair& data_pair, bool use_weights) const override;
 };
 
-#endif // OBJECTIVEMETRIC_H
+#endif // BORNAGAIN_CORE_FITTING_OBJECTIVEMETRIC_H
diff --git a/Core/Fitting/ObjectiveMetricUtils.h b/Core/Fitting/ObjectiveMetricUtils.h
index 76a45643aaa..e8ad28501e5 100644
--- a/Core/Fitting/ObjectiveMetricUtils.h
+++ b/Core/Fitting/ObjectiveMetricUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OBJECTIVEMETRICUTILS_H
-#define OBJECTIVEMETRICUTILS_H
+#ifndef BORNAGAIN_CORE_FITTING_OBJECTIVEMETRICUTILS_H
+#define BORNAGAIN_CORE_FITTING_OBJECTIVEMETRICUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <functional>
@@ -52,4 +52,4 @@ BA_CORE_API_ std::string defaultNormName();
 BA_CORE_API_ std::string defaultMetricName();
 } // namespace ObjectiveMetricUtils
 
-#endif // OBJECTIVEMETRICUTILS_H
+#endif // BORNAGAIN_CORE_FITTING_OBJECTIVEMETRICUTILS_H
diff --git a/Core/Fitting/PyFittingCallbacks.h b/Core/Fitting/PyFittingCallbacks.h
index bb7d0766667..6c57ccdc52a 100644
--- a/Core/Fitting/PyFittingCallbacks.h
+++ b/Core/Fitting/PyFittingCallbacks.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYFITTINGCALLBACKS_H
-#define PYFITTINGCALLBACKS_H
+#ifndef BORNAGAIN_CORE_FITTING_PYFITTINGCALLBACKS_H
+#define BORNAGAIN_CORE_FITTING_PYFITTINGCALLBACKS_H
 
 //! Collection of wrapper classes to call Python callable from C++.
 
@@ -50,4 +50,4 @@ public:
     virtual void update(const FitObjective&);
 };
 
-#endif //  PYFITTINGCALLBACKS_H
+#endif // BORNAGAIN_CORE_FITTING_PYFITTINGCALLBACKS_H
diff --git a/Core/Fitting/SimDataPair.h b/Core/Fitting/SimDataPair.h
index aa3bd86d47d..49f704921d0 100644
--- a/Core/Fitting/SimDataPair.h
+++ b/Core/Fitting/SimDataPair.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMDATAPAIR_H
-#define SIMDATAPAIR_H
+#ifndef BORNAGAIN_CORE_FITTING_SIMDATAPAIR_H
+#define BORNAGAIN_CORE_FITTING_SIMDATAPAIR_H
 
 #include "Core/Fitting/FitTypes.h"
 #include "Core/Instrument/SimulationResult.h"
@@ -120,4 +120,4 @@ private:
     std::unique_ptr<OutputData<double>> m_raw_user_weights;
 };
 
-#endif // SIMDATAPAIR_H
+#endif // BORNAGAIN_CORE_FITTING_SIMDATAPAIR_H
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.h b/Core/HardParticle/FormFactorAnisoPyramid.h
index 5eb1f343ce6..5684a97bad5 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.h
+++ b/Core/HardParticle/FormFactorAnisoPyramid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORANISOPYRAMID_H
-#define FORMFACTORANISOPYRAMID_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -51,4 +51,4 @@ private:
     double m_alpha;
 };
 
-#endif // FORMFACTORANISOPYRAMID_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
diff --git a/Core/HardParticle/FormFactorBar.h b/Core/HardParticle/FormFactorBar.h
index d17d3b077bb..70adb8c1662 100644
--- a/Core/HardParticle/FormFactorBar.h
+++ b/Core/HardParticle/FormFactorBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORBAR_H
-#define FORMFACTORBAR_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
 
 #include "Core/HardParticle/ProfileBar.h"
 
@@ -43,4 +43,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // FORMFACTORBAR_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
diff --git a/Core/HardParticle/FormFactorBox.h b/Core/HardParticle/FormFactorBox.h
index c18b5a4b1b9..9a9cd72bb5e 100644
--- a/Core/HardParticle/FormFactorBox.h
+++ b/Core/HardParticle/FormFactorBox.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORBOX_H
-#define FORMFACTORBOX_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -50,4 +50,4 @@ private:
     double m_width;
 };
 
-#endif // FORMFACTORBOX_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
diff --git a/Core/HardParticle/FormFactorCantellatedCube.h b/Core/HardParticle/FormFactorCantellatedCube.h
index 873ed08823c..17c6731a7bf 100644
--- a/Core/HardParticle/FormFactorCantellatedCube.h
+++ b/Core/HardParticle/FormFactorCantellatedCube.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTOREDGETRUNCATEDCUBE_H
-#define FORMFACTOREDGETRUNCATEDCUBE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -43,4 +43,4 @@ private:
     double m_removed_length;
 };
 
-#endif // FORMFACTOREDGETRUNCATEDCUBE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
diff --git a/Core/HardParticle/FormFactorCone.h b/Core/HardParticle/FormFactorCone.h
index 1ed5f7cbfb3..b11065dd52e 100644
--- a/Core/HardParticle/FormFactorCone.h
+++ b/Core/HardParticle/FormFactorCone.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCONE_H
-#define FORMFACTORCONE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -57,4 +57,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // FORMFACTORCONE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
diff --git a/Core/HardParticle/FormFactorCone6.h b/Core/HardParticle/FormFactorCone6.h
index 4612de15251..9e47288f5e9 100644
--- a/Core/HardParticle/FormFactorCone6.h
+++ b/Core/HardParticle/FormFactorCone6.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCONE6_H
-#define FORMFACTORCONE6_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -48,4 +48,4 @@ private:
     double m_alpha;
 };
 
-#endif // FORMFACTORCONE6_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
diff --git a/Core/HardParticle/FormFactorCuboctahedron.h b/Core/HardParticle/FormFactorCuboctahedron.h
index c2a20f73573..cdc59c649cd 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.h
+++ b/Core/HardParticle/FormFactorCuboctahedron.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCUBOCTAHEDRON_H
-#define FORMFACTORCUBOCTAHEDRON_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -51,4 +51,4 @@ private:
     double m_alpha;
 };
 
-#endif // FORMFACTORCUBOCTAHEDRON_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
diff --git a/Core/HardParticle/FormFactorCylinder.h b/Core/HardParticle/FormFactorCylinder.h
index 8adbc558f71..0715d29c6c2 100644
--- a/Core/HardParticle/FormFactorCylinder.h
+++ b/Core/HardParticle/FormFactorCylinder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCYLINDER_H
-#define FORMFACTORCYLINDER_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -49,4 +49,4 @@ private:
     double m_height;
 };
 
-#endif // FORMFACTORCYLINDER_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
diff --git a/Core/HardParticle/FormFactorDodecahedron.h b/Core/HardParticle/FormFactorDodecahedron.h
index d7944b40d77..4514bceb105 100644
--- a/Core/HardParticle/FormFactorDodecahedron.h
+++ b/Core/HardParticle/FormFactorDodecahedron.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDODECAHEDRON_H
-#define FORMFACTORDODECAHEDRON_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -43,4 +43,4 @@ private:
     double m_edge;
 };
 
-#endif // FORMFACTORDODECAHEDRON_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
diff --git a/Core/HardParticle/FormFactorDot.h b/Core/HardParticle/FormFactorDot.h
index 068c8618696..828c2532ed9 100644
--- a/Core/HardParticle/FormFactorDot.h
+++ b/Core/HardParticle/FormFactorDot.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDOT_H
-#define FORMFACTORDOT_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -44,4 +44,4 @@ private:
     double m_radius;
 };
 
-#endif // FORMFACTORDOT_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.h b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
index df38c378c4b..ef2686fe7ac 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORELLIPSOIDALCYLINDER_H
-#define FORMFACTORELLIPSOIDALCYLINDER_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -51,4 +51,4 @@ private:
     double m_height;
 };
 
-#endif // FORMFACTORELLIPSOIDALCYLINDER_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
diff --git a/Core/HardParticle/FormFactorFullSphere.h b/Core/HardParticle/FormFactorFullSphere.h
index 9f8d10061a8..b8fc57b2aa9 100644
--- a/Core/HardParticle/FormFactorFullSphere.h
+++ b/Core/HardParticle/FormFactorFullSphere.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORFULLSPHERE_H
-#define FORMFACTORFULLSPHERE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -54,4 +54,4 @@ private:
     bool m_position_at_center;
 };
 
-#endif // FORMFACTORFULLSPHERE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHERE_H
diff --git a/Core/HardParticle/FormFactorFullSpheroid.h b/Core/HardParticle/FormFactorFullSpheroid.h
index eef1231adbf..3aaa87f1c51 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.h
+++ b/Core/HardParticle/FormFactorFullSpheroid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORFULLSPHEROID_H
-#define FORMFACTORFULLSPHEROID_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -49,4 +49,4 @@ private:
     double m_height;
 };
 
-#endif // FORMFACTORFULLSPHEROID_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.h b/Core/HardParticle/FormFactorHemiEllipsoid.h
index f73f1d4c6f1..4ba53c9f4d7 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORHEMIELLIPSOID_H
-#define FORMFACTORHEMIELLIPSOID_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -55,4 +55,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // FORMFACTORHEMIELLIPSOID_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
diff --git a/Core/HardParticle/FormFactorIcosahedron.h b/Core/HardParticle/FormFactorIcosahedron.h
index d6b61307944..0b2a1eb1016 100644
--- a/Core/HardParticle/FormFactorIcosahedron.h
+++ b/Core/HardParticle/FormFactorIcosahedron.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORICOSAHEDRON_H
-#define FORMFACTORICOSAHEDRON_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -41,4 +41,4 @@ private:
     double m_edge;
 };
 
-#endif // FORMFACTORICOSAHEDRON_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.h b/Core/HardParticle/FormFactorLongBoxGauss.h
index 7f3c128684b..4563904e737 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.h
+++ b/Core/HardParticle/FormFactorLongBoxGauss.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORLONGBOXGAUSS_H
-#define FORMFACTORLONGBOXGAUSS_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -54,4 +54,4 @@ private:
     double m_height;
 };
 
-#endif // FORMFACTORLONGBOXGAUSS_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.h b/Core/HardParticle/FormFactorLongBoxLorentz.h
index c10a32363c7..8dd811bec65 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORLONGBOXLORENTZ_H
-#define FORMFACTORLONGBOXLORENTZ_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -55,4 +55,4 @@ private:
     double m_height;
 };
 
-#endif // FORMFACTORLONGBOXLORENTZ_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
diff --git a/Core/HardParticle/FormFactorPolyhedron.h b/Core/HardParticle/FormFactorPolyhedron.h
index 06690d43162..70b6cd8f395 100644
--- a/Core/HardParticle/FormFactorPolyhedron.h
+++ b/Core/HardParticle/FormFactorPolyhedron.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORPOLYHEDRON_H
-#define FORMFACTORPOLYHEDRON_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPOLYHEDRON_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPOLYHEDRON_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include <memory>
@@ -170,4 +170,4 @@ protected:
     std::unique_ptr<PolyhedralFace> m_base;
 };
 
-#endif // FORMFACTORPOLYHEDRON_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPOLYHEDRON_H
diff --git a/Core/HardParticle/FormFactorPrism3.h b/Core/HardParticle/FormFactorPrism3.h
index a67c7d3429e..2e38d10df42 100644
--- a/Core/HardParticle/FormFactorPrism3.h
+++ b/Core/HardParticle/FormFactorPrism3.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORPRISM3_H
-#define FORMFACTORPRISM3_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
 //! A prism based on an equilateral triangle.
@@ -42,4 +42,4 @@ private:
     double m_base_edge;
 };
 
-#endif // FORMFACTORPRISM3_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
diff --git a/Core/HardParticle/FormFactorPrism6.h b/Core/HardParticle/FormFactorPrism6.h
index a3fdc40d014..260ab000a5c 100644
--- a/Core/HardParticle/FormFactorPrism6.h
+++ b/Core/HardParticle/FormFactorPrism6.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORPRISM6_H
-#define FORMFACTORPRISM6_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
 //! A prism based on a regular hexagonal.
@@ -42,4 +42,4 @@ private:
     double m_base_edge;
 };
 
-#endif // FORMFACTORPRISM6_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
diff --git a/Core/HardParticle/FormFactorPyramid.h b/Core/HardParticle/FormFactorPyramid.h
index c0d311474c1..1581f5a2306 100644
--- a/Core/HardParticle/FormFactorPyramid.h
+++ b/Core/HardParticle/FormFactorPyramid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORPYRAMID_H
-#define FORMFACTORPYRAMID_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -49,4 +49,4 @@ private:
     double m_alpha;
 };
 
-#endif // FORMFACTORPYRAMID_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
diff --git a/Core/HardParticle/FormFactorRipple1.h b/Core/HardParticle/FormFactorRipple1.h
index 1c5e166fd35..e8944b58a20 100644
--- a/Core/HardParticle/FormFactorRipple1.h
+++ b/Core/HardParticle/FormFactorRipple1.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORRIPPLE1_H
-#define FORMFACTORRIPPLE1_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
 
 #include "Core/HardParticle/ProfileRipple1.h"
 
@@ -56,4 +56,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // FORMFACTORRIPPLE1_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
diff --git a/Core/HardParticle/FormFactorRipple2.h b/Core/HardParticle/FormFactorRipple2.h
index fadea003089..c3688a0966d 100644
--- a/Core/HardParticle/FormFactorRipple2.h
+++ b/Core/HardParticle/FormFactorRipple2.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORRIPPLE2_H
-#define FORMFACTORRIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
 
 #include "Core/HardParticle/ProfileRipple2.h"
 
@@ -56,4 +56,4 @@ private:
     complex_t factor_x(complex_t qx) const override final;
 };
 
-#endif // FORMFACTORRIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
diff --git a/Core/HardParticle/FormFactorTetrahedron.h b/Core/HardParticle/FormFactorTetrahedron.h
index 39bbdc6da28..3fca46b0aa5 100644
--- a/Core/HardParticle/FormFactorTetrahedron.h
+++ b/Core/HardParticle/FormFactorTetrahedron.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORTETRAHEDRON_H
-#define FORMFACTORTETRAHEDRON_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -48,4 +48,4 @@ private:
     double m_alpha;
 };
 
-#endif // FORMFACTORTETRAHEDRON_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
diff --git a/Core/HardParticle/FormFactorTriangle.h b/Core/HardParticle/FormFactorTriangle.h
index 5adc5f8a78c..c55e6cef141 100644
--- a/Core/HardParticle/FormFactorTriangle.h
+++ b/Core/HardParticle/FormFactorTriangle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORTRIANGLE_H
-#define FORMFACTORTRIANGLE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRIANGLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRIANGLE_H
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
 //! A planar equilateral triangle, for testing form factor computations.
@@ -35,4 +35,4 @@ private:
     double m_base_edge;
 };
 
-#endif // FORMFACTORTRIANGLE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRIANGLE_H
diff --git a/Core/HardParticle/FormFactorTruncatedCube.h b/Core/HardParticle/FormFactorTruncatedCube.h
index d06ad0ddf43..b643a6d2a71 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.h
+++ b/Core/HardParticle/FormFactorTruncatedCube.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORTRUNCATEDCUBE_H
-#define FORMFACTORTRUNCATEDCUBE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
 
 #include "Core/HardParticle/FormFactorPolyhedron.h"
 
@@ -43,4 +43,4 @@ private:
     double m_removed_length;
 };
 
-#endif // FORMFACTORTRUNCATEDCUBE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.h b/Core/HardParticle/FormFactorTruncatedSphere.h
index 3c8e98e3e35..342bc367d64 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.h
+++ b/Core/HardParticle/FormFactorTruncatedSphere.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORTRUNCATEDSPHERE_H
-#define FORMFACTORTRUNCATEDSPHERE_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -57,4 +57,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // FORMFACTORTRUNCATEDSPHERE_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.h b/Core/HardParticle/FormFactorTruncatedSpheroid.h
index 0d0ba0374ca..fc8dd781926 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORTRUNCATEDSPHEROID_H
-#define FORMFACTORTRUNCATEDSPHEROID_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -61,4 +61,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // FORMFACTORTRUNCATEDSPHEROID_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
diff --git a/Core/HardParticle/ProfileBar.h b/Core/HardParticle/ProfileBar.h
index 92bee5ce671..af77525dd71 100644
--- a/Core/HardParticle/ProfileBar.h
+++ b/Core/HardParticle/ProfileBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROFILEBAR_H
-#define PROFILEBAR_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
+#define BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -50,4 +50,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // PROFILEBAR_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
diff --git a/Core/HardParticle/ProfileRipple1.h b/Core/HardParticle/ProfileRipple1.h
index fd9a7db0b94..1a0a6527b2a 100644
--- a/Core/HardParticle/ProfileRipple1.h
+++ b/Core/HardParticle/ProfileRipple1.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROFILERIPPLE1_H
-#define PROFILERIPPLE1_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
+#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -50,4 +50,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // PROFILERIPPLE1_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
diff --git a/Core/HardParticle/ProfileRipple2.h b/Core/HardParticle/ProfileRipple2.h
index 0c08be996b9..726547f9aa3 100644
--- a/Core/HardParticle/ProfileRipple2.h
+++ b/Core/HardParticle/ProfileRipple2.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROFILERIPPLE2_H
-#define PROFILERIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
+#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 #include "Core/Tools/Integrator.h"
@@ -52,4 +52,4 @@ private:
     mutable ComplexIntegrator m_integrator;
 };
 
-#endif // PROFILERIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
diff --git a/Core/InputOutput/DataFormatUtils.h b/Core/InputOutput/DataFormatUtils.h
index 16aba5193dd..615ff8118df 100644
--- a/Core/InputOutput/DataFormatUtils.h
+++ b/Core/InputOutput/DataFormatUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAFORMATUTILS_H
-#define DATAFORMATUTILS_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -54,4 +54,4 @@ BA_CORE_API_ std::vector<double> parse_doubles(const std::string& str);
 void readLineOfDoubles(std::vector<double>& buffer, std::istringstream& iss);
 } // namespace DataFormatUtils
 
-#endif // DATAFORMATUTILS_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_DATAFORMATUTILS_H
diff --git a/Core/InputOutput/IntensityDataIOFactory.h b/Core/InputOutput/IntensityDataIOFactory.h
index 965234e87ae..9c8f5260c00 100644
--- a/Core/InputOutput/IntensityDataIOFactory.h
+++ b/Core/InputOutput/IntensityDataIOFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAIOFACTORY_H
-#define INTENSITYDATAIOFACTORY_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -64,4 +64,4 @@ public:
     static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
 };
 
-#endif // INTENSITYDATAIOFACTORY_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_INTENSITYDATAIOFACTORY_H
diff --git a/Core/InputOutput/OutputDataReadFactory.h b/Core/InputOutput/OutputDataReadFactory.h
index 3cf911b9ee6..11991de8687 100644
--- a/Core/InputOutput/OutputDataReadFactory.h
+++ b/Core/InputOutput/OutputDataReadFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAREADFACTORY_H
-#define OUTPUTDATAREADFACTORY_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
 
 #include "Core/InputOutput/OutputDataReader.h"
 
@@ -30,4 +30,4 @@ private:
     static IOutputDataReadStrategy* getReadStrategy(const std::string& file_name);
 };
 
-#endif // OUTPUTDATAREADFACTORY_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADFACTORY_H
diff --git a/Core/InputOutput/OutputDataReadStrategy.h b/Core/InputOutput/OutputDataReadStrategy.h
index 00991a03e08..6aa27c80965 100644
--- a/Core/InputOutput/OutputDataReadStrategy.h
+++ b/Core/InputOutput/OutputDataReadStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAREADSTRATEGY_H
-#define OUTPUTDATAREADSTRATEGY_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <istream>
@@ -76,4 +76,4 @@ private:
 };
 #endif // BORNAGAIN_TIFF_SUPPORT
 
-#endif // OUTPUTDATAREADSTRATEGY_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADSTRATEGY_H
diff --git a/Core/InputOutput/OutputDataReader.h b/Core/InputOutput/OutputDataReader.h
index 4b81a82c248..6ce395152a7 100644
--- a/Core/InputOutput/OutputDataReader.h
+++ b/Core/InputOutput/OutputDataReader.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAREADER_H
-#define OUTPUTDATAREADER_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
 
 #include "Core/InputOutput/OutputDataReadStrategy.h"
 #include <memory>
@@ -40,4 +40,4 @@ private:
     std::unique_ptr<IOutputDataReadStrategy> m_read_strategy;
 };
 
-#endif // OUTPUTDATAREADER_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAREADER_H
diff --git a/Core/InputOutput/OutputDataWriteFactory.h b/Core/InputOutput/OutputDataWriteFactory.h
index f6f76857001..a69c4824725 100644
--- a/Core/InputOutput/OutputDataWriteFactory.h
+++ b/Core/InputOutput/OutputDataWriteFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAWRITEFACTORY_H
-#define OUTPUTDATAWRITEFACTORY_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
 
 #include "Core/InputOutput/OutputDataWriter.h"
 
@@ -29,4 +29,4 @@ private:
     static IOutputDataWriteStrategy* getWriteStrategy(const std::string& file_name);
 };
 
-#endif // OUTPUTDATAWRITEFACTORY_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITEFACTORY_H
diff --git a/Core/InputOutput/OutputDataWriteStrategy.h b/Core/InputOutput/OutputDataWriteStrategy.h
index 1ff309b0d3b..742870bd3b0 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.h
+++ b/Core/InputOutput/OutputDataWriteStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAWRITESTRATEGY_H
-#define OUTPUTDATAWRITESTRATEGY_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <istream>
@@ -70,4 +70,4 @@ private:
 
 #endif // BORNAGAIN_TIFF_SUPPORT
 
-#endif // OUTPUTDATAWRITESTRATEGY_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITESTRATEGY_H
diff --git a/Core/InputOutput/OutputDataWriter.h b/Core/InputOutput/OutputDataWriter.h
index 85370cfd30e..d11a14db066 100644
--- a/Core/InputOutput/OutputDataWriter.h
+++ b/Core/InputOutput/OutputDataWriter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAWRITER_H
-#define OUTPUTDATAWRITER_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
 
 #include "Core/InputOutput/OutputDataWriteStrategy.h"
 #include <memory>
@@ -39,4 +39,4 @@ private:
     std::unique_ptr<IOutputDataWriteStrategy> m_write_strategy;
 };
 
-#endif // OUTPUTDATAWRITER_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_OUTPUTDATAWRITER_H
diff --git a/Core/InputOutput/TiffHandler.h b/Core/InputOutput/TiffHandler.h
index ebbfa2e3995..e0d6e294d92 100644
--- a/Core/InputOutput/TiffHandler.h
+++ b/Core/InputOutput/TiffHandler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TIFFHANDLER_H
-#define TIFFHANDLER_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
 
 #ifdef BORNAGAIN_TIFF_SUPPORT
 
@@ -52,4 +52,4 @@ private:
 
 #endif // BORNAGAIN_TIFF_SUPPORT
 
-#endif // TIFFHANDLER_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_TIFFHANDLER_H
diff --git a/Core/InputOutput/boost_streams.h b/Core/InputOutput/boost_streams.h
index f0622c8f181..f24fe8eb4f5 100644
--- a/Core/InputOutput/boost_streams.h
+++ b/Core/InputOutput/boost_streams.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BOOST_STREAMS_H
-#define BOOST_STREAMS_H
+#ifndef BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
+#define BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
 
 #include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
@@ -27,4 +27,4 @@
 #pragma warning(pop)
 #endif
 
-#endif // BOOST_STREAMS_H
+#endif // BORNAGAIN_CORE_INPUTOUTPUT_BOOST_STREAMS_H
diff --git a/Core/Instrument/AngularSpecScan.h b/Core/Instrument/AngularSpecScan.h
index 3c35bb7bcb3..da1a2e5acdb 100644
--- a/Core/Instrument/AngularSpecScan.h
+++ b/Core/Instrument/AngularSpecScan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ANGULARSPECSCAN_H
-#define ANGULARSPECSCAN_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
+#define BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
 
 #include "Core/Instrument/ISpecularScan.h"
 #include <memory>
@@ -128,4 +128,4 @@ private:
     mutable DistrOutput m_inc_res_cache;
 };
 
-#endif // ANGULARSPECSCAN_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_ANGULARSPECSCAN_H
diff --git a/Core/Instrument/ArrayUtils.h b/Core/Instrument/ArrayUtils.h
index 365f6afea08..2f46080ee4b 100644
--- a/Core/Instrument/ArrayUtils.h
+++ b/Core/Instrument/ArrayUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ARRAYUTILS_H
-#define ARRAYUTILS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_ARRAYUTILS_H
+#define BORNAGAIN_CORE_INSTRUMENT_ARRAYUTILS_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Wrap/WinDllMacros.h"
@@ -170,4 +170,4 @@ template <class T> decltype(auto) ArrayUtils::createVector2D(const T& data)
     return result;
 }
 
-#endif // ARRAYUTILS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_ARRAYUTILS_H
diff --git a/Core/Instrument/AxisNames.h b/Core/Instrument/AxisNames.h
index e3244def0cf..f6b95812adb 100644
--- a/Core/Instrument/AxisNames.h
+++ b/Core/Instrument/AxisNames.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef AXISNAMES_H
-#define AXISNAMES_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_AXISNAMES_H
+#define BORNAGAIN_CORE_INSTRUMENT_AXISNAMES_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include <map>
@@ -35,4 +35,4 @@ BA_CORE_API_ std::map<AxesUnits, std::string> InitSpecAxisQ();
 BA_CORE_API_ std::map<AxesUnits, std::string> InitSampleDepthAxis();
 } // namespace AxisNames
 
-#endif // AXISNAMES_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_AXISNAMES_H
diff --git a/Core/Instrument/ChiSquaredModule.h b/Core/Instrument/ChiSquaredModule.h
index 1d5cee882f7..002c98987bb 100644
--- a/Core/Instrument/ChiSquaredModule.h
+++ b/Core/Instrument/ChiSquaredModule.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CHISQUAREDMODULE_H
-#define CHISQUAREDMODULE_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
+#define BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
 
 #include "Core/Instrument/IChiSquaredModule.h"
 
@@ -32,4 +32,4 @@ public:
     virtual double residual(double a, double b, double weight);
 };
 
-#endif // CHISQUAREDMODULE_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_CHISQUAREDMODULE_H
diff --git a/Core/Instrument/ConvolutionDetectorResolution.h b/Core/Instrument/ConvolutionDetectorResolution.h
index b1d2c3d9c9f..6556c5dd9c3 100644
--- a/Core/Instrument/ConvolutionDetectorResolution.h
+++ b/Core/Instrument/ConvolutionDetectorResolution.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CONVOLUTIONDETECTORRESOLUTION_H
-#define CONVOLUTIONDETECTORRESOLUTION_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_CONVOLUTIONDETECTORRESOLUTION_H
+#define BORNAGAIN_CORE_INSTRUMENT_CONVOLUTIONDETECTORRESOLUTION_H
 
 #include "Core/Instrument/IDetectorResolution.h"
 #include "Core/Instrument/IResolutionFunction2D.h"
@@ -69,4 +69,4 @@ inline const IResolutionFunction2D* ConvolutionDetectorResolution::getResolution
     return mp_res_function_2d.get();
 }
 
-#endif // CONVOLUTIONDETECTORRESOLUTION_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_CONVOLUTIONDETECTORRESOLUTION_H
diff --git a/Core/Instrument/Convolve.h b/Core/Instrument/Convolve.h
index 30dbc21f86f..a757b05f658 100644
--- a/Core/Instrument/Convolve.h
+++ b/Core/Instrument/Convolve.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CONVOLVE_H
-#define CONVOLVE_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_CONVOLVE_H
+#define BORNAGAIN_CORE_INSTRUMENT_CONVOLVE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <fftw3.h>
@@ -120,4 +120,4 @@ private:
     std::vector<size_t> m_implemented_factors; // favorite factorization terms of fftw3
 };
 
-#endif // CONVOLVE_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_CONVOLVE_H
diff --git a/Core/Instrument/CumulativeValue.h b/Core/Instrument/CumulativeValue.h
index 2a7602ea290..3ac23f50d4c 100644
--- a/Core/Instrument/CumulativeValue.h
+++ b/Core/Instrument/CumulativeValue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CUMULATIVEVALUE_H
-#define CUMULATIVEVALUE_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_CUMULATIVEVALUE_H
+#define BORNAGAIN_CORE_INSTRUMENT_CUMULATIVEVALUE_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -45,4 +45,4 @@ private:
 BA_CORE_API_ bool operator<(const CumulativeValue& lhs, const CumulativeValue& rhs);
 BA_CORE_API_ bool operator>(const CumulativeValue& lhs, const CumulativeValue& rhs);
 
-#endif // CUMULATIVEVALUE_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_CUMULATIVEVALUE_H
diff --git a/Core/Instrument/DetectionProperties.h b/Core/Instrument/DetectionProperties.h
index f24b955af11..dcbb5dcbcad 100644
--- a/Core/Instrument/DetectionProperties.h
+++ b/Core/Instrument/DetectionProperties.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTIONPROPERTIES_H
-#define DETECTIONPROPERTIES_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_DETECTIONPROPERTIES_H
+#define BORNAGAIN_CORE_INSTRUMENT_DETECTIONPROPERTIES_H
 
 #include "Core/Parametrization/INode.h"
 #include "Core/Vector/EigenCore.h"
@@ -56,4 +56,4 @@ private:
     double m_total_transmission; //!< total transmission of polarization analysis
 };
 
-#endif // DETECTIONPROPERTIES_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_DETECTIONPROPERTIES_H
diff --git a/Core/Instrument/DetectorContext.h b/Core/Instrument/DetectorContext.h
index 8633b409141..4656c7db273 100644
--- a/Core/Instrument/DetectorContext.h
+++ b/Core/Instrument/DetectorContext.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORCONTEXT_H
-#define DETECTORCONTEXT_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_DETECTORCONTEXT_H
+#define BORNAGAIN_CORE_INSTRUMENT_DETECTORCONTEXT_H
 
 #include "Core/Binning/IPixel.h"
 #include "Core/Vector/EigenCore.h"
@@ -48,4 +48,4 @@ private:
     std::vector<size_t> active_indices; //! The sequence of detector bin indices (unmasked, in ROI)
 };
 
-#endif // DETECTORCONTEXT_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_DETECTORCONTEXT_H
diff --git a/Core/Instrument/DetectorFunctions.h b/Core/Instrument/DetectorFunctions.h
index 3e9f6139aab..51355ae6c86 100644
--- a/Core/Instrument/DetectorFunctions.h
+++ b/Core/Instrument/DetectorFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORFUNCTIONS_H
-#define DETECTORFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_DETECTORFUNCTIONS_H
+#define BORNAGAIN_CORE_INSTRUMENT_DETECTORFUNCTIONS_H
 
 #include "Core/Instrument/IDetector.h"
 #include "Wrap/WinDllMacros.h"
@@ -45,4 +45,4 @@ BA_CORE_API_ std::string axesToString(const OutputData<double>& data);
 
 } // namespace DetectorFunctions
 
-#endif // DETECTORFUNCTIONS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_DETECTORFUNCTIONS_H
diff --git a/Core/Instrument/DetectorMask.h b/Core/Instrument/DetectorMask.h
index 364cfbf1a43..669bbf9ef58 100644
--- a/Core/Instrument/DetectorMask.h
+++ b/Core/Instrument/DetectorMask.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORMASK_H
-#define DETECTORMASK_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_DETECTORMASK_H
+#define BORNAGAIN_CORE_INSTRUMENT_DETECTORMASK_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Core/Mask/IShape2D.h"
@@ -70,4 +70,4 @@ private:
     int m_number_of_masked_channels;
 };
 
-#endif // DETECTORMASK_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_DETECTORMASK_H
diff --git a/Core/Instrument/FourierTransform.h b/Core/Instrument/FourierTransform.h
index bb4d04d3fe2..c2568a37724 100644
--- a/Core/Instrument/FourierTransform.h
+++ b/Core/Instrument/FourierTransform.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FOURIERTRANSFORM_H
-#define FOURIERTRANSFORM_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
+#define BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
 
 #include "Wrap/WinDllMacros.h"
 #include <fftw3.h>
@@ -92,4 +92,4 @@ private:
     Workspace ws;
 };
 
-#endif // FOURIERTRANSFORM_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_FOURIERTRANSFORM_H
diff --git a/Core/Instrument/Histogram1D.h b/Core/Instrument/Histogram1D.h
index 4b9761451de..22bd1601daa 100644
--- a/Core/Instrument/Histogram1D.h
+++ b/Core/Instrument/Histogram1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HISTOGRAM1D_H
-#define HISTOGRAM1D_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM1D_H
+#define BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM1D_H
 
 #include "Core/Instrument/IHistogram.h"
 
@@ -69,4 +69,4 @@ public:
     Histogram1D* crop(double xmin, double xmax);
 };
 
-#endif // HISTOGRAM1D_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM1D_H
diff --git a/Core/Instrument/Histogram2D.h b/Core/Instrument/Histogram2D.h
index ba2a084db19..09ff29521e0 100644
--- a/Core/Instrument/Histogram2D.h
+++ b/Core/Instrument/Histogram2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HISTOGRAM2D_H
-#define HISTOGRAM2D_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM2D_H
+#define BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM2D_H
 
 #include "Core/Instrument/ArrayUtils.h"
 #include "Core/Instrument/IHistogram.h"
@@ -126,4 +126,4 @@ template <typename T> void Histogram2D::initFromShape(const T& data)
     m_data.addAxis(FixedBinAxis("y-axis", nrows, 0.0, static_cast<double>(nrows)));
 }
 
-#endif // HISTOGRAM2D_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_HISTOGRAM2D_H
diff --git a/Core/Instrument/IChiSquaredModule.h b/Core/Instrument/IChiSquaredModule.h
index eba8866ed8c..629358ba790 100644
--- a/Core/Instrument/IChiSquaredModule.h
+++ b/Core/Instrument/IChiSquaredModule.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ICHISQUAREDMODULE_H
-#define ICHISQUAREDMODULE_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
+#define BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
 
 #include "Core/Basics/ICloneable.h"
 #include <memory>
@@ -55,4 +55,4 @@ protected:
     std::unique_ptr<IIntensityFunction> mp_intensity_function;
 };
 
-#endif // ICHISQUAREDMODULE_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_ICHISQUAREDMODULE_H
diff --git a/Core/Instrument/IDetector.h b/Core/Instrument/IDetector.h
index 69cdc436dfa..24bf3f190da 100644
--- a/Core/Instrument/IDetector.h
+++ b/Core/Instrument/IDetector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IDETECTOR_H_
-#define IDETECTOR_H_
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IDETECTOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_IDETECTOR_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Binning/IAxis.h"
@@ -130,4 +130,4 @@ private:
     std::unique_ptr<IDetectorResolution> mP_detector_resolution;
 };
 
-#endif /* IDETECTOR_H_ */
+#endif // BORNAGAIN_CORE_INSTRUMENT_IDETECTOR_H
diff --git a/Core/Instrument/IDetector2D.h b/Core/Instrument/IDetector2D.h
index f20f63b34a4..dc8703af1a6 100644
--- a/Core/Instrument/IDetector2D.h
+++ b/Core/Instrument/IDetector2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IDETECTOR2D_H
-#define IDETECTOR2D_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IDETECTOR2D_H
+#define BORNAGAIN_CORE_INSTRUMENT_IDETECTOR2D_H
 
 #include "Core/Instrument/DetectorMask.h"
 #include "Core/Instrument/IDetector.h"
@@ -93,4 +93,4 @@ private:
     std::unique_ptr<RegionOfInterest> m_region_of_interest;
 };
 
-#endif // IDETECTOR2D_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IDETECTOR2D_H
diff --git a/Core/Instrument/IDetectorResolution.h b/Core/Instrument/IDetectorResolution.h
index 80755477ca9..e95777ade8c 100644
--- a/Core/Instrument/IDetectorResolution.h
+++ b/Core/Instrument/IDetectorResolution.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IDETECTORRESOLUTION_H
-#define IDETECTORRESOLUTION_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IDETECTORRESOLUTION_H
+#define BORNAGAIN_CORE_INSTRUMENT_IDETECTORRESOLUTION_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Instrument/OutputData.h"
@@ -35,4 +35,4 @@ public:
     virtual IDetectorResolution* clone() const = 0;
 };
 
-#endif // IDETECTORRESOLUTION_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IDETECTORRESOLUTION_H
diff --git a/Core/Instrument/IHistogram.h b/Core/Instrument/IHistogram.h
index 89b29e82e3f..adc4322fc43 100644
--- a/Core/Instrument/IHistogram.h
+++ b/Core/Instrument/IHistogram.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IHISTOGRAM_H
-#define IHISTOGRAM_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IHISTOGRAM_H
+#define BORNAGAIN_CORE_INSTRUMENT_IHISTOGRAM_H
 
 #include "Core/Instrument/CumulativeValue.h"
 #include "Core/Instrument/OutputData.h"
@@ -211,4 +211,4 @@ protected:
     OutputData<CumulativeValue> m_data;
 };
 
-#endif // IHISTOGRAM_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IHISTOGRAM_H
diff --git a/Core/Instrument/IIntensityFunction.h b/Core/Instrument/IIntensityFunction.h
index f8f1853aa35..30c16875592 100644
--- a/Core/Instrument/IIntensityFunction.h
+++ b/Core/Instrument/IIntensityFunction.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IINTENSITYFUNCTION_H
-#define IINTENSITYFUNCTION_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IINTENSITYFUNCTION_H
+#define BORNAGAIN_CORE_INSTRUMENT_IINTENSITYFUNCTION_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -49,4 +49,4 @@ public:
     virtual double evaluate(double value) const;
 };
 
-#endif // IINTENSITYFUNCTION_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IINTENSITYFUNCTION_H
diff --git a/Core/Instrument/IIntensityNormalizer.h b/Core/Instrument/IIntensityNormalizer.h
index 584c2db1885..4b2f815bbcd 100644
--- a/Core/Instrument/IIntensityNormalizer.h
+++ b/Core/Instrument/IIntensityNormalizer.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IINTENSITYNORMALIZER_H
-#define IINTENSITYNORMALIZER_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IINTENSITYNORMALIZER_H
+#define BORNAGAIN_CORE_INSTRUMENT_IINTENSITYNORMALIZER_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Instrument/OutputData.h"
@@ -95,4 +95,4 @@ public:
     }
 };
 
-#endif // IINTENSITYNORMALIZER_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IINTENSITYNORMALIZER_H
diff --git a/Core/Instrument/IResolutionFunction2D.h b/Core/Instrument/IResolutionFunction2D.h
index 313f140f226..8dd667e526c 100644
--- a/Core/Instrument/IResolutionFunction2D.h
+++ b/Core/Instrument/IResolutionFunction2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IRESOLUTIONFUNCTION2D_H
-#define IRESOLUTIONFUNCTION2D_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IRESOLUTIONFUNCTION2D_H
+#define BORNAGAIN_CORE_INSTRUMENT_IRESOLUTIONFUNCTION2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -30,4 +30,4 @@ public:
     virtual IResolutionFunction2D* clone() const = 0;
 };
 
-#endif // IRESOLUTIONFUNCTION2D_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IRESOLUTIONFUNCTION2D_H
diff --git a/Core/Instrument/ISpecularScan.h b/Core/Instrument/ISpecularScan.h
index d707b880bb2..2fb14b9925e 100644
--- a/Core/Instrument/ISpecularScan.h
+++ b/Core/Instrument/ISpecularScan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARDATAHANDLER_H
-#define SPECULARDATAHANDLER_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
+#define BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
 
 #include "Core/Basics/ICloneable.h"
 
@@ -70,4 +70,4 @@ inline std::ostream& operator<<(std::ostream& os, const ISpecularScan& scan)
 {
     return os << scan.print();
 }
-#endif // SPECULARDATAHANDLER_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_ISPECULARSCAN_H
diff --git a/Core/Instrument/IUnitConverter.h b/Core/Instrument/IUnitConverter.h
index e5feca573d6..cccf4aac7f8 100644
--- a/Core/Instrument/IUnitConverter.h
+++ b/Core/Instrument/IUnitConverter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IUNITCONVERTER_H
-#define IUNITCONVERTER_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_IUNITCONVERTER_H
+#define BORNAGAIN_CORE_INSTRUMENT_IUNITCONVERTER_H
 
 #include "Core/Basics/ICloneable.h"
 #include <map>
@@ -78,4 +78,4 @@ private:
     virtual std::vector<std::map<AxesUnits, std::string>> createNameMaps() const = 0;
 };
 
-#endif // IUNITCONVERTER_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_IUNITCONVERTER_H
diff --git a/Core/Instrument/Instrument.h b/Core/Instrument/Instrument.h
index 8661b5287da..75ababbfc0f 100644
--- a/Core/Instrument/Instrument.h
+++ b/Core/Instrument/Instrument.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENT_H
-#define INSTRUMENT_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
+#define BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
 
 #include "Core/Beam/Beam.h"
 #include "Core/Instrument/IDetector.h"
@@ -103,4 +103,4 @@ protected:
     Beam m_beam;
 };
 
-#endif // INSTRUMENT_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_INSTRUMENT_H
diff --git a/Core/Instrument/IntensityDataFunctions.h b/Core/Instrument/IntensityDataFunctions.h
index 45e2619f8f7..d541979d38f 100644
--- a/Core/Instrument/IntensityDataFunctions.h
+++ b/Core/Instrument/IntensityDataFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAFUNCTIONS_H
-#define INTENSITYDATAFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
+#define BORNAGAIN_CORE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
 
 #include "Core/Instrument/OutputData.h"
 #include <memory>
@@ -98,4 +98,4 @@ BA_CORE_API_ SimulationResult ConvertData(const Simulation& simulation,
 
 }; // namespace IntensityDataFunctions
 
-#endif // INTENSITYDATAFUNCTIONS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_INTENSITYDATAFUNCTIONS_H
diff --git a/Core/Instrument/IsGISAXSDetector.h b/Core/Instrument/IsGISAXSDetector.h
index 67f9b93c36e..bf389a1daac 100644
--- a/Core/Instrument/IsGISAXSDetector.h
+++ b/Core/Instrument/IsGISAXSDetector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISGISAXSDETECTOR_H
-#define ISGISAXSDETECTOR_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_ISGISAXSDETECTOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_ISGISAXSDETECTOR_H
 
 #include "Core/Instrument/SphericalDetector.h"
 
@@ -43,4 +43,4 @@ protected:
     size_t getIndexOfSpecular(const Beam& beam) const override;
 };
 
-#endif // ISGISAXSDETECTOR_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_ISGISAXSDETECTOR_H
diff --git a/Core/Instrument/LLData.h b/Core/Instrument/LLData.h
index af79d473e02..2c647b49576 100644
--- a/Core/Instrument/LLData.h
+++ b/Core/Instrument/LLData.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LLDATA_H
-#define LLDATA_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_LLDATA_H
+#define BORNAGAIN_CORE_INSTRUMENT_LLDATA_H
 
 #include "Core/Basics/Exceptions.h"
 #include "Core/Vector/EigenCore.h"
@@ -306,4 +306,4 @@ template <class T> bool HaveSameDimensions(const LLData<T>& left, const LLData<T
     return true;
 }
 
-#endif // LLDATA_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_LLDATA_H
diff --git a/Core/Instrument/OutputData.h b/Core/Instrument/OutputData.h
index 19643c763db..499b608137f 100644
--- a/Core/Instrument/OutputData.h
+++ b/Core/Instrument/OutputData.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATA_H
-#define OUTPUTDATA_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATA_H
+#define BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATA_H
 
 #include "Core/Binning/FixedBinAxis.h"
 #include "Core/Instrument/LLData.h"
@@ -627,4 +627,4 @@ template <class T> bool OutputData<T>::axisNameExists(const std::string& axis_na
     return false;
 }
 
-#endif // OUTPUTDATA_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATA_H
diff --git a/Core/Instrument/OutputDataIterator.h b/Core/Instrument/OutputDataIterator.h
index 9dafb76b1bc..80f03353cdb 100644
--- a/Core/Instrument/OutputDataIterator.h
+++ b/Core/Instrument/OutputDataIterator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAITERATOR_H
-#define OUTPUTDATAITERATOR_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATAITERATOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATAITERATOR_H
 
 #include <cstddef>
 #include <iterator>
@@ -211,4 +211,4 @@ bool operator!=(const OutputDataIterator<TValue1, TContainer1>& left,
     return !(left == right);
 }
 
-#endif // OUTPUTDATAITERATOR_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATAITERATOR_H
diff --git a/Core/Instrument/PyArrayImportUtils.h b/Core/Instrument/PyArrayImportUtils.h
index ef52ffe8383..69df6dc41d4 100644
--- a/Core/Instrument/PyArrayImportUtils.h
+++ b/Core/Instrument/PyArrayImportUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYARRAYIMPORTUTILS_H
-#define PYARRAYIMPORTUTILS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
+#define BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <vector>
@@ -34,4 +34,4 @@ importArrayToOutputData(const std::vector<std::vector<double>>& vec);
 
 } // namespace PyArrayImport
 
-#endif // PYARRAYIMPORTUTILS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_PYARRAYIMPORTUTILS_H
diff --git a/Core/Instrument/QSpecScan.h b/Core/Instrument/QSpecScan.h
index dfea8059ab3..6feb0dd33ad 100644
--- a/Core/Instrument/QSpecScan.h
+++ b/Core/Instrument/QSpecScan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef QSPECSCAN_H
-#define QSPECSCAN_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
+#define BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
 
 #include "Core/Instrument/ISpecularScan.h"
 #include <memory>
@@ -94,4 +94,4 @@ private:
     mutable std::vector<std::vector<ParameterSample>> m_q_res_cache;
 };
 
-#endif // QSPECSCAN_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_QSPECSCAN_H
diff --git a/Core/Instrument/RectangularDetector.h b/Core/Instrument/RectangularDetector.h
index 428d82ced97..001ee5ed6e7 100644
--- a/Core/Instrument/RectangularDetector.h
+++ b/Core/Instrument/RectangularDetector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGULARDETECTOR_H
-#define RECTANGULARDETECTOR_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_RECTANGULARDETECTOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_RECTANGULARDETECTOR_H
 
 #include "Core/Binning/IPixel.h"
 #include "Core/Instrument/IDetector2D.h"
@@ -130,4 +130,4 @@ private:
     kvector_t m_v_unit;
 };
 
-#endif // RECTANGULARDETECTOR_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_RECTANGULARDETECTOR_H
diff --git a/Core/Instrument/RegionOfInterest.h b/Core/Instrument/RegionOfInterest.h
index e4ff77ae210..39860747f16 100644
--- a/Core/Instrument/RegionOfInterest.h
+++ b/Core/Instrument/RegionOfInterest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REGIONOFINTEREST_H
-#define REGIONOFINTEREST_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_REGIONOFINTEREST_H
+#define BORNAGAIN_CORE_INSTRUMENT_REGIONOFINTEREST_H
 
 #include "Core/Basics/ICloneable.h"
 #include <memory>
@@ -87,4 +87,4 @@ inline size_t RegionOfInterest::ycoord(size_t index, const std::vector<size_t>&
     return index % dims[1];
 }
 
-#endif // REGIONOFINTEREST_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_REGIONOFINTEREST_H
diff --git a/Core/Instrument/ResolutionFunction2DGaussian.h b/Core/Instrument/ResolutionFunction2DGaussian.h
index dbfc408c4de..bc11918757b 100644
--- a/Core/Instrument/ResolutionFunction2DGaussian.h
+++ b/Core/Instrument/ResolutionFunction2DGaussian.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RESOLUTIONFUNCTION2DGAUSSIAN_H
-#define RESOLUTIONFUNCTION2DGAUSSIAN_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_RESOLUTIONFUNCTION2DGAUSSIAN_H
+#define BORNAGAIN_CORE_INSTRUMENT_RESOLUTIONFUNCTION2DGAUSSIAN_H
 
 #include "Core/Instrument/IResolutionFunction2D.h"
 
@@ -44,4 +44,4 @@ private:
     double m_sigma_y;
 };
 
-#endif // RESOLUTIONFUNCTION2DGAUSSIAN_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_RESOLUTIONFUNCTION2DGAUSSIAN_H
diff --git a/Core/Instrument/ScanResolution.h b/Core/Instrument/ScanResolution.h
index 1599dda1fa9..b0476b0c6ca 100644
--- a/Core/Instrument/ScanResolution.h
+++ b/Core/Instrument/ScanResolution.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCANRESOLUTIONS_H
-#define SCANRESOLUTIONS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SCANRESOLUTION_H
+#define BORNAGAIN_CORE_INSTRUMENT_SCANRESOLUTION_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/ParameterSample.h"
@@ -69,4 +69,4 @@ inline std::ostream& operator<<(std::ostream& os, const ScanResolution& scan_res
     return os << scan_resolution.print();
 }
 
-#endif // SCANRESOLUTIONS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SCANRESOLUTION_H
diff --git a/Core/Instrument/SimpleUnitConverters.h b/Core/Instrument/SimpleUnitConverters.h
index 525ca1bd7b2..59ce3dd18e8 100644
--- a/Core/Instrument/SimpleUnitConverters.h
+++ b/Core/Instrument/SimpleUnitConverters.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMPLEUNITCONVERTERS_H
-#define SIMPLEUNITCONVERTERS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SIMPLEUNITCONVERTERS_H
+#define BORNAGAIN_CORE_INSTRUMENT_SIMPLEUNITCONVERTERS_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include "Core/Vector/Vectors3D.h"
@@ -165,4 +165,4 @@ private:
     void checkUnits(AxesUnits units_type) const;
 };
 
-#endif // SIMPLEUNITCONVERTERS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SIMPLEUNITCONVERTERS_H
diff --git a/Core/Instrument/SimulationArea.h b/Core/Instrument/SimulationArea.h
index 7e40a256de3..732b4d2d3c1 100644
--- a/Core/Instrument/SimulationArea.h
+++ b/Core/Instrument/SimulationArea.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONAREA_H
-#define SIMULATIONAREA_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREA_H
+#define BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREA_H
 
 #include "Core/Instrument/SimulationAreaIterator.h"
 #include "Wrap/WinDllMacros.h"
@@ -67,4 +67,4 @@ public:
     virtual bool isMasked(size_t) const;
 };
 
-#endif // SIMULATIONAREA_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREA_H
diff --git a/Core/Instrument/SimulationAreaIterator.h b/Core/Instrument/SimulationAreaIterator.h
index 83659a43537..83962e0435b 100644
--- a/Core/Instrument/SimulationAreaIterator.h
+++ b/Core/Instrument/SimulationAreaIterator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONAREAITERATOR_H
-#define SIMULATIONAREAITERATOR_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREAITERATOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREAITERATOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <cstdlib>
@@ -58,4 +58,4 @@ inline bool SimulationAreaIterator::operator!=(const SimulationAreaIterator& rig
     return !(*this == right);
 }
 
-#endif // SIMULATIONAREAITERATOR_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SIMULATIONAREAITERATOR_H
diff --git a/Core/Instrument/SimulationResult.h b/Core/Instrument/SimulationResult.h
index dc8c1737e8c..31c87b66086 100644
--- a/Core/Instrument/SimulationResult.h
+++ b/Core/Instrument/SimulationResult.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONRESULT_H
-#define SIMULATIONRESULT_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
+#define BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include "Core/Tools/PyObject.h"
@@ -83,4 +83,4 @@ private:
     std::unique_ptr<IUnitConverter> mP_unit_converter;
 };
 
-#endif // SIMULATIONRESULT_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SIMULATIONRESULT_H
diff --git a/Core/Instrument/SpecularDetector1D.h b/Core/Instrument/SpecularDetector1D.h
index 7737c08467d..c3d2cf3f3d9 100644
--- a/Core/Instrument/SpecularDetector1D.h
+++ b/Core/Instrument/SpecularDetector1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARDETECTOR1D_H_
-#define SPECULARDETECTOR1D_H_
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SPECULARDETECTOR1D_H
+#define BORNAGAIN_CORE_INSTRUMENT_SPECULARDETECTOR1D_H
 
 #include "Core/Instrument/IDetector.h"
 
@@ -52,4 +52,4 @@ protected:
     void initialize();
 };
 
-#endif /* SPECULARDETECTOR1D_H_ */
+#endif // BORNAGAIN_CORE_INSTRUMENT_SPECULARDETECTOR1D_H
diff --git a/Core/Instrument/SphericalDetector.h b/Core/Instrument/SphericalDetector.h
index 5b45a29de96..410a2dc1789 100644
--- a/Core/Instrument/SphericalDetector.h
+++ b/Core/Instrument/SphericalDetector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPHERICALDETECTOR_H
-#define SPHERICALDETECTOR_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_SPHERICALDETECTOR_H
+#define BORNAGAIN_CORE_INSTRUMENT_SPHERICALDETECTOR_H
 
 #include "Core/Binning/IPixel.h"
 #include "Core/Instrument/IDetector2D.h"
@@ -79,4 +79,4 @@ protected:
     size_t getIndexOfSpecular(const Beam& beam) const override;
 };
 
-#endif // SPHERICALDETECTOR_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_SPHERICALDETECTOR_H
diff --git a/Core/Instrument/UnitConverter1D.h b/Core/Instrument/UnitConverter1D.h
index 6d16ed8aa8b..fd2c0cfb0df 100644
--- a/Core/Instrument/UnitConverter1D.h
+++ b/Core/Instrument/UnitConverter1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UNITCONVERTER1D_H
-#define UNITCONVERTER1D_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTER1D_H
+#define BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTER1D_H
 
 #include "Core/Instrument/IUnitConverter.h"
 
@@ -129,4 +129,4 @@ protected:
 
     std::unique_ptr<IAxis> m_axis; //!< qz values (in inv. nm).
 };
-#endif // UNITCONVERTER1D_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTER1D_H
diff --git a/Core/Instrument/UnitConverterUtils.h b/Core/Instrument/UnitConverterUtils.h
index 5fe66901716..8c01e9aae6d 100644
--- a/Core/Instrument/UnitConverterUtils.h
+++ b/Core/Instrument/UnitConverterUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UNITCONVERTERUTILS_H
-#define UNITCONVERTERUTILS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTERUTILS_H
+#define BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTERUTILS_H
 
 #include "Core/Instrument/IUnitConverter.h"
 
@@ -42,4 +42,4 @@ BA_CORE_API_ std::unique_ptr<IUnitConverter> createConverterForGISAS(const Instr
 BA_CORE_API_ std::unique_ptr<IUnitConverter> createConverter(const Simulation& simulation);
 } // namespace UnitConverterUtils
 
-#endif // UNITCONVERTERUTILS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_UNITCONVERTERUTILS_H
diff --git a/Core/Instrument/VarianceFunctions.h b/Core/Instrument/VarianceFunctions.h
index 3aa1212155d..d89159c5f1c 100644
--- a/Core/Instrument/VarianceFunctions.h
+++ b/Core/Instrument/VarianceFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef VARIANCEFUNCTIONS_H
-#define VARIANCEFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
+#define BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -56,4 +56,4 @@ private:
     double m_epsilon;
 };
 
-#endif // VARIANCEFUNCTIONS_H
+#endif // BORNAGAIN_CORE_INSTRUMENT_VARIANCEFUNCTIONS_H
diff --git a/Core/Lattice/ILatticeOrientation.h b/Core/Lattice/ILatticeOrientation.h
index 7009f8a24ca..34f2fb8d386 100644
--- a/Core/Lattice/ILatticeOrientation.h
+++ b/Core/Lattice/ILatticeOrientation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ILATTICEORIENTATION_H
-#define ILATTICEORIENTATION_H
+#ifndef BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
+#define BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
 
 #include "Core/Lattice/Lattice.h"
 #include "Core/Vector/Transform3D.h"
@@ -63,4 +63,4 @@ private:
     MillerIndex m_ind1, m_ind2;
 };
 
-#endif // ILATTICEORIENTATION_H
+#endif // BORNAGAIN_CORE_LATTICE_ILATTICEORIENTATION_H
diff --git a/Core/Lattice/ISelectionRule.h b/Core/Lattice/ISelectionRule.h
index da879ab0e92..9eea2e0da9a 100644
--- a/Core/Lattice/ISelectionRule.h
+++ b/Core/Lattice/ISelectionRule.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISELECTIONRULE_H
-#define ISELECTIONRULE_H
+#ifndef BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
+#define BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
 
 #include "Core/Vector/Vectors3D.h"
 
@@ -63,4 +63,4 @@ inline bool SimpleSelectionRule::coordinateSelected(const ivector_t& coordinate)
     return (m_a * coordinate[0] + m_b * coordinate[1] + m_c * coordinate[2]) % m_mod == 0;
 }
 
-#endif // ISELECTIONRULE_H
+#endif // BORNAGAIN_CORE_LATTICE_ISELECTIONRULE_H
diff --git a/Core/Lattice/Lattice.h b/Core/Lattice/Lattice.h
index a36ba63a6d7..9c4ee65275d 100644
--- a/Core/Lattice/Lattice.h
+++ b/Core/Lattice/Lattice.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICE_H
-#define LATTICE_H
+#ifndef BORNAGAIN_CORE_LATTICE_LATTICE_H
+#define BORNAGAIN_CORE_LATTICE_LATTICE_H
 
 #include "Core/Parametrization/INode.h"
 #include "Core/Vector/Vectors3D.h"
@@ -117,4 +117,4 @@ private:
     mutable bool m_cache_ok;
 };
 
-#endif // LATTICE_H
+#endif // BORNAGAIN_CORE_LATTICE_LATTICE_H
diff --git a/Core/Lattice/Lattice1DParameters.h b/Core/Lattice/Lattice1DParameters.h
index 7743c6e6060..b1f3e542e77 100644
--- a/Core/Lattice/Lattice1DParameters.h
+++ b/Core/Lattice/Lattice1DParameters.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICE1DPARAMETERS_H
-#define LATTICE1DPARAMETERS_H
+#ifndef BORNAGAIN_CORE_LATTICE_LATTICE1DPARAMETERS_H
+#define BORNAGAIN_CORE_LATTICE_LATTICE1DPARAMETERS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -32,4 +32,4 @@ public:
     double m_xi;
 };
 
-#endif // LATTICE1DPARAMETERS_H
+#endif // BORNAGAIN_CORE_LATTICE_LATTICE1DPARAMETERS_H
diff --git a/Core/Lattice/Lattice2D.h b/Core/Lattice/Lattice2D.h
index 3004f2d8f6f..1642a6387ec 100644
--- a/Core/Lattice/Lattice2D.h
+++ b/Core/Lattice/Lattice2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICE2D_H
-#define LATTICE2D_H
+#ifndef BORNAGAIN_CORE_LATTICE_LATTICE2D_H
+#define BORNAGAIN_CORE_LATTICE_LATTICE2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -104,4 +104,4 @@ private:
     double m_length;
 };
 
-#endif // LATTICE2D_H
+#endif // BORNAGAIN_CORE_LATTICE_LATTICE2D_H
diff --git a/Core/Lattice/LatticeUtils.h b/Core/Lattice/LatticeUtils.h
index 0e6c774d38f..c4a3736c46f 100644
--- a/Core/Lattice/LatticeUtils.h
+++ b/Core/Lattice/LatticeUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICEUTILS_H
-#define LATTICEUTILS_H
+#ifndef BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
+#define BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
 
 #include "Core/Lattice/Lattice.h"
 #include "Core/Vector/Vectors3D.h"
@@ -28,4 +28,4 @@ BA_CORE_API_ Lattice CreateHCPLattice(double a, double c, const ILatticeOrientat
 BA_CORE_API_ Lattice CreateBCTLattice(double a, double c, const ILatticeOrientation& orientation);
 } // namespace LatticeUtils
 
-#endif // LATTICEUTILS_H
+#endif // BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
diff --git a/Core/Mask/Ellipse.h b/Core/Mask/Ellipse.h
index ae6f5fd5aba..0714d05d53f 100644
--- a/Core/Mask/Ellipse.h
+++ b/Core/Mask/Ellipse.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ELLIPSE_H
-#define ELLIPSE_H
+#ifndef BORNAGAIN_CORE_MASK_ELLIPSE_H
+#define BORNAGAIN_CORE_MASK_ELLIPSE_H
 
 #include "Core/Mask/IShape2D.h"
 
@@ -39,4 +39,4 @@ private:
     double m_xc, m_yc, m_xr, m_yr, m_theta;
 };
 
-#endif // ELLIPSE_H
+#endif // BORNAGAIN_CORE_MASK_ELLIPSE_H
diff --git a/Core/Mask/IShape2D.h b/Core/Mask/IShape2D.h
index 6ee3952b564..88400967148 100644
--- a/Core/Mask/IShape2D.h
+++ b/Core/Mask/IShape2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISHAPE2D_H
-#define ISHAPE2D_H
+#ifndef BORNAGAIN_CORE_MASK_ISHAPE2D_H
+#define BORNAGAIN_CORE_MASK_ISHAPE2D_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Basics/INamed.h"
@@ -47,4 +47,4 @@ protected:
     virtual void print(std::ostream& ostr) const { ostr << getName(); }
 };
 
-#endif // ISHAPE2D_H
+#endif // BORNAGAIN_CORE_MASK_ISHAPE2D_H
diff --git a/Core/Mask/InfinitePlane.h b/Core/Mask/InfinitePlane.h
index 8c87652d947..17e0b1d820d 100644
--- a/Core/Mask/InfinitePlane.h
+++ b/Core/Mask/InfinitePlane.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INFINITEPLANE_H
-#define INFINITEPLANE_H
+#ifndef BORNAGAIN_CORE_MASK_INFINITEPLANE_H
+#define BORNAGAIN_CORE_MASK_INFINITEPLANE_H
 
 #include "Core/Mask/IShape2D.h"
 
@@ -30,4 +30,4 @@ public:
     bool contains(const Bin1D&, const Bin1D&) const { return true; }
 };
 
-#endif // INFINITEPLANE_H
+#endif // BORNAGAIN_CORE_MASK_INFINITEPLANE_H
diff --git a/Core/Mask/Line.h b/Core/Mask/Line.h
index 054c96c08cc..b0b64a6aab7 100644
--- a/Core/Mask/Line.h
+++ b/Core/Mask/Line.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LINE_H
-#define LINE_H
+#ifndef BORNAGAIN_CORE_MASK_LINE_H
+#define BORNAGAIN_CORE_MASK_LINE_H
 
 #include "Core/Mask/IShape2D.h"
 
@@ -69,4 +69,4 @@ private:
     double m_y;
 };
 
-#endif // LINE_H
+#endif // BORNAGAIN_CORE_MASK_LINE_H
diff --git a/Core/Mask/Polygon.h b/Core/Mask/Polygon.h
index ebe52e4ad1e..467282714cf 100644
--- a/Core/Mask/Polygon.h
+++ b/Core/Mask/Polygon.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POLYGON_H
-#define POLYGON_H
+#ifndef BORNAGAIN_CORE_MASK_POLYGON_H
+#define BORNAGAIN_CORE_MASK_POLYGON_H
 
 #include "Core/Mask/IShape2D.h"
 #include <vector>
@@ -52,4 +52,4 @@ private:
     PolygonPrivate* m_d;
 };
 
-#endif // POLYGON_H
+#endif // BORNAGAIN_CORE_MASK_POLYGON_H
diff --git a/Core/Mask/Rectangle.h b/Core/Mask/Rectangle.h
index 2f51b65b619..93ee9995577 100644
--- a/Core/Mask/Rectangle.h
+++ b/Core/Mask/Rectangle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGLE_H
-#define RECTANGLE_H
+#ifndef BORNAGAIN_CORE_MASK_RECTANGLE_H
+#define BORNAGAIN_CORE_MASK_RECTANGLE_H
 
 #include "Core/Mask/IShape2D.h"
 
@@ -40,4 +40,4 @@ private:
     double m_xlow, m_ylow, m_xup, m_yup;
 };
 
-#endif // RECTANGLE_H
+#endif // BORNAGAIN_CORE_MASK_RECTANGLE_H
diff --git a/Core/Material/BaseMaterialImpl.h b/Core/Material/BaseMaterialImpl.h
index 6154c424085..d45dc2edb39 100644
--- a/Core/Material/BaseMaterialImpl.h
+++ b/Core/Material/BaseMaterialImpl.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BASEMATERIALIMPL_H_
-#define BASEMATERIALIMPL_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
+#define BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Basics/INamed.h"
@@ -74,4 +74,4 @@ public:
     virtual void print(std::ostream& ostr) const = 0;
 };
 
-#endif /* BASEMATERIALIMPL_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_BASEMATERIALIMPL_H
diff --git a/Core/Material/MagneticMaterialImpl.h b/Core/Material/MagneticMaterialImpl.h
index 68a3721528a..5e005f44480 100644
--- a/Core/Material/MagneticMaterialImpl.h
+++ b/Core/Material/MagneticMaterialImpl.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAGNETICMATERIALIMPL_H_
-#define MAGNETICMATERIALIMPL_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
+#define BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Material/BaseMaterialImpl.h"
@@ -61,4 +61,4 @@ private:
     kvector_t m_magnetization; //!< magnetization
 };
 
-#endif /* MAGNETICMATERIALIMPL_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
diff --git a/Core/Material/Material.h b/Core/Material/Material.h
index 43d4d2a6b21..dc76c3ea5e0 100644
--- a/Core/Material/Material.h
+++ b/Core/Material/Material.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIAL_H_
-#define MATERIAL_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_MATERIAL_H
+#define BORNAGAIN_CORE_MATERIAL_MATERIAL_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Material/BaseMaterialImpl.h"
@@ -108,4 +108,4 @@ BA_CORE_API_ bool operator==(const Material& left, const Material& right);
 //! Comparison operator for material wrapper (inequality check)
 BA_CORE_API_ bool operator!=(const Material& left, const Material& right);
 
-#endif /* MATERIAL_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_MATERIAL_H
diff --git a/Core/Material/MaterialBySLDImpl.h b/Core/Material/MaterialBySLDImpl.h
index 618fb551ec8..8b1e8a043f9 100644
--- a/Core/Material/MaterialBySLDImpl.h
+++ b/Core/Material/MaterialBySLDImpl.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALBYSLDIMPL_H_
-#define MATERIALBYSLDIMPL_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
+#define BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
 
 #include "Core/Material/MagneticMaterialImpl.h"
 #include "Core/Material/Material.h"
@@ -64,4 +64,4 @@ private:
     double m_sld_imag; //!< imaginary part of scattering length density (negative by default)
 };
 
-#endif /* MATERIALBYSLDIMPL_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
diff --git a/Core/Material/MaterialFactoryFuncs.h b/Core/Material/MaterialFactoryFuncs.h
index 0817827ebdb..7abb7c3c6d6 100644
--- a/Core/Material/MaterialFactoryFuncs.h
+++ b/Core/Material/MaterialFactoryFuncs.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALFACTORYFUNCS_H_
-#define MATERIALFACTORYFUNCS_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
+#define BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
 
 #include "Core/Material/Material.h"
 
@@ -73,4 +73,4 @@ BA_CORE_API_ Material CreateAveragedMaterial(const Material& layer_mat,
 
 #endif // SWIG
 
-#endif /* MATERIALFACTORYFUNCS_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_MATERIALFACTORYFUNCS_H
diff --git a/Core/Material/MaterialUtils.h b/Core/Material/MaterialUtils.h
index 089b70d43da..b99ec74e6ae 100644
--- a/Core/Material/MaterialUtils.h
+++ b/Core/Material/MaterialUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALUTILS_H_
-#define MATERIALUTILS_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
+#define BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Material/Material.h"
@@ -50,4 +50,4 @@ BA_CORE_API_ MATERIAL_TYPES checkMaterialTypes(const std::vector<const Material*
 
 } // namespace MaterialUtils
 
-#endif /* MATERIALUTILS_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
diff --git a/Core/Material/RefractiveMaterialImpl.h b/Core/Material/RefractiveMaterialImpl.h
index 3eb118112df..4fb2156bc95 100644
--- a/Core/Material/RefractiveMaterialImpl.h
+++ b/Core/Material/RefractiveMaterialImpl.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REFRACTIVEMATERIALIMPL_H_
-#define REFRACTIVEMATERIALIMPL_H_
+#ifndef BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
+#define BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
 
 #include "Core/Material/MagneticMaterialImpl.h"
 #include "Core/Material/Material.h"
@@ -65,4 +65,4 @@ private:
     double m_beta; //!< \f$\beta\f$ coefficient for refractive index \f$n = 1 - \delta + i \beta\f$
 };
 
-#endif /* REFRACTIVEMATERIALIMPL_H_ */
+#endif // BORNAGAIN_CORE_MATERIAL_REFRACTIVEMATERIALIMPL_H
diff --git a/Core/Multilayer/DecouplingApproximationStrategy.h b/Core/Multilayer/DecouplingApproximationStrategy.h
index 45b1d8dd8c6..6515f355b54 100644
--- a/Core/Multilayer/DecouplingApproximationStrategy.h
+++ b/Core/Multilayer/DecouplingApproximationStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DECOUPLINGAPPROXIMATIONSTRATEGY_H
-#define DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
 
 #include "Core/Multilayer/IInterferenceFunctionStrategy.h"
 
@@ -33,4 +33,4 @@ private:
     double polarizedCalculation(const SimulationElement& sim_element) const override;
 };
 
-#endif // DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_DECOUPLINGAPPROXIMATIONSTRATEGY_H
diff --git a/Core/Multilayer/FormFactorBAPol.h b/Core/Multilayer/FormFactorBAPol.h
index 514098c4bbc..af3617b1494 100644
--- a/Core/Multilayer/FormFactorBAPol.h
+++ b/Core/Multilayer/FormFactorBAPol.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORBAPOL_H
-#define FORMFACTORBAPOL_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
+#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
 
 #include "Core/Scattering/IFormFactor.h"
 #include <memory>
@@ -56,4 +56,4 @@ private:
     std::unique_ptr<IFormFactor> mP_form_factor;
 };
 
-#endif // FORMFACTORBAPOL_H
+#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORBAPOL_H
diff --git a/Core/Multilayer/FormFactorDWBA.h b/Core/Multilayer/FormFactorDWBA.h
index 8b2702940be..39e65d68496 100644
--- a/Core/Multilayer/FormFactorDWBA.h
+++ b/Core/Multilayer/FormFactorDWBA.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDWBA_H
-#define FORMFACTORDWBA_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
+#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
 
 #include "Core/Scattering/IFormFactor.h"
 #include <memory>
@@ -62,4 +62,4 @@ private:
     std::unique_ptr<const ILayerRTCoefficients> mp_out_coeffs;
 };
 
-#endif // FORMFACTORDWBA_H
+#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBA_H
diff --git a/Core/Multilayer/FormFactorDWBAPol.h b/Core/Multilayer/FormFactorDWBAPol.h
index 6eda166acbc..4fa0ce95a0a 100644
--- a/Core/Multilayer/FormFactorDWBAPol.h
+++ b/Core/Multilayer/FormFactorDWBAPol.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDWBAPOL_H
-#define FORMFACTORDWBAPOL_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
+#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
 
 #include "Core/Scattering/IFormFactor.h"
 #include <memory>
@@ -66,4 +66,4 @@ private:
     std::unique_ptr<const ILayerRTCoefficients> mp_out_coeffs;
 };
 
-#endif // FORMFACTORDWBAPOL_H
+#endif // BORNAGAIN_CORE_MULTILAYER_FORMFACTORDWBAPOL_H
diff --git a/Core/Multilayer/IFresnelMap.h b/Core/Multilayer/IFresnelMap.h
index 098c30c6d49..47f6ab32640 100644
--- a/Core/Multilayer/IFresnelMap.h
+++ b/Core/Multilayer/IFresnelMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFRESNELMAP_H
-#define IFRESNELMAP_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
+#define BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
 
 #include "Core/Computation/Slice.h"
 #include "Core/Multilayer/ILayerRTCoefficients.h"
@@ -64,4 +64,4 @@ protected:
     std::unique_ptr<ISpecularStrategy> m_Strategy;
 };
 
-#endif // IFRESNELMAP_H
+#endif // BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
diff --git a/Core/Multilayer/IInterferenceFunctionStrategy.h b/Core/Multilayer/IInterferenceFunctionStrategy.h
index 75abdec9de0..22509ba25f9 100644
--- a/Core/Multilayer/IInterferenceFunctionStrategy.h
+++ b/Core/Multilayer/IInterferenceFunctionStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IINTERFERENCEFUNCTIONSTRATEGY_H
-#define IINTERFERENCEFUNCTIONSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Parametrization/SimulationOptions.h"
@@ -73,4 +73,4 @@ private:
 #endif
 };
 
-#endif // IINTERFERENCEFUNCTIONSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_IINTERFERENCEFUNCTIONSTRATEGY_H
diff --git a/Core/Multilayer/ILayerRTCoefficients.h b/Core/Multilayer/ILayerRTCoefficients.h
index f258448d5d3..7fa8e70a9e0 100644
--- a/Core/Multilayer/ILayerRTCoefficients.h
+++ b/Core/Multilayer/ILayerRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ILAYERRTCOEFFICIENTS_H
-#define ILAYERRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Basics/Exceptions.h"
@@ -62,4 +62,4 @@ public:
     }
 };
 
-#endif // ILAYERRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
diff --git a/Core/Multilayer/IMultiLayerBuilder.h b/Core/Multilayer/IMultiLayerBuilder.h
index 53d04f88ea6..100fe075cf1 100644
--- a/Core/Multilayer/IMultiLayerBuilder.h
+++ b/Core/Multilayer/IMultiLayerBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMULTILAYERBUILDER_H
-#define IMULTILAYERBUILDER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_IMULTILAYERBUILDER_H
+#define BORNAGAIN_CORE_MULTILAYER_IMULTILAYERBUILDER_H
 
 #include "Core/Parametrization/IParameterized.h"
 
@@ -41,4 +41,4 @@ public:
     virtual size_t size() { return 1; }
 };
 
-#endif // IMULTILAYERBUILDER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_IMULTILAYERBUILDER_H
diff --git a/Core/Multilayer/ISpecularStrategy.h b/Core/Multilayer/ISpecularStrategy.h
index 4f0cec717ec..98f3e74707e 100644
--- a/Core/Multilayer/ISpecularStrategy.h
+++ b/Core/Multilayer/ISpecularStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISPECULARSTRATEGY_H
-#define ISPECULARSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
 
 #include "Core/Computation/Slice.h"
 #include "Core/Multilayer/ILayerRTCoefficients.h"
@@ -38,4 +38,4 @@ public:
                              const std::vector<complex_t>& kz) const = 0;
 };
 
-#endif // ISPECULARSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_ISPECULARSTRATEGY_H
diff --git a/Core/Multilayer/InterferenceFunctionUtils.h b/Core/Multilayer/InterferenceFunctionUtils.h
index 28f3a4e465c..324be4c01a5 100644
--- a/Core/Multilayer/InterferenceFunctionUtils.h
+++ b/Core/Multilayer/InterferenceFunctionUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONUTILS_H
-#define INTERFERENCEFUNCTIONUTILS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
+#define BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
 
 #include "Core/Basics/Complex.h"
 #include <Eigen/StdVector>
@@ -35,4 +35,4 @@ PrecomputePolarizedFormFactors(const SimulationElement& sim_element,
 
 } // namespace InterferenceFunctionUtils
 
-#endif // INTERFERENCEFUNCTIONUTILS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_INTERFERENCEFUNCTIONUTILS_H
diff --git a/Core/Multilayer/KzComputation.h b/Core/Multilayer/KzComputation.h
index d0d125ed895..f66e5e18915 100644
--- a/Core/Multilayer/KzComputation.h
+++ b/Core/Multilayer/KzComputation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IKZCOMPUTATION_H
-#define IKZCOMPUTATION_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
+#define BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Basics/ICloneable.h"
@@ -50,4 +50,4 @@ BA_CORE_API_ std::vector<complex_t> computeKzFromRefIndices(const std::vector<Sl
                                                             kvector_t k);
 } // namespace KzComputation
 
-#endif // IKZCOMPUTATION_H
+#endif // BORNAGAIN_CORE_MULTILAYER_KZCOMPUTATION_H
diff --git a/Core/Multilayer/Layer.h b/Core/Multilayer/Layer.h
index e2b09acc3ef..f6dbfe18f2b 100644
--- a/Core/Multilayer/Layer.h
+++ b/Core/Multilayer/Layer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYER_H
-#define LAYER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_LAYER_H
+#define BORNAGAIN_CORE_MULTILAYER_LAYER_H
 
 #include "Core/Material/Material.h"
 #include "Core/Scattering/ISample.h"
@@ -60,4 +60,4 @@ private:
     unsigned int m_n_slices = 1;          //!< number of slices to create for graded layer approach
 };
 
-#endif // LAYER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_LAYER_H
diff --git a/Core/Multilayer/LayerFillLimits.h b/Core/Multilayer/LayerFillLimits.h
index c20a3970c27..814fc464f00 100644
--- a/Core/Multilayer/LayerFillLimits.h
+++ b/Core/Multilayer/LayerFillLimits.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERFILLLIMITS_H
-#define LAYERFILLLIMITS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
+#define BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
 
 #include "Core/Particle/IParticle.h"
 #include "Core/Particle/ZLimits.h"
@@ -47,4 +47,4 @@ private:
     std::vector<ZLimits> m_layer_fill_limits;
 };
 
-#endif // LAYERFILLLIMITS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_LAYERFILLLIMITS_H
diff --git a/Core/Multilayer/LayerInterface.h b/Core/Multilayer/LayerInterface.h
index 3d3bd9e06d9..0068921b5b3 100644
--- a/Core/Multilayer/LayerInterface.h
+++ b/Core/Multilayer/LayerInterface.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERINTERFACE_H
-#define LAYERINTERFACE_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
+#define BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
 
 #include "Core/Scattering/ISample.h"
 #include <memory>
@@ -75,4 +75,4 @@ inline const Layer* LayerInterface::bottomLayer() const
     return m_bottomLayer;
 }
 
-#endif // LAYERINTERFACE_H
+#endif // BORNAGAIN_CORE_MULTILAYER_LAYERINTERFACE_H
diff --git a/Core/Multilayer/LayerRoughness.h b/Core/Multilayer/LayerRoughness.h
index fcfb30b3034..bc1876a5925 100644
--- a/Core/Multilayer/LayerRoughness.h
+++ b/Core/Multilayer/LayerRoughness.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERROUGHNESS_H
-#define LAYERROUGHNESS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
+#define BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Vector/Vectors3D.h"
@@ -70,4 +70,4 @@ private:
     void initialize();
 };
 
-#endif // LAYERROUGHNESS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
diff --git a/Core/Multilayer/LayoutStrategyBuilder.h b/Core/Multilayer/LayoutStrategyBuilder.h
index 6f297f22339..a08841c6198 100644
--- a/Core/Multilayer/LayoutStrategyBuilder.h
+++ b/Core/Multilayer/LayoutStrategyBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYOUTSTRATEGYBUILDER_H
-#define LAYOUTSTRATEGYBUILDER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_LAYOUTSTRATEGYBUILDER_H
+#define BORNAGAIN_CORE_MULTILAYER_LAYOUTSTRATEGYBUILDER_H
 
 #include "Core/Parametrization/SimulationOptions.h"
 #include <memory>
@@ -45,4 +45,4 @@ private:
     std::unique_ptr<IInterferenceFunctionStrategy> mP_strategy;
 };
 
-#endif // LAYOUTSTRATEGYBUILDER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_LAYOUTSTRATEGYBUILDER_H
diff --git a/Core/Multilayer/MatrixFresnelMap.h b/Core/Multilayer/MatrixFresnelMap.h
index b75a032f982..c70eb3865dd 100644
--- a/Core/Multilayer/MatrixFresnelMap.h
+++ b/Core/Multilayer/MatrixFresnelMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATRIXFRESNELMAP_H
-#define MATRIXFRESNELMAP_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
+#define BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
 
 #include "Core/Multilayer/IFresnelMap.h"
 #include "Core/Multilayer/MatrixRTCoefficients.h"
@@ -72,4 +72,4 @@ private:
                                                                 CoefficientHash& hash_table) const;
 };
 
-#endif // MATRIXFRESNELMAP_H
+#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXFRESNELMAP_H
diff --git a/Core/Multilayer/MatrixRTCoefficients.h b/Core/Multilayer/MatrixRTCoefficients.h
index b2255f00475..ac924ae2e98 100644
--- a/Core/Multilayer/MatrixRTCoefficients.h
+++ b/Core/Multilayer/MatrixRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATRIXRTCOEFFICIENTS_H
-#define MATRIXRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
 
 #include "Core/Multilayer/ILayerRTCoefficients.h"
 
@@ -67,4 +67,4 @@ public:
                                      //!< lambda=0
 };
 
-#endif // MATRIXRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
diff --git a/Core/Multilayer/MatrixRTCoefficients_v2.h b/Core/Multilayer/MatrixRTCoefficients_v2.h
index 40e8c96bee7..804a9d98467 100644
--- a/Core/Multilayer/MatrixRTCoefficients_v2.h
+++ b/Core/Multilayer/MatrixRTCoefficients_v2.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATRIXRTCOEFFICIENTS_V2_H
-#define MATRIXRTCOEFFICIENTS_V2_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
 
 #include "Core/Multilayer/ILayerRTCoefficients.h"
 #include "Core/Vector/Vectors3D.h"
@@ -65,4 +65,4 @@ private:
                          //!< the second eigenmode
 };
 
-#endif // MATRIXRTCOEFFICIENTS_V2_H
+#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h
index f8c038bb14c..d12e0faf831 100644
--- a/Core/Multilayer/MultiLayer.h
+++ b/Core/Multilayer/MultiLayer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYER_H
-#define MULTILAYER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
+#define BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
 
 #include "Core/Multilayer/RoughnessModels.h"
 #include "Core/Particle/ZLimits.h"
@@ -116,4 +116,4 @@ private:
     RoughnessModel m_roughness_model;
 };
 
-#endif // MULTILAYER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
diff --git a/Core/Multilayer/MultiLayerFuncs.h b/Core/Multilayer/MultiLayerFuncs.h
index cddd6220048..338a80abde0 100644
--- a/Core/Multilayer/MultiLayerFuncs.h
+++ b/Core/Multilayer/MultiLayerFuncs.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERFUNCS_H_
-#define MULTILAYERFUNCS_H_
+#ifndef BORNAGAIN_CORE_MULTILAYER_MULTILAYERFUNCS_H
+#define BORNAGAIN_CORE_MULTILAYER_MULTILAYERFUNCS_H
 
 #include "Core/Basics/Complex.h"
 #include "Wrap/WinDllMacros.h"
@@ -34,4 +34,4 @@ BA_CORE_API_ std::pair<double, double> DefaultMaterialProfileLimits(const MultiL
 //! Generate z values (equidistant) for use in MaterialProfile
 BA_CORE_API_ std::vector<double> GenerateZValues(int n_points, double z_min, double z_max);
 
-#endif // MULTILAYERFUNCS_H_
+#endif // BORNAGAIN_CORE_MULTILAYER_MULTILAYERFUNCS_H
diff --git a/Core/Multilayer/RoughnessModels.h b/Core/Multilayer/RoughnessModels.h
index 4b237f2d738..83c0da4b301 100644
--- a/Core/Multilayer/RoughnessModels.h
+++ b/Core/Multilayer/RoughnessModels.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROUGHNESSMODELS_H
-#define ROUGHNESSMODELS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
+#define BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
 
 #include <string>
 
@@ -30,4 +30,4 @@ struct BA_CORE_API_ RoughnessModelWrap {
 };
 typedef RoughnessModelWrap::RoughnessModel RoughnessModel;
 
-#endif // ROUGHNESSMODELS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_ROUGHNESSMODELS_H
diff --git a/Core/Multilayer/SSCAHelper.h b/Core/Multilayer/SSCAHelper.h
index 511d9a3ee6d..becc0ef2b09 100644
--- a/Core/Multilayer/SSCAHelper.h
+++ b/Core/Multilayer/SSCAHelper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SSCAHELPER_H
-#define SSCAHELPER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
+#define BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Multilayer/IInterferenceFunctionStrategy.h"
@@ -50,4 +50,4 @@ private:
     double m_mean_radius;
 };
 
-#endif // SSCAHELPER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
diff --git a/Core/Multilayer/SSCApproximationStrategy.h b/Core/Multilayer/SSCApproximationStrategy.h
index 69623a1a5c6..e6593994515 100644
--- a/Core/Multilayer/SSCApproximationStrategy.h
+++ b/Core/Multilayer/SSCApproximationStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SSCAPPROXIMATIONSTRATEGY_H
-#define SSCAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
 
 #include "Core/Multilayer/IInterferenceFunctionStrategy.h"
 #include "Core/Multilayer/SSCAHelper.h"
@@ -36,4 +36,4 @@ private:
     SSCAHelper m_helper;
 };
 
-#endif // SSCAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
diff --git a/Core/Multilayer/SampleBuilderNode.h b/Core/Multilayer/SampleBuilderNode.h
index 9fb46956a41..3fd4c19dd62 100644
--- a/Core/Multilayer/SampleBuilderNode.h
+++ b/Core/Multilayer/SampleBuilderNode.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEBUILDERNODE_H
-#define SAMPLEBUILDERNODE_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SAMPLEBUILDERNODE_H
+#define BORNAGAIN_CORE_MULTILAYER_SAMPLEBUILDERNODE_H
 
 #include "Core/Parametrization/INode.h"
 #include <memory>
@@ -50,4 +50,4 @@ private:
     builder_t m_sample_builder;
 };
 
-#endif // SAMPLEBUILDERNODE_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SAMPLEBUILDERNODE_H
diff --git a/Core/Multilayer/SampleProvider.h b/Core/Multilayer/SampleProvider.h
index 5d4bd04eeae..e6cdb2c2bab 100644
--- a/Core/Multilayer/SampleProvider.h
+++ b/Core/Multilayer/SampleProvider.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEPROVIDER_H
-#define SAMPLEPROVIDER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SAMPLEPROVIDER_H
+#define BORNAGAIN_CORE_MULTILAYER_SAMPLEPROVIDER_H
 
 #include "Core/Multilayer/SampleBuilderNode.h"
 #include "Core/Parametrization/INode.h"
@@ -53,4 +53,4 @@ private:
     SampleBuilderNode m_sample_builder;
 };
 
-#endif // SAMPLEPROVIDER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SAMPLEPROVIDER_H
diff --git a/Core/Multilayer/ScalarFresnelMap.h b/Core/Multilayer/ScalarFresnelMap.h
index cf436358409..8d04bd45e21 100644
--- a/Core/Multilayer/ScalarFresnelMap.h
+++ b/Core/Multilayer/ScalarFresnelMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCALARFRESNELMAP_H
-#define SCALARFRESNELMAP_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
+#define BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
 
 #include "Core/Multilayer/IFresnelMap.h"
 #include "Core/Multilayer/ISpecularStrategy.h"
@@ -57,4 +57,4 @@ private:
         m_cache;
 };
 
-#endif // SCALARFRESNELMAP_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
diff --git a/Core/Multilayer/ScalarRTCoefficients.h b/Core/Multilayer/ScalarRTCoefficients.h
index a90e713f074..cfd4910fdaa 100644
--- a/Core/Multilayer/ScalarRTCoefficients.h
+++ b/Core/Multilayer/ScalarRTCoefficients.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCALARRTCOEFFICIENTS_H
-#define SCALARRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Multilayer/ILayerRTCoefficients.h"
@@ -139,4 +139,4 @@ inline complex_t ScalarRTCoefficients::getScalarT() const
     return t_r(0);
 }
 
-#endif // SCALARRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
diff --git a/Core/Multilayer/SpecularMagneticOldStrategy.h b/Core/Multilayer/SpecularMagneticOldStrategy.h
index 563ca77b592..769397dda73 100644
--- a/Core/Multilayer/SpecularMagneticOldStrategy.h
+++ b/Core/Multilayer/SpecularMagneticOldStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARMAGNETICOLDSTRATEGY_H
-#define SPECULARMAGNETICOLDSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
 
 #include "Core/Multilayer/ISpecularStrategy.h"
 #include "Core/Multilayer/MatrixRTCoefficients.h"
@@ -38,4 +38,4 @@ public:
 
 }; // class SpecularMagneticOldStrategy
 
-#endif // SPECULARMAGNETICOLDSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
diff --git a/Core/Multilayer/SpecularMagneticStrategy.h b/Core/Multilayer/SpecularMagneticStrategy.h
index 8d5c6b8f80b..1aad956c46d 100644
--- a/Core/Multilayer/SpecularMagneticStrategy.h
+++ b/Core/Multilayer/SpecularMagneticStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARMAGNETICSTRATEGY_H
-#define SPECULARMAGNETICSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
 
 #include "Core/Multilayer/ISpecularStrategy.h"
 #include "Core/Multilayer/MatrixRTCoefficients_v2.h"
@@ -70,4 +70,4 @@ public:
                                   const Eigen::Matrix2cd& weights);
 };
 
-#endif // SPECULARMAGNETICSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
diff --git a/Core/Multilayer/SpecularScalarNCStrategy.h b/Core/Multilayer/SpecularScalarNCStrategy.h
index 0bd98c60ba5..527c2c50f42 100644
--- a/Core/Multilayer/SpecularScalarNCStrategy.h
+++ b/Core/Multilayer/SpecularScalarNCStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSCALARNCSTRATEGY_H
-#define SPECULARSCALARNCSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
 
 #include "Core/Multilayer/SpecularScalarStrategy.h"
 
@@ -39,4 +39,4 @@ private:
                                         const Eigen::Vector2cd& t_r1) const override;
 };
 
-#endif // SPECULARSCALARNCSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARNCSTRATEGY_H
diff --git a/Core/Multilayer/SpecularScalarStrategy.h b/Core/Multilayer/SpecularScalarStrategy.h
index 09a7caf4950..2178b99ac12 100644
--- a/Core/Multilayer/SpecularScalarStrategy.h
+++ b/Core/Multilayer/SpecularScalarStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSCALARSTRATEGY_H
-#define SPECULARSCALARSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
 
 #include "Core/Multilayer/ISpecularStrategy.h"
 #include "Core/Multilayer/ScalarRTCoefficients.h"
@@ -56,4 +56,4 @@ private:
                               size_t slice_index) const;
 };
 
-#endif // SPECULARSCALARSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
diff --git a/Core/Multilayer/SpecularScalarTanhStrategy.h b/Core/Multilayer/SpecularScalarTanhStrategy.h
index 8230111a2ba..0eca2f157d9 100644
--- a/Core/Multilayer/SpecularScalarTanhStrategy.h
+++ b/Core/Multilayer/SpecularScalarTanhStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSCALARTANHSTRATEGY_H
-#define SPECULARSCALARTANHSTRATEGY_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
 
 #include "Core/Multilayer/SpecularScalarStrategy.h"
 
@@ -35,4 +35,4 @@ private:
                                         const Eigen::Vector2cd& t_r1) const override;
 };
 
-#endif // SPECULARSCALARTANHSTRATEGY_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARTANHSTRATEGY_H
diff --git a/Core/Multilayer/SpecularStrategyBuilder.h b/Core/Multilayer/SpecularStrategyBuilder.h
index 991742c29b8..67976b9b817 100644
--- a/Core/Multilayer/SpecularStrategyBuilder.h
+++ b/Core/Multilayer/SpecularStrategyBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSTRATEGYBUILDER_H
-#define SPECULARSTRATEGYBUILDER_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSTRATEGYBUILDER_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSTRATEGYBUILDER_H
 
 #include "Core/Multilayer/ISpecularStrategy.h"
 #include "Core/Multilayer/MultiLayer.h"
@@ -26,4 +26,4 @@ public:
     static std::unique_ptr<ISpecularStrategy> build(const MultiLayer& sample, const bool magnetic);
 };
 
-#endif // SPECULARSTRATEGYBUILDER_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSTRATEGYBUILDER_H
diff --git a/Core/Parametrization/DistributionHandler.h b/Core/Parametrization/DistributionHandler.h
index 1f8243281c3..8dc25a3a915 100644
--- a/Core/Parametrization/DistributionHandler.h
+++ b/Core/Parametrization/DistributionHandler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONHANDLER_H
-#define DISTRIBUTIONHANDLER_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
 
 #include "Core/Parametrization/ParameterDistribution.h"
 #include <vector>
@@ -57,4 +57,4 @@ private:
     std::vector<std::vector<ParameterSample>> m_cached_samples;
 };
 
-#endif // DISTRIBUTIONHANDLER_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONHANDLER_H
diff --git a/Core/Parametrization/Distributions.h b/Core/Parametrization/Distributions.h
index 3e7971c162b..a2ee117d304 100644
--- a/Core/Parametrization/Distributions.h
+++ b/Core/Parametrization/Distributions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONS_H
-#define DISTRIBUTIONS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -314,4 +314,4 @@ private:
     double m_right;
 };
 
-#endif // DISTRIBUTIONS_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
diff --git a/Core/Parametrization/INode.h b/Core/Parametrization/INode.h
index fdc92c0c568..f7b59f87ffb 100644
--- a/Core/Parametrization/INode.h
+++ b/Core/Parametrization/INode.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INODE_H
-#define INODE_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
 
 #include "Core/Parametrization/INodeVisitor.h"
 #include "Core/Parametrization/IParameterized.h"
@@ -101,4 +101,4 @@ inline std::vector<const INode*>& operator<<(std::vector<const INode*>&& v_node,
     return v_node;
 }
 
-#endif // INODE_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_INODE_H
diff --git a/Core/Parametrization/INodeVisitor.h b/Core/Parametrization/INodeVisitor.h
index fc5d7e28811..b134ef68ef6 100644
--- a/Core/Parametrization/INodeVisitor.h
+++ b/Core/Parametrization/INodeVisitor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INODEVISITOR_H
-#define INODEVISITOR_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -295,4 +295,4 @@ private:
 BA_CORE_API_ void VisitNodesPreorder(const INode& node, INodeVisitor& visitor);
 BA_CORE_API_ void VisitNodesPostorder(const INode& node, INodeVisitor& visitor);
 
-#endif // ISAMPLEVISITOR_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_INODEVISITOR_H
diff --git a/Core/Parametrization/IParameter.h b/Core/Parametrization/IParameter.h
index e0ab288b0ec..6530ba45fb4 100644
--- a/Core/Parametrization/IParameter.h
+++ b/Core/Parametrization/IParameter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPARAMETER_H
-#define IPARAMETER_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
 
 #include "Core/Basics/INamed.h"
 #include <functional>
@@ -72,4 +72,4 @@ template <class T> bool IParameter<T>::hasSameData(const IParameter<T>& other)
     return &getData() == &other.getData();
 }
 
-#endif // IPARAMETER_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETER_H
diff --git a/Core/Parametrization/IParameterized.h b/Core/Parametrization/IParameterized.h
index 56f7c6051ee..0579dfdda33 100644
--- a/Core/Parametrization/IParameterized.h
+++ b/Core/Parametrization/IParameterized.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPARAMETERIZED_H
-#define IPARAMETERIZED_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
 
 #include "Core/Basics/BornAgainNamespace.h"
 #include "Core/Basics/INamed.h"
@@ -70,4 +70,4 @@ private:
     ParameterPool* m_pool; //!< parameter pool (kind of pointer-to-implementation)
 };
 
-#endif // IPARAMETERIZED_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_IPARAMETERIZED_H
diff --git a/Core/Parametrization/IterationStrategy.h b/Core/Parametrization/IterationStrategy.h
index dd55b700dba..b61d348b514 100644
--- a/Core/Parametrization/IterationStrategy.h
+++ b/Core/Parametrization/IterationStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITERATIONSTRATEGY_H
-#define ITERATIONSTRATEGY_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
 
 #include "Core/Scattering/ISample.h"
 
@@ -63,4 +63,4 @@ public:
     virtual bool isDone(IteratorMemento& iterator_stack) const;
 };
 
-#endif // ITERATIONSTRATEGY_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_ITERATIONSTRATEGY_H
diff --git a/Core/Parametrization/NodeIterator.h b/Core/Parametrization/NodeIterator.h
index 9576cfdb02e..589511f73cb 100644
--- a/Core/Parametrization/NodeIterator.h
+++ b/Core/Parametrization/NodeIterator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NODEITERATOR_H
-#define NODEITERATOR_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
 
 #include "Core/Parametrization/INode.h"
 #include <ostream>
@@ -134,4 +134,4 @@ template <class Strategy> inline int NodeIterator<Strategy>::depth() const
     return static_cast<int>(m_memento_itor.size());
 }
 
-#endif // NODEITERATOR_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_NODEITERATOR_H
diff --git a/Core/Parametrization/NodeUtils.h b/Core/Parametrization/NodeUtils.h
index f46a52215ba..4f164c1f7f1 100644
--- a/Core/Parametrization/NodeUtils.h
+++ b/Core/Parametrization/NodeUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NODEUTILS_H
-#define NODEUTILS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -31,4 +31,4 @@ BA_CORE_API_ std::string nodePath(const INode& node, const INode* root = nullptr
 
 } // namespace NodeUtils
 
-#endif // NODEUTILS_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_NODEUTILS_H
diff --git a/Core/Parametrization/ParameterDistribution.h b/Core/Parametrization/ParameterDistribution.h
index 2b2c5873678..660b49826da 100644
--- a/Core/Parametrization/ParameterDistribution.h
+++ b/Core/Parametrization/ParameterDistribution.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERDISTRIBUTION_H
-#define PARAMETERDISTRIBUTION_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
 
 #include "Core/Parametrization/IParameterized.h"
 #include "Core/Parametrization/ParameterSample.h"
@@ -77,4 +77,4 @@ private:
     double m_xmax;
 };
 
-#endif // PARAMETERDISTRIBUTION_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERDISTRIBUTION_H
diff --git a/Core/Parametrization/ParameterPattern.h b/Core/Parametrization/ParameterPattern.h
index ee7ca7237ac..dc662279a4d 100644
--- a/Core/Parametrization/ParameterPattern.h
+++ b/Core/Parametrization/ParameterPattern.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERPATTERN_H
-#define PARAMETERPATTERN_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -36,4 +36,4 @@ private:
     std::string m_pattern;
 };
 
-#endif // PARAMETERPATTERN_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPATTERN_H
diff --git a/Core/Parametrization/ParameterPool.h b/Core/Parametrization/ParameterPool.h
index 4fcdd21f078..2fb6b83fecb 100644
--- a/Core/Parametrization/ParameterPool.h
+++ b/Core/Parametrization/ParameterPool.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERPOOL_H
-#define PARAMETERPOOL_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
 
 #include "Core/Basics/ICloneable.h"
 #include <ostream>
@@ -83,4 +83,4 @@ private:
     std::vector<RealParameter*> m_params;
 };
 
-#endif // PARAMETERPOOL_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERPOOL_H
diff --git a/Core/Parametrization/ParameterSample.h b/Core/Parametrization/ParameterSample.h
index a9eb99d13cf..46e841071e0 100644
--- a/Core/Parametrization/ParameterSample.h
+++ b/Core/Parametrization/ParameterSample.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERSAMPLE_H
-#define PARAMETERSAMPLE_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
 
 //! A parameter value with a weight, as obtained when sampling from a distribution.
 //! @ingroup algorithms_internal
@@ -26,4 +26,4 @@ public:
     double weight;
 };
 
-#endif // PARAMETERSAMPLE_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERSAMPLE_H
diff --git a/Core/Parametrization/ParameterUtils.h b/Core/Parametrization/ParameterUtils.h
index 8aaec132dd1..2c045617723 100644
--- a/Core/Parametrization/ParameterUtils.h
+++ b/Core/Parametrization/ParameterUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERUTILS_H
-#define PARAMETERUTILS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -36,4 +36,4 @@ BA_CORE_API_ std::string poolParameterUnits(const IParameterized& node, const st
 
 } // namespace ParameterUtils
 
-#endif // PARAMETERPATTERN_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_PARAMETERUTILS_H
diff --git a/Core/Parametrization/RangedDistributions.h b/Core/Parametrization/RangedDistributions.h
index 31853734948..64f26edc1a5 100644
--- a/Core/Parametrization/RangedDistributions.h
+++ b/Core/Parametrization/RangedDistributions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RANGEDDISTRIBUTIONS_H
-#define RANGEDDISTRIBUTIONS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Fit/Tools/RealLimits.h"
@@ -222,4 +222,4 @@ inline std::ostream& operator<<(std::ostream& os, const RangedDistribution& dist
     return os << distribution.print();
 }
 
-#endif // RANGEDDISTRIBUTIONS_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_RANGEDDISTRIBUTIONS_H
diff --git a/Core/Parametrization/RealParameter.h b/Core/Parametrization/RealParameter.h
index 382e90b0dae..ad85fbcacf8 100644
--- a/Core/Parametrization/RealParameter.h
+++ b/Core/Parametrization/RealParameter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALPARAMETER_H
-#define REALPARAMETER_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
 
 #include "Core/Parametrization/IParameter.h"
 #include "Core/Parametrization/Unit.h"
@@ -61,4 +61,4 @@ protected:
     Unit m_unit;
 };
 
-#endif // REALPARAMETER_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_REALPARAMETER_H
diff --git a/Core/Parametrization/SimulationOptions.h b/Core/Parametrization/SimulationOptions.h
index 4ad34df92d0..d7aca311498 100644
--- a/Core/Parametrization/SimulationOptions.h
+++ b/Core/Parametrization/SimulationOptions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONOPTIONS_H
-#define SIMULATIONOPTIONS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
 
 #include "Core/Parametrization/ThreadInfo.h"
 #include <cstddef>
@@ -71,4 +71,4 @@ private:
     ThreadInfo m_thread_info;
 };
 
-#endif // SIMULATIONOPTIONS_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_SIMULATIONOPTIONS_H
diff --git a/Core/Parametrization/ThreadInfo.h b/Core/Parametrization/ThreadInfo.h
index e859fe04d6b..a95424fc640 100644
--- a/Core/Parametrization/ThreadInfo.h
+++ b/Core/Parametrization/ThreadInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef THREADINFO_H
-#define THREADINFO_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -29,4 +29,4 @@ struct BA_CORE_API_ ThreadInfo {
 
 inline ThreadInfo::ThreadInfo() : n_threads(0), n_batches(1), current_batch(0) {}
 
-#endif // THREADINFO_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_THREADINFO_H
diff --git a/Core/Parametrization/Unit.h b/Core/Parametrization/Unit.h
index 9d26e3f7ddf..a43ed2072fd 100644
--- a/Core/Parametrization/Unit.h
+++ b/Core/Parametrization/Unit.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UNIT_H
-#define UNIT_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
 
 #include "Core/Basics/INamed.h"
 #include <string>
@@ -27,4 +27,4 @@ public:
     void setUnit(const std::string& name);
 };
 
-#endif // UNIT_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_UNIT_H
diff --git a/Core/Parametrization/Units.h b/Core/Parametrization/Units.h
index ac160a33b85..5d331c24481 100644
--- a/Core/Parametrization/Units.h
+++ b/Core/Parametrization/Units.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UNITS_H
-#define UNITS_H
+#ifndef BORNAGAIN_CORE_PARAMETRIZATION_UNITS_H
+#define BORNAGAIN_CORE_PARAMETRIZATION_UNITS_H
 
 //! Constants and functions for physical unit conversions.
 
@@ -61,4 +61,4 @@ static const double gauss = 1e-4;
 
 } // namespace Units
 
-#endif // UNITS_H
+#endif // BORNAGAIN_CORE_PARAMETRIZATION_UNITS_H
diff --git a/Core/Particle/Crystal.h b/Core/Particle/Crystal.h
index 84dcfd74c95..7fdea15bf57 100644
--- a/Core/Particle/Crystal.h
+++ b/Core/Particle/Crystal.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CRYSTAL_H
-#define CRYSTAL_H
+#ifndef BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
+#define BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
 
 #include "Core/Lattice/Lattice.h"
 #include "Core/Particle/IClusteredParticles.h"
@@ -53,4 +53,4 @@ private:
     double m_position_variance;
 };
 
-#endif // CRYSTAL_H
+#endif // BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
diff --git a/Core/Particle/FormFactorCoreShell.h b/Core/Particle/FormFactorCoreShell.h
index 9a132771ae6..8efd02c395a 100644
--- a/Core/Particle/FormFactorCoreShell.h
+++ b/Core/Particle/FormFactorCoreShell.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCORESHELL_H
-#define FORMFACTORCORESHELL_H
+#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
+#define BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
 
 #include "Core/Scattering/IFormFactor.h"
 
@@ -55,4 +55,4 @@ protected:
     std::unique_ptr<IFormFactor> mP_shell;
 };
 
-#endif // FORMFACTORCORESHELL_H
+#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORCORESHELL_H
diff --git a/Core/Particle/FormFactorCrystal.h b/Core/Particle/FormFactorCrystal.h
index 5bb4b05ec53..bd8ea490125 100644
--- a/Core/Particle/FormFactorCrystal.h
+++ b/Core/Particle/FormFactorCrystal.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORCRYSTAL_H
-#define FORMFACTORCRYSTAL_H
+#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
+#define BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
 
 #include "Core/Lattice/Lattice.h"
 #include "Core/Scattering/IFormFactorBorn.h"
@@ -64,4 +64,4 @@ private:
     double m_max_rec_length;
 };
 
-#endif // FORMFACTORCRYSTAL_H
+#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORCRYSTAL_H
diff --git a/Core/Particle/FormFactorWeighted.h b/Core/Particle/FormFactorWeighted.h
index 25fe56172f7..27afe97ca9b 100644
--- a/Core/Particle/FormFactorWeighted.h
+++ b/Core/Particle/FormFactorWeighted.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORWEIGHTED_H
-#define FORMFACTORWEIGHTED_H
+#ifndef BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
+#define BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
 
 #include "Core/Scattering/IFormFactor.h"
 
@@ -57,4 +57,4 @@ protected:
     std::vector<double> m_weights;
 };
 
-#endif // FORMFACTORWEIGHTED_H
+#endif // BORNAGAIN_CORE_PARTICLE_FORMFACTORWEIGHTED_H
diff --git a/Core/Particle/HomogeneousRegion.h b/Core/Particle/HomogeneousRegion.h
index bdeea20e7e8..4ba06d60009 100644
--- a/Core/Particle/HomogeneousRegion.h
+++ b/Core/Particle/HomogeneousRegion.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HOMOGENEOUSREGION_H
-#define HOMOGENEOUSREGION_H
+#ifndef BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
+#define BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
 
 #include "Core/Material/Material.h"
 
@@ -29,4 +29,4 @@ struct HomogeneousRegion {
     Material m_material;
 };
 
-#endif // HOMOGENEOUSREGION_H
+#endif // BORNAGAIN_CORE_PARTICLE_HOMOGENEOUSREGION_H
diff --git a/Core/Particle/IAbstractParticle.h b/Core/Particle/IAbstractParticle.h
index ccb21ce1f3f..63d7dceb398 100644
--- a/Core/Particle/IAbstractParticle.h
+++ b/Core/Particle/IAbstractParticle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IABSTRACTPARTICLE_H
-#define IABSTRACTPARTICLE_H
+#ifndef BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
+#define BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Vector/Vectors3D.h"
@@ -53,4 +53,4 @@ protected:
     double m_abundance;
 };
 
-#endif // IABSTRACTPARTICLE_H
+#endif // BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
diff --git a/Core/Particle/IClusteredParticles.h b/Core/Particle/IClusteredParticles.h
index 296c0e8055b..92fe4679a04 100644
--- a/Core/Particle/IClusteredParticles.h
+++ b/Core/Particle/IClusteredParticles.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ICLUSTEREDPARTICLES_H
-#define ICLUSTEREDPARTICLES_H
+#ifndef BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
+#define BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
 
 #include "Core/Particle/HomogeneousRegion.h"
 #include "Core/Scattering/ISample.h"
@@ -42,4 +42,4 @@ public:
     virtual std::vector<HomogeneousRegion> homogeneousRegions() const = 0;
 };
 
-#endif // ICLUSTEREDPARTICLES_H
+#endif // BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h
index d94a1e76750..6d1359dace6 100644
--- a/Core/Particle/IParticle.h
+++ b/Core/Particle/IParticle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPARTICLE_H
-#define IPARTICLE_H
+#ifndef BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
+#define BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
 
 #include "Core/Particle/IAbstractParticle.h"
 #include "Core/Particle/SlicedParticle.h"
@@ -102,4 +102,4 @@ protected:
     std::unique_ptr<IRotation> mP_rotation;
 };
 
-#endif // IPARTICLE_H
+#endif // BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
diff --git a/Core/Particle/MesoCrystal.h b/Core/Particle/MesoCrystal.h
index a11fc868311..e68981214c5 100644
--- a/Core/Particle/MesoCrystal.h
+++ b/Core/Particle/MesoCrystal.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTAL_H
-#define MESOCRYSTAL_H
+#ifndef BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
+#define BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
 
 #include "Core/Particle/IParticle.h"
 
@@ -44,4 +44,4 @@ private:
     std::unique_ptr<IFormFactor> mp_meso_form_factor;           //!< Outer shape of this mesocrystal
 };
 
-#endif // MESOCRYSTAL_H
+#endif // BORNAGAIN_CORE_PARTICLE_MESOCRYSTAL_H
diff --git a/Core/Particle/Particle.h b/Core/Particle/Particle.h
index 564db074ca7..784e9fc0c94 100644
--- a/Core/Particle/Particle.h
+++ b/Core/Particle/Particle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLE_H
-#define PARTICLE_H
+#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLE_H
+#define BORNAGAIN_CORE_PARTICLE_PARTICLE_H
 
 #include "Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h"
 #include "Core/DecoratedFormFactor/FormFactorDecoratorRotation.h"
@@ -52,4 +52,4 @@ private:
     void initialize();
 };
 
-#endif // PARTICLE_H
+#endif // BORNAGAIN_CORE_PARTICLE_PARTICLE_H
diff --git a/Core/Particle/ParticleComposition.h b/Core/Particle/ParticleComposition.h
index 94e0b9e973a..5b90ca2951f 100644
--- a/Core/Particle/ParticleComposition.h
+++ b/Core/Particle/ParticleComposition.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECOMPOSITION_H
-#define PARTICLECOMPOSITION_H
+#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
+#define BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
 
 #include "Core/Particle/IParticle.h"
 #include <memory>
@@ -57,4 +57,4 @@ private:
     void initialize();
 };
 
-#endif // PARTICLECOMPOSITION_H
+#endif // BORNAGAIN_CORE_PARTICLE_PARTICLECOMPOSITION_H
diff --git a/Core/Particle/ParticleCoreShell.h b/Core/Particle/ParticleCoreShell.h
index 766f6ab9e2f..64b70448d8c 100644
--- a/Core/Particle/ParticleCoreShell.h
+++ b/Core/Particle/ParticleCoreShell.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECORESHELL_H
-#define PARTICLECORESHELL_H
+#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
+#define BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
 
 #include "Core/Particle/IParticle.h"
 
@@ -60,4 +60,4 @@ inline const Particle* ParticleCoreShell::shellParticle() const
     return mp_shell.get();
 }
 
-#endif // PARTICLECORESHELL_H
+#endif // BORNAGAIN_CORE_PARTICLE_PARTICLECORESHELL_H
diff --git a/Core/Particle/ParticleDistribution.h b/Core/Particle/ParticleDistribution.h
index fdf17cd62fc..b771503e324 100644
--- a/Core/Particle/ParticleDistribution.h
+++ b/Core/Particle/ParticleDistribution.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEDISTRIBUTION_H
-#define PARTICLEDISTRIBUTION_H
+#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
+#define BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
 
 #include "Core/Parametrization/ParameterDistribution.h"
 #include "Core/Particle/IAbstractParticle.h"
@@ -53,4 +53,4 @@ private:
     ParameterDistribution m_par_distribution;
 };
 
-#endif // PARTICLEDISTRIBUTION_H
+#endif // BORNAGAIN_CORE_PARTICLE_PARTICLEDISTRIBUTION_H
diff --git a/Core/Particle/SlicedFormFactorList.h b/Core/Particle/SlicedFormFactorList.h
index 5b52056eeba..40a45404750 100644
--- a/Core/Particle/SlicedFormFactorList.h
+++ b/Core/Particle/SlicedFormFactorList.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLICEDFORMFACTORLIST_H
-#define SLICEDFORMFACTORLIST_H
+#ifndef BORNAGAIN_CORE_PARTICLE_SLICEDFORMFACTORLIST_H
+#define BORNAGAIN_CORE_PARTICLE_SLICEDFORMFACTORLIST_H
 
 #include "Core/Particle/HomogeneousRegion.h"
 #include "Core/Scattering/IFormFactor.h"
@@ -52,4 +52,4 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // SLICEDFORMFACTORLIST_H
+#endif // BORNAGAIN_CORE_PARTICLE_SLICEDFORMFACTORLIST_H
diff --git a/Core/Particle/SlicedParticle.h b/Core/Particle/SlicedParticle.h
index e1ec9bbf2ed..707ae96f9b4 100644
--- a/Core/Particle/SlicedParticle.h
+++ b/Core/Particle/SlicedParticle.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLICEDPARTICLE_H
-#define SLICEDPARTICLE_H
+#ifndef BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
+#define BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
 
 #include "Core/Particle/HomogeneousRegion.h"
 #include "Core/Scattering/IFormFactor.h"
@@ -30,4 +30,4 @@ struct SlicedParticle {
     std::vector<HomogeneousRegion> m_regions;
 };
 
-#endif // SLICEDPARTICLE_H
+#endif // BORNAGAIN_CORE_PARTICLE_SLICEDPARTICLE_H
diff --git a/Core/Particle/TRange.h b/Core/Particle/TRange.h
index f15c1370bc1..799940d6dcd 100644
--- a/Core/Particle/TRange.h
+++ b/Core/Particle/TRange.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANGE_H
-#define TRANGE_H
+#ifndef BORNAGAIN_CORE_PARTICLE_TRANGE_H
+#define BORNAGAIN_CORE_PARTICLE_TRANGE_H
 
 #include <cstddef>
 
@@ -52,4 +52,4 @@ private:
     size_t m_n_samples;
 };
 
-#endif // TRANGE_H
+#endif // BORNAGAIN_CORE_PARTICLE_TRANGE_H
diff --git a/Core/Particle/ZLimits.h b/Core/Particle/ZLimits.h
index 3465f85c7dc..ac87b253e36 100644
--- a/Core/Particle/ZLimits.h
+++ b/Core/Particle/ZLimits.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ZLIMITS_H
-#define ZLIMITS_H
+#ifndef BORNAGAIN_CORE_PARTICLE_ZLIMITS_H
+#define BORNAGAIN_CORE_PARTICLE_ZLIMITS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <iostream>
@@ -62,4 +62,4 @@ BA_CORE_API_ bool operator!=(const ZLimits& left, const ZLimits& right);
 
 BA_CORE_API_ std::ostream& operator<<(std::ostream& ostr, const ZLimits& limits);
 
-#endif // ZLIMITS_H
+#endif // BORNAGAIN_CORE_PARTICLE_ZLIMITS_H
diff --git a/Core/Scattering/IFormFactor.h b/Core/Scattering/IFormFactor.h
index e65d5674027..e2b2bd806a2 100644
--- a/Core/Scattering/IFormFactor.h
+++ b/Core/Scattering/IFormFactor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFORMFACTOR_H
-#define IFORMFACTOR_H
+#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
+#define BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Material/Material.h"
@@ -90,4 +90,4 @@ protected:
 IFormFactor* CreateTransformedFormFactor(const IFormFactor& formfactor, const IRotation& rot,
                                          kvector_t translation);
 
-#endif // IFORMFACTOR_H
+#endif // BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
diff --git a/Core/Scattering/IFormFactorBorn.h b/Core/Scattering/IFormFactorBorn.h
index 9b42b989557..3ef77026a61 100644
--- a/Core/Scattering/IFormFactorBorn.h
+++ b/Core/Scattering/IFormFactorBorn.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFORMFACTORBORN_H
-#define IFORMFACTORBORN_H
+#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
+#define BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
 
 #include "Core/Scattering/IFormFactor.h"
 #include "Core/Shapes/IShape.h"
@@ -109,4 +109,4 @@ public:
 };
 #endif
 
-#endif // IFORMFACTORBORN_H
+#endif // BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
diff --git a/Core/Scattering/ISample.h b/Core/Scattering/ISample.h
index 83f552ddfd1..41954e1ac75 100644
--- a/Core/Scattering/ISample.h
+++ b/Core/Scattering/ISample.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISAMPLE_H
-#define ISAMPLE_H
+#ifndef BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
+#define BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
 
 #include "Core/Basics/ICloneable.h"
 #include "Core/Parametrization/INode.h"
@@ -37,4 +37,4 @@ public:
     std::vector<const Material*> containedMaterials() const;
 };
 
-#endif // ISAMPLE_H
+#endif // BORNAGAIN_CORE_SCATTERING_ISAMPLE_H
diff --git a/Core/Scattering/Rotations.h b/Core/Scattering/Rotations.h
index bba1b7fb5d0..4f6f8b5c642 100644
--- a/Core/Scattering/Rotations.h
+++ b/Core/Scattering/Rotations.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROTATIONS_H
-#define ROTATIONS_H
+#ifndef BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
+#define BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
 
 #include "Core/Scattering/ISample.h"
 #include "Core/Vector/Transform3D.h"
@@ -145,4 +145,4 @@ protected:
     double m_alpha, m_beta, m_gamma;
 };
 
-#endif // ROTATIONS_H
+#endif // BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
diff --git a/Core/Shapes/Box.h b/Core/Shapes/Box.h
index d90381023f8..da9b12a1aed 100644
--- a/Core/Shapes/Box.h
+++ b/Core/Shapes/Box.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BOX_H
-#define BOX_H
+#ifndef BORNAGAIN_CORE_SHAPES_BOX_H
+#define BORNAGAIN_CORE_SHAPES_BOX_H
 
 #include "Core/Shapes/IShape.h"
 
@@ -24,4 +24,4 @@ public:
     ~Box();
 };
 
-#endif // BOX_H
+#endif // BORNAGAIN_CORE_SHAPES_BOX_H
diff --git a/Core/Shapes/DoubleEllipse.h b/Core/Shapes/DoubleEllipse.h
index 6982857ed4a..1202fa0db77 100644
--- a/Core/Shapes/DoubleEllipse.h
+++ b/Core/Shapes/DoubleEllipse.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOUBLEELLIPSE_H
-#define DOUBLEELLIPSE_H
+#ifndef BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
+#define BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
 
 #include "Core/Shapes/IShape.h"
 
@@ -24,4 +24,4 @@ public:
     ~DoubleEllipse();
 };
 
-#endif // DOUBLEELLIPSE_H
+#endif // BORNAGAIN_CORE_SHAPES_DOUBLEELLIPSE_H
diff --git a/Core/Shapes/IShape.h b/Core/Shapes/IShape.h
index 4e09b5bf7ed..f32acc58e13 100644
--- a/Core/Shapes/IShape.h
+++ b/Core/Shapes/IShape.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISHAPE_H
-#define ISHAPE_H
+#ifndef BORNAGAIN_CORE_SHAPES_ISHAPE_H
+#define BORNAGAIN_CORE_SHAPES_ISHAPE_H
 
 #include "Core/Vector/Vectors3D.h"
 #include <vector>
@@ -48,4 +48,4 @@ std::vector<kvector_t> RectangleVertices(double length, double width, double z);
 //! Generate vertices of centered ellipse with given semi-axes at height z
 std::vector<kvector_t> EllipseVertices(double r_x, double r_y, double z);
 
-#endif // ISHAPE_H
+#endif // BORNAGAIN_CORE_SHAPES_ISHAPE_H
diff --git a/Core/Shapes/RippleCosine.h b/Core/Shapes/RippleCosine.h
index 28aa5a5e386..b08981705b4 100644
--- a/Core/Shapes/RippleCosine.h
+++ b/Core/Shapes/RippleCosine.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RIPPLECOSINE_H
-#define RIPPLECOSINE_H
+#ifndef BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
+#define BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
 
 #include "Core/Shapes/IShape.h"
 
@@ -24,4 +24,4 @@ public:
     ~RippleCosine();
 };
 
-#endif // RIPPLECOSINE_H
+#endif // BORNAGAIN_CORE_SHAPES_RIPPLECOSINE_H
diff --git a/Core/Shapes/RippleSawtooth.h b/Core/Shapes/RippleSawtooth.h
index 9f68328df1d..9d95047a2a5 100644
--- a/Core/Shapes/RippleSawtooth.h
+++ b/Core/Shapes/RippleSawtooth.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RIPPLESAWTOOTH_H
-#define RIPPLESAWTOOTH_H
+#ifndef BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
+#define BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
 
 #include "Core/Shapes/IShape.h"
 
@@ -24,4 +24,4 @@ public:
     ~RippleSawtooth();
 };
 
-#endif // RIPPLESAWTOOTH_H
+#endif // BORNAGAIN_CORE_SHAPES_RIPPLESAWTOOTH_H
diff --git a/Core/Shapes/TruncatedEllipsoid.h b/Core/Shapes/TruncatedEllipsoid.h
index 2d4092af7a1..1cd973be119 100644
--- a/Core/Shapes/TruncatedEllipsoid.h
+++ b/Core/Shapes/TruncatedEllipsoid.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRUNCATEDELLIPSOID_H
-#define TRUNCATEDELLIPSOID_H
+#ifndef BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
+#define BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
 
 #include "Core/Shapes/IShape.h"
 
@@ -24,4 +24,4 @@ public:
     ~TruncatedEllipsoid();
 };
 
-#endif // TRUNCATEDELLIPSOID_H
+#endif // BORNAGAIN_CORE_SHAPES_TRUNCATEDELLIPSOID_H
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index fc0385e5666..b84e2f09d58 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBESIMULATION_H
-#define DEPTHPROBESIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Core/Multilayer/ILayerRTCoefficients.h"
@@ -126,4 +126,4 @@ private:
     std::vector<std::valarray<double>> m_cache;
 };
 
-#endif // DEPTHPROBESIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index a737c88e49d..414ed38166f 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GISASSIMULATION_H
-#define GISASSIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_GISASSIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_GISASSIMULATION_H
 
 #include "Core/Simulation/Simulation2D.h"
 #include "Core/SimulationElement/SimulationElement.h"
@@ -59,4 +59,4 @@ private:
     void initialize();
 };
 
-#endif // GISASSIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_GISASSIMULATION_H
diff --git a/Core/Simulation/MPISimulation.h b/Core/Simulation/MPISimulation.h
index 7b874c9c676..f9d36739abd 100644
--- a/Core/Simulation/MPISimulation.h
+++ b/Core/Simulation/MPISimulation.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MPISIMULATION_H
-#define MPISIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_MPISIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_MPISIMULATION_H
 
 class Simulation;
 
@@ -24,4 +24,4 @@ public:
     void runSimulation(Simulation* simulation);
 };
 
-#endif // MPISIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_MPISIMULATION_H
diff --git a/Core/Simulation/OffSpecSimulation.h b/Core/Simulation/OffSpecSimulation.h
index 38db91ad887..b4e0a0968cb 100644
--- a/Core/Simulation/OffSpecSimulation.h
+++ b/Core/Simulation/OffSpecSimulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OFFSPECSIMULATION_H
-#define OFFSPECSIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_OFFSPECSIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_OFFSPECSIMULATION_H
 
 #include "Core/Simulation/Simulation2D.h"
 #include "Core/SimulationElement/SimulationElement.h"
@@ -88,4 +88,4 @@ private:
     OutputData<double> m_intensity_map;
 };
 
-#endif // OFFSPECSIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_OFFSPECSIMULATION_H
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 5e1cffa866b..f83f6f53e7c 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATION_H
-#define SIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_SIMULATION_H
 
 #include "Core/Computation/ProgressHandler.h"
 #include "Core/Instrument/IDetector2D.h"
@@ -157,4 +157,4 @@ private:
     virtual void setRawResults(const std::vector<double>& raw_data) = 0;
 };
 
-#endif // SIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_SIMULATION_H
diff --git a/Core/Simulation/Simulation2D.h b/Core/Simulation/Simulation2D.h
index 6ff9a3a08e7..a8c500fea76 100644
--- a/Core/Simulation/Simulation2D.h
+++ b/Core/Simulation/Simulation2D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATION2D_H
-#define SIMULATION2D_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATION2D_H
+#define BORNAGAIN_CORE_SIMULATION_SIMULATION2D_H
 
 #include "Core/Instrument/SimulationResult.h"
 #include "Core/Simulation/Simulation.h"
@@ -103,4 +103,4 @@ private:
     void setRawResults(const std::vector<double>& raw_data) override;
 };
 
-#endif // SIMULATION2D_H
+#endif // BORNAGAIN_CORE_SIMULATION_SIMULATION2D_H
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index c4b0aaffcd5..d8380f0c418 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSIMULATION_H
-#define SPECULARSIMULATION_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
+#define BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Core/Multilayer/ILayerRTCoefficients.h"
@@ -116,4 +116,4 @@ private:
     std::vector<double> m_cache;
 };
 
-#endif // SPECULARSIMULATION_H
+#endif // BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
diff --git a/Core/SimulationElement/DepthProbeElement.h b/Core/SimulationElement/DepthProbeElement.h
index cb1f56723dc..8c090984f37 100644
--- a/Core/SimulationElement/DepthProbeElement.h
+++ b/Core/SimulationElement/DepthProbeElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBEELEMENT_H
-#define DEPTHPROBEELEMENT_H
+#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_DEPTHPROBEELEMENT_H
+#define BORNAGAIN_CORE_SIMULATIONELEMENT_DEPTHPROBEELEMENT_H
 
 #include <valarray>
 
@@ -64,4 +64,4 @@ private:
     bool m_calculation_flag;
 };
 
-#endif // DEPTHPROBEELEMENT_H
+#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_DEPTHPROBEELEMENT_H
diff --git a/Core/SimulationElement/PolarizationHandler.h b/Core/SimulationElement/PolarizationHandler.h
index eeb9a1f6176..208bd44ae51 100644
--- a/Core/SimulationElement/PolarizationHandler.h
+++ b/Core/SimulationElement/PolarizationHandler.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POLARIZATIONHANDLER_H_
-#define POLARIZATIONHANDLER_H_
+#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_POLARIZATIONHANDLER_H
+#define BORNAGAIN_CORE_SIMULATIONELEMENT_POLARIZATIONHANDLER_H
 
 #include "Core/Vector/EigenCore.h"
 #include "Wrap/WinDllMacros.h"
@@ -46,4 +46,4 @@ private:
     Eigen::Matrix2cd m_analyzer_operator; //!< polarization analyzer operator
 };
 
-#endif /* POLARIZATIONHANDLER_H_ */
+#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_POLARIZATIONHANDLER_H
diff --git a/Core/SimulationElement/SimulationElement.h b/Core/SimulationElement/SimulationElement.h
index 750612eb059..67ec6fcb7bf 100644
--- a/Core/SimulationElement/SimulationElement.h
+++ b/Core/SimulationElement/SimulationElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONELEMENT_H
-#define SIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_SIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_SIMULATIONELEMENT_SIMULATIONELEMENT_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Binning/IPixel.h"
@@ -97,4 +97,4 @@ private:
     bool m_is_specular;
 };
 
-#endif // SIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_SIMULATIONELEMENT_H
diff --git a/Core/SimulationElement/SpecularSimulationElement.h b/Core/SimulationElement/SpecularSimulationElement.h
index 4a2e8199d41..9b6ecdfce1c 100644
--- a/Core/SimulationElement/SpecularSimulationElement.h
+++ b/Core/SimulationElement/SpecularSimulationElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARSIMULATIONELEMENT_H
-#define SPECULARSIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_SIMULATIONELEMENT_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 // SPECULARSIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
diff --git a/Core/SoftParticle/FormFactorDebyeBueche.h b/Core/SoftParticle/FormFactorDebyeBueche.h
index 6d88f368c83..ed8654ef999 100644
--- a/Core/SoftParticle/FormFactorDebyeBueche.h
+++ b/Core/SoftParticle/FormFactorDebyeBueche.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORDEBYEBUECHE_H
-#define FORMFACTORDEBYEBUECHE_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORDEBYEBUECHE_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORDEBYEBUECHE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -40,4 +40,4 @@ private:
     double m_xi;
 };
 
-#endif // FORMFACTORDEBYEBUECHE_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORDEBYEBUECHE_H
diff --git a/Core/SoftParticle/FormFactorGauss.h b/Core/SoftParticle/FormFactorGauss.h
index a1fdccbe8ab..def40689305 100644
--- a/Core/SoftParticle/FormFactorGauss.h
+++ b/Core/SoftParticle/FormFactorGauss.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORGAUSS_H
-#define FORMFACTORGAUSS_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -46,4 +46,4 @@ private:
     void initialize();
 };
 
-#endif // FORMFACTORGAUSS_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORGAUSS_H
diff --git a/Core/SoftParticle/FormFactorLorentz.h b/Core/SoftParticle/FormFactorLorentz.h
index a2ccaa72767..00e09d842b4 100644
--- a/Core/SoftParticle/FormFactorLorentz.h
+++ b/Core/SoftParticle/FormFactorLorentz.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORLORENTZ_H
-#define FORMFACTORLORENTZ_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORLORENTZ_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORLORENTZ_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -48,4 +48,4 @@ private:
     void initialize();
 };
 
-#endif // FORMFACTORLORENTZ_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORLORENTZ_H
diff --git a/Core/SoftParticle/FormFactorOrnsteinZernike.h b/Core/SoftParticle/FormFactorOrnsteinZernike.h
index 80e920b8192..3bac52090dd 100644
--- a/Core/SoftParticle/FormFactorOrnsteinZernike.h
+++ b/Core/SoftParticle/FormFactorOrnsteinZernike.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORORNSTEINZERNIKE_H
-#define FORMFACTORORNSTEINZERNIKE_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORORNSTEINZERNIKE_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORORNSTEINZERNIKE_H
 
 #include "Core/Scattering/IFormFactorBorn.h"
 
@@ -41,4 +41,4 @@ private:
     double m_xi_z;
 };
 
-#endif // FORMFACTORORNSTEINZERNIKE_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORORNSTEINZERNIKE_H
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.h b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
index d7497d727d6..962b1aa38a7 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORSPHEREGAUSSIANRADIUS_H
-#define FORMFACTORSPHEREGAUSSIANRADIUS_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
 
 #include "Core/HardParticle/FormFactorFullSphere.h"
 #include <memory>
@@ -49,4 +49,4 @@ private:
     std::unique_ptr<FormFactorFullSphere> P_ff_sphere;
 };
 
-#endif // FORMFACTORSPHEREGAUSSIANRADIUS_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREGAUSSIANRADIUS_H
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
index 775210e9670..16d4727456c 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORSPHERELOGNORMALRADIUS_H
-#define FORMFACTORSPHERELOGNORMALRADIUS_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
 
 #include "Core/HardParticle/FormFactorFullSphere.h"
 #include "Core/Parametrization/Distributions.h"
@@ -52,4 +52,4 @@ private:
     std::vector<double> m_probabilities;
 };
 
-#endif // FORMFACTORSPHERELOGNORMALRADIUS_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHERELOGNORMALRADIUS_H
diff --git a/Core/SoftParticle/FormFactorSphereUniformRadius.h b/Core/SoftParticle/FormFactorSphereUniformRadius.h
index 6ff7f125dbc..8abde477b03 100644
--- a/Core/SoftParticle/FormFactorSphereUniformRadius.h
+++ b/Core/SoftParticle/FormFactorSphereUniformRadius.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORSPHEREUNIFORMRADIUS_H
-#define FORMFACTORSPHEREUNIFORMRADIUS_H
+#ifndef BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREUNIFORMRADIUS_H
+#define BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREUNIFORMRADIUS_H
 
 #include "Core/HardParticle/FormFactorFullSphere.h"
 
@@ -44,4 +44,4 @@ private:
     double m_full_width; //!< This is the full width of the radius distribution
 };
 
-#endif // FORMFACTORSPHEREUNIFORMRADIUS_H
+#endif // BORNAGAIN_CORE_SOFTPARTICLE_FORMFACTORSPHEREUNIFORMRADIUS_H
diff --git a/Core/StandardSamples/BoxCompositionBuilder.h b/Core/StandardSamples/BoxCompositionBuilder.h
index 0e3f11e3799..0e4706d1923 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.h
+++ b/Core/StandardSamples/BoxCompositionBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BOXCOMPOSITIONBUILDER_H
-#define BOXCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
 
 #include "Core/Material/Material.h"
 #include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -90,4 +90,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // BOXCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
diff --git a/Core/StandardSamples/BoxesSquareLatticeBuilder.h b/Core/StandardSamples/BoxesSquareLatticeBuilder.h
index 4f9a8708c86..2b03b5741d6 100644
--- a/Core/StandardSamples/BoxesSquareLatticeBuilder.h
+++ b/Core/StandardSamples/BoxesSquareLatticeBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BOXESSQUARELATTICEBUILDER_H
-#define BOXESSQUARELATTICEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -33,4 +33,4 @@ private:
     double m_height;
 };
 
-#endif // BOXESSQUARELATTICEBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.h b/Core/StandardSamples/CoreShellParticleBuilder.h
index d2112e59628..7cb638a71ef 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.h
+++ b/Core/StandardSamples/CoreShellParticleBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CORESHELLPARTICLEBUILDER_H
-#define CORESHELLPARTICLEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -39,4 +39,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // CORESHELLPARTICLEBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CORESHELLPARTICLEBUILDER_H
diff --git a/Core/StandardSamples/CustomMorphologyBuilder.h b/Core/StandardSamples/CustomMorphologyBuilder.h
index a564f708fa9..39ac2757767 100644
--- a/Core/StandardSamples/CustomMorphologyBuilder.h
+++ b/Core/StandardSamples/CustomMorphologyBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CUSTOMMORPHOLOGYBUILDER_H
-#define CUSTOMMORPHOLOGYBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -29,4 +29,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // CUSTOMMORPHOLOGYBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
diff --git a/Core/StandardSamples/CylindersAndPrismsBuilder.h b/Core/StandardSamples/CylindersAndPrismsBuilder.h
index 177841b0850..d8e20efee98 100644
--- a/Core/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Core/StandardSamples/CylindersAndPrismsBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CYLINDERSANDPRISMSBUILDER_H
-#define CYLINDERSANDPRISMSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -29,4 +29,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // CYLINDERSANDPRISMSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
diff --git a/Core/StandardSamples/CylindersBuilder.h b/Core/StandardSamples/CylindersBuilder.h
index ee833564de0..a7d8c595407 100644
--- a/Core/StandardSamples/CylindersBuilder.h
+++ b/Core/StandardSamples/CylindersBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CYLINDERSBUILDER_H
-#define CYLINDERSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -75,4 +75,4 @@ private:
     double m_radius;
 };
 
-#endif // CYLINDERSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_CYLINDERSBUILDER_H
diff --git a/Core/StandardSamples/HomogeneousMultilayerBuilder.h b/Core/StandardSamples/HomogeneousMultilayerBuilder.h
index 223ddfffd63..4da04f4915e 100644
--- a/Core/StandardSamples/HomogeneousMultilayerBuilder.h
+++ b/Core/StandardSamples/HomogeneousMultilayerBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HOMOGENEOUSMULTILAYERBUILDER_H_
-#define HOMOGENEOUSMULTILAYERBUILDER_H_
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -37,4 +37,4 @@ private:
     double m_thick_ni;
 };
 
-#endif /* HOMOGENEOUSMULTILAYERBUILDER_H_ */
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
diff --git a/Core/StandardSamples/IFactory.h b/Core/StandardSamples/IFactory.h
index 7b641f485b1..bd4cb4903f0 100644
--- a/Core/StandardSamples/IFactory.h
+++ b/Core/StandardSamples/IFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFACTORY_H
-#define IFACTORY_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_IFACTORY_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_IFACTORY_H
 
 #include "Core/Basics/Exceptions.h"
 #include <functional>
@@ -109,4 +109,4 @@ template <class T> T* create_new()
     return new T();
 }
 
-#endif // IFACTORY_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_IFACTORY_H
diff --git a/Core/StandardSamples/IRegistry.h b/Core/StandardSamples/IRegistry.h
index 3bafb8049db..cb891b8d780 100644
--- a/Core/StandardSamples/IRegistry.h
+++ b/Core/StandardSamples/IRegistry.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IREGISTRY_H
-#define IREGISTRY_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_IREGISTRY_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_IREGISTRY_H
 
 #include "Core/Basics/Exceptions.h"
 #include <map>
@@ -60,4 +60,4 @@ private:
     std::map<std::string, std::unique_ptr<ValueType>> m_data;
 };
 
-#endif // IREGISTRY_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_IREGISTRY_H
diff --git a/Core/StandardSamples/LatticeBuilder.h b/Core/StandardSamples/LatticeBuilder.h
index 45a32d080ca..ac31a7904ca 100644
--- a/Core/StandardSamples/LatticeBuilder.h
+++ b/Core/StandardSamples/LatticeBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICEBUILDER_H
-#define LATTICEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -36,4 +36,4 @@ private:
     double m_cylinder_radius;
 };
 
-#endif // LATTICEBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LATTICEBUILDER_H
diff --git a/Core/StandardSamples/LayersWithAbsorptionBuilder.h b/Core/StandardSamples/LayersWithAbsorptionBuilder.h
index 5f617077720..7845e16e143 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Core/StandardSamples/LayersWithAbsorptionBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERSWITHABSORPTIONBUILDER_H
-#define LAYERSWITHABSORPTIONBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include <memory>
@@ -43,4 +43,4 @@ private:
     std::unique_ptr<IFormFactor> m_ff;
 };
 
-#endif // LAYERSWITHABSORPTIONBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
diff --git a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
index d5a97c9259f..55b6faeaf28 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+++ b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERSWITHABSORPTIONBYSLDBUILDER_H
-#define LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -30,4 +30,4 @@ public:
     virtual MultiLayer* buildSample() const;
 };
 
-#endif // LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
diff --git a/Core/StandardSamples/MagneticLayersBuilder.h b/Core/StandardSamples/MagneticLayersBuilder.h
index b1438e86c11..055c98051ee 100644
--- a/Core/StandardSamples/MagneticLayersBuilder.h
+++ b/Core/StandardSamples/MagneticLayersBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAGNETICLAYERSBUILDER_H
-#define MAGNETICLAYERSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -68,4 +68,4 @@ private:
     double m_sphere_radius;
 };
 
-#endif // MAGNETICLAYERSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
diff --git a/Core/StandardSamples/MagneticParticlesBuilder.h b/Core/StandardSamples/MagneticParticlesBuilder.h
index 094d61fb772..91eaf2caa01 100644
--- a/Core/StandardSamples/MagneticParticlesBuilder.h
+++ b/Core/StandardSamples/MagneticParticlesBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAGNETICPARTICLESBUILDER_H
-#define MAGNETICPARTICLESBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -60,4 +60,4 @@ private:
     double m_sphere_radius;
 };
 
-#endif // MAGNETICPARTICLESBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
diff --git a/Core/StandardSamples/MesoCrystalBuilder.h b/Core/StandardSamples/MesoCrystalBuilder.h
index 6fb5f97d395..3237c52bcc7 100644
--- a/Core/StandardSamples/MesoCrystalBuilder.h
+++ b/Core/StandardSamples/MesoCrystalBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTALBUILDER_H
-#define MESOCRYSTALBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -33,4 +33,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // MESOCRYSTALBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
diff --git a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
index 45465ea3ebd..768539f31e5 100644
--- a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERWITHNCROUGHNESSBUILDER_H
-#define MULTILAYERWITHNCROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include "Core/StandardSamples/MultiLayerWithRoughnessBuilder.h"
@@ -32,4 +32,4 @@ public:
 private:
 };
 
-#endif // MULTILAYERWITHNCROUGHNESSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
index 03c4d5414bb..fe989e8e07e 100644
--- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERWITHROUGHNESSBUILDER_H
-#define MULTILAYERWITHROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -37,4 +37,4 @@ private:
     double m_crossCorrLength;
 };
 
-#endif // MULTILAYERWITHROUGHNESSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
diff --git a/Core/StandardSamples/MultipleLayoutBuilder.h b/Core/StandardSamples/MultipleLayoutBuilder.h
index 882b2d61db7..acb843de8fe 100644
--- a/Core/StandardSamples/MultipleLayoutBuilder.h
+++ b/Core/StandardSamples/MultipleLayoutBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTIPLELAYOUTBUILDER_H
-#define MULTIPLELAYOUTBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -37,4 +37,4 @@ private:
     double m_cylinder_weight;
 };
 
-#endif // MULTIPLELAYOUTBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
diff --git a/Core/StandardSamples/ParaCrystalBuilder.h b/Core/StandardSamples/ParaCrystalBuilder.h
index f6535a698a5..8c0ffade863 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.h
+++ b/Core/StandardSamples/ParaCrystalBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARACRYSTALBUILDER_H
-#define PARACRYSTALBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include <memory>
@@ -87,4 +87,4 @@ public:
     virtual MultiLayer* buildSample() const;
 };
 
-#endif // PARACRYSTALBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
diff --git a/Core/StandardSamples/ParticleCompositionBuilder.h b/Core/StandardSamples/ParticleCompositionBuilder.h
index 8e9377af138..4aa94b7cb71 100644
--- a/Core/StandardSamples/ParticleCompositionBuilder.h
+++ b/Core/StandardSamples/ParticleCompositionBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECOMPOSITIONBUILDER_H
-#define PARTICLECOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -27,4 +27,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // PARTICLECOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLECOMPOSITIONBUILDER_H
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.h b/Core/StandardSamples/ParticleDistributionsBuilder.h
index c4c95478068..28739e2bfb3 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEDISTRIBUTIONSBUILDER_H
-#define PARTICLEDISTRIBUTIONSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -95,4 +95,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // PARTICLEDISTRIBUTIONSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.h b/Core/StandardSamples/ParticleInTheAirBuilder.h
index c3e983baa0c..0a69a8278df 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.h
+++ b/Core/StandardSamples/ParticleInTheAirBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEINTHEAIRBUILDER_H
-#define PARTICLEINTHEAIRBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINTHEAIRBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINTHEAIRBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include <memory>
@@ -41,4 +41,4 @@ protected:
     std::unique_ptr<IFormFactor> m_ff;
 };
 
-#endif // PARTICLEINTHEAIRBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PARTICLEINTHEAIRBUILDER_H
diff --git a/Core/StandardSamples/PercusYevickBuilder.h b/Core/StandardSamples/PercusYevickBuilder.h
index 132394c8e2b..eebc6b79246 100644
--- a/Core/StandardSamples/PercusYevickBuilder.h
+++ b/Core/StandardSamples/PercusYevickBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PERCUSYEVICKBUILDER_H
-#define PERCUSYEVICKBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include <memory>
@@ -36,4 +36,4 @@ private:
     double m_density;
 };
 
-#endif // PERCUSYEVICKBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
diff --git a/Core/StandardSamples/PlainMultiLayerBySLDBuilder.h b/Core/StandardSamples/PlainMultiLayerBySLDBuilder.h
index c289841884d..472373dddf8 100644
--- a/Core/StandardSamples/PlainMultiLayerBySLDBuilder.h
+++ b/Core/StandardSamples/PlainMultiLayerBySLDBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLANEMULTILAYERBYSLDBUILDER_H_
-#define PLANEMULTILAYERBYSLDBUILDER_H_
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -40,4 +40,4 @@ protected:
     double m_thick_ni; //!< thickness of Ni layer
 };
 
-#endif /* PLANEMULTILAYERBYSLDBUILDER_H_ */
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
diff --git a/Core/StandardSamples/ResonatorBuilder.h b/Core/StandardSamples/ResonatorBuilder.h
index d48bdada7dc..269a7090792 100644
--- a/Core/StandardSamples/ResonatorBuilder.h
+++ b/Core/StandardSamples/ResonatorBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RESONATORBUILDER_H
-#define RESONATORBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -30,4 +30,4 @@ private:
     double m_l_ti; // titanium layer thickness
 };
 
-#endif // RESONATORBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_RESONATORBUILDER_H
diff --git a/Core/StandardSamples/RipplesBuilder.h b/Core/StandardSamples/RipplesBuilder.h
index a0b17c65fa0..7185677475a 100644
--- a/Core/StandardSamples/RipplesBuilder.h
+++ b/Core/StandardSamples/RipplesBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RIPPLESBUILDER_H
-#define RIPPLESBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -49,4 +49,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // RIPPLESBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_RIPPLESBUILDER_H
diff --git a/Core/StandardSamples/RotatedPyramidsBuilder.h b/Core/StandardSamples/RotatedPyramidsBuilder.h
index 79980342d32..fe913c5ea5e 100644
--- a/Core/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Core/StandardSamples/RotatedPyramidsBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROTATEDPYRAMIDSBUILDER_H
-#define ROTATEDPYRAMIDSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -33,4 +33,4 @@ private:
     double m_zangle;
 };
 
-#endif // ROTATEDPYRAMIDSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
diff --git a/Core/StandardSamples/SampleBuilderFactory.h b/Core/StandardSamples/SampleBuilderFactory.h
index 06731641b56..9af5208ba3f 100644
--- a/Core/StandardSamples/SampleBuilderFactory.h
+++ b/Core/StandardSamples/SampleBuilderFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEBUILDERFACTORY_H
-#define SAMPLEBUILDERFACTORY_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 #include "Core/StandardSamples/IFactory.h"
@@ -30,4 +30,4 @@ public:
     MultiLayer* createSample(const std::string& name);
 };
 
-#endif // SAMPLEBUILDERFACTORY_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLEBUILDERFACTORY_H
diff --git a/Core/StandardSamples/SampleComponents.h b/Core/StandardSamples/SampleComponents.h
index e2f59556be9..b7392acc790 100644
--- a/Core/StandardSamples/SampleComponents.h
+++ b/Core/StandardSamples/SampleComponents.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLECOMPONENTS_H
-#define SAMPLECOMPONENTS_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLECOMPONENTS_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLECOMPONENTS_H
 
 #include "Core/Aggregate/FTDistributions2D.h"
 #include "Core/StandardSamples/IRegistry.h"
@@ -36,4 +36,4 @@ public:
     FormFactorComponents();
 };
 
-#endif // SAMPLECOMPONENTS_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SAMPLECOMPONENTS_H
diff --git a/Core/StandardSamples/SimulationFactory.h b/Core/StandardSamples/SimulationFactory.h
index 5b8077d3b9b..e678e695360 100644
--- a/Core/StandardSamples/SimulationFactory.h
+++ b/Core/StandardSamples/SimulationFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONFACTORY_H
-#define SIMULATIONFACTORY_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
 
 #include "Core/Simulation/GISASSimulation.h"
 #include "Core/StandardSamples/IFactory.h"
@@ -29,4 +29,4 @@ public:
     SimulationFactory();
 };
 
-#endif // SIMULATIONFACTORY_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.h b/Core/StandardSamples/SizeDistributionModelsBuilder.h
index 1caa4519f46..93e3da29430 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIZEDISTRIBUTIONMODELSBUILDER_H
-#define SIZEDISTRIBUTIONMODELSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -60,4 +60,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // SIZEDISTRIBUTIONMODELSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
diff --git a/Core/StandardSamples/SlicedCylindersBuilder.h b/Core/StandardSamples/SlicedCylindersBuilder.h
index ccfeaaea849..16d91614d39 100644
--- a/Core/StandardSamples/SlicedCylindersBuilder.h
+++ b/Core/StandardSamples/SlicedCylindersBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLICEDCYLINDERSBUILDER_H
-#define SLICEDCYLINDERSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -59,4 +59,4 @@ private:
     double m_par_surf_density;
 };
 
-#endif // SLICEDCYLINDERSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
diff --git a/Core/StandardSamples/SlicedParticleBuilder.h b/Core/StandardSamples/SlicedParticleBuilder.h
index d6ead50112c..d42bdf36508 100644
--- a/Core/StandardSamples/SlicedParticleBuilder.h
+++ b/Core/StandardSamples/SlicedParticleBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLICEDPARTICLEBUILDER_H
-#define SLICEDPARTICLEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDPARTICLEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDPARTICLEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -27,4 +27,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SLICEDPARTICLEBUILDER_H
diff --git a/Core/StandardSamples/StandardSimulations.h b/Core/StandardSamples/StandardSimulations.h
index d28fa0e4356..23b228e2066 100644
--- a/Core/StandardSamples/StandardSimulations.h
+++ b/Core/StandardSamples/StandardSimulations.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STANDARDSIMULATIONS_H
-#define STANDARDSIMULATIONS_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -82,4 +82,4 @@ BA_CORE_API_ DepthProbeSimulation* BasicDepthProbe();
 
 } // namespace StandardSimulations
 
-#endif // STANDARDSIMULATIONS_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
diff --git a/Core/StandardSamples/ThickAbsorptiveSampleBuilder.h b/Core/StandardSamples/ThickAbsorptiveSampleBuilder.h
index cf5fc48d55d..3691042b725 100644
--- a/Core/StandardSamples/ThickAbsorptiveSampleBuilder.h
+++ b/Core/StandardSamples/ThickAbsorptiveSampleBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef THICKABSORPTIVESAMPLEBUILDER_H
-#define THICKABSORPTIVESAMPLEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -24,4 +24,4 @@ public:
     MultiLayer* buildSample() const override;
 };
 
-#endif // THICKABSORPTIVESAMPLEBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
diff --git a/Core/StandardSamples/TransformationsBuilder.h b/Core/StandardSamples/TransformationsBuilder.h
index 7e30787959f..fe0810a3ad4 100644
--- a/Core/StandardSamples/TransformationsBuilder.h
+++ b/Core/StandardSamples/TransformationsBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMATIONSBUILDER_H
-#define TRANSFORMATIONSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -27,4 +27,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // TRANSFORMATIONSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.h b/Core/StandardSamples/TwoDimLatticeBuilder.h
index b16c38f83d8..dcb3ee0a29e 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TWODIMLATTICEBUILDER_H
-#define TWODIMLATTICEBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -77,4 +77,4 @@ public:
     MultiLayer* buildSample() const;
 };
 
-#endif // TWODIMLATTICEBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
diff --git a/Core/StandardSamples/TwoLayerRoughnessBuilder.h b/Core/StandardSamples/TwoLayerRoughnessBuilder.h
index e5a5a946558..6b73f3863f4 100644
--- a/Core/StandardSamples/TwoLayerRoughnessBuilder.h
+++ b/Core/StandardSamples/TwoLayerRoughnessBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TWOLAYERROUGHNESSBUILDER_H
-#define TWOLAYERROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
+#define BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
 
 #include "Core/Multilayer/IMultiLayerBuilder.h"
 
@@ -34,4 +34,4 @@ private:
     double m_lateralCorrLength;
 };
 
-#endif // TWOLAYERROUGHNESSBUILDER_H
+#endif // BORNAGAIN_CORE_STANDARDSAMPLES_TWOLAYERROUGHNESSBUILDER_H
diff --git a/Core/Tools/FileSystemUtils.h b/Core/Tools/FileSystemUtils.h
index b2f733fbc73..ae43e6bf32b 100644
--- a/Core/Tools/FileSystemUtils.h
+++ b/Core/Tools/FileSystemUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FILESYSTEMUTILS_H
-#define FILESYSTEMUTILS_H
+#ifndef BORNAGAIN_CORE_TOOLS_FILESYSTEMUTILS_H
+#define BORNAGAIN_CORE_TOOLS_FILESYSTEMUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -66,4 +66,4 @@ BA_CORE_API_ bool IsFileExists(const std::string& str);
 
 } // namespace FileSystemUtils
 
-#endif // FILESYSTEMUTILS_H
+#endif // BORNAGAIN_CORE_TOOLS_FILESYSTEMUTILS_H
diff --git a/Core/Tools/Integrator.h b/Core/Tools/Integrator.h
index 1d9393a53d4..a2ac1105e95 100644
--- a/Core/Tools/Integrator.h
+++ b/Core/Tools/Integrator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTEGRATOR_H
-#define INTEGRATOR_H
+#ifndef BORNAGAIN_CORE_TOOLS_INTEGRATOR_H
+#define BORNAGAIN_CORE_TOOLS_INTEGRATOR_H
 
 #include "Core/Basics/Complex.h"
 #include "Wrap/WinDllMacros.h"
@@ -48,4 +48,4 @@ private:
     RealIntegrator imagPart;
 };
 
-#endif // INTEGRATOR_H
+#endif // BORNAGAIN_CORE_TOOLS_INTEGRATOR_H
diff --git a/Core/Tools/IntegratorMCMiser.h b/Core/Tools/IntegratorMCMiser.h
index 96a744291e8..2891f78f463 100644
--- a/Core/Tools/IntegratorMCMiser.h
+++ b/Core/Tools/IntegratorMCMiser.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTEGRATORMCMISER_H
-#define INTEGRATORMCMISER_H
+#ifndef BORNAGAIN_CORE_TOOLS_INTEGRATORMCMISER_H
+#define BORNAGAIN_CORE_TOOLS_INTEGRATORMCMISER_H
 
 #include <gsl/gsl_monte_miser.h>
 #include <memory>
@@ -118,4 +118,4 @@ double IntegratorMCMiser<T>::integrate(double* min_array, double* max_array, voi
     return result;
 }
 
-#endif // INTEGRATORMCMISER_H
+#endif // BORNAGAIN_CORE_TOOLS_INTEGRATORMCMISER_H
diff --git a/Core/Tools/MathFunctions.h b/Core/Tools/MathFunctions.h
index 908d7b517bd..413cfe4e0e6 100644
--- a/Core/Tools/MathFunctions.h
+++ b/Core/Tools/MathFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATHFUNCTIONS_H
-#define MATHFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_TOOLS_MATHFUNCTIONS_H
+#define BORNAGAIN_CORE_TOOLS_MATHFUNCTIONS_H
 
 #include "Core/Basics/Complex.h"
 #include "Wrap/WinDllMacros.h"
@@ -106,4 +106,4 @@ BA_CORE_API_ double GeneratePoissonRandom(double average);
 
 } // Namespace MathFunctions
 
-#endif // MATHFUNCTIONS_H
+#endif // BORNAGAIN_CORE_TOOLS_MATHFUNCTIONS_H
diff --git a/Core/Tools/Numeric.h b/Core/Tools/Numeric.h
index e1ec0be41cd..46ec52d16c0 100644
--- a/Core/Tools/Numeric.h
+++ b/Core/Tools/Numeric.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NUMERIC_H
-#define NUMERIC_H
+#ifndef BORNAGAIN_CORE_TOOLS_NUMERIC_H
+#define BORNAGAIN_CORE_TOOLS_NUMERIC_H
 
 #include "Wrap/WinDllMacros.h"
 #include <limits>
@@ -33,4 +33,4 @@ double BA_CORE_API_ GetLogDifference(double a, double b);
 
 } // namespace Numeric
 
-#endif // NUMERIC_H
+#endif // BORNAGAIN_CORE_TOOLS_NUMERIC_H
diff --git a/Core/Tools/OrderedMap.h b/Core/Tools/OrderedMap.h
index 3a2809e0621..1f5e8751e38 100644
--- a/Core/Tools/OrderedMap.h
+++ b/Core/Tools/OrderedMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ORDEREDMAP_H
-#define ORDEREDMAP_H
+#ifndef BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#define BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
 
 #include <cassert>
 #include <iostream>
@@ -108,4 +108,4 @@ private:
     list_t m_list;
 };
 
-#endif
+#endif // BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
diff --git a/Core/Tools/Precomputed.h b/Core/Tools/Precomputed.h
index ea29c8f098b..17812a890f1 100644
--- a/Core/Tools/Precomputed.h
+++ b/Core/Tools/Precomputed.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PRECOMPUTED_H
-#define PRECOMPUTED_H
+#ifndef BORNAGAIN_CORE_TOOLS_PRECOMPUTED_H
+#define BORNAGAIN_CORE_TOOLS_PRECOMPUTED_H
 
 #include "Wrap/WinDllMacros.h"
 #include <array>
@@ -44,4 +44,4 @@ constexpr std::array<double, N> GenerateReciprocalFactorialArray()
 };
 } // namespace Precomputed
 
-#endif // PRECOMPUTED_H
+#endif // BORNAGAIN_CORE_TOOLS_PRECOMPUTED_H
diff --git a/Core/Tools/PyEmbeddedUtils.h b/Core/Tools/PyEmbeddedUtils.h
index 38bc7ead083..65360a094b5 100644
--- a/Core/Tools/PyEmbeddedUtils.h
+++ b/Core/Tools/PyEmbeddedUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYEMBEDDEDUTILS_H
-#define PYEMBEDDEDUTILS_H
+#ifndef BORNAGAIN_CORE_TOOLS_PYEMBEDDEDUTILS_H
+#define BORNAGAIN_CORE_TOOLS_PYEMBEDDEDUTILS_H
 
 #include "Core/Tools/PyObject.h"
 #include "Wrap/WinDllMacros.h"
@@ -46,4 +46,4 @@ BA_CORE_API_ std::string pythonRuntimeInfo();
 BA_CORE_API_ std::string pythonStackTrace();
 } // namespace PyEmbeddedUtils
 
-#endif
+#endif // BORNAGAIN_CORE_TOOLS_PYEMBEDDEDUTILS_H
diff --git a/Core/Tools/PyImport.h b/Core/Tools/PyImport.h
index 3042ef94805..471b7a71969 100644
--- a/Core/Tools/PyImport.h
+++ b/Core/Tools/PyImport.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYIMPORT_H
-#define PYIMPORT_H
+#ifndef BORNAGAIN_CORE_TOOLS_PYIMPORT_H
+#define BORNAGAIN_CORE_TOOLS_PYIMPORT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -43,4 +43,4 @@ BA_CORE_API_ std::vector<std::string> listOfFunctions(const std::string& script,
                                                       const std::string& path = std::string());
 } // namespace PyImport
 
-#endif
+#endif // BORNAGAIN_CORE_TOOLS_PYIMPORT_H
diff --git a/Core/Tools/PyObject.h b/Core/Tools/PyObject.h
index 71a996ad93b..d11d58f21c3 100644
--- a/Core/Tools/PyObject.h
+++ b/Core/Tools/PyObject.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYOBJECT_H
-#define PYOBJECT_H
+#ifndef BORNAGAIN_CORE_TOOLS_PYOBJECT_H
+#define BORNAGAIN_CORE_TOOLS_PYOBJECT_H
 
 #ifdef BORNAGAIN_PYTHON
 #ifndef PyObject_HEAD
@@ -22,4 +22,4 @@ typedef _object PyObject;
 #endif
 #endif
 
-#endif
+#endif // BORNAGAIN_CORE_TOOLS_PYOBJECT_H
diff --git a/Core/Tools/PythonCore.h b/Core/Tools/PythonCore.h
index e9478103c1a..e3a51ba28ba 100644
--- a/Core/Tools/PythonCore.h
+++ b/Core/Tools/PythonCore.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYTHONCORE_H
-#define PYTHONCORE_H
+#ifndef BORNAGAIN_CORE_TOOLS_PYTHONCORE_H
+#define BORNAGAIN_CORE_TOOLS_PYTHONCORE_H
 
 #ifdef BORNAGAIN_PYTHON
 
@@ -37,4 +37,4 @@
 
 #endif // BORNAGAIN_PYTHON
 
-#endif // PYTHONCORE_H
+#endif // BORNAGAIN_CORE_TOOLS_PYTHONCORE_H
diff --git a/Core/Tools/SafePointerVector.h b/Core/Tools/SafePointerVector.h
index d2504275740..481112f5117 100644
--- a/Core/Tools/SafePointerVector.h
+++ b/Core/Tools/SafePointerVector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAFEPOINTERVECTOR_H
-#define SAFEPOINTERVECTOR_H
+#ifndef BORNAGAIN_CORE_TOOLS_SAFEPOINTERVECTOR_H
+#define BORNAGAIN_CORE_TOOLS_SAFEPOINTERVECTOR_H
 
 #include <algorithm>
 #include <vector>
@@ -103,4 +103,4 @@ template <class T> void SafePointerVector<T>::clear()
     m_pointers.clear();
 }
 
-#endif // SAFEPOINTERVECTOR_H
+#endif // BORNAGAIN_CORE_TOOLS_SAFEPOINTERVECTOR_H
diff --git a/Core/Tools/SpectrumUtils.h b/Core/Tools/SpectrumUtils.h
index c0821f9d029..39d2c8be041 100644
--- a/Core/Tools/SpectrumUtils.h
+++ b/Core/Tools/SpectrumUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECTRUMUTILS_H
-#define SPECTRUMUTILS_H
+#ifndef BORNAGAIN_CORE_TOOLS_SPECTRUMUTILS_H
+#define BORNAGAIN_CORE_TOOLS_SPECTRUMUTILS_H
 
 #include "Core/Instrument/Histogram2D.h"
 #include "Wrap/WinDllMacros.h"
@@ -33,4 +33,4 @@ BA_CORE_API_ std::vector<std::pair<double, double>> FindPeaks(const Histogram2D&
                                                               double threshold = 0.05);
 }
 
-#endif // SPECTRUMUTILS_H
+#endif // BORNAGAIN_CORE_TOOLS_SPECTRUMUTILS_H
diff --git a/Core/Tools/SysUtils.h b/Core/Tools/SysUtils.h
index 102b13c5020..83059b2a25f 100644
--- a/Core/Tools/SysUtils.h
+++ b/Core/Tools/SysUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SYSUTILS_H
-#define SYSUTILS_H
+#ifndef BORNAGAIN_CORE_TOOLS_SYSUTILS_H
+#define BORNAGAIN_CORE_TOOLS_SYSUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -36,4 +36,4 @@ BA_CORE_API_ bool isWindowsHost();
 
 } // namespace SysUtils
 
-#endif // SYSUTILS_H
+#endif // BORNAGAIN_CORE_TOOLS_SYSUTILS_H
diff --git a/Core/Tools/fp_exception_glibc_extension.h b/Core/Tools/fp_exception_glibc_extension.h
index 721880b29d4..a0926bed6c6 100644
--- a/Core/Tools/fp_exception_glibc_extension.h
+++ b/Core/Tools/fp_exception_glibc_extension.h
@@ -9,8 +9,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FP_EXCEPTION_GLIBC_EXTENSION_H
-#define FP_EXCEPTION_GLIBC_EXTENSION_H
+#ifndef BORNAGAIN_CORE_TOOLS_FP_EXCEPTION_GLIBC_EXTENSION_H
+#define BORNAGAIN_CORE_TOOLS_FP_EXCEPTION_GLIBC_EXTENSION_H
 
 //#include <fenv.h>
 #ifdef __cplusplus
@@ -58,4 +58,4 @@ void fhdl(int sig, siginfo_t* sip, ucontext_t* scp);
 }
 #endif
 
-#endif // FP_EXCEPTION_GLIBC_EXTENSION_H
+#endif // BORNAGAIN_CORE_TOOLS_FP_EXCEPTION_GLIBC_EXTENSION_H
diff --git a/Core/Vector/BasicVector3D.h b/Core/Vector/BasicVector3D.h
index 89b9ad9bdc2..bc8f846593a 100644
--- a/Core/Vector/BasicVector3D.h
+++ b/Core/Vector/BasicVector3D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BASICVECTOR3D_H
-#define BASICVECTOR3D_H
+#ifndef BORNAGAIN_CORE_VECTOR_BASICVECTOR3D_H
+#define BORNAGAIN_CORE_VECTOR_BASICVECTOR3D_H
 
 //! Forked from CLHEP/Geometry by E. Chernyaev <Evgueni.Tcherniaev@cern.ch>,
 //! then reworked beyond recongnition. Removed split of point and vector semantics.
@@ -356,4 +356,4 @@ BA_CORE_API_ BasicVector3D<std::complex<double>> BasicVector3D<std::complex<doub
 
 template <> BA_CORE_API_ double BasicVector3D<double>::angle(const BasicVector3D<double>& v) const;
 
-#endif // BASICVECTOR3D_H
+#endif // BORNAGAIN_CORE_VECTOR_BASICVECTOR3D_H
diff --git a/Core/Vector/EigenCore.h b/Core/Vector/EigenCore.h
index f6ddbd5c309..296be0e12e7 100644
--- a/Core/Vector/EigenCore.h
+++ b/Core/Vector/EigenCore.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef EIGENCORE_H
-#define EIGENCORE_H
+#ifndef BORNAGAIN_CORE_VECTOR_EIGENCORE_H
+#define BORNAGAIN_CORE_VECTOR_EIGENCORE_H
 
 // This include file is introduced to deal with Eigen alignment
 // see http://eigen.tuxfamily.org/dox-devel/group__TopicStructHavingEigenMembers.html
@@ -29,4 +29,4 @@
 #endif
 #endif
 
-#endif // EIGENCORE_H
+#endif // BORNAGAIN_CORE_VECTOR_EIGENCORE_H
diff --git a/Core/Vector/Transform3D.h b/Core/Vector/Transform3D.h
index 624b4964aa3..4924357c182 100644
--- a/Core/Vector/Transform3D.h
+++ b/Core/Vector/Transform3D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORM3D_H
-#define TRANSFORM3D_H
+#ifndef BORNAGAIN_CORE_VECTOR_TRANSFORM3D_H
+#define BORNAGAIN_CORE_VECTOR_TRANSFORM3D_H
 
 #include "Core/Basics/Complex.h"
 #include "Core/Vector/EigenCore.h"
@@ -113,4 +113,4 @@ private:
 #endif
 };
 
-#endif // TRANSFORM3D_H
+#endif // BORNAGAIN_CORE_VECTOR_TRANSFORM3D_H
diff --git a/Core/Vector/Vectors3D.h b/Core/Vector/Vectors3D.h
index 98aaeb193c4..9e2d8576699 100644
--- a/Core/Vector/Vectors3D.h
+++ b/Core/Vector/Vectors3D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef VECTORS3D_H
-#define VECTORS3D_H
+#ifndef BORNAGAIN_CORE_VECTOR_VECTORS3D_H
+#define BORNAGAIN_CORE_VECTOR_VECTORS3D_H
 
 #include "Core/Vector/BasicVector3D.h"
 
@@ -21,4 +21,4 @@ typedef BasicVector3D<int> ivector_t;
 typedef BasicVector3D<double> kvector_t;
 typedef BasicVector3D<std::complex<double>> cvector_t;
 
-#endif // VECTORS3D_H
+#endif // BORNAGAIN_CORE_VECTOR_VECTORS3D_H
diff --git a/Core/Vector/WavevectorInfo.h b/Core/Vector/WavevectorInfo.h
index 38eb3d42921..d304c30c22b 100644
--- a/Core/Vector/WavevectorInfo.h
+++ b/Core/Vector/WavevectorInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef WAVEVECTORINFO_H
-#define WAVEVECTORINFO_H
+#ifndef BORNAGAIN_CORE_VECTOR_WAVEVECTORINFO_H
+#define BORNAGAIN_CORE_VECTOR_WAVEVECTORINFO_H
 
 #include "Core/Vector/Vectors3D.h"
 
@@ -48,4 +48,4 @@ private:
     double m_vacuum_wavelength;
 };
 
-#endif // WAVEVECTORINFO_H
+#endif // BORNAGAIN_CORE_VECTOR_WAVEVECTORINFO_H
diff --git a/Core/includeIncludes/FormFactors.h b/Core/includeIncludes/FormFactors.h
index 1705fcb6eb4..cc68c992ae6 100644
--- a/Core/includeIncludes/FormFactors.h
+++ b/Core/includeIncludes/FormFactors.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORS_H
-#define FORMFACTORS_H
+#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
+#define BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
 
 #include "Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h"
 #include "Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h"
@@ -22,4 +22,4 @@
 #include "Core/includeIncludes/HardParticles.h"
 #include "Core/includeIncludes/SoftParticles.h"
 
-#endif // FORMFACTORS_H
+#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
diff --git a/Core/includeIncludes/HardParticles.h b/Core/includeIncludes/HardParticles.h
index 46076242515..3a8834b1e20 100644
--- a/Core/includeIncludes/HardParticles.h
+++ b/Core/includeIncludes/HardParticles.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HARDPARTICLES_H
-#define HARDPARTICLES_H
+#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_HARDPARTICLES_H
+#define BORNAGAIN_CORE_INCLUDEINCLUDES_HARDPARTICLES_H
 
 #include "Core/HardParticle/FormFactorAnisoPyramid.h"
 #include "Core/HardParticle/FormFactorBar.h"
@@ -42,4 +42,4 @@
 #include "Core/HardParticle/FormFactorTruncatedSphere.h"
 #include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
 
-#endif // HARDPARTICLES_H
+#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_HARDPARTICLES_H
diff --git a/Core/includeIncludes/InterferenceFunctions.h b/Core/includeIncludes/InterferenceFunctions.h
index 4da995e43f7..6d22bf282d3 100644
--- a/Core/includeIncludes/InterferenceFunctions.h
+++ b/Core/includeIncludes/InterferenceFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONS_H
-#define INTERFERENCEFUNCTIONS_H
+#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_INTERFERENCEFUNCTIONS_H
+#define BORNAGAIN_CORE_INCLUDEINCLUDES_INTERFERENCEFUNCTIONS_H
 
 #include "Core/Aggregate/InterferenceFunction1DLattice.h"
 #include "Core/Aggregate/InterferenceFunction2DLattice.h"
@@ -27,4 +27,4 @@
 #include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
 #include "Core/Aggregate/InterferenceFunctionTwin.h"
 
-#endif // INTERFERENCEFUNCTIONS_H
+#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_INTERFERENCEFUNCTIONS_H
diff --git a/Core/includeIncludes/SoftParticles.h b/Core/includeIncludes/SoftParticles.h
index bf19e901b76..88c62806b3a 100644
--- a/Core/includeIncludes/SoftParticles.h
+++ b/Core/includeIncludes/SoftParticles.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SOFTPARTICLES_H
-#define SOFTPARTICLES_H
+#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
+#define BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
 
 #include "Core/SoftParticle/FormFactorDebyeBueche.h"
 #include "Core/SoftParticle/FormFactorGauss.h"
@@ -24,4 +24,4 @@
 #include "Core/SoftParticle/FormFactorSphereUniformRadius.h"
 #include "Core/includeIncludes/SoftParticles.h"
 
-#endif // SOFTPARTICLES_H
+#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_SOFTPARTICLES_H
diff --git a/Fit/Kernel/FitOptions.h b/Fit/Kernel/FitOptions.h
index b2efac5520b..54eb98d75c0 100644
--- a/Fit/Kernel/FitOptions.h
+++ b/Fit/Kernel/FitOptions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOPTIONS_H
-#define FITOPTIONS_H
+#ifndef BORNAGAIN_FIT_KERNEL_FITOPTIONS_H
+#define BORNAGAIN_FIT_KERNEL_FITOPTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -35,4 +35,4 @@ private:
     double m_step_factor;   //!< default relative parameter step
 };
 
-#endif // FITOPTIONS_H
+#endif // BORNAGAIN_FIT_KERNEL_FITOPTIONS_H
diff --git a/Fit/Kernel/IFunctionAdapter.h b/Fit/Kernel/IFunctionAdapter.h
index 0b811dd254d..79c16362bc3 100644
--- a/Fit/Kernel/IFunctionAdapter.h
+++ b/Fit/Kernel/IFunctionAdapter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFUNCTIONADAPTER_H
-#define IFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_KERNEL_IFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_KERNEL_IFUNCTIONADAPTER_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -39,4 +39,4 @@ protected:
 
 } // namespace Fit
 
-#endif //  IFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_KERNEL_IFUNCTIONADAPTER_H
diff --git a/Fit/Kernel/Kernel.h b/Fit/Kernel/Kernel.h
index d1d43921426..6fd6eaaa551 100644
--- a/Fit/Kernel/Kernel.h
+++ b/Fit/Kernel/Kernel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef KERNEL_H
-#define KERNEL_H
+#ifndef BORNAGAIN_FIT_KERNEL_KERNEL_H
+#define BORNAGAIN_FIT_KERNEL_KERNEL_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Fit/Kernel/MinimizerResult.h"
@@ -56,4 +56,4 @@ private:
 
 } // namespace Fit
 
-#endif // KERNEL_H
+#endif // BORNAGAIN_FIT_KERNEL_KERNEL_H
diff --git a/Fit/Kernel/KernelTypes.h b/Fit/Kernel/KernelTypes.h
index 1374535f8a2..4e6860db310 100644
--- a/Fit/Kernel/KernelTypes.h
+++ b/Fit/Kernel/KernelTypes.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef KERNELTYPES_H
-#define KERNELTYPES_H
+#ifndef BORNAGAIN_FIT_KERNEL_KERNELTYPES_H
+#define BORNAGAIN_FIT_KERNEL_KERNELTYPES_H
 
 #include <functional>
 #include <vector>
@@ -37,4 +37,4 @@ using root_gradient_t = std::function<double(const double*, unsigned int, double
 using fcn_scalar_t = std::function<double(const Fit::Parameters&)>;
 using fcn_residual_t = std::function<std::vector<double>(const Fit::Parameters&)>;
 
-#endif // KERNELTYPES_H
+#endif // BORNAGAIN_FIT_KERNEL_KERNELTYPES_H
diff --git a/Fit/Kernel/Minimizer.h b/Fit/Kernel/Minimizer.h
index a1641c5ece5..352e7616bef 100644
--- a/Fit/Kernel/Minimizer.h
+++ b/Fit/Kernel/Minimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZER_H
-#define MINIMIZER_H
+#ifndef BORNAGAIN_FIT_KERNEL_MINIMIZER_H
+#define BORNAGAIN_FIT_KERNEL_MINIMIZER_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Fit/Kernel/MinimizerResult.h"
@@ -61,4 +61,4 @@ private:
 
 } // namespace Fit
 
-#endif // MINIMIZER_H
+#endif // BORNAGAIN_FIT_KERNEL_MINIMIZER_H
diff --git a/Fit/Kernel/MinimizerResult.h b/Fit/Kernel/MinimizerResult.h
index eba0779d7ea..a625d23c47c 100644
--- a/Fit/Kernel/MinimizerResult.h
+++ b/Fit/Kernel/MinimizerResult.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERRESULT_H
-#define MINIMIZERRESULT_H
+#ifndef BORNAGAIN_FIT_KERNEL_MINIMIZERRESULT_H
+#define BORNAGAIN_FIT_KERNEL_MINIMIZERRESULT_H
 
 #include "Fit/Kernel/Parameters.h"
 #include "Wrap/WinDllMacros.h"
@@ -56,4 +56,4 @@ private:
 
 } // namespace Fit
 
-#endif
+#endif // BORNAGAIN_FIT_KERNEL_MINIMIZERRESULT_H
diff --git a/Fit/Kernel/Parameter.h b/Fit/Kernel/Parameter.h
index 1c58d47aca0..04f037b30bf 100644
--- a/Fit/Kernel/Parameter.h
+++ b/Fit/Kernel/Parameter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETER_H
-#define PARAMETER_H
+#ifndef BORNAGAIN_FIT_KERNEL_PARAMETER_H
+#define BORNAGAIN_FIT_KERNEL_PARAMETER_H
 
 #include "Fit/Tools/AttLimits.h"
 #include "Wrap/WinDllMacros.h"
@@ -64,4 +64,4 @@ private:
 
 } // namespace Fit
 
-#endif // PARAMETER_H
+#endif // BORNAGAIN_FIT_KERNEL_PARAMETER_H
diff --git a/Fit/Kernel/Parameters.h b/Fit/Kernel/Parameters.h
index 31988e88f56..cf31370b7f1 100644
--- a/Fit/Kernel/Parameters.h
+++ b/Fit/Kernel/Parameters.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERS_H
-#define PARAMETERS_H
+#ifndef BORNAGAIN_FIT_KERNEL_PARAMETERS_H
+#define BORNAGAIN_FIT_KERNEL_PARAMETERS_H
 
 #include "Fit/Kernel/Parameter.h"
 #include "Wrap/WinDllMacros.h"
@@ -70,4 +70,4 @@ private:
 
 } // namespace Fit
 
-#endif // PARAMETERS_H
+#endif // BORNAGAIN_FIT_KERNEL_PARAMETERS_H
diff --git a/Fit/Kernel/PyCallback.h b/Fit/Kernel/PyCallback.h
index 6a950cf730b..cd38370a24c 100644
--- a/Fit/Kernel/PyCallback.h
+++ b/Fit/Kernel/PyCallback.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYCALLBACK_H
-#define PYCALLBACK_H
+#ifndef BORNAGAIN_FIT_KERNEL_PYCALLBACK_H
+#define BORNAGAIN_FIT_KERNEL_PYCALLBACK_H
 
 #include "Fit/Kernel/Parameters.h"
 #include "Wrap/WinDllMacros.h"
@@ -46,4 +46,4 @@ private:
     CallbackType m_callback_type;
 };
 
-#endif // PYCALLBACK_H
+#endif // BORNAGAIN_FIT_KERNEL_PYCALLBACK_H
diff --git a/Fit/Minimizer/IMinimizer.h b/Fit/Minimizer/IMinimizer.h
index aae690a24b8..615b6e04a67 100644
--- a/Fit/Minimizer/IMinimizer.h
+++ b/Fit/Minimizer/IMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMINIMIZER_H
-#define IMINIMIZER_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_IMINIMIZER_H
+#define BORNAGAIN_FIT_MINIMIZER_IMINIMIZER_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Fit/Kernel/MinimizerResult.h"
@@ -62,4 +62,4 @@ public:
 #endif // SWIG
 };
 
-#endif // IMINIMIZER_H
+#endif // BORNAGAIN_FIT_MINIMIZER_IMINIMIZER_H
diff --git a/Fit/Minimizer/MinimizerCatalogue.h b/Fit/Minimizer/MinimizerCatalogue.h
index 553f53e0332..8ffc58aecf3 100644
--- a/Fit/Minimizer/MinimizerCatalogue.h
+++ b/Fit/Minimizer/MinimizerCatalogue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERCATALOGUE_H
-#define MINIMIZERCATALOGUE_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
 
 #include "Fit/Minimizer/MinimizerInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -54,4 +54,4 @@ private:
     std::vector<MinimizerInfo> m_minimizers;
 };
 
-#endif // MINIMIZERCATALOGUE_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
diff --git a/Fit/Minimizer/MinimizerConstants.h b/Fit/Minimizer/MinimizerConstants.h
index f12230156cf..f4b771a44c8 100644
--- a/Fit/Minimizer/MinimizerConstants.h
+++ b/Fit/Minimizer/MinimizerConstants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERCONSTANTS_H
-#define MINIMIZERCONSTANTS_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERCONSTANTS_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERCONSTANTS_H
 
 #include <string>
 
@@ -74,4 +74,4 @@ const std::string BoltzmannTmin = "t_min";
 
 } // namespace OptionNames
 
-#endif // MINIMIZERCONSTANTS_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERCONSTANTS_H
diff --git a/Fit/Minimizer/MinimizerFactory.h b/Fit/Minimizer/MinimizerFactory.h
index 1902f5b5da2..96cc34e66ad 100644
--- a/Fit/Minimizer/MinimizerFactory.h
+++ b/Fit/Minimizer/MinimizerFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERFACTORY_H
-#define MINIMIZERFACTORY_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
 
 #include "Fit/Minimizer/MinimizerCatalogue.h"
 #include "Wrap/WinDllMacros.h"
@@ -40,4 +40,4 @@ public:
     static const MinimizerCatalogue& catalogue();
 };
 
-#endif // MINIMIZERFACTORY_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
diff --git a/Fit/Minimizer/MinimizerInfo.h b/Fit/Minimizer/MinimizerInfo.h
index 8d1719a5fb0..d9902efd174 100644
--- a/Fit/Minimizer/MinimizerInfo.h
+++ b/Fit/Minimizer/MinimizerInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERINFO_H
-#define MINIMIZERINFO_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERINFO_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -69,4 +69,4 @@ private:
     std::string m_current_algorithm;
 };
 
-#endif // MINIMIZERINFO_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERINFO_H
diff --git a/Fit/Minimizer/MinimizerOptions.h b/Fit/Minimizer/MinimizerOptions.h
index b5cb73f414a..c1df1b1b4dc 100644
--- a/Fit/Minimizer/MinimizerOptions.h
+++ b/Fit/Minimizer/MinimizerOptions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZEROPTIONS_H
-#define MINIMIZEROPTIONS_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZEROPTIONS_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZEROPTIONS_H
 
 #include "Fit/Tools/OptionContainer.h"
 
@@ -33,4 +33,4 @@ private:
     void processCommand(const std::string& command);
 };
 
-#endif // MINIMIZEROPTIONS_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZEROPTIONS_H
diff --git a/Fit/Minimizer/TestMinimizer.h b/Fit/Minimizer/TestMinimizer.h
index ec7c450800e..46c224dc2a6 100644
--- a/Fit/Minimizer/TestMinimizer.h
+++ b/Fit/Minimizer/TestMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTMINIMIZER_H
-#define TESTMINIMIZER_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_TESTMINIMIZER_H
+#define BORNAGAIN_FIT_MINIMIZER_TESTMINIMIZER_H
 
 #include "Fit/Minimizer/IMinimizer.h"
 
@@ -35,4 +35,4 @@ private:
     scalar_function_t m_fcn;
 };
 
-#endif // TESTMINIMIZER_H
+#endif // BORNAGAIN_FIT_MINIMIZER_TESTMINIMIZER_H
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
index 56b96839a25..535a05e569b 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+++ b/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GSLLEVENBERGMARQUARDTMINIMIZER_H
-#define GSLLEVENBERGMARQUARDTMINIMIZER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
 
 #include "Fit/RootAdapter/RootMinimizerAdapter.h"
 
@@ -64,4 +64,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLNLSMinimizer> m_gsl_minimizer;
 };
 
-#endif // GSLLEVENBERGMARQUARDTMINIMIZER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.h b/Fit/RootAdapter/GSLMultiMinimizer.h
index e6f1775f416..35cfa9c5e69 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.h
+++ b/Fit/RootAdapter/GSLMultiMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GSLMULTIMINIMIZER_H
-#define GSLMULTIMINIMIZER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
 
 #include "Fit/Minimizer/MinimizerConstants.h"
 #include "Fit/RootAdapter/RootMinimizerAdapter.h"
@@ -55,4 +55,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLMinimizer> m_gsl_minimizer;
 };
 
-#endif // GSLMULTIMINIMIZER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
diff --git a/Fit/RootAdapter/GeneticMinimizer.h b/Fit/RootAdapter/GeneticMinimizer.h
index 991d1a01fc5..5e6c47e95f4 100644
--- a/Fit/RootAdapter/GeneticMinimizer.h
+++ b/Fit/RootAdapter/GeneticMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GENETICMINIMIZER_H
-#define GENETICMINIMIZER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
 
 #include "Fit/RootAdapter/RootMinimizerAdapter.h"
 
@@ -71,4 +71,4 @@ private:
     std::unique_ptr<ROOT::Math::GeneticMinimizer> m_genetic_minimizer;
 };
 
-#endif // GENETICMINIMIZER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
diff --git a/Fit/RootAdapter/MinimizerResultUtils.h b/Fit/RootAdapter/MinimizerResultUtils.h
index 5c3fcb0f44d..71674a71a1c 100644
--- a/Fit/RootAdapter/MinimizerResultUtils.h
+++ b/Fit/RootAdapter/MinimizerResultUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERRESULTSHELPER_H
-#define MINIMIZERRESULTSHELPER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_MINIMIZERRESULTUTILS_H
+#define BORNAGAIN_FIT_ROOTADAPTER_MINIMIZERRESULTUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -37,4 +37,4 @@ std::string reportParameters(const Fit::Parameters& parameters);
 
 }; // namespace MinimizerResultUtils
 
-#endif // MINIMIZERRESULTSHELPER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_MINIMIZERRESULTUTILS_H
diff --git a/Fit/RootAdapter/Minuit2Minimizer.h b/Fit/RootAdapter/Minuit2Minimizer.h
index d1c74e3bdde..ace2bc535b6 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.h
+++ b/Fit/RootAdapter/Minuit2Minimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINUIT2MINIMIZER_H
-#define MINUIT2MINIMIZER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
 
 #include "Fit/Minimizer/MinimizerConstants.h"
 #include "Fit/RootAdapter/RootMinimizerAdapter.h"
@@ -85,4 +85,4 @@ private:
     std::unique_ptr<ROOT::Minuit2::Minuit2Minimizer> m_minuit2_minimizer;
 };
 
-#endif // MINUIT2MINIMIZER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
diff --git a/Fit/RootAdapter/ObjectiveFunctionAdapter.h b/Fit/RootAdapter/ObjectiveFunctionAdapter.h
index d8e46bac8e2..33fe0c1adc0 100644
--- a/Fit/RootAdapter/ObjectiveFunctionAdapter.h
+++ b/Fit/RootAdapter/ObjectiveFunctionAdapter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OBJECTIVEFUNCTIONADAPTER_H
-#define OBJECTIVEFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_OBJECTIVEFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_OBJECTIVEFUNCTIONADAPTER_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Wrap/WinDllMacros.h"
@@ -51,4 +51,4 @@ private:
 
 } // namespace Fit
 
-#endif //  OBJECTIVEFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_OBJECTIVEFUNCTIONADAPTER_H
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.h b/Fit/RootAdapter/ResidualFunctionAdapter.h
index 62c87ba688d..6d52aab26bb 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.h
+++ b/Fit/RootAdapter/ResidualFunctionAdapter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RESIDUALFUNCTIONADAPTER_H
-#define RESIDUALFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
 
 #include "Fit/Kernel/IFunctionAdapter.h"
 #include "Fit/Kernel/KernelTypes.h"
@@ -58,4 +58,4 @@ private:
 
 } //  namespace Fit
 
-#endif // RESIDUALFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.h b/Fit/RootAdapter/RootMinimizerAdapter.h
index 931de5b1551..28a38c87ad6 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.h
+++ b/Fit/RootAdapter/RootMinimizerAdapter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROOTMINIMIZERADAPTER_H
-#define ROOTMINIMIZERADAPTER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_ROOTMINIMIZERADAPTER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_ROOTMINIMIZERADAPTER_H
 
 #include "Fit/Minimizer/IMinimizer.h"
 #include "Fit/Minimizer/MinimizerInfo.h"
@@ -123,4 +123,4 @@ template <class T> T RootMinimizerAdapter::optionValue(const std::string& option
     return m_options.optionValue<T>(optionName);
 }
 
-#endif // ROOTMINIMIZERADAPTER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_ROOTMINIMIZERADAPTER_H
diff --git a/Fit/RootAdapter/RootResidualFunction.h b/Fit/RootAdapter/RootResidualFunction.h
index eabb7fee545..aefbb822e22 100644
--- a/Fit/RootAdapter/RootResidualFunction.h
+++ b/Fit/RootAdapter/RootResidualFunction.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROOTRESIDUALFUNCTION_H
-#define ROOTRESIDUALFUNCTION_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_ROOTRESIDUALFUNCTION_H
+#define BORNAGAIN_FIT_ROOTADAPTER_ROOTRESIDUALFUNCTION_H
 
 #include "Fit/Kernel/KernelTypes.h"
 
@@ -59,4 +59,4 @@ private:
     size_t m_datasize;
 };
 
-#endif //  ROOTRESIDUALFUNCTION_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_ROOTRESIDUALFUNCTION_H
diff --git a/Fit/RootAdapter/RootScalarFunction.h b/Fit/RootAdapter/RootScalarFunction.h
index a3a4104cda4..390644f7afb 100644
--- a/Fit/RootAdapter/RootScalarFunction.h
+++ b/Fit/RootAdapter/RootScalarFunction.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROOTSCALARFUNCTION_H
-#define ROOTSCALARFUNCTION_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_ROOTSCALARFUNCTION_H
+#define BORNAGAIN_FIT_ROOTADAPTER_ROOTSCALARFUNCTION_H
 
 #include "Fit/Kernel/KernelTypes.h"
 
@@ -35,4 +35,4 @@ public:
     RootScalarFunction(root_scalar_t fcn, int ndims);
 };
 
-#endif // ROOTSCALARFUNCTION_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_ROOTSCALARFUNCTION_H
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.h b/Fit/RootAdapter/ScalarFunctionAdapter.h
index 58539c17ea8..0761f9ba73e 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.h
+++ b/Fit/RootAdapter/ScalarFunctionAdapter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCALARFUNCTIONADAPTER_H
-#define SCALARFUNCTIONADAPTER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
 
 #include "Fit/Kernel/IFunctionAdapter.h"
 #include "Fit/Kernel/KernelTypes.h"
@@ -48,4 +48,4 @@ private:
 
 } //  namespace Fit
 
-#endif // SCALARFUNCTIONADAPTER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
diff --git a/Fit/RootAdapter/SimAnMinimizer.h b/Fit/RootAdapter/SimAnMinimizer.h
index f873d8943c9..ef129a90b78 100644
--- a/Fit/RootAdapter/SimAnMinimizer.h
+++ b/Fit/RootAdapter/SimAnMinimizer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMANMINIMIZER_H
-#define SIMANMINIMIZER_H
+#ifndef BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
+#define BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
 
 #include "Fit/RootAdapter/RootMinimizerAdapter.h"
 
@@ -77,4 +77,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLSimAnMinimizer> m_siman_minimizer;
 };
 
-#endif // SIMANMINIMIZER_H
+#endif // BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
diff --git a/Fit/Tools/AttLimits.h b/Fit/Tools/AttLimits.h
index b3bd4a7d34b..2772166a02b 100644
--- a/Fit/Tools/AttLimits.h
+++ b/Fit/Tools/AttLimits.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ATTLIMITS_H
-#define ATTLIMITS_H
+#ifndef BORNAGAIN_FIT_TOOLS_ATTLIMITS_H
+#define BORNAGAIN_FIT_TOOLS_ATTLIMITS_H
 
 #include "Fit/Tools/Attributes.h"
 #include "Fit/Tools/RealLimits.h"
@@ -65,4 +65,4 @@ private:
     Attributes m_att_fixed;
 };
 
-#endif // ATTLIMITS_H
+#endif // BORNAGAIN_FIT_TOOLS_ATTLIMITS_H
diff --git a/Fit/Tools/Attributes.h b/Fit/Tools/Attributes.h
index 6638b237064..90e6f155012 100644
--- a/Fit/Tools/Attributes.h
+++ b/Fit/Tools/Attributes.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ATTRIBUTES_H
-#define ATTRIBUTES_H
+#ifndef BORNAGAIN_FIT_TOOLS_ATTRIBUTES_H
+#define BORNAGAIN_FIT_TOOLS_ATTRIBUTES_H
 
 #include "Wrap/WinDllMacros.h"
 #include <ostream>
@@ -59,4 +59,4 @@ inline void Attributes::print(std::ostream& ostr) const
         ostr << "free";
 }
 
-#endif // ATTRIBUTES_H
+#endif // BORNAGAIN_FIT_TOOLS_ATTRIBUTES_H
diff --git a/Fit/Tools/MinimizerUtils.h b/Fit/Tools/MinimizerUtils.h
index 1c1c8268f40..c27f82b66fd 100644
--- a/Fit/Tools/MinimizerUtils.h
+++ b/Fit/Tools/MinimizerUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERUTILS_H
-#define MINIMIZERUTILS_H
+#ifndef BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
+#define BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <map>
@@ -38,4 +38,4 @@ BA_CORE_API_ std::string sectionString(const std::string& sectionName = "",
 
 } // namespace MinimizerUtils
 
-#endif
+#endif // BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
diff --git a/Fit/Tools/MultiOption.h b/Fit/Tools/MultiOption.h
index e2ea8e4974a..ea62649c747 100644
--- a/Fit/Tools/MultiOption.h
+++ b/Fit/Tools/MultiOption.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTIOPTION_H
-#define MULTIOPTION_H
+#ifndef BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
+#define BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
 
 #include "Wrap/WinDllMacros.h"
 #include <boost/variant.hpp>
@@ -76,4 +76,4 @@ template <typename T> T MultiOption::getDefault() const
     return boost::get<T>(m_default_value);
 }
 
-#endif // MULTIOPTION_H
+#endif // BORNAGAIN_FIT_TOOLS_MULTIOPTION_H
diff --git a/Fit/Tools/OptionContainer.h b/Fit/Tools/OptionContainer.h
index 19ac0fedda7..97cce066ec2 100644
--- a/Fit/Tools/OptionContainer.h
+++ b/Fit/Tools/OptionContainer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OPTIONCONTAINER_H
-#define OPTIONCONTAINER_H
+#ifndef BORNAGAIN_FIT_TOOLS_OPTIONCONTAINER_H
+#define BORNAGAIN_FIT_TOOLS_OPTIONCONTAINER_H
 
 #include "Fit/Tools/MultiOption.h"
 #include "Wrap/WinDllMacros.h"
@@ -91,4 +91,4 @@ template <class T> void OptionContainer::setOptionValue(const std::string& optio
             + optionName + "'");
 }
 
-#endif // OPTIONCONTAINER_H
+#endif // BORNAGAIN_FIT_TOOLS_OPTIONCONTAINER_H
diff --git a/Fit/Tools/RealLimits.h b/Fit/Tools/RealLimits.h
index b7f27185df8..c74684eb755 100644
--- a/Fit/Tools/RealLimits.h
+++ b/Fit/Tools/RealLimits.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALLIMITS_H
-#define REALLIMITS_H
+#ifndef BORNAGAIN_FIT_TOOLS_REALLIMITS_H
+#define BORNAGAIN_FIT_TOOLS_REALLIMITS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <ostream>
@@ -109,4 +109,4 @@ protected:
     double m_upper_limit;   //! maximum allowed value
 };
 
-#endif // REALLIMITS_H
+#endif // BORNAGAIN_FIT_TOOLS_REALLIMITS_H
diff --git a/Fit/Tools/StringUtils.h b/Fit/Tools/StringUtils.h
index 793ada72940..703c8c8ab35 100644
--- a/Fit/Tools/StringUtils.h
+++ b/Fit/Tools/StringUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STRINGUTILS_H
-#define STRINGUTILS_H
+#ifndef BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
+#define BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <iomanip>
@@ -59,4 +59,4 @@ template <typename T> std::string StringUtils::scientific(const T value, int n)
     return out.str();
 }
 
-#endif // STRINGUTILS_H
+#endif // BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
diff --git a/Fit/Tools/WallclockTimer.h b/Fit/Tools/WallclockTimer.h
index 127cc84e752..c951cf440b7 100644
--- a/Fit/Tools/WallclockTimer.h
+++ b/Fit/Tools/WallclockTimer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TIMEINTERVAL_H
-#define TIMEINTERVAL_H
+#ifndef BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
+#define BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -38,4 +38,4 @@ private:
     std::unique_ptr<WallclockTimerState> m_state;
 };
 
-#endif // TIMEINTERVAL_H
+#endif // BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
diff --git a/GUI/ba3d/def.h b/GUI/ba3d/def.h
index a699b07ff65..a2d4eda1e8a 100644
--- a/GUI/ba3d/def.h
+++ b/GUI/ba3d/def.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_DEF_H
-#define BA3D_DEF_H
+#ifndef BORNAGAIN_GUI_BA3D_DEF_H
+#define BORNAGAIN_GUI_BA3D_DEF_H
 
 #if defined(__GNUC__) && !defined(__APPLE__)
 #pragma GCC diagnostic ignored "-Wswitch-enum"
@@ -86,4 +86,4 @@ struct VectorRange {
 
 //------------------------------------------------------------------------------
 } // namespace RealSpace
-#endif
+#endif // BORNAGAIN_GUI_BA3D_DEF_H
diff --git a/GUI/ba3d/model/geometry.h b/GUI/ba3d/model/geometry.h
index b0c0147a9ad..0a9bab78956 100644
--- a/GUI/ba3d/model/geometry.h
+++ b/GUI/ba3d/model/geometry.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_GEOMETRY_H
-#define BA3D_GEOMETRY_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
+#define BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
 
 #include "../def.h"
 #include "GUI/ba3d/model/geometry_inc.h"
@@ -114,4 +114,4 @@ private:
 GeometryStore& geometryStore(); // simpleton
 
 } // namespace RealSpace
-#endif
+#endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
diff --git a/GUI/ba3d/model/geometry_inc.h b/GUI/ba3d/model/geometry_inc.h
index 0b317a60e49..71f29207d28 100644
--- a/GUI/ba3d/model/geometry_inc.h
+++ b/GUI/ba3d/model/geometry_inc.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_GEOMETRY_INC_H
-#define BA3D_GEOMETRY_INC_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_INC_H
+#define BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_INC_H
 
 #include "../def.h"
 #include <memory>
@@ -68,4 +68,4 @@ struct KeyHash {
 } // namespace GeometricID
 } // namespace RealSpace
 
-#endif // BA3D_GEOMETRY_INC_H
+#endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_INC_H
diff --git a/GUI/ba3d/model/layer.h b/GUI/ba3d/model/layer.h
index 0d43b280826..12d7dee163a 100644
--- a/GUI/ba3d/model/layer.h
+++ b/GUI/ba3d/model/layer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_LAYER_H
-#define BA3D_LAYER_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_LAYER_H
+#define BORNAGAIN_GUI_BA3D_MODEL_LAYER_H
 
 #include "GUI/ba3d/model/object.h"
 
@@ -27,4 +27,4 @@ public:
     Layer(VectorRange);
 };
 } // namespace RealSpace
-#endif // BA3D_LAYER_H
+#endif // BORNAGAIN_GUI_BA3D_MODEL_LAYER_H
diff --git a/GUI/ba3d/model/model.h b/GUI/ba3d/model/model.h
index 29b7c2fa388..68ec83d80d9 100644
--- a/GUI/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_MODEL_H
-#define BA3D_MODEL_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_MODEL_H
+#define BORNAGAIN_GUI_BA3D_MODEL_MODEL_H
 
 #include "GUI/ba3d/model/object.h"
 #include "GUI/ba3d/model/particles.h"
@@ -66,4 +66,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_MODEL_H
+#endif // BORNAGAIN_GUI_BA3D_MODEL_MODEL_H
diff --git a/GUI/ba3d/model/object.h b/GUI/ba3d/model/object.h
index fa20c989461..710ce64b44f 100644
--- a/GUI/ba3d/model/object.h
+++ b/GUI/ba3d/model/object.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_OBJECT_H
-#define BA3D_OBJECT_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
+#define BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
 
 #include "../def.h"
 #include "GUI/ba3d/model/geometry_inc.h"
@@ -59,4 +59,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_OBJECT_H
+#endif // BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
diff --git a/GUI/ba3d/model/particles.h b/GUI/ba3d/model/particles.h
index bc7664cfa61..dcb0c5e6f63 100644
--- a/GUI/ba3d/model/particles.h
+++ b/GUI/ba3d/model/particles.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_PARTICLES_H
-#define BA3D_PARTICLES_H
+#ifndef BORNAGAIN_GUI_BA3D_MODEL_PARTICLES_H
+#define BORNAGAIN_GUI_BA3D_MODEL_PARTICLES_H
 
 #include "GUI/ba3d/model/object.h"
 
@@ -259,4 +259,4 @@ public:
 };
 } // namespace Particles
 } // namespace RealSpace
-#endif // BA3D_PARTICLES_H
+#endif // BORNAGAIN_GUI_BA3D_MODEL_PARTICLES_H
diff --git a/GUI/ba3d/view/buffer.h b/GUI/ba3d/view/buffer.h
index 577425a6705..ce0887e1341 100644
--- a/GUI/ba3d/view/buffer.h
+++ b/GUI/ba3d/view/buffer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_BUFFER_H
-#define BA3D_BUFFER_H
+#ifndef BORNAGAIN_GUI_BA3D_VIEW_BUFFER_H
+#define BORNAGAIN_GUI_BA3D_VIEW_BUFFER_H
 
 #include "../def.h"
 #include <QOpenGLBuffer>
@@ -52,4 +52,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_BUFFER_H
+#endif // BORNAGAIN_GUI_BA3D_VIEW_BUFFER_H
diff --git a/GUI/ba3d/view/camera.h b/GUI/ba3d/view/camera.h
index a9885a279f0..54dfe3d4208 100644
--- a/GUI/ba3d/view/camera.h
+++ b/GUI/ba3d/view/camera.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_CAMERA_H
-#define BA3D_CAMERA_H
+#ifndef BORNAGAIN_GUI_BA3D_VIEW_CAMERA_H
+#define BORNAGAIN_GUI_BA3D_VIEW_CAMERA_H
 
 #include "../def.h"
 #include <QColor>
@@ -83,4 +83,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_CAMERA_H
+#endif // BORNAGAIN_GUI_BA3D_VIEW_CAMERA_H
diff --git a/GUI/ba3d/view/canvas.h b/GUI/ba3d/view/canvas.h
index be6df8a69a7..fbc8b472906 100644
--- a/GUI/ba3d/view/canvas.h
+++ b/GUI/ba3d/view/canvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_CANVAS_H
-#define BA3D_CANVAS_H
+#ifndef BORNAGAIN_GUI_BA3D_VIEW_CANVAS_H
+#define BORNAGAIN_GUI_BA3D_VIEW_CANVAS_H
 
 #include "../def.h"
 #include <QHash>
@@ -100,4 +100,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_CANVAS_H
+#endif // BORNAGAIN_GUI_BA3D_VIEW_CANVAS_H
diff --git a/GUI/ba3d/view/program.h b/GUI/ba3d/view/program.h
index b5f90891e62..184377264b1 100644
--- a/GUI/ba3d/view/program.h
+++ b/GUI/ba3d/view/program.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_PROGRAM_H
-#define BA3D_PROGRAM_H
+#ifndef BORNAGAIN_GUI_BA3D_VIEW_PROGRAM_H
+#define BORNAGAIN_GUI_BA3D_VIEW_PROGRAM_H
 
 #include "../def.h"
 #include <QOpenGLShaderProgram>
@@ -48,4 +48,4 @@ private:
 };
 
 } // namespace RealSpace
-#endif // BA3D_PROGRAM_H
+#endif // BORNAGAIN_GUI_BA3D_VIEW_PROGRAM_H
diff --git a/GUI/ba3d/widget.h b/GUI/ba3d/widget.h
index ed96d5500ae..d50c19867a5 100644
--- a/GUI/ba3d/widget.h
+++ b/GUI/ba3d/widget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BA3D_WIDGET_H
-#define BA3D_WIDGET_H
+#ifndef BORNAGAIN_GUI_BA3D_WIDGET_H
+#define BORNAGAIN_GUI_BA3D_WIDGET_H
 
 #include "GUI/ba3d/def.h"
 #include <QWidget>
@@ -51,4 +51,4 @@ private:
 
 //------------------------------------------------------------------------------
 } // namespace RealSpace
-#endif
+#endif // BORNAGAIN_GUI_BA3D_WIDGET_H
diff --git a/GUI/coregui/Models/ApplicationModels.h b/GUI/coregui/Models/ApplicationModels.h
index 8edd679a38c..ed8aab6839d 100644
--- a/GUI/coregui/Models/ApplicationModels.h
+++ b/GUI/coregui/Models/ApplicationModels.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef APPLICATIONMODELS_H
-#define APPLICATIONMODELS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_APPLICATIONMODELS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_APPLICATIONMODELS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -80,4 +80,4 @@ private:
     MaterialPropertyController* m_materialPropertyController;
 };
 
-#endif // APPLICATIONMODELS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_APPLICATIONMODELS_H
diff --git a/GUI/coregui/Models/AxesItems.h b/GUI/coregui/Models/AxesItems.h
index e496eb58691..40a063f9fba 100644
--- a/GUI/coregui/Models/AxesItems.h
+++ b/GUI/coregui/Models/AxesItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef AXESITEMS_H
-#define AXESITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_AXESITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_AXESITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 #include <memory>
@@ -50,4 +50,4 @@ private:
     void setMinMaxEditor(const QString& editorType);
 };
 
-#endif // AXESITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_AXESITEMS_H
diff --git a/GUI/coregui/Models/BackgroundItems.h b/GUI/coregui/Models/BackgroundItems.h
index 8ba7cc23726..c169adf4dfc 100644
--- a/GUI/coregui/Models/BackgroundItems.h
+++ b/GUI/coregui/Models/BackgroundItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BACKGROUNDITEMS_H
-#define BACKGROUNDITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_BACKGROUNDITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_BACKGROUNDITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -50,4 +50,4 @@ public:
     std::unique_ptr<IBackground> createBackground() const;
 };
 
-#endif // BACKGROUNDITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_BACKGROUNDITEMS_H
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/coregui/Models/BeamAngleItems.h
index 4b1fc0fe322..e3fd238f3ba 100644
--- a/GUI/coregui/Models/BeamAngleItems.h
+++ b/GUI/coregui/Models/BeamAngleItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BEAMANGLEITEMS_H
-#define BEAMANGLEITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_BEAMANGLEITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_BEAMANGLEITEMS_H
 
 #include "GUI/coregui/Models/BeamDistributionItem.h"
 
@@ -43,4 +43,4 @@ private:
     static const bool m_show_mean = true;
 };
 
-#endif // BEAMANGLEITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_BEAMANGLEITEMS_H
diff --git a/GUI/coregui/Models/BeamDistributionItem.h b/GUI/coregui/Models/BeamDistributionItem.h
index bee69dec450..cf41423c2ad 100644
--- a/GUI/coregui/Models/BeamDistributionItem.h
+++ b/GUI/coregui/Models/BeamDistributionItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BEAMDISTRIBUTIONITEM_H
-#define BEAMDISTRIBUTIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_BEAMDISTRIBUTIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_BEAMDISTRIBUTIONITEM_H
 
 #include "GUI/coregui/Models/DistributionItems.h"
 
@@ -43,4 +43,4 @@ protected:
     virtual std::unique_ptr<IDistribution1D> createDistribution1D() const;
 };
 
-#endif // BEAMDISTRIBUTIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_BEAMDISTRIBUTIONITEM_H
diff --git a/GUI/coregui/Models/BeamItems.h b/GUI/coregui/Models/BeamItems.h
index efbdbf9400d..412df3a9db5 100644
--- a/GUI/coregui/Models/BeamItems.h
+++ b/GUI/coregui/Models/BeamItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BEAMITEM_H
-#define BEAMITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_BEAMITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_BEAMITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -86,4 +86,4 @@ public:
     double getInclinationAngle() const override;
 };
 
-#endif // BEAMITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_BEAMITEMS_H
diff --git a/GUI/coregui/Models/BeamWavelengthItem.h b/GUI/coregui/Models/BeamWavelengthItem.h
index 8b9e4ed7e6a..a33f1900feb 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.h
+++ b/GUI/coregui/Models/BeamWavelengthItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BEAMWAVELENGTHITEM_H
-#define BEAMWAVELENGTHITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_BEAMWAVELENGTHITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_BEAMWAVELENGTHITEM_H
 
 #include "GUI/coregui/Models/BeamDistributionItem.h"
 
@@ -36,4 +36,4 @@ public:
     void setToRange(const RealLimits& limits);
 };
 
-#endif // BEAMWAVELENGTHITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_BEAMWAVELENGTHITEM_H
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index d6c540ac1c7..d2d4c91bad7 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMBOPROPERTY_H
-#define COMBOPROPERTY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_COMBOPROPERTY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_COMBOPROPERTY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QStringList>
@@ -75,4 +75,4 @@ private:
 
 Q_DECLARE_METATYPE(ComboProperty)
 
-#endif // COMBOPROPERTY_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_COMBOPROPERTY_H
diff --git a/GUI/coregui/Models/ComponentProxyModel.h b/GUI/coregui/Models/ComponentProxyModel.h
index 1d5ede75e83..156763d10fd 100644
--- a/GUI/coregui/Models/ComponentProxyModel.h
+++ b/GUI/coregui/Models/ComponentProxyModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTPROXYMODEL_H
-#define COMPONENTPROXYMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYMODEL_H
 
 #include "GUI/coregui/Models/ProxyModelStrategy.h"
 #include "Wrap/WinDllMacros.h"
@@ -70,4 +70,4 @@ private:
     std::unique_ptr<ProxyModelStrategy> m_proxyStrategy;
 };
 
-#endif // COMPONENTPROXYMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYMODEL_H
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.h b/GUI/coregui/Models/ComponentProxyStrategy.h
index c22dfb1c3fc..01faa8570cb 100644
--- a/GUI/coregui/Models/ComponentProxyStrategy.h
+++ b/GUI/coregui/Models/ComponentProxyStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTPROXYSTRATEGY_H
-#define COMPONENTPROXYSTRATEGY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYSTRATEGY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYSTRATEGY_H
 
 #include "GUI/coregui/Models/ProxyModelStrategy.h"
 
@@ -40,4 +40,4 @@ private:
     int parentVisibleRow(const SessionItem& item);
 };
 
-#endif //  COMPONENTPROXYSTRATEGY_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_COMPONENTPROXYSTRATEGY_H
diff --git a/GUI/coregui/Models/Data1DViewItem.h b/GUI/coregui/Models/Data1DViewItem.h
index 9c774c40d9e..b1c916ba9e9 100644
--- a/GUI/coregui/Models/Data1DViewItem.h
+++ b/GUI/coregui/Models/Data1DViewItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAITEM1DVIEW_H
-#define DATAITEM1DVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATA1DVIEWITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATA1DVIEWITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -93,4 +93,4 @@ private:
     JobItem* m_job_item;
 };
 
-#endif // DATAITEM1DVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATA1DVIEWITEM_H
diff --git a/GUI/coregui/Models/DataItem.h b/GUI/coregui/Models/DataItem.h
index e0f374e695f..699a3645c51 100644
--- a/GUI/coregui/Models/DataItem.h
+++ b/GUI/coregui/Models/DataItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAITEM_H
-#define DATAITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATAITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATAITEM_H
 
 #include "Core/Instrument/OutputData.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -70,4 +70,4 @@ protected:
     std::mutex m_update_data_mutex;
 };
 
-#endif // DATAITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATAITEM_H
diff --git a/GUI/coregui/Models/DataItemUtils.h b/GUI/coregui/Models/DataItemUtils.h
index eb0b9e749f7..ea60cf60684 100644
--- a/GUI/coregui/Models/DataItemUtils.h
+++ b/GUI/coregui/Models/DataItemUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAITEMUTILS_H
-#define DATAITEMUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATAITEMUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATAITEMUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -32,4 +32,4 @@ BA_CORE_API_ IntensityDataItem* intensityDataItem(SessionItem* parent);
 BA_CORE_API_ SpecularDataItem* specularDataItem(SessionItem* parent);
 } // namespace DataItemUtils
 
-#endif //  DATAITEMUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATAITEMUTILS_H
diff --git a/GUI/coregui/Models/DataProperties.h b/GUI/coregui/Models/DataProperties.h
index e6d3fd88b61..583c00d0051 100644
--- a/GUI/coregui/Models/DataProperties.h
+++ b/GUI/coregui/Models/DataProperties.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAPROPERTIES_H
-#define DATAPROPERTIES_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTIES_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTIES_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -54,4 +54,4 @@ public:
     static const QString& nextColorName(Data1DProperties* properties);
 };
 
-#endif // DATAPROPERTIES_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTIES_H
diff --git a/GUI/coregui/Models/DataPropertyContainer.h b/GUI/coregui/Models/DataPropertyContainer.h
index 307ca51814c..fff53626c6a 100644
--- a/GUI/coregui/Models/DataPropertyContainer.h
+++ b/GUI/coregui/Models/DataPropertyContainer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAITEMVIEW_H
-#define DATAITEMVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTYCONTAINER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTYCONTAINER_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -41,4 +41,4 @@ protected:
     DataItem* dataItem(size_t i) const;
 };
 
-#endif // DATAITEMVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATAPROPERTYCONTAINER_H
diff --git a/GUI/coregui/Models/DataViewUtils.h b/GUI/coregui/Models/DataViewUtils.h
index 6611cbe156e..1d7e46d3f96 100644
--- a/GUI/coregui/Models/DataViewUtils.h
+++ b/GUI/coregui/Models/DataViewUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATAVIEWUTILS_H
-#define DATAVIEWUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DATAVIEWUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DATAVIEWUTILS_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include <QString>
@@ -32,4 +32,4 @@ std::unique_ptr<OutputData<double>> getTranslatedData(Data1DViewItem* view_item,
                                                       DataItem* data_item);
 }; // namespace DataViewUtils
 
-#endif // DATAVIEWUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DATAVIEWUTILS_H
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.h b/GUI/coregui/Models/DepthProbeInstrumentItem.h
index 39884656d2c..5e791379f5c 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.h
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBEINSTRUMENTITEM_H
-#define DEPTHPROBEINSTRUMENTITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DEPTHPROBEINSTRUMENTITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DEPTHPROBEINSTRUMENTITEM_H
 
 #include "GUI/coregui/Models/InstrumentItems.h"
 
@@ -42,4 +42,4 @@ public:
     std::unique_ptr<IUnitConverter> createUnitConverter() const;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DEPTHPROBEINSTRUMENTITEM_H
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index a05bcc57261..b665527255a 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORITEMS_H
-#define DETECTORITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DETECTORITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DETECTORITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -69,4 +69,4 @@ protected:
     void addMasksToDomain(IDetector2D* detector) const;
 };
 
-#endif // DETECTORITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DETECTORITEMS_H
diff --git a/GUI/coregui/Models/DistributionItems.h b/GUI/coregui/Models/DistributionItems.h
index c462e6df22a..d91a66ffd1b 100644
--- a/GUI/coregui/Models/DistributionItems.h
+++ b/GUI/coregui/Models/DistributionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONITEMS_H
-#define DISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DISTRIBUTIONITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -140,4 +140,4 @@ public:
     void showMean(bool flag) override;
 };
 
-#endif // DISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DISTRIBUTIONITEMS_H
diff --git a/GUI/coregui/Models/DocumentModel.h b/GUI/coregui/Models/DocumentModel.h
index a351151a946..6642ce81062 100644
--- a/GUI/coregui/Models/DocumentModel.h
+++ b/GUI/coregui/Models/DocumentModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOCUMENTMODEL_H
-#define DOCUMENTMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DOCUMENTMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DOCUMENTMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 
@@ -32,4 +32,4 @@ public:
     SimulationOptionsItem* simulationOptionsItem();
 };
 
-#endif // DOCUMENTMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DOCUMENTMODEL_H
diff --git a/GUI/coregui/Models/DomainObjectBuilder.h b/GUI/coregui/Models/DomainObjectBuilder.h
index d513e1a9c5f..e9d7321c05e 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.h
+++ b/GUI/coregui/Models/DomainObjectBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOMAINOBJECTBUILDER_H
-#define DOMAINOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DOMAINOBJECTBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DOMAINOBJECTBUILDER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -41,4 +41,4 @@ BA_CORE_API_ std::unique_ptr<IUnitConverter>
 createUnitConverter(const InstrumentItem* instrumentItem);
 }; // namespace DomainObjectBuilder
 
-#endif // DOMAINOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DOMAINOBJECTBUILDER_H
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.h b/GUI/coregui/Models/DomainSimulationBuilder.h
index ae8249d8c93..4dc0179e107 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.h
+++ b/GUI/coregui/Models/DomainSimulationBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOMAINSIMULATIONBUILDER_H
-#define DOMAINSIMULATIONBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_DOMAINSIMULATIONBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_DOMAINSIMULATIONBUILDER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -35,4 +35,4 @@ createSimulation(const MultiLayerItem* sampleItem, const InstrumentItem* instrum
                  const SimulationOptionsItem* optionsItem = nullptr);
 }; // namespace DomainSimulationBuilder
 
-#endif // DOMAINSIMULATIONBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_DOMAINSIMULATIONBUILDER_H
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index 17efb3a463d..aefd1f300a3 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FTDECAYFUNCTIONITEMS_H
-#define FTDECAYFUNCTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FTDECAYFUNCTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FTDECAYFUNCTIONITEMS_H
 
 #include "Core/Aggregate/FTDecayFunctions.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -99,4 +99,4 @@ public:
     std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const;
 };
 
-#endif // FTDECAYFUNCTIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FTDECAYFUNCTIONITEMS_H
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index e596ebfb5c9..1b93d1e08b6 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FTDISTRIBUTIONITEMS_H
-#define FTDISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FTDISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FTDISTRIBUTIONITEMS_H
 
 #include "Core/Aggregate/FTDistributions1D.h"
 #include "Core/Aggregate/FTDistributions2D.h"
@@ -128,4 +128,4 @@ public:
     std::unique_ptr<IFTDistribution2D> createFTDistribution() const;
 };
 
-#endif // FTDISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FTDISTRIBUTIONITEMS_H
diff --git a/GUI/coregui/Models/FilterPropertyProxy.h b/GUI/coregui/Models/FilterPropertyProxy.h
index 6f976660a8d..be70fa552e0 100644
--- a/GUI/coregui/Models/FilterPropertyProxy.h
+++ b/GUI/coregui/Models/FilterPropertyProxy.h
@@ -11,8 +11,8 @@
 //! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
-#ifndef FILTERPROPERTYPROXY_H
-#define FILTERPROPERTYPROXY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FILTERPROPERTYPROXY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FILTERPROPERTYPROXY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QSortFilterProxyModel>
@@ -42,4 +42,4 @@ private:
     int m_columns;
 };
 
-#endif // FILTERPROPERTYPROXY_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FILTERPROPERTYPROXY_H
diff --git a/GUI/coregui/Models/FitParameterHelper.h b/GUI/coregui/Models/FitParameterHelper.h
index c478d415f72..309d506e56d 100644
--- a/GUI/coregui/Models/FitParameterHelper.h
+++ b/GUI/coregui/Models/FitParameterHelper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPARAMETERHELPER_H
-#define FITPARAMETERHELPER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERHELPER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERHELPER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QStringList>
@@ -45,4 +45,4 @@ public:
                                            const QString& link);
 };
 
-#endif // FITPARAMETERHELPER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERHELPER_H
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/FitParameterItems.h
index fe7ebde34a4..2ea01fac2fe 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/FitParameterItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPARAMETERITEMS_H
-#define FITPARAMETERITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERITEMS_H
 
 #include "Fit/Tools/AttLimits.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -83,4 +83,4 @@ public:
     Fit::Parameters createParameters() const;
 };
 
-#endif // FITPARAMETERITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERITEMS_H
diff --git a/GUI/coregui/Models/FitParameterProxyModel.h b/GUI/coregui/Models/FitParameterProxyModel.h
index fdd3444cad3..86c6cb119ac 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.h
+++ b/GUI/coregui/Models/FitParameterProxyModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPARAMETERPROXYMODEL_H
-#define FITPARAMETERPROXYMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERPROXYMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERPROXYMODEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QAbstractItemModel>
@@ -90,4 +90,4 @@ inline Qt::DropActions FitParameterProxyModel::supportedDropActions() const
     return Qt::MoveAction | Qt::CopyAction;
 }
 
-#endif // FITPARAMETERPROXYMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FITPARAMETERPROXYMODEL_H
diff --git a/GUI/coregui/Models/FitSuiteItem.h b/GUI/coregui/Models/FitSuiteItem.h
index eb7f81fe7a7..4e420cb37da 100644
--- a/GUI/coregui/Models/FitSuiteItem.h
+++ b/GUI/coregui/Models/FitSuiteItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITSUITEITEM_H
-#define FITSUITEITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FITSUITEITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FITSUITEITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -35,4 +35,4 @@ public:
     MinimizerContainerItem* minimizerContainerItem();
 };
 
-#endif // FITSUITEITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FITSUITEITEM_H
diff --git a/GUI/coregui/Models/FootprintItems.h b/GUI/coregui/Models/FootprintItems.h
index 3f36c4ec1ca..2a4d70760f3 100644
--- a/GUI/coregui/Models/FootprintItems.h
+++ b/GUI/coregui/Models/FootprintItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FOOTPRINTITEMS_H
-#define FOOTPRINTITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FOOTPRINTITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FOOTPRINTITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -57,4 +57,4 @@ public:
     std::unique_ptr<IFootprintFactor> createFootprint() const override;
 };
 
-#endif // FOOTPRINTITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FOOTPRINTITEMS_H
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/coregui/Models/FormFactorItems.h
index 0196ca24235..359b4cdeeb0 100644
--- a/GUI/coregui/Models/FormFactorItems.h
+++ b/GUI/coregui/Models/FormFactorItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FORMFACTORITEMS_H
-#define FORMFACTORITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_FORMFACTORITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_FORMFACTORITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -299,4 +299,4 @@ public:
     std::unique_ptr<IFormFactor> createFormFactor() const;
 };
 
-#endif // FORMFACTORITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_FORMFACTORITEMS_H
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.h b/GUI/coregui/Models/GUIDomainSampleVisitor.h
index 372ab9b7620..ffc6c4d75d0 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.h
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIDOMAINSAMPLEVISITOR_H
-#define GUIDOMAINSAMPLEVISITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GUIDOMAINSAMPLEVISITOR_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GUIDOMAINSAMPLEVISITOR_H
 
 #include "Core/Parametrization/INodeVisitor.h"
 #include <QMap>
@@ -111,4 +111,4 @@ private:
     MaterialModel* m_materialModel;
 };
 
-#endif //  GUIDOMAINSAMPLEVISITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GUIDOMAINSAMPLEVISITOR_H
diff --git a/GUI/coregui/Models/GUIExamplesFactory.h b/GUI/coregui/Models/GUIExamplesFactory.h
index 93ef11b69da..2ae41e86aaf 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.h
+++ b/GUI/coregui/Models/GUIExamplesFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIEXAMPLESFACTORY_H
-#define GUIEXAMPLESFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GUIEXAMPLESFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GUIEXAMPLESFACTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -38,4 +38,4 @@ private:
     //!< correspondance of GUI example name and name from StandardSamples registry
 };
 
-#endif // GUIEXAMPLESFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GUIEXAMPLESFACTORY_H
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index 78d84599dec..b10443ba9b7 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIOBJECTBUILDER_H
-#define GUIOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GUIOBJECTBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GUIOBJECTBUILDER_H
 
 #include "Core/Parametrization/INodeVisitor.h"
 #include <QMap>
@@ -49,4 +49,4 @@ BA_CORE_API_ SessionItem* populateDocumentModel(DocumentModel* p_documentModel,
                                                 const Simulation& simulation);
 }; // namespace GUIObjectBuilder
 
-#endif // GUIOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GUIOBJECTBUILDER_H
diff --git a/GUI/coregui/Models/GroupInfo.h b/GUI/coregui/Models/GroupInfo.h
index c3a0f1ce0f6..243be74877e 100644
--- a/GUI/coregui/Models/GroupInfo.h
+++ b/GUI/coregui/Models/GroupInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GROUPINFO_H
-#define GROUPINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFO_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -58,4 +58,4 @@ private:
     QVector<TypeAndLabel> m_info;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFO_H
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.h b/GUI/coregui/Models/GroupInfoCatalogue.h
index 501e33c6dd8..9b58faf326a 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.h
+++ b/GUI/coregui/Models/GroupInfoCatalogue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GROUPINFOCATALOGUE_H
-#define GROUPINFOCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
 
 #include "GUI/coregui/Models/GroupInfo.h"
 
@@ -33,4 +33,4 @@ private:
     QVector<GroupInfo> m_groups;
 };
 
-#endif // GROUPINFOCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index 1a58abef48e..8c952c1e65a 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GROUPITEM_H
-#define GROUPITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEM_H
 
 #include "GUI/coregui/Models/GroupInfo.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -46,4 +46,4 @@ private:
     std::unique_ptr<GroupItemController> m_controller;
 };
 
-#endif // GROUPITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEM_H
diff --git a/GUI/coregui/Models/GroupItemController.h b/GUI/coregui/Models/GroupItemController.h
index d61860015c0..d03c856a519 100644
--- a/GUI/coregui/Models/GroupItemController.h
+++ b/GUI/coregui/Models/GroupItemController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GROUPITEMCONTROLLER_H
-#define GROUPITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEMCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEMCONTROLLER_H
 
 #include "GUI/coregui/Models/GroupInfo.h"
 #include <QStringList>
@@ -53,4 +53,4 @@ private:
     GroupInfo m_groupInfo;
 };
 
-#endif // GROUPITEMCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPITEMCONTROLLER_H
diff --git a/GUI/coregui/Models/InstrumentItems.h b/GUI/coregui/Models/InstrumentItems.h
index 4e74bf811a7..ab465e2faea 100644
--- a/GUI/coregui/Models/InstrumentItems.h
+++ b/GUI/coregui/Models/InstrumentItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTITEMS_H
-#define INSTRUMENTITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTITEMS_H
 
 #include "GUI/coregui/Models/BeamItems.h"
 
@@ -108,4 +108,4 @@ public:
     void updateToRealData(const RealDataItem* item) override;
 };
 
-#endif // INSTRUMENTITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTITEMS_H
diff --git a/GUI/coregui/Models/InstrumentModel.h b/GUI/coregui/Models/InstrumentModel.h
index 60ed2285038..83d5b52a0d6 100644
--- a/GUI/coregui/Models/InstrumentModel.h
+++ b/GUI/coregui/Models/InstrumentModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTMODEL_H
-#define INSTRUMENTMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 
@@ -33,4 +33,4 @@ public:
     InstrumentItem* instrumentItem();
 };
 
-#endif // INSTRUMENTMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_INSTRUMENTMODEL_H
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index 8dfac99ebfe..96fce4865f0 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAITEM_H
-#define INTENSITYDATAITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_INTENSITYDATAITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_INTENSITYDATAITEM_H
 
 #include "GUI/coregui/Models/DataItem.h"
 
@@ -115,4 +115,4 @@ private:
     void updateAxesLabels();
 };
 
-#endif // INTENSITYDATAITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_INTENSITYDATAITEM_H
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.h b/GUI/coregui/Models/InterferenceFunctionItems.h
index a3a13acf5de..fb250d04284 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.h
+++ b/GUI/coregui/Models/InterferenceFunctionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONITEMS_H
-#define INTERFERENCEFUNCTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_INTERFERENCEFUNCTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_INTERFERENCEFUNCTIONITEMS_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 class IInterferenceFunction;
@@ -104,4 +104,4 @@ public:
     std::unique_ptr<IInterferenceFunction> createInterferenceFunction() const;
 };
 
-#endif // INTERFERENCEFUNCTIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_INTERFERENCEFUNCTIONITEMS_H
diff --git a/GUI/coregui/Models/ItemCatalogue.h b/GUI/coregui/Models/ItemCatalogue.h
index 0477f4afb91..32e4580104d 100644
--- a/GUI/coregui/Models/ItemCatalogue.h
+++ b/GUI/coregui/Models/ItemCatalogue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMCATALOGUE_H
-#define ITEMCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
 
 #include "Core/StandardSamples/IFactory.h"
 #include "Wrap/WinDllMacros.h"
@@ -43,4 +43,4 @@ private:
     QStringList m_valid_top_item_types;
 };
 
-#endif // ITEMCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
diff --git a/GUI/coregui/Models/ItemFactory.h b/GUI/coregui/Models/ItemFactory.h
index f18c20f0e0e..8f1a2f512c5 100644
--- a/GUI/coregui/Models/ItemFactory.h
+++ b/GUI/coregui/Models/ItemFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMFACTORY_H
-#define ITEMFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEMFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ITEMFACTORY_H
 
 #include <QString>
 
@@ -32,4 +32,4 @@ QStringList ValidTopItemTypes();
 
 }; // namespace ItemFactory
 
-#endif // ITEMFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEMFACTORY_H
diff --git a/GUI/coregui/Models/ItemFileNameUtils.h b/GUI/coregui/Models/ItemFileNameUtils.h
index 36c626a5828..dc2c8c11763 100644
--- a/GUI/coregui/Models/ItemFileNameUtils.h
+++ b/GUI/coregui/Models/ItemFileNameUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBITEMFUNCTIONS_H
-#define JOBITEMFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEMFILENAMEUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ITEMFILENAMEUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -43,4 +43,4 @@ BA_CORE_API_ QStringList nonXMLFileNameFilters();
 
 } // namespace ItemFileNameUtils
 
-#endif // JOBITEMFUNCTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEMFILENAMEUTILS_H
diff --git a/GUI/coregui/Models/JobItem.h b/GUI/coregui/Models/JobItem.h
index 56d223e4812..ffe46d244f3 100644
--- a/GUI/coregui/Models/JobItem.h
+++ b/GUI/coregui/Models/JobItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBITEM_H
-#define JOBITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -112,4 +112,4 @@ private:
     const SimulationOptionsItem* simulationOptionsItem() const;
 };
 
-#endif // JOBITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBITEM_H
diff --git a/GUI/coregui/Models/JobItemUtils.h b/GUI/coregui/Models/JobItemUtils.h
index 718e8d5fb4d..c4309e48ade 100644
--- a/GUI/coregui/Models/JobItemUtils.h
+++ b/GUI/coregui/Models/JobItemUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBITEMUTILS_H
-#define JOBITEMUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBITEMUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBITEMUTILS_H
 
 #include "Core/Instrument/IDetector.h"
 #include "GUI/coregui/Models/ComboProperty.h"
@@ -53,4 +53,4 @@ BA_CORE_API_ void setResults(DataItem* intensityItem, const Simulation* simulati
 BA_CORE_API_ ComboProperty availableUnits(const IUnitConverter& converter);
 } // namespace JobItemUtils
 
-#endif // JOBITEMUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBITEMUTILS_H
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/coregui/Models/JobModel.h
index df420d44cc8..461d097f2a7 100644
--- a/GUI/coregui/Models/JobModel.h
+++ b/GUI/coregui/Models/JobModel.h
@@ -11,8 +11,8 @@
 //! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
-#ifndef JOBMODEL_H
-#define JOBMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 class JobQueueData;
@@ -65,4 +65,4 @@ private:
     JobQueueData* m_queue_data;
 };
 
-#endif // JOBMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBMODEL_H
diff --git a/GUI/coregui/Models/JobModelFunctions.h b/GUI/coregui/Models/JobModelFunctions.h
index 02d83ce7af6..225f68570b6 100644
--- a/GUI/coregui/Models/JobModelFunctions.h
+++ b/GUI/coregui/Models/JobModelFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBMODELFUNCTIONS_H
-#define JOBMODELFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBMODELFUNCTIONS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBMODELFUNCTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -52,4 +52,4 @@ BA_CORE_API_ void copyRealDataItem(JobItem* jobItem, const RealDataItem* realDat
 BA_CORE_API_ const JobItem* findJobItem(const SessionItem* item);
 } // namespace JobModelFunctions
 
-#endif // JOBMODELFUNCTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBMODELFUNCTIONS_H
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/coregui/Models/JobQueueData.h
index 80bd36d1eb1..f59a8c24a21 100644
--- a/GUI/coregui/Models/JobQueueData.h
+++ b/GUI/coregui/Models/JobQueueData.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBQUEUEDATA_H
-#define JOBQUEUEDATA_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBQUEUEDATA_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBQUEUEDATA_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -69,4 +69,4 @@ private:
     JobModel* m_jobModel;
 };
 
-#endif // JOBQUEUEDATA_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBQUEUEDATA_H
diff --git a/GUI/coregui/Models/JobWorker.h b/GUI/coregui/Models/JobWorker.h
index 899a109902e..56fade7ec2f 100644
--- a/GUI/coregui/Models/JobWorker.h
+++ b/GUI/coregui/Models/JobWorker.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBWORKER_H
-#define JOBWORKER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_JOBWORKER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_JOBWORKER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -59,4 +59,4 @@ private:
     int m_simulation_duration;
 };
 
-#endif // JOBWORKER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_JOBWORKER_H
diff --git a/GUI/coregui/Models/Lattice2DItems.h b/GUI/coregui/Models/Lattice2DItems.h
index bcb0c2f69e8..2947ef9b3fb 100644
--- a/GUI/coregui/Models/Lattice2DItems.h
+++ b/GUI/coregui/Models/Lattice2DItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LATTICE2DITEMS_H
-#define LATTICE2DITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_LATTICE2DITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_LATTICE2DITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 class Lattice2D;
@@ -53,4 +53,4 @@ public:
     std::unique_ptr<Lattice2D> createLattice() const;
 };
 
-#endif // LATTICE2DITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_LATTICE2DITEMS_H
diff --git a/GUI/coregui/Models/LayerItem.h b/GUI/coregui/Models/LayerItem.h
index 4104f358407..6e5a80053e9 100644
--- a/GUI/coregui/Models/LayerItem.h
+++ b/GUI/coregui/Models/LayerItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERITEM_H
-#define LAYERITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_LAYERITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_LAYERITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -33,4 +33,4 @@ private:
     void updateAppearance(SessionItem* new_parent);
 };
 
-#endif // LAYERITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_LAYERITEM_H
diff --git a/GUI/coregui/Models/LayerRoughnessItems.h b/GUI/coregui/Models/LayerRoughnessItems.h
index 7aae008f462..b7a81371fc3 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.h
+++ b/GUI/coregui/Models/LayerRoughnessItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERROUGHNESSITEMS_H
-#define LAYERROUGHNESSITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_LAYERROUGHNESSITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_LAYERROUGHNESSITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -32,4 +32,4 @@ public:
     LayerBasicRoughnessItem();
 };
 
-#endif // LAYERROUGHNESSITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_LAYERROUGHNESSITEMS_H
diff --git a/GUI/coregui/Models/MaskItems.h b/GUI/coregui/Models/MaskItems.h
index a3498c6f1de..de883df1d0d 100644
--- a/GUI/coregui/Models/MaskItems.h
+++ b/GUI/coregui/Models/MaskItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKITEMS_H
-#define MASKITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MASKITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MASKITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -111,4 +111,4 @@ public:
     virtual std::unique_ptr<IShape2D> createShape(double scale) const;
 };
 
-#endif // MASKITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MASKITEMS_H
diff --git a/GUI/coregui/Models/MaterialDataItems.h b/GUI/coregui/Models/MaterialDataItems.h
index e37a13672e4..215f0bd0bb2 100644
--- a/GUI/coregui/Models/MaterialDataItems.h
+++ b/GUI/coregui/Models/MaterialDataItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALDATAITEMS_H
-#define MATERIALDATAITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MATERIALDATAITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MATERIALDATAITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -41,4 +41,4 @@ public:
     MaterialSLDDataItem();
 };
 
-#endif // MATERIALDATAITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MATERIALDATAITEMS_H
diff --git a/GUI/coregui/Models/MaterialItem.h b/GUI/coregui/Models/MaterialItem.h
index 4d3a6cbe187..5012152b4bd 100644
--- a/GUI/coregui/Models/MaterialItem.h
+++ b/GUI/coregui/Models/MaterialItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALITEM_H
-#define MATERIALITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -37,4 +37,4 @@ public:
     std::unique_ptr<Material> createMaterial() const;
 };
 
-#endif // MATERIALITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEM_H
diff --git a/GUI/coregui/Models/MaterialItemContainer.h b/GUI/coregui/Models/MaterialItemContainer.h
index 35ba5764af1..339d2c140bf 100644
--- a/GUI/coregui/Models/MaterialItemContainer.h
+++ b/GUI/coregui/Models/MaterialItemContainer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALITEMCONTAINER_H
-#define MATERIALITEMCONTAINER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEMCONTAINER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEMCONTAINER_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -34,4 +34,4 @@ public:
     MaterialItem* findMaterialById(QString id);
 };
 
-#endif // MATERIALITEMCONTAINER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MATERIALITEMCONTAINER_H
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/coregui/Models/MaterialModel.h
index 6ff3979296f..9c91da81a04 100644
--- a/GUI/coregui/Models/MaterialModel.h
+++ b/GUI/coregui/Models/MaterialModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALMODEL_H
-#define MATERIALMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MATERIALMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MATERIALMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 
@@ -43,4 +43,4 @@ private:
     MaterialItem* createMaterial(const QString& name);
 };
 
-#endif // MATERIALMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MATERIALMODEL_H
diff --git a/GUI/coregui/Models/MaterialPropertyController.h b/GUI/coregui/Models/MaterialPropertyController.h
index 143d357963f..6d5a7bea65c 100644
--- a/GUI/coregui/Models/MaterialPropertyController.h
+++ b/GUI/coregui/Models/MaterialPropertyController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALPROPERTYCONTROLLER_H
-#define MATERIALPROPERTYCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MATERIALPROPERTYCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MATERIALPROPERTYCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -47,4 +47,4 @@ private:
     SampleModel* m_sampleModel;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MATERIALPROPERTYCONTROLLER_H
diff --git a/GUI/coregui/Models/MesoCrystalItem.h b/GUI/coregui/Models/MesoCrystalItem.h
index 5d3b0e944e5..8c2c5745605 100644
--- a/GUI/coregui/Models/MesoCrystalItem.h
+++ b/GUI/coregui/Models/MesoCrystalItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTALITEM_H
-#define MESOCRYSTALITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MESOCRYSTALITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MESOCRYSTALITEM_H
 
 #include "Core/Lattice/Lattice.h"
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
@@ -43,4 +43,4 @@ public:
     std::unique_ptr<IFormFactor> getOuterShape() const;
 };
 
-#endif // MESOCRYSTALITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MESOCRYSTALITEM_H
diff --git a/GUI/coregui/Models/MinimizerItem.h b/GUI/coregui/Models/MinimizerItem.h
index de35bca8efa..a3b65e9dab4 100644
--- a/GUI/coregui/Models/MinimizerItem.h
+++ b/GUI/coregui/Models/MinimizerItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERITEM_H
-#define MINIMIZERITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -125,4 +125,4 @@ public:
     std::unique_ptr<IMinimizer> createMinimizer() const;
 };
 
-#endif // MINIMIZERITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEM_H
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.h b/GUI/coregui/Models/MinimizerItemCatalogue.h
index 45c6076f942..f405fe2c49b 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.h
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERITEMCATALOGUE_H
-#define MINIMIZERITEMCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
 
 #include "GUI/coregui/Models/ComboProperty.h"
 
@@ -32,4 +32,4 @@ private:
     static QStringList algorithmDescriptions(const QString& minimizerType);
 };
 
-#endif // MINIMIZERITEMCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/coregui/Models/ModelMapper.h
index c5f319229fa..d1db2bfba10 100644
--- a/GUI/coregui/Models/ModelMapper.h
+++ b/GUI/coregui/Models/ModelMapper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MODELMAPPER_H
-#define MODELMAPPER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MODELMAPPER_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MODELMAPPER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QModelIndex>
@@ -115,4 +115,4 @@ template <class U> inline void ModelMapper::clean_container(U& v, const void* ca
             v.end());
 }
 
-#endif // MODELMAPPER_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MODELMAPPER_H
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/coregui/Models/ModelPath.h
index 04287de210a..62b21d1c3bf 100644
--- a/GUI/coregui/Models/ModelPath.h
+++ b/GUI/coregui/Models/ModelPath.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MODELPATH_H
-#define MODELPATH_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MODELPATH_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MODELPATH_H
 
 #include "GUI/coregui/Models/ParameterTranslators.h"
 #include "Wrap/WinDllMacros.h"
@@ -39,4 +39,4 @@ BA_CORE_API_ const SessionItem* ancestor(const SessionItem* item, const QString&
 BA_CORE_API_ QString itemPathTranslation(const SessionItem& item, const SessionItem* topItem = 0);
 } // namespace ModelPath
 
-#endif // MODELPATH_H namespace
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MODELPATH_H
diff --git a/GUI/coregui/Models/ModelUtils.h b/GUI/coregui/Models/ModelUtils.h
index 29e2a36164b..bc2d0a0c28d 100644
--- a/GUI/coregui/Models/ModelUtils.h
+++ b/GUI/coregui/Models/ModelUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MODELUTILS_H
-#define MODELUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MODELUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MODELUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -39,4 +39,4 @@ BA_CORE_API_ void iterate_if(const QModelIndex& index, const QAbstractItemModel*
 
 } // namespace ModelUtils
 
-#endif //  MODELUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MODELUTILS_H
diff --git a/GUI/coregui/Models/MultiLayerItem.h b/GUI/coregui/Models/MultiLayerItem.h
index b9a4e21784d..b051ae8347e 100644
--- a/GUI/coregui/Models/MultiLayerItem.h
+++ b/GUI/coregui/Models/MultiLayerItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERITEM_H
-#define MULTILAYERITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MULTILAYERITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MULTILAYERITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -31,4 +31,4 @@ private:
     void updateLayers();
 };
 
-#endif // MULTILAYERITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MULTILAYERITEM_H
diff --git a/GUI/coregui/Models/ParameterTranslators.h b/GUI/coregui/Models/ParameterTranslators.h
index 6f76bb33a3b..d189135146c 100644
--- a/GUI/coregui/Models/ParameterTranslators.h
+++ b/GUI/coregui/Models/ParameterTranslators.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTRANSLATORS_H
-#define PARAMETERTRANSLATORS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTRANSLATORS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTRANSLATORS_H
 
 #include <QStringList>
 
@@ -112,4 +112,4 @@ private:
     QStringList m_additional_names;
 };
 
-#endif // PARAMETERTRANSLATORS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTRANSLATORS_H
diff --git a/GUI/coregui/Models/ParameterTreeItems.h b/GUI/coregui/Models/ParameterTreeItems.h
index 3e1bde85d29..8933d134cf4 100644
--- a/GUI/coregui/Models/ParameterTreeItems.h
+++ b/GUI/coregui/Models/ParameterTreeItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTREEITEMS_H
-#define PARAMETERTREEITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -54,4 +54,4 @@ public:
     ParameterContainerItem();
 };
 
-#endif // PARAMETERTREEITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEITEMS_H
diff --git a/GUI/coregui/Models/ParameterTreeUtils.h b/GUI/coregui/Models/ParameterTreeUtils.h
index b44cf8f0e04..37e07829707 100644
--- a/GUI/coregui/Models/ParameterTreeUtils.h
+++ b/GUI/coregui/Models/ParameterTreeUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTREEUTILS_H
-#define PARAMETERTREEUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QPair>
@@ -54,4 +54,4 @@ BA_CORE_API_ SessionItem* parameterNameToLinkedItem(const QString& parName,
 
 } // namespace ParameterTreeUtils
 
-#endif // PARAMETERTREEUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTREEUTILS_H
diff --git a/GUI/coregui/Models/ParameterTuningModel.h b/GUI/coregui/Models/ParameterTuningModel.h
index cca693bdd14..43f431c4499 100644
--- a/GUI/coregui/Models/ParameterTuningModel.h
+++ b/GUI/coregui/Models/ParameterTuningModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTUNINGMODEL_H
-#define PARAMETERTUNINGMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTUNINGMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTUNINGMODEL_H
 
 #include "GUI/coregui/Models/FilterPropertyProxy.h"
 
@@ -50,4 +50,4 @@ inline Qt::DropActions ParameterTuningModel::supportedDropActions() const
     return Qt::IgnoreAction;
 }
 
-#endif // PARAMETERTUNINGMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARAMETERTUNINGMODEL_H
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index c8a0c95cfe5..1544c25c6dc 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECOMPOSITIONITEM_H
-#define PARTICLECOMPOSITIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECOMPOSITIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECOMPOSITIONITEM_H
 
 #include "Core/Particle/ParticleComposition.h"
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
@@ -26,4 +26,4 @@ public:
     std::unique_ptr<ParticleComposition> createParticleComposition() const;
 };
 
-#endif // PARTICLECOMPOSITIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECOMPOSITIONITEM_H
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/coregui/Models/ParticleCoreShellItem.h
index 0810bf79fd7..4b78c560700 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.h
+++ b/GUI/coregui/Models/ParticleCoreShellItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECORESHELLITEM_H
-#define PARTICLECORESHELLITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECORESHELLITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECORESHELLITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -29,4 +29,4 @@ public:
     QVector<SessionItem*> materialPropertyItems();
 };
 
-#endif // PARTICLECORESHELLITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARTICLECORESHELLITEM_H
diff --git a/GUI/coregui/Models/ParticleDistributionItem.h b/GUI/coregui/Models/ParticleDistributionItem.h
index 15721cefe4e..1853788a69a 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.h
+++ b/GUI/coregui/Models/ParticleDistributionItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEDISTRIBUTIONITEM_H
-#define PARTICLEDISTRIBUTIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEDISTRIBUTIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEDISTRIBUTIONITEM_H
 
 #include "Core/Particle/ParticleDistribution.h"
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
@@ -48,4 +48,4 @@ private:
     QStringList m_linked_names;
 };
 
-#endif // PARTICLEDISTRIBUTIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEDISTRIBUTIONITEM_H
diff --git a/GUI/coregui/Models/ParticleItem.h b/GUI/coregui/Models/ParticleItem.h
index 99d2d0dcd94..b284ac09b49 100644
--- a/GUI/coregui/Models/ParticleItem.h
+++ b/GUI/coregui/Models/ParticleItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEITEM_H
-#define PARTICLEITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -39,4 +39,4 @@ private:
     bool parentIsParticleLayout() const;
 };
 
-#endif // PARTICLEITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARTICLEITEM_H
diff --git a/GUI/coregui/Models/ParticleLayoutItem.h b/GUI/coregui/Models/ParticleLayoutItem.h
index c5bd6561375..0202cdb20a2 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.h
+++ b/GUI/coregui/Models/ParticleLayoutItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLELAYOUTITEM_H
-#define PARTICLELAYOUTITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PARTICLELAYOUTITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PARTICLELAYOUTITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -31,4 +31,4 @@ private:
     void updateDensityValue();
 };
 
-#endif // PARTICLELAYOUTITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PARTICLELAYOUTITEM_H
diff --git a/GUI/coregui/Models/PointwiseAxisItem.h b/GUI/coregui/Models/PointwiseAxisItem.h
index 8f73f2bf9f9..1b4cd6bde9a 100644
--- a/GUI/coregui/Models/PointwiseAxisItem.h
+++ b/GUI/coregui/Models/PointwiseAxisItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POINTWISEAXISITEM_H
-#define POINTWISEAXISITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_POINTWISEAXISITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_POINTWISEAXISITEM_H
 
 #include "GUI/coregui/Models/AxesItems.h"
 #include "GUI/coregui/mainwindow/SaveLoadInterface.h"
@@ -58,4 +58,4 @@ private:
     QDateTime m_last_modified;
 };
 
-#endif // POINTWISEAXISITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_POINTWISEAXISITEM_H
diff --git a/GUI/coregui/Models/ProjectionItems.h b/GUI/coregui/Models/ProjectionItems.h
index 2a568511393..1106868644a 100644
--- a/GUI/coregui/Models/ProjectionItems.h
+++ b/GUI/coregui/Models/ProjectionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONITEMS_H
-#define PROJECTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PROJECTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PROJECTIONITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -25,4 +25,4 @@ public:
     ProjectionContainerItem();
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PROJECTIONITEMS_H
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/coregui/Models/PropertyItem.h
index 36788676416..671c5bc1c11 100644
--- a/GUI/coregui/Models/PropertyItem.h
+++ b/GUI/coregui/Models/PropertyItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROPERTYITEM_H
-#define PROPERTYITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PROPERTYITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PROPERTYITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -24,4 +24,4 @@ public:
     PropertyItem();
 };
 
-#endif // PROPERTYITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PROPERTYITEM_H
diff --git a/GUI/coregui/Models/ProxyModelStrategy.h b/GUI/coregui/Models/ProxyModelStrategy.h
index c9b8c530c2f..ab094112441 100644
--- a/GUI/coregui/Models/ProxyModelStrategy.h
+++ b/GUI/coregui/Models/ProxyModelStrategy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROXYMODELSTRATEGY_H
-#define PROXYMODELSTRATEGY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_PROXYMODELSTRATEGY_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_PROXYMODELSTRATEGY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QPersistentModelIndex>
@@ -62,4 +62,4 @@ protected:
     bool processSourceIndex(const QModelIndex& index);
 };
 
-#endif // ProxyModelStrategy
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_PROXYMODELSTRATEGY_H
diff --git a/GUI/coregui/Models/RealDataItem.h b/GUI/coregui/Models/RealDataItem.h
index 650447187f1..a7975ceced5 100644
--- a/GUI/coregui/Models/RealDataItem.h
+++ b/GUI/coregui/Models/RealDataItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAITEM_H
-#define REALDATAITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_REALDATAITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_REALDATAITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -68,4 +68,4 @@ private:
     const InstrumentItem* m_linkedInstrument;
 };
 
-#endif // REALDATAITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_REALDATAITEM_H
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/coregui/Models/RealDataModel.h
index 77a70dec959..3b9daab8bc1 100644
--- a/GUI/coregui/Models/RealDataModel.h
+++ b/GUI/coregui/Models/RealDataModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAMODEL_H
-#define REALDATAMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_REALDATAMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_REALDATAMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 
@@ -30,4 +30,4 @@ public:
     QVector<SessionItem*> nonXMLData() const override;
 };
 
-#endif // REALDATAMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_REALDATAMODEL_H
diff --git a/GUI/coregui/Models/RealLimitsItems.h b/GUI/coregui/Models/RealLimitsItems.h
index 4071f21cf21..d8304e89957 100644
--- a/GUI/coregui/Models/RealLimitsItems.h
+++ b/GUI/coregui/Models/RealLimitsItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALLIMITSITEMS_H
-#define REALLIMITSITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_REALLIMITSITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_REALLIMITSITEMS_H
 
 #include "Fit/Tools/RealLimits.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -70,4 +70,4 @@ public:
     RealLimits createRealLimits(double scale_factor = 1.0) const;
 };
 
-#endif // REALLIMITSITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_REALLIMITSITEMS_H
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index 5a387f60a7c..80e8452c2dc 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGULARDETECTORITEM_H
-#define RECTANGULARDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_RECTANGULARDETECTORITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_RECTANGULARDETECTORITEM_H
 
 #include "Core/Vector/Vectors3D.h"
 #include "GUI/coregui/Models/DetectorItems.h"
@@ -50,4 +50,4 @@ private:
     bool m_is_constructed;
 };
 
-#endif // RECTANGULARDETECTORITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_RECTANGULARDETECTORITEM_H
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/coregui/Models/ResolutionFunctionItems.h
index d68eb6d5658..4a73c711ef7 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.h
+++ b/GUI/coregui/Models/ResolutionFunctionItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RESOLUTIONFUNCTIONITEMS_H
-#define RESOLUTIONFUNCTIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_RESOLUTIONFUNCTIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_RESOLUTIONFUNCTIONITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 #include <memory>
@@ -49,4 +49,4 @@ public:
     std::unique_ptr<IResolutionFunction2D> createResolutionFunction(double scale = 1.0) const;
 };
 
-#endif // RESOLUTIONFUNCTIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_RESOLUTIONFUNCTIONITEMS_H
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index 67dfe434f56..2c743646d16 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ROTATIONITEMS_H
-#define ROTATIONITEMS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ROTATIONITEMS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ROTATIONITEMS_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 #include "Wrap/WinDllMacros.h"
@@ -61,4 +61,4 @@ public:
     std::unique_ptr<IRotation> createRotation() const;
 };
 
-#endif // ROTATIONITEMS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ROTATIONITEMS_H
diff --git a/GUI/coregui/Models/SampleModel.h b/GUI/coregui/Models/SampleModel.h
index c72a39ef480..74482e01fe4 100644
--- a/GUI/coregui/Models/SampleModel.h
+++ b/GUI/coregui/Models/SampleModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEMODEL_H
-#define SAMPLEMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEMODEL_H
 
 #include "GUI/coregui/Models/SessionModel.h"
 
@@ -33,4 +33,4 @@ public:
     MultiLayerItem* multiLayerItem();
 };
 
-#endif // SAMPLEMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEMODEL_H
diff --git a/GUI/coregui/Models/SampleValidator.h b/GUI/coregui/Models/SampleValidator.h
index 0c0395048e1..77d87d3bc64 100644
--- a/GUI/coregui/Models/SampleValidator.h
+++ b/GUI/coregui/Models/SampleValidator.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVALIDATOR_H
-#define SAMPLEVALIDATOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEVALIDATOR_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEVALIDATOR_H
 
 #include <QModelIndex>
 
@@ -46,4 +46,4 @@ private:
     QString m_validation_message;
 };
 
-#endif // SAMPLEVALIDATOR_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SAMPLEVALIDATOR_H
diff --git a/GUI/coregui/Models/SessionDecorationModel.h b/GUI/coregui/Models/SessionDecorationModel.h
index e43b77ed709..9a90f32ad93 100644
--- a/GUI/coregui/Models/SessionDecorationModel.h
+++ b/GUI/coregui/Models/SessionDecorationModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONDECORATIONMODEL_H
-#define SESSIONDECORATIONMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONDECORATIONMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONDECORATIONMODEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QIdentityProxyModel>
@@ -42,4 +42,4 @@ private:
     SessionModel* m_model;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONDECORATIONMODEL_H
diff --git a/GUI/coregui/Models/SessionFlags.h b/GUI/coregui/Models/SessionFlags.h
index 7898124ea81..b5155cbd8a7 100644
--- a/GUI/coregui/Models/SessionFlags.h
+++ b/GUI/coregui/Models/SessionFlags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONFLAGS_H
-#define SESSIONFLAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONFLAGS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONFLAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <qnamespace.h>
@@ -49,4 +49,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ModelColumn)
 Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ItemDataRole)
 Q_DECLARE_OPERATORS_FOR_FLAGS(SessionFlags::ItemAppearance)
 
-#endif // SESSIONFLAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONFLAGS_H
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/coregui/Models/SessionGraphicsItem.h
index 4bfa3f243d3..85e9de65f27 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.h
+++ b/GUI/coregui/Models/SessionGraphicsItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONGRAPHICSITEM_H
-#define SESSIONGRAPHICSITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONGRAPHICSITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONGRAPHICSITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 
@@ -28,4 +28,4 @@ protected:
     explicit SessionGraphicsItem(const QString& model_type = QString());
 };
 
-#endif // SESSIONGRAPHICSITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONGRAPHICSITEM_H
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index 65da9b9e82b..f8043120c53 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEM_H
-#define SESSIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEM_H
 
 #include "Fit/Tools/RealLimits.h"
 #include "GUI/coregui/Models/ModelMapper.h"
@@ -153,4 +153,4 @@ template <typename T> T& SessionItem::groupItem(const QString& groupName) const
     return *t;
 }
 
-#endif // SESSIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEM_H
diff --git a/GUI/coregui/Models/SessionItemData.h b/GUI/coregui/Models/SessionItemData.h
index 67854fce1e6..977880754d3 100644
--- a/GUI/coregui/Models/SessionItemData.h
+++ b/GUI/coregui/Models/SessionItemData.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEMDATA_H
-#define SESSIONITEMDATA_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMDATA_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMDATA_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QVariant>
@@ -43,4 +43,4 @@ private:
     QVector<ItemData> m_values;
 };
 
-#endif //   SESSIONITEMDATA_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMDATA_H
diff --git a/GUI/coregui/Models/SessionItemTags.h b/GUI/coregui/Models/SessionItemTags.h
index 6c4c1c5095a..ca24a8d556f 100644
--- a/GUI/coregui/Models/SessionItemTags.h
+++ b/GUI/coregui/Models/SessionItemTags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEMTAGS_H
-#define SESSIONITEMTAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMTAGS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMTAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -66,4 +66,4 @@ private:
     QVector<TagInfo> m_tags;
 };
 
-#endif //  SESSIONITEMTAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMTAGS_H
diff --git a/GUI/coregui/Models/SessionItemUtils.h b/GUI/coregui/Models/SessionItemUtils.h
index 7d12203a6ff..9ec9c5a933b 100644
--- a/GUI/coregui/Models/SessionItemUtils.h
+++ b/GUI/coregui/Models/SessionItemUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEMUTILS_H
-#define SESSIONITEMUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMUTILS_H
 
 #include "Core/Vector/Vectors3D.h"
 #include "Wrap/WinDllMacros.h"
@@ -75,4 +75,4 @@ BA_CORE_API_ bool HasOwnAbundance(const SessionItem* item);
 
 } // namespace SessionItemUtils
 
-#endif // SESSIONITEMUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONITEMUTILS_H
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index 1920e23a67c..258ef6ed635 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONMODEL_H
-#define SESSIONMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODEL_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODEL_H
 
 #include "GUI/coregui/Models/SessionFlags.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -154,4 +154,4 @@ inline void SessionModel::setDraggedItemType(const QString& type)
     m_dragged_item_type = type;
 }
 
-#endif // SESSIONMODEL_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODEL_H
diff --git a/GUI/coregui/Models/SessionModelDelegate.h b/GUI/coregui/Models/SessionModelDelegate.h
index 9372b980fe2..f360ba95100 100644
--- a/GUI/coregui/Models/SessionModelDelegate.h
+++ b/GUI/coregui/Models/SessionModelDelegate.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONMODELDELEGATE_H
-#define SESSIONMODELDELEGATE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODELDELEGATE_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODELDELEGATE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QStyledItemDelegate>
@@ -51,4 +51,4 @@ private:
                           const QModelIndex& index, const QString& text) const;
 };
 
-#endif // SESSIONMODELDELEGATE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONMODELDELEGATE_H
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index e3edbf43577..b3392af4c2d 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONXML_H
-#define SESSIONXML_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SESSIONXML_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SESSIONXML_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QVariant>
@@ -62,4 +62,4 @@ BA_CORE_API_ QString readProperty(QXmlStreamReader* reader, SessionItem* item,
                                   MessageService* messageService = nullptr);
 } // namespace SessionXML
 
-#endif // SESSIONXML_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONXML_H
diff --git a/GUI/coregui/Models/SimulationOptionsItem.h b/GUI/coregui/Models/SimulationOptionsItem.h
index 2a1764aa30b..043e5e815e6 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.h
+++ b/GUI/coregui/Models/SimulationOptionsItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONOPTIONSITEM_H
-#define SIMULATIONOPTIONSITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SIMULATIONOPTIONSITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SIMULATIONOPTIONSITEM_H
 
 #include "GUI/coregui/Models/SessionItem.h"
 #include <QMap>
@@ -60,4 +60,4 @@ private:
     QMap<QString, int> m_text_to_nthreads;
 };
 
-#endif // SIMULATIONOPTIONSITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SIMULATIONOPTIONSITEM_H
diff --git a/GUI/coregui/Models/SpecularBeamInclinationItem.h b/GUI/coregui/Models/SpecularBeamInclinationItem.h
index 9670531f33d..86c93fd02a8 100644
--- a/GUI/coregui/Models/SpecularBeamInclinationItem.h
+++ b/GUI/coregui/Models/SpecularBeamInclinationItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARBEAMINCLINATIONITEM_H
-#define SPECULARBEAMINCLINATIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SPECULARBEAMINCLINATIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SPECULARBEAMINCLINATIONITEM_H
 
 #include "GUI/coregui/Models/BeamDistributionItem.h"
 
@@ -39,4 +39,4 @@ private:
     static const bool m_show_mean = false;
 };
 
-#endif // SPECULARBEAMINCLINATIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SPECULARBEAMINCLINATIONITEM_H
diff --git a/GUI/coregui/Models/SpecularDataItem.h b/GUI/coregui/Models/SpecularDataItem.h
index 8131846e961..c60d6a4cbee 100644
--- a/GUI/coregui/Models/SpecularDataItem.h
+++ b/GUI/coregui/Models/SpecularDataItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARDATAITEM_H
-#define SPECULARDATAITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SPECULARDATAITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SPECULARDATAITEM_H
 
 #include "GUI/coregui/Models/DataItem.h"
 
@@ -89,4 +89,4 @@ private:
     void updateAxesZoomLevel();
 };
 
-#endif // SPECULARDATAITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SPECULARDATAITEM_H
diff --git a/GUI/coregui/Models/SphericalDetectorItem.h b/GUI/coregui/Models/SphericalDetectorItem.h
index c402c4c07da..f19109ab28b 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.h
+++ b/GUI/coregui/Models/SphericalDetectorItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPHERICALDETECTORITEM_H
-#define SPHERICALDETECTORITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_SPHERICALDETECTORITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_SPHERICALDETECTORITEM_H
 
 #include "GUI/coregui/Models/DetectorItems.h"
 
@@ -34,4 +34,4 @@ protected:
     double axesToDomainUnitsFactor() const override;
 };
 
-#endif // SPHERICALDETECTORITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_SPHERICALDETECTORITEM_H
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/coregui/Models/TransformFromDomain.h
index e363d9c21c4..315613c0024 100644
--- a/GUI/coregui/Models/TransformFromDomain.h
+++ b/GUI/coregui/Models/TransformFromDomain.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMFROMDOMAIN_H
-#define TRANSFORMFROMDOMAIN_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMFROMDOMAIN_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMFROMDOMAIN_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -116,4 +116,4 @@ BA_CORE_API_ void setAxisItem(SessionItem* item, const IAxis& axis, double facto
 
 } // namespace TransformFromDomain
 
-#endif // TRANSFORMFROMDOMAIN_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMFROMDOMAIN_H
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 5d69a9c3fdf..0c14914124c 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMTODOMAIN_H
-#define TRANSFORMTODOMAIN_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMTODOMAIN_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMTODOMAIN_H
 
 #include "Core/Aggregate/IInterferenceFunction.h"
 #include "Core/Aggregate/ParticleLayout.h"
@@ -60,4 +60,4 @@ BA_CORE_API_ void setPositionInfo(IParticle* result, const SessionItem& item);
 BA_CORE_API_ void setRotationInfo(IParticle* result, const SessionItem& item);
 } // namespace TransformToDomain
 
-#endif // TRANSFORMTODOMAIN_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMTODOMAIN_H
diff --git a/GUI/coregui/Models/TransformationItem.h b/GUI/coregui/Models/TransformationItem.h
index 4f9eb9d23c9..b7b08d55f35 100644
--- a/GUI/coregui/Models/TransformationItem.h
+++ b/GUI/coregui/Models/TransformationItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMATIONITEM_H
-#define TRANSFORMATIONITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMATIONITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMATIONITEM_H
 
 #include "GUI/coregui/Models/SessionGraphicsItem.h"
 
@@ -24,4 +24,4 @@ public:
     TransformationItem();
 };
 
-#endif // TRANSFORMATIONITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_TRANSFORMATIONITEM_H
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index 082c4c60a1b..bb104431821 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef VECTORITEM_H
-#define VECTORITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_VECTORITEM_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_VECTORITEM_H
 
 #include "Core/Vector/Vectors3D.h"
 #include "GUI/coregui/Models/SessionItem.h"
@@ -33,4 +33,4 @@ private:
     void updateLabel();
 };
 
-#endif // VECTORITEM_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_VECTORITEM_H
diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h
index c4e16c9e06d..75ef1b6f4df 100644
--- a/GUI/coregui/Models/item_constants.h
+++ b/GUI/coregui/Models/item_constants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEM_CONSTANTS_H
-#define ITEM_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEM_CONSTANTS_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ITEM_CONSTANTS_H
 
 #include <QString>
 
@@ -312,4 +312,4 @@ const QString MultiSelectionComboEditorType = "MultiSelectionComboEditor";
 
 } // namespace Constants
 
-#endif // ITEM_CONSTANTS_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEM_CONSTANTS_H
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index f9e7e0e4042..c95a5a2f47b 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -28,8 +28,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ACCORDIONWIDGET_H
-#define ACCORDIONWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_ACCORDIONWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_ACCORDIONWIDGET_H
 
 #include "GUI/coregui/Views/AccordionWidget/ClickableFrame.h"
 #include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
@@ -382,4 +382,4 @@ protected:
     void paintEvent(ATTR_UNUSED QPaintEvent* event);
 };
 
-#endif // ACCORDIONWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_ACCORDIONWIDGET_H
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index dcd551fef9a..cdf2e2b978e 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
@@ -28,8 +28,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef CLICKABLEFRAME_H
-#define CLICKABLEFRAME_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFrame>
@@ -171,4 +171,4 @@ protected:
     void leaveEvent(QEvent* event);
 };
 
-#endif // CLICKABLEFRAME_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CLICKABLEFRAME_H
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index 1236fc69641..f2f283cf5d2 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -28,8 +28,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef CONTENTPANE_H
-#define CONTENTPANE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CONTENTPANE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CONTENTPANE_H
 
 #include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
 #include "GUI/coregui/Views/AccordionWidget/ClickableFrame.h"
@@ -331,4 +331,4 @@ protected:
     void paintEvent(ATTR_UNUSED QPaintEvent* event);
 };
 
-#endif // CONTENTPANE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CONTENTPANE_H
diff --git a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
index 4c491387397..909b4253341 100644
--- a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
+++ b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ADJUSTINGSCROLLAREA_H
-#define ADJUSTINGSCROLLAREA_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QScrollArea>
@@ -35,4 +35,4 @@ private:
     bool eventFilter(QObject* obj, QEvent* ev);
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ADJUSTINGSCROLLAREA_H
diff --git a/GUI/coregui/Views/CommonWidgets/ColumnResizer.h b/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
index 55ff3186c45..fe2968f2c9a 100644
--- a/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
+++ b/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
@@ -19,8 +19,8 @@
  * https://github.com/agateau/columnresizer
  */
 
-#ifndef COLUMNRESIZER_H
-#define COLUMNRESIZER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_COLUMNRESIZER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_COLUMNRESIZER_H
 
 #include <QFormLayout>
 #include <QList>
@@ -59,4 +59,4 @@ private:
     ColumnResizerPrivate* const d;
 };
 
-#endif // COLUMNRESIZER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_COLUMNRESIZER_H
diff --git a/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h b/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h
index 14d904c45d2..2c0e4894cd9 100644
--- a/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h
+++ b/GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOCKWIDGETINFO_H
-#define DOCKWIDGETINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <qnamespace.h>
@@ -39,4 +39,4 @@ private:
     Qt::DockWidgetArea m_area;
 };
 
-#endif //  DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKWIDGETINFO_H
diff --git a/GUI/coregui/Views/CommonWidgets/DocksController.h b/GUI/coregui/Views/CommonWidgets/DocksController.h
index b4dd7ba519c..2b480e8f51b 100644
--- a/GUI/coregui/Views/CommonWidgets/DocksController.h
+++ b/GUI/coregui/Views/CommonWidgets/DocksController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DOCKSCONTROLLER_H
-#define DOCKSCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
 
 #include "GUI/coregui/Views/CommonWidgets/DockWidgetInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -68,4 +68,4 @@ private:
     DockSizeInfo m_dock_info;
 };
 
-#endif //  DOCKSCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DOCKSCONTROLLER_H
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.h b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
index d64686bc92d..ae3e0c87108 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INFOPANEL_H
-#define INFOPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFrame>
@@ -54,4 +54,4 @@ protected:
     int m_cached_height;
 };
 
-#endif // INFOPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANEL_H
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
index 2d022982e03..03de654c01a 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INFOPANELTOOLBAR_H
-#define INFOPANELTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 
@@ -44,4 +44,4 @@ private:
     bool m_expanded;
 };
 
-#endif // INFOPANELTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_INFOPANELTOOLBAR_H
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
index 5957a6d15ca..8e484db51c9 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMCOMBOTOOLBAR_H
-#define ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 #include <QList>
@@ -52,4 +52,4 @@ private:
     QAction* m_comboBoxAction;
 };
 
-#endif // ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
index 0710b46b036..8755689c488 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMCOMBOWIDGET_H
-#define ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
 
 #include "Core/StandardSamples/IFactory.h"
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
@@ -70,4 +70,4 @@ private:
     QMap<QString, SessionItemWidget*> m_presentationTypeToWidget;
 };
 
-#endif // ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMCOMBOWIDGET_H
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
index 4bb83e8fa65..9e3f09ecf98 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMSELECTORWIDGET_H
-#define ITEMSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QItemSelectionModel>
@@ -71,4 +71,4 @@ protected:
     std::unique_ptr<SessionDecorationModel> m_decorationModel;
 };
 
-#endif // ITEMSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSELECTORWIDGET_H
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index 6b3a857ecc3..f3492b96b97 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMSTACKPRESENTER_H
-#define ITEMSTACKPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackWidget.h"
 #include <QDebug>
@@ -133,4 +133,4 @@ template <class T> void ItemStackPresenter<T>::removeWidgets()
     m_itemToWidget.clear();
 }
 
-#endif // ITEMSTACKPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKPRESENTER_H
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
index 50cd3b44f4c..a44c8d52f05 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMSTACKWIDGET_H
-#define ITEMSTACKWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -58,4 +58,4 @@ protected:
     QSize m_size_hint;
 };
 
-#endif // ITEMSTACKWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_ITEMSTACKWIDGET_H
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.h b/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
index 45769b3c882..ce3619975f6 100644
--- a/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
+++ b/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MODELTREEVIEW_H
-#define MODELTREEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -45,4 +45,4 @@ private:
     bool m_is_expanded;
 };
 
-#endif // MODELTREEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_MODELTREEVIEW_H
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.h b/GUI/coregui/Views/CommonWidgets/SessionItemController.h
index 9e31adf511f..1df4de7a1fb 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemController.h
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEMCONTROLLER_H
-#define SESSIONITEMCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -55,4 +55,4 @@ private:
     bool m_parent_subscribed;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMCONTROLLER_H
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
index b88308a2249..2ed4982c4c1 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONITEMWIDGET_H
-#define SESSIONITEMWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -51,4 +51,4 @@ private:
     SessionItemController* m_itemController;
 };
 
-#endif // SESSIONITEMWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_SESSIONITEMWIDGET_H
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.h b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
index ae853fbc35a..27f1764b2c6 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.h
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STATUSLABEL_H
-#define STATUSLABEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFrame>
@@ -47,4 +47,4 @@ private:
     QFont m_font;
 };
 
-#endif // STATUSLABEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_STATUSLABEL_H
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
index f109ea0f63f..ad72c974c08 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UPDATETIMER_H
-#define UPDATETIMER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -51,4 +51,4 @@ private:
     QTimer* m_timer;
 };
 
-#endif // UPDATETIMER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_UPDATETIMER_H
diff --git a/GUI/coregui/Views/CommonWidgets/detailsbutton.h b/GUI/coregui/Views/CommonWidgets/detailsbutton.h
index 8478e650255..cef6a2a284e 100644
--- a/GUI/coregui/Views/CommonWidgets/detailsbutton.h
+++ b/GUI/coregui/Views/CommonWidgets/detailsbutton.h
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef DETAILSBUTTON_H
-#define DETAILSBUTTON_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
 
 #include <QAbstractButton>
 
@@ -83,4 +83,4 @@ private:
 };
 } // namespace Utils
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSBUTTON_H
diff --git a/GUI/coregui/Views/CommonWidgets/detailswidget.h b/GUI/coregui/Views/CommonWidgets/detailswidget.h
index fbde34dde3f..caa9d58fe25 100644
--- a/GUI/coregui/Views/CommonWidgets/detailswidget.h
+++ b/GUI/coregui/Views/CommonWidgets/detailswidget.h
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef DETAILSWIDGET_H
-#define DETAILSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -98,4 +98,4 @@ private:
 
 } // namespace Utils
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_COMMONWIDGETS_DETAILSWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
index a3572e48c70..1d2e3952c36 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITACTIVITYPANEL_H
-#define FITACTIVITYPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h"
 #include <QWidget>
@@ -55,4 +55,4 @@ private:
     FitSessionManager* m_fitSessionManager;
 };
 
-#endif // FITACTIVITYPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITACTIVITYPANEL_H
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.h b/GUI/coregui/Views/FitWidgets/FitComparisonController.h
index 558f3160da0..3522aab0809 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonController.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITCOMPARISONCONTROLLER_H
-#define FITCOMPARISONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -51,4 +51,4 @@ private:
     PropertyRepeater* m_zAxisRepeater;
 };
 
-#endif // FITCOMPARISONCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.h b/GUI/coregui/Views/FitWidgets/FitComparisonViewController.h
index d0944b28077..d718acbd3d3 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonViewController.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonViewController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITCOMPARISONVIEWCONTROLLER_H
-#define FITCOMPARISONVIEWCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -66,4 +66,4 @@ private:
     PropertyRepeater* m_xAxisRepeater;
 };
 
-#endif // FITCOMPARISONVIEWCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
index b538c09757a..fe67ded37d0 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITCOMPARISONWIDGET_H
-#define FITCOMPARISONWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include <QMap>
@@ -66,4 +66,4 @@ private:
     FitComparisonController2D* m_comparisonController;
 };
 
-#endif // FITCOMPARISONWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h
index 788699d3720..788dc2212d8 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITCOMPARISONWIDGET1D_NEW_H
-#define FITCOMPARISONWIDGET1D_NEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -59,4 +59,4 @@ private:
     FitComparison1DViewController* m_comparisonController;
 };
 
-#endif // FITCOMPARISONWIDGET1D_NEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
index a6741cea09a..7a603899bd6 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITFLOWWIDGET_H
-#define FITFLOWWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -41,4 +41,4 @@ private:
     QVector<double> m_y;
 };
 
-#endif // FITFLOWWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitLog.h b/GUI/coregui/Views/FitWidgets/FitLog.h
index b2d15219166..084749a017f 100644
--- a/GUI/coregui/Views/FitWidgets/FitLog.h
+++ b/GUI/coregui/Views/FitWidgets/FitLog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITLOG_H
-#define FITLOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOG_H
 
 #include "GUI/coregui/Views/FitWidgets/FitLogFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -41,4 +41,4 @@ private:
     JobMessagePanel* m_messagePanel;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOG_H
diff --git a/GUI/coregui/Views/FitWidgets/FitLogFlags.h b/GUI/coregui/Views/FitWidgets/FitLogFlags.h
index e1b8858678d..74225a7ce42 100644
--- a/GUI/coregui/Views/FitWidgets/FitLogFlags.h
+++ b/GUI/coregui/Views/FitWidgets/FitLogFlags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITLOGFLAGS_H
-#define FITLOGFLAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOGFLAGS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOGFLAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QColor>
@@ -32,4 +32,4 @@ public:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(FitLogFlags::MessageType)
 
-#endif //  PROJECTFLAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITLOGFLAGS_H
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h
index 5f9db20cc0a..580feffa373 100644
--- a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h
+++ b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBJECTIVEBUILDER_H
-#define FITOBJECTIVEBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -60,4 +60,4 @@ private:
     std::unique_ptr<FitObjective> m_fit_objective;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITOBJECTIVEBUILDER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
index 68c39b19ff2..e1eb2844099 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPARAMETERWIDGET_H
-#define FITPARAMETERWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include <memory>
@@ -96,4 +96,4 @@ private:
     OverlayLabelController* m_infoLabel;
 };
 
-#endif // FITPARAMETERWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPARAMETERWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
index 56377d0dd0e..b90d1e7edfb 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPROGRESSINFO_H
-#define FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -43,4 +43,4 @@ private:
     std::vector<double> m_sim_values;
 };
 
-#endif // FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITPROGRESSINFO_H
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
index 2331f2a66ea..060f87e8a29 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITRESULTSWIDGET_H
-#define FITRESULTSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -28,4 +28,4 @@ public:
     FitResultsWidget(QWidget* parent = 0);
 };
 
-#endif // FITRESULTSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITRESULTSWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.h b/GUI/coregui/Views/FitWidgets/FitSessionController.h
index d2fea57add7..4b8af2169b7 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionController.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITSESSIONCONTROLLER_H
-#define FITSESSIONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -67,4 +67,4 @@ private:
     bool m_block_progress_update;
 };
 
-#endif // FITSESSIONCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONCONTROLLER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.h b/GUI/coregui/Views/FitWidgets/FitSessionManager.h
index d4f51e7dadd..ae4c84be1f9 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionManager.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionManager.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITSESSIONMANAGEER_H
-#define FITSESSIONMANAGEER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -49,4 +49,4 @@ private:
     QMap<SessionItem*, FitSessionController*> m_item_to_controller;
 };
 
-#endif // FITSESSIONMANAGEER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONMANAGER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.h b/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
index 97682d75720..0e2199c95fb 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITSESSIONWIDGET_H
-#define FITSESSIONWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
 
 #include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -58,4 +58,4 @@ private:
     FitSessionController* m_sessionController;
 };
 
-#endif // FITSUITEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITSESSIONWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/FitWorker.h b/GUI/coregui/Views/FitWidgets/FitWorker.h
index 0d1170ba6ba..c3be80980d1 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorker.h
+++ b/GUI/coregui/Views/FitWidgets/FitWorker.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITWORKER_H
-#define FITWORKER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -47,4 +47,4 @@ private:
     std::shared_ptr<FitObjectiveBuilder> m_fit_objective;
 };
 
-#endif // FITWORKER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKER_H
diff --git a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
index 6a059ca7115..abc1dcbf617 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
+++ b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITWORKERLAUNCHER_H
-#define FITWORKERLAUNCHER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -54,4 +54,4 @@ private:
     int m_duration;
 };
 
-#endif // FITWORKERLAUNCHER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_FITWORKERLAUNCHER_H
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
index 3823bb8c630..80d9e40f67e 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIFITOBSERVER_H
-#define GUIFITOBSERVER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
 
 #include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
 #include <QObject>
@@ -58,4 +58,4 @@ private:
     FitProgressInfo m_iteration_info;
 };
 
-#endif // GUIFITOBSERVER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_GUIFITOBSERVER_H
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.h b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
index 1c5c6be8dc2..6b472a28c27 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.h
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HISTOGRAMPLOT_H
-#define HISTOGRAMPLOT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
 
 #include "Wrap/WinDllMacros.h"
 #include "qcustomplot.h"
@@ -37,4 +37,4 @@ private:
     QCustomPlot* m_customPlot;
 };
 
-#endif // HISTOGRAMPLOT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
index bf4c96c2c98..f61e33f2820 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERSETTINGSWIDGET_H
-#define MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -43,4 +43,4 @@ private:
     ComponentEditor* m_componentEditor;
 };
 
-#endif // MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
index 9da3bf96366..2463cda89ef 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RUNFITCONTROLWIDGET_H
-#define RUNFITCONTROLWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include <QWidget>
@@ -68,4 +68,4 @@ private:
     WarningSign* m_warningSign;
 };
 
-#endif // RUNFITCONTROLWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_RUNFITCONTROLWIDGET_H
diff --git a/GUI/coregui/Views/FitWidgets/plot_constants.h b/GUI/coregui/Views/FitWidgets/plot_constants.h
index 02ba37a4be1..9351113125a 100644
--- a/GUI/coregui/Views/FitWidgets/plot_constants.h
+++ b/GUI/coregui/Views/FitWidgets/plot_constants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLOT_CONSTANTS_H
-#define PLOT_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_PLOT_CONSTANTS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_PLOT_CONSTANTS_H
 
 #include "GUI/coregui/utils/StyleUtils.h"
 #include <QSize>
@@ -38,4 +38,4 @@ inline int plot_colorbar_size()
 
 } // namespace Constants
 
-#endif // PLOT_CONSTANTS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_FITWIDGETS_PLOT_CONSTANTS_H
diff --git a/GUI/coregui/Views/ImportDataView.h b/GUI/coregui/Views/ImportDataView.h
index c27724d61ad..70cbb92d68e 100644
--- a/GUI/coregui/Views/ImportDataView.h
+++ b/GUI/coregui/Views/ImportDataView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMPORTDATAVIEW_H
-#define IMPORTDATAVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAVIEW_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h"
 #include "GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h"
@@ -46,4 +46,4 @@ private:
     RealDataModel* m_realDataModel;
 };
 
-#endif // IMPORTDATAVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAVIEW_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
index 8b95c54f9fd..c2675116982 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVDATACOLUMN_H
-#define CSVDATACOLUMN_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVDATACOLUMN_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVDATACOLUMN_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
@@ -66,4 +66,4 @@ private:
     csv::ColumnType m_name;
 };
 
-#endif // CSVDATACOLUMN_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVDATACOLUMN_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
index 072003346cc..fd7fc23f1ee 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVIMPORTASSISTANT_H
-#define CSVIMPORTASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTASSISTANT_H
 
 #include "Core/InputOutput/DataFormatUtils.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h"
@@ -86,4 +86,4 @@ private:
     AxesUnits m_units;
     bool m_dataAvailable;
 };
-#endif // CSVIMPORTASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTASSISTANT_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
index 08e88f9cd04..f115d4cc0f7 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVIMPORTTABLE_H
-#define CSVIMPORTTABLE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTTABLE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTTABLE_H
 
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
@@ -117,4 +117,4 @@ private:
     bool m_data_is_suitable;
 };
 
-#endif // CSVIMPORTTABLE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVIMPORTTABLE_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
index b06eab18178..2290584bbd9 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVNAMESPACE_H
-#define CSVNAMESPACE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVNAMESPACE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVNAMESPACE_H
 
 #include <QString>
 #include <QStringList>
@@ -30,4 +30,4 @@ typedef std::vector<std::string> DataColumn;
 bool isAscii(QString filename);
 } // namespace csv
 
-#endif // CSVNAMESPACE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVNAMESPACE_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
index 749ca2a2cd9..66fe4edcfac 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvReader.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVREADER_H
-#define CSVREADER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVREADER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVREADER_H
 
 #include <algorithm>
 #include <fstream>
@@ -124,4 +124,4 @@ private:
     std::vector<std::vector<std::string>> m_data;
 };
 
-#endif // CSVREADER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_CSVREADER_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
index 2a1c7024b48..c8b6604e9ab 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DATASELECTOR_H
-#define DATASELECTOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_DATASELECTOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_DATASELECTOR_H
 
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvDataColumn.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
@@ -92,4 +92,4 @@ private:
     QPushButton* m_cancelButton;
     QLabel* m_errorLabel;
 };
-#endif // DATASELECTOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_DATASELECTOR_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
index 13f0d999ac6..37700643c54 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TABLECONTEXTMENU_H
-#define TABLECONTEXTMENU_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_TABLECONTEXTMENU_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_TABLECONTEXTMENU_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
@@ -47,4 +47,4 @@ private:
     QAction* m_discardRow;
 };
 
-#endif // TABLECONTEXTMENU_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_CSVIMPORTASSISTANT_TABLECONTEXTMENU_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h b/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h
index abf5272d545..8bd3cbbb937 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMPORTDATAUTILS_H
-#define IMPORTDATAUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
 
 #include "GUI/coregui/utils/ImportDataInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -50,4 +50,4 @@ BA_CORE_API_ QString printShapeMessage(const std::vector<int>& instrument_shape,
                                        const std::vector<int>& data_shape);
 }; // namespace ImportDataUtils
 
-#endif // IMPORTDATAUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
index 68d842f27b6..613684d0e0b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LINKINSTRUMENTMANAGER_H
-#define LINKINSTRUMENTMANAGER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_LINKINSTRUMENTMANAGER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_LINKINSTRUMENTMANAGER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QList>
@@ -82,4 +82,4 @@ private:
     QVector<InstrumentInfo> m_instrumentVec;
 };
 
-#endif // LINKINSTRUMENTMANAGER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_LINKINSTRUMENTMANAGER_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
index c452af0cb83..f1a417bbdb4 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAMASKWIDGET_H
-#define REALDATAMASKWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -45,4 +45,4 @@ private:
     MaskEditor* m_maskEditor;
 };
 
-#endif // REALDATAMASKWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAMASKWIDGET_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
index 7ec292899ba..ae798c59477 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAPRESENTER_H
-#define REALDATAPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
 
@@ -35,4 +35,4 @@ protected:
     QStringList activePresentationList(SessionItem* item);
 };
 
-#endif // REALDATAPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPRESENTER_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
index a57a5b63cc4..c978fde6566 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATAPROPERTIESWIDGET_H
-#define REALDATAPROPERTIESWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -63,4 +63,4 @@ private:
     RealDataItem* m_currentDataItem;
 };
 
-#endif // REALDATAPROPERTIESWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATAPROPERTIESWIDGET_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
index 910b5608c8d..87cbba38143 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATASELECTORACTIONS_H
-#define REALDATASELECTORACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -54,4 +54,4 @@ private:
     QItemSelectionModel* m_selectionModel;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORACTIONS_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h
index 73ecd6d5061..3b57f1d3dfe 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorHBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATASELECTORHBAR_H
-#define REALDATASELECTORHBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORHBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORHBAR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QToolBar>
@@ -37,4 +37,4 @@ private:
     RealDataSelectorActions* m_actions;
 };
 
-#endif // REALDATASELECTORHBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORHBAR_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
index 5867677bbd5..ce93ef737ff 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATASELECTORTOOLBAR_H
-#define REALDATASELECTORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORTOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 
@@ -35,4 +35,4 @@ private:
     QToolButton* m_removeDataButton;
 };
 
-#endif // REALDATASELECTORTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORTOOLBAR_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
index 3673c3d809f..a9828e26485 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALDATASELECTORWIDGET_H
-#define REALDATASELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -63,4 +63,4 @@ private:
     RealDataPropertiesWidget* m_propertiesWidget;
 };
 
-#endif // REALDATASELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_IMPORTDATAWIDGETS_REALDATASELECTORWIDGET_H
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
index 17ff25b3aff..d2a7a462e9e 100644
--- a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMBOSELECTORDIALOG_H
-#define COMBOSELECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -47,4 +47,4 @@ private:
     QLabel* m_bottomLabel;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_COMBOSELECTORDIALOG_H
diff --git a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
index fbb3f5fde6b..e55b7f404a2 100644
--- a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
+++ b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETAILEDMESSAGEBOX_H
-#define DETAILEDMESSAGEBOX_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -45,4 +45,4 @@ private:
     QTextEdit* m_textEdit;
 };
 
-#endif // DETAILEDMESSAGEBOX_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DETAILEDMESSAGEBOX_H
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
index 45627a3a79a..7d5d7809ce9 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONDIALOG_H
-#define DISTRIBUTIONDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONDIALOG_H
 
 #include <QDialog>
 class DistributionEditor;
@@ -35,4 +35,4 @@ private:
     DistributionEditor* m_editor;
 };
 
-#endif // DISTRIBUTIONDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONDIALOG_H
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
index 04772c7221a..6004c9b9354 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONEDITOR_H
-#define DISTRIBUTIONEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -49,4 +49,4 @@ private:
     QGroupBox* m_box;
 };
 
-#endif // DISTRIBUTIONEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONEDITOR_H
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
index 0fb57ed8245..aac99c4fe8f 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONWIDGET_H
-#define DISTRIBUTIONWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONWIDGET_H
 
 #include "qcustomplot.h"
 #include <QWidget>
@@ -67,4 +67,4 @@ private:
     WarningSign* m_warningSign;
 };
 
-#endif // DISTRIBUTIONWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_DISTRIBUTIONWIDGET_H
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
index 304a6d061ee..c4418a237b5 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GROUPINFOBOX_H
-#define GROUPINFOBOX_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_GROUPINFOBOX_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_GROUPINFOBOX_H
 
 #include <QGroupBox>
 
@@ -42,4 +42,4 @@ private:
     int m_yImage;
 };
 
-#endif // GROUPINFOBOX_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_GROUPINFOBOX_H
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
index 8b30ae8b5a1..85fda0a6b0a 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OVERLAYLABELCONTROLLER_H
-#define OVERLAYLABELCONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -48,4 +48,4 @@ private:
     QString m_text;
 };
 
-#endif // OVERLAYLABELCONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELCONTROLLER_H
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
index 2d5612c960d..add2ab425ed 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OVERLAYLABELWIDGET_H
-#define OVERLAYLABELWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QRect>
@@ -42,4 +42,4 @@ private:
     QRect m_bounding_rect;
 };
 
-#endif // OVERLAYLABELWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_OVERLAYLABELWIDGET_H
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
index 0d2fa505dc4..730a5c6fdb9 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTLOADWARNINGDIALOG_H
-#define PROJECTLOADWARNINGDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PROJECTLOADWARNINGDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PROJECTLOADWARNINGDIALOG_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -54,4 +54,4 @@ private:
     QString m_projectDocumentVersion;
 };
 
-#endif // PROJECTLOADWARNINGDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PROJECTLOADWARNINGDIALOG_H
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
index f4d10473504..b500123e66b 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYSAMPLEWIDGET_H
-#define PYSAMPLEWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYSAMPLEWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYSAMPLEWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -62,4 +62,4 @@ private:
     WarningSign* m_warningSign;
 };
 
-#endif // PYSAMPLEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYSAMPLEWIDGET_H
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
index 9862423e835..a9cc419f2c8 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
@@ -35,8 +35,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef PYTHONSYNTAXHIGHLIGHTER_H
-#define PYTHONSYNTAXHIGHLIGHTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
 
 #include <QSyntaxHighlighter>
 
@@ -89,4 +89,4 @@ private:
     QRegExp triDoubleQuote;
 };
 
-#endif // PYTHONSYNTAXHIGHLIGHTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_PYTHONSYNTAXHIGHLIGHTER_H
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.h b/GUI/coregui/Views/InfoWidgets/WarningSign.h
index cac24c4b4eb..b4b909f8e78 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSign.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSign.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef WARNINGSIGN_H
-#define WARNINGSIGN_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGN_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGN_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -52,4 +52,4 @@ private:
     bool m_clear_just_had_happened;
 };
 
-#endif // WARNINGSIGN_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGN_H
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
index 2c315432481..e8d036a8e9f 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef WARNINGSIGNWIDGET_H
-#define WARNINGSIGNWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGNWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGNWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QPixmap>
@@ -42,4 +42,4 @@ private:
     QString m_warning_message;
 };
 
-#endif // WARNINGSIGNWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INFOWIDGETS_WARNINGSIGNWIDGET_H
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/coregui/Views/InstrumentView.h
index 374caf3a4a4..bdda6ec3ed1 100644
--- a/GUI/coregui/Views/InstrumentView.h
+++ b/GUI/coregui/Views/InstrumentView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTVIEW_H
-#define INSTRUMENTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTVIEW_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h"
 #include "Wrap/WinDllMacros.h"
@@ -51,4 +51,4 @@ private:
     InstrumentModel* m_instrumentModel;
 };
 
-#endif // INSTRUMENTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTVIEW_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
index 815767318f3..0a4dd4a7135 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DEPTHPROBEINSTRUMENTEDITOR_H
-#define DEPTHPROBEINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -42,4 +42,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DEPTHPROBEINSTRUMENTEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
index e51a50c27e5..f3d4e3ef1cd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORMASKDELEGATE_H
-#define DETECTORMASKDELEGATE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORMASKDELEGATE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORMASKDELEGATE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QModelIndex>
@@ -48,4 +48,4 @@ private:
     IntensityDataItem* m_intensityItem;
 };
 
-#endif // DETECTORMASKDELEGATE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORMASKDELEGATE_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h b/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h
index 9bcfe48ff14..b29afd3d0ce 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DETECTORPRESENTER_H
-#define DETECTORPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORPRESENTER_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
 
@@ -33,4 +33,4 @@ protected:
     QStringList activePresentationList(SessionItem* item) override;
 };
 
-#endif // DETECTORPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_DETECTORPRESENTER_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h b/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h
index 6fcefb2e591..9a26c187fb4 100644
--- a/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/EnvironmentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ENVIRONMENTEDITOR_H
-#define ENVIRONMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -43,4 +43,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // ENVIRONMENTEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_ENVIRONMENTEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
index 965096b12a1..b7846941358 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef EXTENDEDDETECTORDIALOG_H
-#define EXTENDEDDETECTORDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_EXTENDEDDETECTORDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_EXTENDEDDETECTORDIALOG_H
 
 #include <QDialog>
 
@@ -45,4 +45,4 @@ private:
     DetectorMaskDelegate* m_maskDelegate;
 };
 
-#endif // EXTENDEDDETECTORDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_EXTENDEDDETECTORDIALOG_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h
index a9fb82d9e4c..5f40440d4d2 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GISASBEAMEDITOR_H
-#define GISASBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -49,4 +49,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // GISASBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASBEAMEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h b/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h
index 9b861cc8f0d..0dd8605840c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASDetectorEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GISASDETECTOREDITOR_H
-#define GISASDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASDETECTOREDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASDETECTOREDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -44,4 +44,4 @@ private:
     DetectorPresenter* m_detectorPresenter;
 };
 
-#endif // GISASDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASDETECTOREDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h b/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h
index 15796ea1d16..412763dbbd8 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASInstrumentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GISASINSTRUMENTEDITOR_H
-#define GISASINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -43,4 +43,4 @@ private:
     PolarizationAnalysisEditor* m_polarizationAnalysisEditor;
 };
 
-#endif // GISASINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_GISASINSTRUMENTEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
index 5928b363d79..3c9a80ac3e6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTEDITORWIDGET_H
-#define INSTRUMENTEDITORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITORWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -53,4 +53,4 @@ private:
     bool m_block_signals;
 };
 
-#endif // INSTRUMENTEDITORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTEDITORWIDGET_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h
index 0430fd3dd67..61b3e142f47 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTPRESENTER_H
-#define INSTRUMENTPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTPRESENTER_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
 
@@ -32,4 +32,4 @@ protected:
     QStringList activePresentationList(SessionItem* item) override;
 };
 
-#endif // INSTRUMENTPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTPRESENTER_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
index 81ac8ac9b6d..adb027e631d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTSELECTORWIDGET_H
-#define INSTRUMENTSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTSELECTORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTSELECTORWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
 
@@ -32,4 +32,4 @@ public:
     QSize minimumSizeHint() const;
 };
 
-#endif // INSTRUMENTSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTSELECTORWIDGET_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
index 8e126e475e7..20d3181282a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTVIEWACTIONS_H
-#define INSTRUMENTVIEWACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -60,4 +60,4 @@ private:
     QItemSelectionModel* m_selectionModel;
 };
 
-#endif // INSTRUMENTVIEWACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWACTIONS_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
index a8b4a5907dd..e3d1620b851 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INSTRUMENTVIEWTOOLBAR_H
-#define INSTRUMENTVIEWTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 #include <QList>
@@ -42,4 +42,4 @@ private:
     QMenu* m_addInstrumentMenu;
 };
 
-#endif // INSTRUMENTVIEWTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_INSTRUMENTVIEWTOOLBAR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h
index a8e2147595a..a0ae4d2cfb5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OFFSPECBEAMEDITOR_H
-#define OFFSPECBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECBEAMEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECBEAMEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -49,4 +49,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // OFFSPECBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECBEAMEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h b/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h
index ca6becab0d7..0679107b77f 100644
--- a/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/OffSpecInstrumentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OFFSPECINSTRUMENTEDITOR_H
-#define OFFSPECINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECINSTRUMENTEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -43,4 +43,4 @@ private:
     PolarizationAnalysisEditor* m_polarizationAnalysisEditor;
 };
 
-#endif // OFFSPECINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_OFFSPECINSTRUMENTEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
index 43bf92f4818..57becc4dada 100644
--- a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POLARIZATIONANALYSISEDITOR_H
-#define POLARIZATIONANALYSISEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -51,4 +51,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // POLARIZATIONANALYSISEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_POLARIZATIONANALYSISEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h
index b64207f56e7..93645cd0edd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGULARDETECTOREDITOR_H
-#define RECTANGULARDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 class RectangularDetectorItem;
@@ -50,4 +50,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // RECTANGULARDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_RECTANGULARDETECTOREDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h
index 2f4ef84aa00..a2534fb299e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARBEAMEDITOR_H_
-#define SPECULARBEAMEDITOR_H_
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -48,4 +48,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif /* SPECULARBEAMEDITOR_H_ */
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARBEAMEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h b/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h
index 4e13c8a3882..71a949d727a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SpecularInstrumentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARINSTRUMENTEDITOR_H_
-#define SPECULARINSTRUMENTEDITOR_H_
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -42,4 +42,4 @@ private:
     PolarizationAnalysisEditor* m_polarizationAnalysisEditor;
 };
 
-#endif /* SPECULARINSTRUMENTEDITOR_H_ */
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPECULARINSTRUMENTEDITOR_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h
index 57a71a92ad3..6c3d837c7af 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPHERICALDETECTOREDITOR_H
-#define SPHERICALDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 class SphericalDetectorItem;
@@ -39,4 +39,4 @@ private:
     QGridLayout* m_gridLayout;
 };
 
-#endif // SPHERICALDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INSTRUMENTWIDGETS_SPHERICALDETECTOREDITOR_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
index e2259a6c77b..61065138430 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COLORMAP_H
-#define COLORMAP_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
 
 #include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
 #include "qcustomplot.h"
@@ -107,4 +107,4 @@ private:
     bool m_block_update;
 };
 
-#endif // COLORMAP_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAP_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
index 1a812d57d6d..7e7939e252c 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COLORMAPCANVAS_H
-#define COLORMAPCANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -50,4 +50,4 @@ private:
     PlotStatusLabel* m_statusLabel;
 };
 
-#endif // COLORMAPCANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPCANVAS_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
index eed9ab40ba0..bad0ee7cd1f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COLORMAPUTILS_H
-#define COLORMAPUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include "qcustomplot.h"
@@ -58,4 +58,4 @@ BA_CORE_API_ void setDefaultMargins(QCustomPlot* customPlot);
 
 } // namespace ColorMapUtils
 
-#endif // COLORMAPUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_COLORMAPUTILS_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h b/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h
index 844609dc8dc..0424471d8e3 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FONTSCALINGEVENT_H
-#define FONTSCALINGEVENT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFont>
@@ -46,4 +46,4 @@ private:
     QMap<QString, QFont> m_fonts;
 };
 
-#endif // FONTSCALINGEVENT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_FONTSCALINGEVENT_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
index 323bf41b2f6..1f008220f65 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATACANVAS_H
-#define INTENSITYDATACANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
 
 #include "Core/Instrument/OutputData.h"
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
@@ -59,4 +59,4 @@ private:
     QAction* m_savePlotAction;
 };
 
-#endif // INTENSITYDATACANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATACANVAS_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
index 0afd53f3072..b9ac6c6c3bc 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataFFTPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAFFTPRESENTER_H
-#define INTENSITYDATAFFTPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -53,4 +53,4 @@ private:
     bool m_in_fft_mode;
 };
 
-#endif //  INTENSITYDATAFFTPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAFFTPRESENTER_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
index 09444228d26..f031bebcf03 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAPROJECTIONSWIDGET_H
-#define INTENSITYDATAPROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -44,4 +44,4 @@ private:
     ProjectionsEditor* m_projectionsEditor;
 };
 
-#endif // INTENSITYDATAPROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROJECTIONSWIDGET_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index ab2e1836ede..71362ff93a4 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAPROPERTYWIDGET_H
-#define INTENSITYDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -47,4 +47,4 @@ private:
     ComponentEditor* m_componentEditor;
 };
 
-#endif // INTENSITYDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAPROPERTYWIDGET_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
index e9d12baf911..04e0a5c065b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAWIDGET_H
-#define INTENSITYDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include <memory>
@@ -52,4 +52,4 @@ private:
     IntensityDataFFTPresenter* m_fftPresenter;
 };
 
-#endif // INTENSITYDATAWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_INTENSITYDATAWIDGET_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.h b/GUI/coregui/Views/IntensityDataWidgets/Plot1D.h
index 299ff834874..a02f4ea72f4 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/Plot1D.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/Plot1D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLOT1D_H
-#define PLOT1D_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
 
 #include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
 #include "qcustomplot.h"
@@ -113,4 +113,4 @@ private:
     bool m_block_update;
 };
 
-#endif // PLOT1D_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOT1D_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h b/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h
index f9829187953..7a50fd7f245 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLOTEVENTINFO_H
-#define PLOTEVENTINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
 
 #include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
 #include "Wrap/WinDllMacros.h"
@@ -62,4 +62,4 @@ private:
     PLOT_TYPE m_info_type;
 };
 
-#endif // PLOTEVENTINFO_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTEVENTINFO_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h b/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h
index 2c0e50c7545..b6b8468c822 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/PlotStatusLabel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLOTSTATUSLABEL_H
-#define PLOTSTATUSLABEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
 
 #include "GUI/coregui/Views/CommonWidgets/StatusLabel.h"
 #include <QList>
@@ -51,4 +51,4 @@ private:
     QList<ScientificPlot*> m_plots;
 };
 
-#endif // PLOTSTATUSLABEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PLOTSTATUSLABEL_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
index 3f0b878b382..9be9ed17434 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSPLOT_H
-#define PROJECTIONSPLOT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROJECTIONSPLOT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROJECTIONSPLOT_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include "qcustomplot.h"
@@ -76,4 +76,4 @@ private:
     bool m_block_plot_update;
 };
 
-#endif // PROJECTIONSPLOT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROJECTIONSPLOT_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
index d4e08000987..8aaac5e60a6 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROPERTYREPEATER_H
-#define PROPERTYREPEATER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -48,4 +48,4 @@ private:
     bool m_repeat_child_properties;
 };
 
-#endif // PROPERTYREPEATER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_PROPERTYREPEATER_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
index b61d244a96d..75a0490ba66 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAVEPLOTASSISTANT_H
-#define SAVEPLOTASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -51,4 +51,4 @@ private:
     static QVector<Format> m_formats;
 };
 
-#endif // SAVEPLOTASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPLOTASSISTANT_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
index 166286e12c4..95549891564 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAVEPROJECTIONSASSISTANT_H
-#define SAVEPROJECTIONSASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPROJECTIONSASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPROJECTIONSASSISTANT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -58,4 +58,4 @@ private:
     QString projectionFileHeader(ProjectionsData& projectionsData);
 };
 
-#endif // SAVEPROJECTIONSASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SAVEPROJECTIONSASSISTANT_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h
index 340f01082e0..af8c966bf5f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCIENTIFICPLOT_H
-#define SCIENTIFICPLOT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include <memory>
@@ -67,4 +67,4 @@ private:
     ScientificPlotEvent* m_event;
 };
 
-#endif // SCIENTIFICPLOT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOT_H
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h
index 47c2ee05e37..06a59574935 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCIENTIFICPLOTEVENT_H
-#define SCIENTIFICPLOTEVENT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
 
 #include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -55,4 +55,4 @@ private:
     PlotEventInfo m_prevPos;
 };
 
-#endif // SCIENTIFICPLOTEVENT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_INTENSITYDATAWIDGETS_SCIENTIFICPLOTEVENT_H
diff --git a/GUI/coregui/Views/JobView.h b/GUI/coregui/Views/JobView.h
index 8f3e598898d..6c75b0c71e9 100644
--- a/GUI/coregui/Views/JobView.h
+++ b/GUI/coregui/Views/JobView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBVIEW_H
-#define JOBVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include "fancymainwindow.h"
@@ -63,4 +63,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif // JOBVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBVIEW_H
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
index c28b691e62c..60c6ed64a9b 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBLISTVIEWDELEGATE_H
-#define JOBLISTVIEWDELEGATE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QItemDelegate>
@@ -50,4 +50,4 @@ private:
     QMap<QString, QColor> m_status_to_color;
 };
 
-#endif // JOBLISTVIEWDELEGATE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTVIEWDELEGATE_H
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.h b/GUI/coregui/Views/JobWidgets/JobListWidget.h
index e58d91064de..e68d664abce 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBLISTWIDGET_H
-#define JOBLISTWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QModelIndexList>
@@ -60,4 +60,4 @@ private:
     JobModel* m_jobModel;
 };
 
-#endif // JOBLISTWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBLISTWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
index f5b9e6cefc2..2da2e3bdef7 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBMESSAGEPANEL_H
-#define JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
 
 #include "GUI/coregui/Views/CommonWidgets/InfoPanel.h"
 #include <QColor>
@@ -37,4 +37,4 @@ private:
     QTextEdit* m_plainLog;
 };
 
-#endif // JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
index 16695ad308c..a62386b8009 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBOUTPUTDATAWIDGET_H
-#define JOBOUTPUTDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBOUTPUTDATAWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBOUTPUTDATAWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h"
 
@@ -40,4 +40,4 @@ private:
     ItemStackPresenter<JobResultsPresenter>* m_stackedWidget;
 };
 
-#endif // JOBOUTPUTDATAWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBOUTPUTDATAWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
index 860c632366e..ca34b5b0bec 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBPROGRESSASSISTANT_H
-#define JOBPROGRESSASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -35,4 +35,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif // JOBPROGRESSASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROGRESSASSISTANT_H
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
index 2cf249931c1..caf77ac9394 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBPROPERTIESWIDGET_H
-#define JOBPROPERTIESWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -53,4 +53,4 @@ private:
     bool m_block_update;
 };
 
-#endif // JOBPROPERTIESWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBPROPERTIESWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
index b0a0d2a5ee7..784e22aceda 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBREALTIMETOOLBAR_H
-#define JOBREALTIMETOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMETOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMETOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 
@@ -35,4 +35,4 @@ private:
     QToolButton* m_resetParametersButton;
 };
 
-#endif // JOBREALTIMETOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMETOOLBAR_H
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
index 15d34cca566..4658aae750b 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBREALTIMEWIDGET_H
-#define JOBREALTIMEWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMEWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMEWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h"
 
@@ -44,4 +44,4 @@ private:
     ItemStackPresenter<ParameterTuningWidget>* m_stackedWidget;
 };
 
-#endif // JOBREALTIMEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBREALTIMEWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
index c21e3d4aa90..2854b0f1519 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBRESULTSPRESENTER_H
-#define JOBRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
 
 #include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
 #include "GUI/coregui/Views/JobWidgets/JobViewFlags.h"
@@ -37,4 +37,4 @@ protected:
     QStringList presentationList(SessionItem* item) override;
 };
 
-#endif // JOBRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBRESULTSPRESENTER_H
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
index c3b2bb73419..f5bdbbb3f75 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBSELECTORACTIONS_H
-#define JOBSELECTORACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QModelIndex>
@@ -55,4 +55,4 @@ private:
     JobModel* m_jobModel;
 };
 
-#endif // JOBSELECTORACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORACTIONS_H
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
index f992fc25d40..f69ac3e2c6d 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBSELECTORTOOLBAR_H
-#define JOBSELECTORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 
@@ -35,4 +35,4 @@ private:
     QToolButton* m_removeJobButton;
 };
 
-#endif // INSTRUMENTVIEWTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORTOOLBAR_H
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
index 9a4dee118b1..af32df1c6cf 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBSELECTORWIDGET_H
-#define JOBSELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -65,4 +65,4 @@ private:
     JobModel* m_jobModel;
 };
 
-#endif // JOBSELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBSELECTORWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.h b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
index 74ea31aae1a..fb3407bc7fa 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBVIEWACTIVITIES_H
-#define JOBVIEWACTIVITIES_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
 
 #include "GUI/coregui/Views/JobWidgets/JobViewFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -38,4 +38,4 @@ private:
     static activity_map_t m_activityToDocks;
 };
 
-#endif // JOBVIEWACTIVITIES_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWACTIVITIES_H
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.h b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
index 5b5a9aadcca..c8d69690a90 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBVIEWDOCKS_H
-#define JOBVIEWDOCKS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWDOCKS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWDOCKS_H
 
 #include "GUI/coregui/Views/CommonWidgets/DocksController.h"
 
@@ -63,4 +63,4 @@ private:
     JobView* m_jobView;
 };
 
-#endif // JOBVIEWDOCKS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWDOCKS_H
diff --git a/GUI/coregui/Views/JobWidgets/JobViewFlags.h b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
index d6a42c72f13..df6f6617aad 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewFlags.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBVIEWFLAGS_H
-#define JOBVIEWFLAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -43,4 +43,4 @@ public:
 Q_DECLARE_OPERATORS_FOR_FLAGS(JobViewFlags::Dock)
 Q_DECLARE_OPERATORS_FOR_FLAGS(JobViewFlags::Activity)
 
-#endif // JOBVIEWFLAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWFLAGS_H
diff --git a/GUI/coregui/Views/JobWidgets/JobViewStatusBar.h b/GUI/coregui/Views/JobWidgets/JobViewStatusBar.h
index 7ab591fae85..f8bc6e7dbe4 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewStatusBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewStatusBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef JOBVIEWSTATUSBAR_H
-#define JOBVIEWSTATUSBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWSTATUSBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWSTATUSBAR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -48,4 +48,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif // JOBVIEWSTATUSBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_JOBVIEWSTATUSBAR_H
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
index d29d5298bcc..bf0cd9605d6 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTUNINGDELEGATE_H
-#define PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGDELEGATE_H
 
 #include "Fit/Tools/RealLimits.h"
 #include <QItemDelegate>
@@ -88,4 +88,4 @@ private:
     bool m_isReadOnly;
 };
 
-#endif // PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
index 033f2a14418..7962735f932 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERTUNINGWIDGET_H
-#define PARAMETERTUNINGWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -77,4 +77,4 @@ private:
     WarningSign* m_warningSign;
 };
 
-#endif // PARAMETERTUNINGWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PARAMETERTUNINGWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
index af0a446b636..7101aa2854c 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSEDITOR_H
-#define PROJECTIONSEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMainWindow>
@@ -63,4 +63,4 @@ private:
     QSplitter* m_bottomSplitter;
 };
 
-#endif // PROJECTIONSEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITOR_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
index 1f08d8d4960..a128b9af287 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSEDITORACTIONS_H
-#define PROJECTIONSEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QList>
@@ -60,4 +60,4 @@ private:
     QWidget* m_parent;
 };
 
-#endif // PROJECTIONSEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORACTIONS_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
index 8e0641c3f12..cf1cfc4b4f3 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSEDITORCANVAS_H
-#define PROJECTIONSEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORCANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORCANVAS_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -81,4 +81,4 @@ private:
     bool m_block_update;
 };
 
-#endif // PROJECTIONSEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSEDITORCANVAS_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
index 453bee60dcb..c09b357fbca 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSPROPERTYPANEL_H
-#define PROJECTIONSPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSPROPERTYPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSPROPERTYPANEL_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -37,4 +37,4 @@ private:
     ComponentEditor* m_componentEditor;
 };
 
-#endif // PROJECTIONSPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSPROPERTYPANEL_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
index 9e5a79a7126..27d0eab5acf 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSTOOLBAR_H
-#define PROJECTIONSTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSTOOLBAR_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -55,4 +55,4 @@ private:
     MaskEditorFlags::Activity m_previousActivity;
 };
 
-#endif // PROJECTIONSTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSTOOLBAR_H
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
index 11d94cecba9..481de483bf9 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTIONSWIDGET_H
-#define PROJECTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
@@ -51,4 +51,4 @@ private:
     QTabWidget* m_tabWidget;
 };
 
-#endif // PROJECTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_PROJECTIONSWIDGET_H
diff --git a/GUI/coregui/Views/JobWidgets/ScientificSpinBox.h b/GUI/coregui/Views/JobWidgets/ScientificSpinBox.h
index 83d48ae9cee..23b64503e0a 100644
--- a/GUI/coregui/Views/JobWidgets/ScientificSpinBox.h
+++ b/GUI/coregui/Views/JobWidgets/ScientificSpinBox.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCIENTIFICSPINBOX_H
-#define SCIENTIFICSPINBOX_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SCIENTIFICSPINBOX_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SCIENTIFICSPINBOX_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QAbstractSpinBox>
@@ -68,4 +68,4 @@ private:
     QDoubleValidator m_validator;
 };
 
-#endif // SCIENTIFICSPINBOX_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SCIENTIFICSPINBOX_H
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
index 3f0e28c396a..7056757f2b2 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SLIDERSETTINGSWIDGET_H
-#define SLIDERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SLIDERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SLIDERSETTINGSWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -44,4 +44,4 @@ private:
     QCheckBox* m_lockzCheckBox;
 };
 
-#endif // SLIDERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_JOBWIDGETS_SLIDERSETTINGSWIDGET_H
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
index 260736c9666..24edc524878 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COLORMAPSCENEADAPTOR_H
-#define COLORMAPSCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
 
 #include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
 class ColorMap;
@@ -43,4 +43,4 @@ private:
     ColorMap* m_plot;
 };
 
-#endif // COLORMAPSCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_COLORMAPSCENEADAPTOR_H
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/coregui/Views/MaskWidgets/EllipseView.h
index 2ab953fd084..a524b9df3fa 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.h
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ELLIPSEVIEW_H
-#define ELLIPSEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/RectangleBaseView.h"
 
@@ -47,4 +47,4 @@ private:
     qreal bottom() const;
 };
 
-#endif // ELLIPSEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
index 18abcc3072d..58777e35081 100644
--- a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISCENEADAPTOR_H
-#define ISCENEADAPTOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -58,4 +58,4 @@ public:
     qreal fromSceneY(qreal value) const { return value; }
 };
 
-#endif // ISCENEADAPTOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISCENEADAPTOR_H
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.h b/GUI/coregui/Views/MaskWidgets/IShape2DView.h
index 4d63e9d4312..1ad8039d393 100644
--- a/GUI/coregui/Views/MaskWidgets/IShape2DView.h
+++ b/GUI/coregui/Views/MaskWidgets/IShape2DView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISHAPE2DVIEW_H
-#define ISHAPE2DVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
 #include "Wrap/WinDllMacros.h"
@@ -73,4 +73,4 @@ private:
     void onItemPropertyChange(const QString& propertyName);
 };
 
-#endif // ISHAPE2DVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_ISHAPE2DVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
index f4df7791cfa..51035f1835e 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTENSITYDATAVIEW_H
-#define INTENSITYDATAVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_INTENSITYDATAVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_INTENSITYDATAVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 #include "GUI/coregui/Views/MaskWidgets/SizeHandleElement.h"
@@ -39,4 +39,4 @@ protected:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*);
 };
 
-#endif // INTENSITYDATAVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_INTENSITYDATAVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.h b/GUI/coregui/Views/MaskWidgets/LineViews.h
index 968aa5a17dc..0584c02347b 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.h
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LINEVIEWS_H
-#define LINEVIEWS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 
@@ -59,4 +59,4 @@ protected:
     QVariant itemChange(GraphicsItemChange change, const QVariant& value);
 };
 
-#endif // LINEVIEWS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_LINEVIEWS_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.h b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
index 9904454cd5d..1c8340a9a58 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKALLVIEW_H
-#define MASKALLVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 
@@ -35,4 +35,4 @@ protected:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*);
 };
 
-#endif // MASKALLVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKALLVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
index 3f384709a35..ced89cf00b1 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKCONTAINERVIEW_H
-#define MASKCONTAINERVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 #include "GUI/coregui/Views/MaskWidgets/SizeHandleElement.h"
@@ -41,4 +41,4 @@ protected:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*);
 };
 
-#endif // MASKCONTAINERVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKCONTAINERVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
index 1d80e62d177..e8a96104c19 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKDRAWINGCONTEXT_H
-#define MASKDRAWINGCONTEXT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -57,4 +57,4 @@ private:
     bool m_drawing_in_progress;
 };
 
-#endif // MASKDRAWINGCONTEXT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKDRAWINGCONTEXT_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.h b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
index 614ae9f78cf..149961868f7 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITOR_H
-#define MASKEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMainWindow>
@@ -66,4 +66,4 @@ private:
     Manhattan::MiniSplitter* m_splitter;
 };
 
-#endif // MASKEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITOR_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
index 89c4d923999..e7fd85bbf49 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORACTIONS_H
-#define MASKEDITORACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -80,4 +80,4 @@ private:
     QItemSelectionModel* m_selectionModel;
 };
 
-#endif // MASKEDITORACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORACTIONS_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
index c5cddeea9ab..12d1c746bb4 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORCANVAS_H
-#define MASKEDITORCANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include <QWidget>
@@ -65,4 +65,4 @@ private:
     MaskResultsPresenter* m_resultsPresenter;
 };
 
-#endif // MASKEDITORCANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORCANVAS_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
index 27dc7c898a4..1e87d87f02f 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORFLAGS_H
-#define MASKEDITORFLAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -52,4 +52,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::Stacking)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::MaskValue)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskEditorFlags::PresentationType)
 
-#endif // MASKEDITORFLAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORFLAGS_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
index 9be87e680dd..1bea500ca2c 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORHELPER_H
-#define MASKEDITORHELPER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QGraphicsItem>
@@ -51,4 +51,4 @@ public:
     static QRectF getMarkerRectangle(const QPointF& pos);
 };
 
-#endif // MASKEDITORHELPER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORHELPER_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
index 597ece5a16c..e7116912bd7 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORPROPERTYPANEL_H
-#define MASKEDITORPROPERTYPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include <QModelIndex>
@@ -68,4 +68,4 @@ private:
     IntensityDataItem* m_intensityDataItem;
 };
 
-#endif // MASKEDITORPROPERTYPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORPROPERTYPANEL_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
index d90359918bb..78ae34312e7 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKEDITORTOOLBAR_H
-#define MASKEDITORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -61,4 +61,4 @@ private:
     MaskEditorFlags::Activity m_previousActivity;
 };
 
-#endif // MASKEDITORTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKEDITORTOOLBAR_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
index 387406a9836..40b829514aa 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKGRAPHICSPROXY_H
-#define MASKGRAPHICSPROXY_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
 #include <QGraphicsProxyWidget>
@@ -54,4 +54,4 @@ private:
     bool m_send_signals_to_colormap;
 };
 
-#endif // MASKGRAPHICSPROXY_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSPROXY_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
index c906256ff51..69253346a2a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKGRAPHICSSCENE_H
-#define MASKGRAPHICSSCENE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h"
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
@@ -123,4 +123,4 @@ private:
     MaskDrawingContext m_context;
 };
 
-#endif // MASKGRAPHICSSCENE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSSCENE_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
index 52bdd4c58a7..2d184481d43 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKGRAPHICSVIEW_H
-#define MASKGRAPHICSVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include <QGraphicsView>
@@ -57,4 +57,4 @@ private:
     double m_current_zoom_value;
 };
 
-#endif // MASKGRAPHICSVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKGRAPHICSVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
index 5ad7e97d14b..37612c29cb4 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKRESULTSPRESENTER_H
-#define MASKRESULTSPRESENTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -53,4 +53,4 @@ private:
     bool m_interpolation_flag_backup;
 };
 
-#endif // MASKRESULTSPRESENTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKRESULTSPRESENTER_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
index b64ec46865d..ef5a303b65d 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKUNITSCONVERTER_H
-#define MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -52,4 +52,4 @@ private:
     EConvertionDirection m_direction;
 };
 
-#endif // MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
index c77941b5507..4f1e602c186 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MASKVIEWFACTORY_H
-#define MASKVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -30,4 +30,4 @@ public:
     static IShape2DView* createMaskView(SessionItem* item, ISceneAdaptor* adaptor = 0);
 };
 
-#endif // MASKVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_MASKVIEWFACTORY_H
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
index d607626eb58..976ee584cc1 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POLYGONPOINTVIEW_H
-#define POLYGONPOINTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 
@@ -50,4 +50,4 @@ private:
     bool m_on_hover;
 };
 
-#endif // POLYGONPOINTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONPOINTVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/coregui/Views/MaskWidgets/PolygonView.h
index e7c98443d61..743f4ba6b25 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef POLYGONVIEW_H
-#define POLYGONVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 #include <QPolygonF>
@@ -56,4 +56,4 @@ private:
     bool m_close_polygon_request;
 };
 
-#endif // POLYGONVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_POLYGONVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
index 1e2e02cdea9..894351afe07 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGLEBASEVIEW_H
-#define RECTANGLEBASEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
 #include "GUI/coregui/Views/MaskWidgets/SizeHandleElement.h"
@@ -58,4 +58,4 @@ protected:
     SizeHandleElement* m_activeHandleElement;
 };
 
-#endif // RECTANGLEBASEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEBASEVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/coregui/Views/MaskWidgets/RectangleView.h
index f0bc49c5b39..aaf284549e3 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RECTANGLEVIEW_H
-#define RECTANGLEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/RectangleBaseView.h"
 
@@ -47,4 +47,4 @@ protected:
     qreal bottom() const;
 };
 
-#endif // RECTANGLEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
index 1db1f7ecd6c..78f251cd7ce 100644
--- a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
+++ b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REGIONOFINTERESTVIEW_H
-#define REGIONOFINTERESTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
 
 #include "GUI/coregui/Views/MaskWidgets/RectangleView.h"
 
@@ -30,4 +30,4 @@ protected:
     void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*);
 };
 
-#endif // REGIONOFINTERESTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_REGIONOFINTERESTVIEW_H
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
index 889e500a360..5321840799e 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIZEHANDLEELEMENT_H
-#define SIZEHANDLEELEMENT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
 
 #include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
 #include <QCursor>
@@ -73,4 +73,4 @@ private:
     static QMap<EHandleLocation, EHandleLocation> m_opposite_handle_location;
 };
 
-#endif // SIZEHANDLEELEMENT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MASKWIDGETS_SIZEHANDLEELEMENT_H
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
index c1eb9dc3e9e..cae3cf4fe30 100644
--- a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
+++ b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef EXTERNALPROPERTY_H
-#define EXTERNALPROPERTY_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_EXTERNALPROPERTY_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_EXTERNALPROPERTY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QColor>
@@ -57,4 +57,4 @@ private:
 
 Q_DECLARE_METATYPE(ExternalProperty)
 
-#endif // EXTERNALPROPERTY_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_EXTERNALPROPERTY_H
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
index ccd4368a10e..5199afd03a5 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALEDITOR_H
-#define MATERIALEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -65,4 +65,4 @@ private:
     bool m_model_was_modified;
 };
 
-#endif // MATERIALEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITOR_H
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
index 3ec44bd68e2..66e561305a1 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALEDITORDIALOG_H
-#define MATERIALEDITORDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -55,4 +55,4 @@ private:
     MaterialEditor* m_materialEditor;
 };
 
-#endif // MATERIALEDITORDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORDIALOG_H
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
index a20ce73513d..097343f5689 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALEDITORTOOLBAR_H
-#define MATERIALEDITORTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QToolBar>
@@ -52,4 +52,4 @@ private:
     QAction* m_removeMaterialAction;
 };
 
-#endif // MATERIALEDITORTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
index ce8fbaf0013..308306f97ab 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALITEMUTILS_H
-#define MATERIALITEMUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALITEMUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALITEMUTILS_H
 
 #include "GUI/coregui/Models/MaterialItem.h"
 #include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
@@ -58,4 +58,4 @@ selectColorProperty(const ExternalProperty& previous = ExternalProperty());
 BA_CORE_API_ QVector<SessionItem*> materialPropertyItems(SessionItem* item);
 } // namespace MaterialItemUtils
 
-#endif // MATERIALITEMUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_MATERIALEDITOR_MATERIALITEMUTILS_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
index 83e899ffcc9..8851cb0f53f 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTEDITOR_H
-#define COMPONENTEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -73,4 +73,4 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(ComponentEditor::EditorType)
 
-#endif // COMPONENTEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTEDITOR_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
index ae10681b435..7da691ca2f2 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTFLATVIEW_H
-#define COMPONENTFLATVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
 
 #include "GUI/coregui/Views/PropertyEditor/ComponentView.h"
 #include <memory>
@@ -63,4 +63,4 @@ private:
     QVector<const SessionItem*> m_topItems;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTFLATVIEW_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
index e399b2b7e33..29121ac2d93 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTREEACTIONS_H
-#define COMPONENTREEACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -32,4 +32,4 @@ public slots:
     void onCustomContextMenuRequested(const QPoint& point, SessionItem& item);
 };
 
-#endif // COMPONENTREEACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEACTIONS_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
index 593240a2223..bc2d0f17179 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTTREEVIEW_H
-#define COMPONENTTREEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
 
 #include "GUI/coregui/Views/PropertyEditor/ComponentView.h"
 #include <memory>
@@ -60,4 +60,4 @@ private:
     bool m_show_root_item; //!< Tree will starts from item itself, if true.
 };
 
-#endif //  COMPONENTTREEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTTREEVIEW_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentUtils.h b/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
index 0a5c25c63c4..77bac2b79d6 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTUTILS_H
-#define COMPONENTUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QList>
@@ -34,4 +34,4 @@ BA_CORE_API_ QList<const SessionItem*> componentItems(const SessionItem& item);
 
 } // namespace ComponentUtils
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTUTILS_H
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentView.h b/GUI/coregui/Views/PropertyEditor/ComponentView.h
index 92ce5707a2b..e7c823f2021 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTVIEW_H
-#define COMPONENTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -33,4 +33,4 @@ public:
     virtual void addItem(SessionItem*) {}
 };
 
-#endif // COMPONENTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_COMPONENTVIEW_H
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.h b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
index e2f432b8dbd..71b777960dc 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.h
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CUSTOMEDITORS_H
-#define CUSTOMEDITORS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QVariant>
@@ -198,4 +198,4 @@ private:
     QCheckBox* m_checkBox;
 };
 
-#endif //  CUSTOMEDITORS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_CUSTOMEDITORS_H
diff --git a/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h b/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h
index ae76c16bf1c..bcfd8ffd05e 100644
--- a/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTICOMBOPROPERTYEDITOR_H
-#define MULTICOMBOPROPERTYEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
 
 #include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
 #include <QStyledItemDelegate>
@@ -66,4 +66,4 @@ public:
                const QModelIndex& index) const;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_MULTICOMBOPROPERTYEDITOR_H
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
index 588b5df2aa6..adb656ddf62 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROPERTYEDITORFACTORY_H
-#define PROPERTYEDITORFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -39,4 +39,4 @@ BA_CORE_API_ QWidget* CreateEditor(const SessionItem& item, QWidget* parent = nu
 
 } // namespace PropertyEditorFactory
 
-#endif //  PROPERTYEDITORFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYEDITORFACTORY_H
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
index 4fe9e242a0b..c39f90d9a80 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROPERTYWIDGETITEM_H
-#define PROPERTYWIDGETITEM_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -52,4 +52,4 @@ private:
     const SessionItem* m_item;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_PROPERTYWIDGETITEM_H
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.h b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
index 0ecc09260e6..7eff245912f 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTCOMPONENTVIEW_H
-#define TESTCOMPONENTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -67,4 +67,4 @@ private:
     bool m_isExpaned;
 };
 
-#endif // TESTCOMPONENTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_PROPERTYEDITOR_TESTCOMPONENTVIEW_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h
index 5546c495ac3..ea9ae1acae1 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IPOSITIONBUILDER_H
-#define IPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
 
 #include <memory>
 #include <vector>
@@ -131,4 +131,4 @@ private:
     std::unique_ptr<InterferenceFunctionRadialParaCrystal> mP_iff;
 };
 
-#endif // IPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_IPOSITIONBUILDER_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h b/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h
index d20e6ce6380..435a1657363 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLE3DCONTAINER_H
-#define PARTICLE3DCONTAINER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -60,4 +60,4 @@ private:
     std::vector<bool> m_containerParticlesBlend;
 };
 
-#endif // PARTICLE3DCONTAINER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
index 7b6dc010442..fb70f2a01bb 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACE2DPARACRYSTALUTILS_H
-#define REALSPACE2DPARACRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <vector>
@@ -26,4 +26,4 @@ std::vector<std::vector<double>>
 Compute2DParacrystalLatticePositions(const InterferenceFunction2DParaCrystal*, double layer_size);
 };
 
-#endif // REALSPACE2DPARACRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
index 1d91172c9c6..d479a2b428e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEACTIONS_H
-#define REALSPACEACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -28,4 +28,4 @@ public:
     RealSpaceActions(QObject* parent = 0);
 };
 
-#endif // REALSPACEACTIONS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEACTIONS_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
index 4f9d108f743..2a0cc5b70ab 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEBUILDER_H
-#define REALSPACEBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
 
 #include "GUI/ba3d/view/camera.h"
 #include "Wrap/WinDllMacros.h"
@@ -62,4 +62,4 @@ public:
                                             const QVector3D& lattice_position = QVector3D()) const;
 };
 
-#endif // REALSPACEBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDER_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
index 411e41e247b..e230bf9636f 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEBUILDERUTILS_H
-#define REALSPACEBUILDERUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
 
 #include "Core/Scattering/Rotations.h"
 #include "Core/Vector/Vectors3D.h"
@@ -97,4 +97,4 @@ BA_CORE_API_ Particle3DContainer mesoCrystal3DContainer(const MesoCrystalItem& m
 
 } // namespace RealSpaceBuilderUtils
 
-#endif // REALSPACEBUILDERUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
index 7e31c150f4e..73fab73f18d 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACECANVAS_H
-#define REALSPACECANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QItemSelectionModel>
@@ -102,4 +102,4 @@ private:
     void savePicture(const QPixmap& pixmap);
 };
 
-#endif // REALSPACESCENE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACECANVAS_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
index 71604fcd671..910c3c9cdad 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEMESOCRYSTALUTILS_H
-#define REALSPACEMESOCRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
 
 #include "Core/Scattering/Rotations.h"
 #include "Wrap/WinDllMacros.h"
@@ -40,4 +40,4 @@ private:
     QVector3D m_origin;
 };
 
-#endif // REALSPACEMESOCRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
index 99873cdcf9e..4fd66fa2671 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEMODEL_H
-#define REALSPACEMODEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
 
 #include "GUI/ba3d/model/model.h"
 #include "Wrap/WinDllMacros.h"
@@ -23,4 +23,4 @@ class RealSpaceModel : public RealSpace::Model
 public:
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEMODEL_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
index 759b30dc8c1..de450c58f28 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePositionBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEPOSITIONBUILDER_H
-#define REALSPACEPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
 
 #include "Core/Parametrization/INodeVisitor.h"
 #include <memory>
@@ -42,4 +42,4 @@ private:
     std::unique_ptr<IPositionBuilder> mP_pos_builder;
 };
 
-#endif // REALSPACEPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
index 2cc9605b4a2..3ee9634657c 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACETOOLBAR_H
-#define REALSPACETOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 
@@ -48,4 +48,4 @@ private:
     QToolButton* m_savePictureButton;
 };
 
-#endif // REALSPACETOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACETOOLBAR_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
index 1e664e87b8d..b2291e98ea9 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEVIEW_H
-#define REALSPACEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -47,4 +47,4 @@ private:
     RealSpace::Widget3D* m_3dview;
 };
 
-#endif // REALSPACEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEVIEW_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
index 1a30cf2ed40..b2e28c1b32b 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEWIDGET_H
-#define REALSPACEWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -47,4 +47,4 @@ private:
     QItemSelectionModel* m_selectionModel;
 };
 
-#endif // REALSPACEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEWIDGET_H
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
index 426c81faa4b..eb57a1c7f01 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMTO3D_H
-#define TRANSFORMTO3D_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
 
 #include "Core/Vector/Vectors3D.h"
 #include "GUI/ba3d/model/layer.h"
@@ -47,4 +47,4 @@ createParticlefromIFormFactor(const IFormFactor* ff);
 
 } // namespace TransformTo3D
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_TRANSFORMTO3D_H
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.h b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
index ea905ccd772..99622159375 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.h
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CONNECTABLEVIEW_H
-#define CONNECTABLEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/IView.h"
 #include "GUI/coregui/Views/SampleDesigner/NodeEditorPort.h"
@@ -86,4 +86,4 @@ private:
 //    //! сalls the ISampleViewVisitor's visit method
 //};
 
-#endif // CONNECTABLEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_CONNECTABLEVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
index d749576d010..3bd935ff80c 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DESIGNERHELPER_H
-#define DESIGNERHELPER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERHELPER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERHELPER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QColor>
@@ -79,4 +79,4 @@ public:
     static int getPythonEditorFontSize();
 };
 
-#endif // DESIGNERHELPER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERHELPER_H
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
index 3de6eb441c3..09f333e7700 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DESIGNERMIMEDATA_H
-#define DESIGNERMIMEDATA_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMimeData>
@@ -46,4 +46,4 @@ private:
     QString m_classname;
 };
 
-#endif // DESIGNERMIMEDATA_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERMIMEDATA_H
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
index 23757296e52..5ed459df67c 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DESIGNERSCENE_H
-#define DESIGNERSCENE_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QGraphicsScene>
@@ -118,4 +118,4 @@ private:
     NodeEditor* m_nodeEditor;
 };
 
-#endif // DESIGNERSCENE_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERSCENE_H
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.h b/GUI/coregui/Views/SampleDesigner/DesignerView.h
index c2e3ba6c0e1..96e5739fa6b 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DESIGNERVIEW_H
-#define DESIGNERVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QGraphicsView>
@@ -55,4 +55,4 @@ protected:
     void keyReleaseEvent(QKeyEvent* event);
 };
 
-#endif // DESIGNERVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_DESIGNERVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/coregui/Views/SampleDesigner/ILayerView.h
index f721b2955cb..21ef053ffd8 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ILAYERVIEW_H
-#define ILAYERVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -66,4 +66,4 @@ public:
     QLineF getInterfaceToScene();
 };
 
-#endif // ILAYERVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ILAYERVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/coregui/Views/SampleDesigner/IView.h
index 02c17fd92d4..77038cc2daa 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.h
+++ b/GUI/coregui/Views/SampleDesigner/IView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IVIEW_H
-#define IVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ViewTypes.h"
 #include "Wrap/WinDllMacros.h"
@@ -63,4 +63,4 @@ inline SessionItem* IView::getItem()
     return m_item;
 }
 
-#endif // IVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_IVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
index dfeb38d1967..21189f908c1 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef INTERFERENCEFUNCTIONVIEWS_H
-#define INTERFERENCEFUNCTIONVIEWS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFUNCTIONVIEWS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFUNCTIONVIEWS_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -65,4 +65,4 @@ public:
     int type() const { return ViewTypes::INTERFERENCE_FUNCTION_RADIAL_PARA; }
 };
 
-#endif // INTERFERENCEFUNCTIONVIEWS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_INTERFERENCEFUNCTIONVIEWS_H
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
index b080e0dcaf6..048556f38f7 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMTREEVIEW_H
-#define ITEMTREEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QTreeView>
@@ -31,4 +31,4 @@ protected:
 #endif
 };
 
-#endif // ITEMTREEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_ITEMTREEVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.h b/GUI/coregui/Views/SampleDesigner/LayerView.h
index 32ac77878f7..4b2722c89f0 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYERVIEW_H
-#define LAYERVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ILayerView.h"
 
@@ -31,4 +31,4 @@ public:
     virtual void addView(IView* childView, int row = 0); // to add ParticleLayout
 };
 
-#endif // LAYERVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_LAYERVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
index bc248151826..66bd9263d49 100644
--- a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
+++ b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTALVIEW_H
-#define MESOCRYSTALVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -30,4 +30,4 @@ public:
     void addView(IView* childView, int row = 0);
 };
 
-#endif // MESOCRYSTALVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MESOCRYSTALVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
index 8a169f0dfb3..b52d4275bff 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERVIEW_H
-#define MULTILAYERVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ILayerView.h"
 
@@ -62,4 +62,4 @@ private:
     QList<QLineF> m_interfaces;
 };
 
-#endif // MULTILAYERVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_MULTILAYERVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.h b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
index 2138f454373..5976c4e795c 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NODEEDITOR_H
-#define NODEEDITOR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
 
 /*
  * Node editor: original code is taken from
@@ -60,4 +60,4 @@ private:
     NodeEditorConnection* m_conn;
 };
 
-#endif // NODEEDITOR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITOR_H
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
index 5f4c45b8346..4e8923816be 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NODEEDITORCONNECTION_H
-#define NODEEDITORCONNECTION_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
 
 /*
  * Node editor: original code is taken from
@@ -64,4 +64,4 @@ private:
     NodeEditorPort* m_port2;
 };
 
-#endif // NODEEDITORCONNECTION_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORCONNECTION_H
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
index 683a78757eb..c3cd3fba08c 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NODEEDITORPORT_H
-#define NODEEDITORPORT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
 
 /*
  * Node editor: original code is taken from
@@ -97,4 +97,4 @@ inline NodeEditorPort::EPortType NodeEditorPort::getPortType() const
     return m_port_type;
 }
 
-#endif // NODEEDITORPORT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_NODEEDITORPORT_H
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
index 6fe800483a9..afe72bd293d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECOMPOSITIONVIEW_H
-#define PARTICLECOMPOSITIONVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -30,4 +30,4 @@ public:
     void addView(IView* childView, int row = 0);
 };
 
-#endif // PARTICLECOMPOSITIONVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECOMPOSITIONVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
index 5a47cdc1864..22cccfa67e5 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLECORESHELLVIEW_H
-#define PARTICLECORESHELLVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -30,4 +30,4 @@ public:
     void addView(IView* childView, int row = 0);
 };
 
-#endif // PARTICLECORESHELLVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
index 29b60a48d3d..73d31f934bc 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEDISTRIBUTIONVIEW_H
-#define PARTICLEDISTRIBUTIONVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEDISTRIBUTIONVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEDISTRIBUTIONVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -30,4 +30,4 @@ public:
     void addView(IView* childView, int row = 0);
 };
 
-#endif // PARTICLEDISTRIBUTIONVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEDISTRIBUTIONVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
index 416fdc91f2b..5826e2df11d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLELAYOUTVIEW_H
-#define PARTICLELAYOUTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -27,4 +27,4 @@ public:
     void addView(IView* childView, int row = 0); // to add Particle
 };
 
-#endif // PARTICLELAYOUTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLELAYOUTVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/coregui/Views/SampleDesigner/ParticleView.h
index bd9eb6ffd1f..98d4e1a3627 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARTICLEVIEW_H
-#define PARTICLEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 #include <QPixmap>
@@ -44,4 +44,4 @@ private:
     QPixmap m_pixmap;
 };
 
-#endif // PARTICLEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_PARTICLEVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/RealSpacePanel.h b/GUI/coregui/Views/SampleDesigner/RealSpacePanel.h
index 2a355d32429..c48787d497f 100644
--- a/GUI/coregui/Views/SampleDesigner/RealSpacePanel.h
+++ b/GUI/coregui/Views/SampleDesigner/RealSpacePanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef REALSPACEPANEL_H
-#define REALSPACEPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -37,4 +37,4 @@ private:
     RealSpaceWidget* m_realSpaceWidget;
 };
 
-#endif // REALSPACEPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_REALSPACEPANEL_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
index 6ff1cefda3a..43c135643eb 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEDESIGNER_H
-#define SAMPLEDESIGNER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEDESIGNER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEDESIGNER_H
 
 #include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
 #include "GUI/coregui/Views/SampleDesigner/DesignerView.h"
@@ -62,4 +62,4 @@ private:
     DesignerView* m_designerView;   //! graphical representation of scene with object
 };
 
-#endif // SAMPLEDESIGNER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEDESIGNER_H
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
index e5ce7725d30..4b3de2960c7 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEPROPERTYWIDGET_H
-#define SAMPLEPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -44,4 +44,4 @@ private:
     ComponentEditor* m_propertyEditor;
 };
 
-#endif // SAMPLEPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEPROPERTYWIDGET_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
index 0b6cd10b1f9..a786457da64 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLETOOLBAR_H
-#define SAMPLETOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
 
 #include "GUI/coregui/mainwindow/StyledToolBar.h"
 #include <QTreeView>
@@ -58,4 +58,4 @@ private:
     SampleViewActions* m_sampleViewActions;
 };
 
-#endif // SAMPLETOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETOOLBAR_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h b/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h
index ba747bbef1e..3e6d0261bee 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleTreeWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLETREEWIDGET_H
-#define SAMPLETREEWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -51,4 +51,4 @@ private:
     SampleModel* m_sampleModel;
 };
 
-#endif // SAMPLETREEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLETREEWIDGET_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewActions.h b/GUI/coregui/Views/SampleDesigner/SampleViewActions.h
index a9011de3c55..e271b675475 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewActions.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewActions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEWACTIONS_H
-#define SAMPLEVIEWACTIONS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWACTIONS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWACTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -45,4 +45,4 @@ private:
     QItemSelectionModel* m_selection_model;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWACTIONS_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
index 56aadb6664d..11b538d552f 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEWALIGNER_H
-#define SAMPLEVIEWALIGNER_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -50,4 +50,4 @@ private:
     QMap<IView*, QPointF> m_viewToPos;
 };
 
-#endif // SAMPLEVIEWALIGNER_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWALIGNER_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewDocks.h b/GUI/coregui/Views/SampleDesigner/SampleViewDocks.h
index 25f42d20159..b7438227166 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewDocks.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewDocks.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEWDOCKS_H
-#define SAMPLEVIEWDOCKS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWDOCKS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWDOCKS_H
 
 #include "GUI/coregui/Views/CommonWidgets/DocksController.h"
 
@@ -62,4 +62,4 @@ private:
     RealSpacePanel* m_realSpacePanel;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWDOCKS_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
index e7a42f755f4..20ecc9b96c4 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEWFACTORY_H
-#define SAMPLEVIEWFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -33,4 +33,4 @@ private:
     static QStringList m_valid_item_names;
 };
 
-#endif // SAMPLEVIEWFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWFACTORY_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewStatusBar.h b/GUI/coregui/Views/SampleDesigner/SampleViewStatusBar.h
index bf543418017..1c825129f8d 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewStatusBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewStatusBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEWSTATUSBAR_H
-#define SAMPLEVIEWSTATUSBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWSTATUSBAR_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWSTATUSBAR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -40,4 +40,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEVIEWSTATUSBAR_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
index df108b0c1e0..2d80622ce27 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEWIDGETBOX_H
-#define SAMPLEWIDGETBOX_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -34,4 +34,4 @@ private:
     QDesignerWidgetBoxInterface* m_widgetBox;
 };
 
-#endif // SAMPLEWIDGETBOX_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SAMPLEWIDGETBOX_H
diff --git a/GUI/coregui/Views/SampleDesigner/ScriptPanel.h b/GUI/coregui/Views/SampleDesigner/ScriptPanel.h
index b6997b56c06..38083293213 100644
--- a/GUI/coregui/Views/SampleDesigner/ScriptPanel.h
+++ b/GUI/coregui/Views/SampleDesigner/ScriptPanel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCRIPTPANEL_H
-#define SCRIPTPANEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
 
 #include "GUI/coregui/Views/CommonWidgets/InfoPanel.h"
 
@@ -37,4 +37,4 @@ private:
     PySampleWidget* m_pySampleWidget;
 };
 
-#endif // SCRIPTPANEL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_SCRIPTPANEL_H
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.h b/GUI/coregui/Views/SampleDesigner/TransformationView.h
index b616f4d9df6..970b5cd3033 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.h
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSFORMATIONVIEW_H
-#define TRANSFORMATIONVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
 
 #include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
 
@@ -27,4 +27,4 @@ public:
     int type() const { return ViewTypes::TRANSFORMATION; }
 };
 
-#endif // TRANSFORMATIONVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_TRANSFORMATIONVIEW_H
diff --git a/GUI/coregui/Views/SampleDesigner/ViewTypes.h b/GUI/coregui/Views/SampleDesigner/ViewTypes.h
index 8ea6c710a2c..dc7345bec4d 100644
--- a/GUI/coregui/Views/SampleDesigner/ViewTypes.h
+++ b/GUI/coregui/Views/SampleDesigner/ViewTypes.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef VIEWTYPES_H
-#define VIEWTYPES_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
 
 #include <QGraphicsItem>
 
@@ -43,4 +43,4 @@ enum EWidgetTypes {
 
 }
 
-#endif // VIEWTYPES_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEDESIGNER_VIEWTYPES_H
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index cb38b681638..73debc49e06 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAMPLEVIEW_H
-#define SAMPLEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include "fancymainwindow.h"
@@ -65,4 +65,4 @@ private:
     SampleViewStatusBar* m_statusBar;
 };
 
-#endif // SAMPLEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SAMPLEVIEW_H
diff --git a/GUI/coregui/Views/SessionModelView.h b/GUI/coregui/Views/SessionModelView.h
index 50dc2a22b3f..91da056f12d 100644
--- a/GUI/coregui/Views/SessionModelView.h
+++ b/GUI/coregui/Views/SessionModelView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SESSIONMODELVIEW_H
-#define SESSIONMODELVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SESSIONMODELVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SESSIONMODELVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -55,4 +55,4 @@ private:
     QVector<ModelTreeView*> m_content;
 };
 
-#endif // SESSIONMODELVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SESSIONMODELVIEW_H
diff --git a/GUI/coregui/Views/SimulationView.h b/GUI/coregui/Views/SimulationView.h
index bdec822f432..dd910bf49db 100644
--- a/GUI/coregui/Views/SimulationView.h
+++ b/GUI/coregui/Views/SimulationView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONVIEW_H
-#define SIMULATIONVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -42,4 +42,4 @@ private:
     StyledToolBar* m_toolBar;
 };
 
-#endif // SIMULATIONVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONVIEW_H
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
index 49f9e7fe0c4..a3cc7fbf097 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYTHONSCRIPTWIDGET_H
-#define PYTHONSCRIPTWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -50,4 +50,4 @@ private:
     QString m_outputDir;
 };
 
-#endif // PYTHONSCRIPTWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_PYTHONSCRIPTWIDGET_H
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
index 5275c1128e7..fc02de64c3e 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONDATASELECTORWIDGET_H
-#define SIMULATIONDATASELECTORWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONDATASELECTORWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONDATASELECTORWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -54,4 +54,4 @@ private:
     ApplicationModels* m_applicationModels;
 };
 
-#endif // SIMULATIONDATASELECTORWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONDATASELECTORWIDGET_H
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
index 664a1faf5d8..0c177947046 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONOPTIONSWIDGET_H
-#define SIMULATIONOPTIONSWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONOPTIONSWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONOPTIONSWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -37,4 +37,4 @@ private:
     ComponentFlatView* m_boxEditor;
 };
 
-#endif // SIMULATIONOPTIONSWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONOPTIONSWIDGET_H
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
index 8800594749f..14e5aab08f6 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONSETUPASSISTANT_H
-#define SIMULATIONSETUPASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPASSISTANT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QStringList>
@@ -45,4 +45,4 @@ private:
     QStringList m_messages;
 };
 
-#endif // SIMULATIONSETUPASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPASSISTANT_H
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
index 3a92d2ec635..11e440dacaf 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SIMULATIONSETUPWIDGET_H
-#define SIMULATIONSETUPWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -53,4 +53,4 @@ private:
     SimulationOptionsWidget* m_simOptionsWidget;
 };
 
-#endif // SIMULATIONSETUPWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SIMULATIONWIDGETS_SIMULATIONSETUPWIDGET_H
diff --git a/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h b/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h
index 42cd6626aeb..6a9fbdbf5c1 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/coregui/Views/SpecularDataWidgets/Plot1DCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PLOT1DCANVAS_H
-#define PLOT1DCANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -49,4 +49,4 @@ private:
     PlotStatusLabel* m_statusLabel;
 };
 
-#endif // PLOT1DCANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h
index 252bf4500af..4f179e27e17 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARDATACANVAS_H
-#define SPECULARDATACANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 #include "Wrap/WinDllMacros.h"
@@ -49,4 +49,4 @@ private:
     QAction* m_save_plot_action;
 };
 
-#endif // SPECULARDATACANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h
index d86befd70fd..f73b023fc5c 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARDATAWIDGET_H
-#define SPECULARDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -42,4 +42,4 @@ private:
     IntensityDataPropertyWidget* m_property_widget;
 };
 
-#endif // SPECULARDATAWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h
index c817b6ba0ff..26fd3ac49c8 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlot.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARPLOT_H
-#define SPECULARPLOT_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
 
 #include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
 #include "qcustomplot.h"
@@ -109,4 +109,4 @@ private:
     bool m_block_update;
 };
 
-#endif // SPECULARPLOT_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOT_H
diff --git a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h
index 67672c43057..c2f2a12f539 100644
--- a/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/coregui/Views/SpecularDataWidgets/SpecularPlotCanvas.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPECULARPLOTCANVAS_H
-#define SPECULARPLOTCANVAS_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
 
 #include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -48,4 +48,4 @@ private:
     PlotStatusLabel* m_statusLabel;
 };
 
-#endif // SPECULARPLOTCANVAS_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
diff --git a/GUI/coregui/Views/TestView.h b/GUI/coregui/Views/TestView.h
index 13b0038fff6..95b8b387635 100644
--- a/GUI/coregui/Views/TestView.h
+++ b/GUI/coregui/Views/TestView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTVIEW_H
-#define TESTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_TESTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_TESTVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -37,4 +37,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif // TESTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_TESTVIEW_H
diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h
index 01dc449c5d9..6dd5614397e 100644
--- a/GUI/coregui/Views/WelcomeView.h
+++ b/GUI/coregui/Views/WelcomeView.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef WELCOMEVIEW_H
-#define WELCOMEVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WELCOMEVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WELCOMEVIEW_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -65,4 +65,4 @@ private:
     UpdateNotifierWidget* m_notifierWidget;
 };
 
-#endif // WELCOMEVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WELCOMEVIEW_H
diff --git a/GUI/coregui/Views/widgetbox/deviceprofile_p.h b/GUI/coregui/Views/widgetbox/deviceprofile_p.h
index 9d8aca81254..46500b34fe0 100644
--- a/GUI/coregui/Views/widgetbox/deviceprofile_p.h
+++ b/GUI/coregui/Views/widgetbox/deviceprofile_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef DEVICEPROFILE_P_H
-#define DEVICEPROFILE_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_DEVICEPROFILE_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_DEVICEPROFILE_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -154,4 +154,4 @@ inline bool operator!=(const DeviceProfile& s1, const DeviceProfile& s2)
 
 QT_END_NAMESPACE
 
-#endif // DEVICEPROFILE_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_DEVICEPROFILE_P_H
diff --git a/GUI/coregui/Views/widgetbox/formwindowbase_p.h b/GUI/coregui/Views/widgetbox/formwindowbase_p.h
index 23cdf582c70..c255618daf3 100644
--- a/GUI/coregui/Views/widgetbox/formwindowbase_p.h
+++ b/GUI/coregui/Views/widgetbox/formwindowbase_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef FORMWINDOWBASE_P_H
-#define FORMWINDOWBASE_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -197,4 +197,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // FORMWINDOWBASE_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_FORMWINDOWBASE_P_H
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h b/GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h
index 073944fa25e..dfbdcc3fa70 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_dnditem_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QDESIGNER_DNDITEM_P_H
-#define QDESIGNER_DNDITEM_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_DNDITEM_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_DNDITEM_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 #include <QtDesigner/abstractdnditem.h>
@@ -146,4 +146,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QDESIGNER_DNDITEM_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_DNDITEM_P_H
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
index 6b86c857bf3..20c200da0c3 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QDESIGNER_FORMBUILDER_P_H
-#define QDESIGNER_FORMBUILDER_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_FORMBUILDER_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_FORMBUILDER_P_H
 
 #include "GUI/coregui/Views/widgetbox/deviceprofile_p.h"
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
@@ -180,4 +180,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QDESIGNER_FORMBUILDER_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_FORMBUILDER_P_H
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h b/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
index cb1bdcd96d3..bbb258d03cd 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QDESIGNER_UTILS_P_H
-#define QDESIGNER_UTILS_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_UTILS_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_UTILS_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -519,4 +519,4 @@ inline bool isCentralWidget(QDesignerFormWindowInterface* fw, QWidget* widget)
 
 QT_END_NAMESPACE
 
-#endif // QDESIGNER_UTILS_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_UTILS_P_H
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
index 4828a11bd21..0a40765351f 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QDESIGNER_WIDGETBOX_P_H
-#define QDESIGNER_WIDGETBOX_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 #include <QtDesigner/QDesignerWidgetBoxInterface>
@@ -98,4 +98,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QDESIGNER_WIDGETBOX_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QDESIGNER_WIDGETBOX_P_H
diff --git a/GUI/coregui/Views/widgetbox/qsimpleresource_p.h b/GUI/coregui/Views/widgetbox/qsimpleresource_p.h
index 70c2d5a9129..35df1062781 100644
--- a/GUI/coregui/Views/widgetbox/qsimpleresource_p.h
+++ b/GUI/coregui/Views/widgetbox/qsimpleresource_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef QSIMPLERESOURCE_P_H
-#define QSIMPLERESOURCE_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QSIMPLERESOURCE_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QSIMPLERESOURCE_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 //#include "abstractformbuilder.h"
@@ -154,4 +154,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSIMPLERESOURCE_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_QSIMPLERESOURCE_P_H
diff --git a/GUI/coregui/Views/widgetbox/shared_enums_p.h b/GUI/coregui/Views/widgetbox/shared_enums_p.h
index 18078d907c2..93133d3423b 100644
--- a/GUI/coregui/Views/widgetbox/shared_enums_p.h
+++ b/GUI/coregui/Views/widgetbox/shared_enums_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef SHARED_ENUMS_P_H
-#define SHARED_ENUMS_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_ENUMS_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_ENUMS_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -98,4 +98,4 @@ enum AuxiliaryItemDataRoles {
 
 QT_END_NAMESPACE
 
-#endif // SHARED_ENUMS_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_ENUMS_P_H
diff --git a/GUI/coregui/Views/widgetbox/shared_global_p.h b/GUI/coregui/Views/widgetbox/shared_global_p.h
index dbbe9901b57..a81427340ee 100644
--- a/GUI/coregui/Views/widgetbox/shared_global_p.h
+++ b/GUI/coregui/Views/widgetbox/shared_global_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef SHARED_GLOBAL_P_H
-#define SHARED_GLOBAL_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_GLOBAL_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_GLOBAL_P_H
 
 #include <QtCore/qglobal.h>
 
@@ -73,4 +73,4 @@
 #define QDESIGNER_SHARED_EXPORT
 #endif
 
-#endif // SHARED_GLOBAL_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHARED_GLOBAL_P_H
diff --git a/GUI/coregui/Views/widgetbox/sheet_delegate_p.h b/GUI/coregui/Views/widgetbox/sheet_delegate_p.h
index 3b53631ec04..4d119234be6 100644
--- a/GUI/coregui/Views/widgetbox/sheet_delegate_p.h
+++ b/GUI/coregui/Views/widgetbox/sheet_delegate_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef SHEET_DELEGATE_P_H
-#define SHEET_DELEGATE_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHEET_DELEGATE_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHEET_DELEGATE_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -85,4 +85,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // SHEET_DELEGATE_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SHEET_DELEGATE_P_H
diff --git a/GUI/coregui/Views/widgetbox/spacer_widget_p.h b/GUI/coregui/Views/widgetbox/spacer_widget_p.h
index 04912245fb2..da3acc0b876 100644
--- a/GUI/coregui/Views/widgetbox/spacer_widget_p.h
+++ b/GUI/coregui/Views/widgetbox/spacer_widget_p.h
@@ -50,8 +50,8 @@
 // We mean it.
 //
 
-#ifndef SPACER_WIDGET_P_H
-#define SPACER_WIDGET_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SPACER_WIDGET_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SPACER_WIDGET_P_H
 
 #include "GUI/coregui/Views/widgetbox/shared_global_p.h"
 
@@ -116,4 +116,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // SPACER_WIDGET_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_SPACER_WIDGET_P_H
diff --git a/GUI/coregui/Views/widgetbox/ui4_p.h b/GUI/coregui/Views/widgetbox/ui4_p.h
index 0f7841ef1cb..d162e4d4cf0 100644
--- a/GUI/coregui/Views/widgetbox/ui4_p.h
+++ b/GUI/coregui/Views/widgetbox/ui4_p.h
@@ -52,8 +52,8 @@
 
 // THIS FILE IS AUTOMATICALLY GENERATED
 
-#ifndef UI4_P_H
-#define UI4_P_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_UI4_P_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_UI4_P_H
 
 #include <QtCore/QList>
 #include <QtCore/QString>
@@ -3921,4 +3921,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // UI4_P_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_UI4_P_H
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.h b/GUI/coregui/Views/widgetbox/widgetbox.h
index 5b482db91ba..2906dc9db62 100644
--- a/GUI/coregui/Views/widgetbox/widgetbox.h
+++ b/GUI/coregui/Views/widgetbox/widgetbox.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef WIDGETBOX_H
-#define WIDGETBOX_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H
 
 #include "GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h"
 #include "GUI/coregui/Views/widgetbox/widgetbox_global.h"
@@ -111,4 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // WIDGETBOX_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_H
diff --git a/GUI/coregui/Views/widgetbox/widgetbox_global.h b/GUI/coregui/Views/widgetbox/widgetbox_global.h
index e4c3afeee20..547bf2a7f84 100644
--- a/GUI/coregui/Views/widgetbox/widgetbox_global.h
+++ b/GUI/coregui/Views/widgetbox/widgetbox_global.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef WIDGETBOX_GLOBAL_H
-#define WIDGETBOX_GLOBAL_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_GLOBAL_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
@@ -54,4 +54,4 @@
 #define QT_WIDGETBOX_EXPORT
 #endif
 
-#endif // WIDGETBOX_GLOBAL_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOX_GLOBAL_H
diff --git a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h
index 69d02d3a82b..1cb79d6b6f0 100644
--- a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h
+++ b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef WIDGETBOXCATEGORYLISTVIEW_H
-#define WIDGETBOXCATEGORYLISTVIEW_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
 
 #include <QtDesigner/QDesignerWidgetBoxInterface>
 
@@ -122,4 +122,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // WIDGETBOXCATEGORYLISTVIEW_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXCATEGORYLISTVIEW_H
diff --git a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.h b/GUI/coregui/Views/widgetbox/widgetboxtreewidget.h
index 12886b1b0cf..4e7c131b437 100644
--- a/GUI/coregui/Views/widgetbox/widgetboxtreewidget.h
+++ b/GUI/coregui/Views/widgetbox/widgetboxtreewidget.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef WIDGETBOXTREEWIDGET_H
-#define WIDGETBOXTREEWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
 
 #include "GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h"
 
@@ -150,4 +150,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // WIDGETBOXTREEWIDGET_H
+#endif // BORNAGAIN_GUI_COREGUI_VIEWS_WIDGETBOX_WIDGETBOXTREEWIDGET_H
diff --git a/GUI/coregui/mainwindow/AppSvc.h b/GUI/coregui/mainwindow/AppSvc.h
index c83bb61bd36..ccb0ca8ab9c 100644
--- a/GUI/coregui/mainwindow/AppSvc.h
+++ b/GUI/coregui/mainwindow/AppSvc.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef APPSVC_H
-#define APPSVC_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_APPSVC_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_APPSVC_H
 
 #include "Core/Basics/ISingleton.h"
 #include "Wrap/WinDllMacros.h"
@@ -49,4 +49,4 @@ private:
     MaterialModel* m_materialModel;
 };
 
-#endif // APPSVC_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_APPSVC_H
diff --git a/GUI/coregui/mainwindow/AutosaveController.h b/GUI/coregui/mainwindow/AutosaveController.h
index 2627bdc5ba6..ec70155fa77 100644
--- a/GUI/coregui/mainwindow/AutosaveController.h
+++ b/GUI/coregui/mainwindow/AutosaveController.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef AUTOSAVECONTROLLER_H
-#define AUTOSAVECONTROLLER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_AUTOSAVECONTROLLER_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_AUTOSAVECONTROLLER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -56,4 +56,4 @@ private:
     UpdateTimer* m_timer;
 };
 
-#endif // AUTOSAVECONTROLLER_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_AUTOSAVECONTROLLER_H
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.h b/GUI/coregui/mainwindow/OutputDataIOHistory.h
index 79d8b154caa..a120d09d922 100644
--- a/GUI/coregui/mainwindow/OutputDataIOHistory.h
+++ b/GUI/coregui/mainwindow/OutputDataIOHistory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAIOHISTORY_H
-#define OUTPUTDATAIOHISTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOHISTORY_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOHISTORY_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDateTime>
@@ -84,4 +84,4 @@ private:
     QMap<QString, OutputDataDirHistory> m_dir_history;
 };
 
-#endif // OUTPUTDATAIOHISTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOHISTORY_H
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.h b/GUI/coregui/mainwindow/OutputDataIOService.h
index 403fc52bfb3..78cdeba74b9 100644
--- a/GUI/coregui/mainwindow/OutputDataIOService.h
+++ b/GUI/coregui/mainwindow/OutputDataIOService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OUTPUTDATAIOSERVICE_H
-#define OUTPUTDATAIOSERVICE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOSERVICE_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOSERVICE_H
 
 #include "GUI/coregui/mainwindow/OutputDataIOHistory.h"
 #include "Wrap/WinDllMacros.h"
@@ -51,4 +51,4 @@ private:
     ApplicationModels* m_applicationModels;
 };
 
-#endif // OUTPUTDATAIOSERVICE_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_OUTPUTDATAIOSERVICE_H
diff --git a/GUI/coregui/mainwindow/ProjectFlags.h b/GUI/coregui/mainwindow/ProjectFlags.h
index f455191f2fc..cdb91ff15a7 100644
--- a/GUI/coregui/mainwindow/ProjectFlags.h
+++ b/GUI/coregui/mainwindow/ProjectFlags.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTFLAGS_H
-#define PROJECTFLAGS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTFLAGS_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTFLAGS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFlags>
@@ -37,4 +37,4 @@ public:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(ProjectFlags::DocumentStatus)
 
-#endif //  PROJECTFLAGS_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTFLAGS_H
diff --git a/GUI/coregui/mainwindow/ProjectUtils.h b/GUI/coregui/mainwindow/ProjectUtils.h
index 0b2f5a02bcb..1e570e3788d 100644
--- a/GUI/coregui/mainwindow/ProjectUtils.h
+++ b/GUI/coregui/mainwindow/ProjectUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTUTILS_H
-#define PROJECTUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTUTILS_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -69,4 +69,4 @@ BA_CORE_API_ QString userExportDir();
 
 } // namespace ProjectUtils
 
-#endif // PROJECTUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTUTILS_H
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.h b/GUI/coregui/mainwindow/PyImportAssistant.h
index df45cf1e48c..c4826b0f929 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.h
+++ b/GUI/coregui/mainwindow/PyImportAssistant.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYIMPORTASSISTANT_H
-#define PYIMPORTASSISTANT_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_PYIMPORTASSISTANT_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_PYIMPORTASSISTANT_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -44,4 +44,4 @@ private:
     MainWindow* m_mainWindow;
 };
 
-#endif // PYIMPORTASSISTANT_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_PYIMPORTASSISTANT_H
diff --git a/GUI/coregui/mainwindow/SaveLoadInterface.h b/GUI/coregui/mainwindow/SaveLoadInterface.h
index ba70596b455..4afbca7dbdb 100644
--- a/GUI/coregui/mainwindow/SaveLoadInterface.h
+++ b/GUI/coregui/mainwindow/SaveLoadInterface.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAVELOADINTERFACE_H
-#define SAVELOADINTERFACE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVELOADINTERFACE_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVELOADINTERFACE_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -50,4 +50,4 @@ public:
     QString fileName(const QString& projectDir) const;
 };
 
-#endif // SAVELOADINTERFACE_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVELOADINTERFACE_H
diff --git a/GUI/coregui/mainwindow/SaveService.h b/GUI/coregui/mainwindow/SaveService.h
index f41fe7c7f5d..75cdd770486 100644
--- a/GUI/coregui/mainwindow/SaveService.h
+++ b/GUI/coregui/mainwindow/SaveService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAVESERVICE_H
-#define SAVESERVICE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVESERVICE_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVESERVICE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -63,4 +63,4 @@ private:
     ProjectDocument* m_document;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVESERVICE_H
diff --git a/GUI/coregui/mainwindow/SaveThread.h b/GUI/coregui/mainwindow/SaveThread.h
index bca85359458..c990aedf5c4 100644
--- a/GUI/coregui/mainwindow/SaveThread.h
+++ b/GUI/coregui/mainwindow/SaveThread.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SAVETHREAD_H
-#define SAVETHREAD_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVETHREAD_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVETHREAD_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -42,4 +42,4 @@ private:
     QString m_projectFile;
 };
 
-#endif // SAVETHREAD_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_SAVETHREAD_H
diff --git a/GUI/coregui/mainwindow/SplashScreen.h b/GUI/coregui/mainwindow/SplashScreen.h
index c88cae37b9d..face1a35555 100644
--- a/GUI/coregui/mainwindow/SplashScreen.h
+++ b/GUI/coregui/mainwindow/SplashScreen.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SPLASHSCREEN_H
-#define SPLASHSCREEN_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_SPLASHSCREEN_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_SPLASHSCREEN_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QSplashScreen>
@@ -36,4 +36,4 @@ private:
     int m_percentage_done;
 };
 
-#endif // SPLASHSCREEN_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_SPLASHSCREEN_H
diff --git a/GUI/coregui/mainwindow/StyledToolBar.h b/GUI/coregui/mainwindow/StyledToolBar.h
index 2a5f1123364..bf13f5244da 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.h
+++ b/GUI/coregui/mainwindow/StyledToolBar.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STYLEDTOOLBAR_H
-#define STYLEDTOOLBAR_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_STYLEDTOOLBAR_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_STYLEDTOOLBAR_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QToolBar>
@@ -34,4 +34,4 @@ protected:
     void contextMenuEvent(QContextMenuEvent*);
 };
 
-#endif // STYLEDTOOLBAR_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_STYLEDTOOLBAR_H
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.h b/GUI/coregui/mainwindow/UpdateNotifier.h
index ce821e99170..ad5825cab02 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.h
+++ b/GUI/coregui/mainwindow/UpdateNotifier.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UPDATENOTIFIER_H
-#define UPDATENOTIFIER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIER_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -44,4 +44,4 @@ private:
     QNetworkAccessManager* m_networkAccessManager;
 };
 
-#endif // UPDATENOTIFIER_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIER_H
diff --git a/GUI/coregui/mainwindow/UpdateNotifierWidget.h b/GUI/coregui/mainwindow/UpdateNotifierWidget.h
index a51f8c3c517..35661477b8a 100644
--- a/GUI/coregui/mainwindow/UpdateNotifierWidget.h
+++ b/GUI/coregui/mainwindow/UpdateNotifierWidget.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef UPDATENOTIFIERWIDGET_H
-#define UPDATENOTIFIERWIDGET_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIERWIDGET_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIERWIDGET_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QWidget>
@@ -43,4 +43,4 @@ private:
     bool m_check_for_updates;
 };
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_UPDATENOTIFIERWIDGET_H
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.h b/GUI/coregui/mainwindow/aboutapplicationdialog.h
index e4584c9d808..0504df3fe18 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.h
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ABOUTAPPLICATIONDIALOG_H
-#define ABOUTAPPLICATIONDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -34,4 +34,4 @@ private:
     QBoxLayout* createButtonLayout();
 };
 
-#endif // ABOUTAPPLICATIONDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
diff --git a/GUI/coregui/mainwindow/actionmanager.h b/GUI/coregui/mainwindow/actionmanager.h
index fca511663e0..0ffd6b60fa9 100644
--- a/GUI/coregui/mainwindow/actionmanager.h
+++ b/GUI/coregui/mainwindow/actionmanager.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ACTIONMANAGER_H
-#define ACTIONMANAGER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_ACTIONMANAGER_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_ACTIONMANAGER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -64,4 +64,4 @@ private:
     void createGlobalShortcuts();
 };
 
-#endif // ACTIONMANAGER_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_ACTIONMANAGER_H
diff --git a/GUI/coregui/mainwindow/mainwindow.h b/GUI/coregui/mainwindow/mainwindow.h
index aae9cfa0713..4adff69adbe 100644
--- a/GUI/coregui/mainwindow/mainwindow.h
+++ b/GUI/coregui/mainwindow/mainwindow.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_H
 
 #include "Wrap/WinDllMacros.h"
 #include "fancymainwindow.h"
@@ -101,4 +101,4 @@ private:
     SessionModelView* m_sessionModelView;
 };
 
-#endif // MAINWINDOW_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_H
diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/coregui/mainwindow/mainwindow_constants.h
index e7651e51c7f..d5e4134fb87 100644
--- a/GUI/coregui/mainwindow/mainwindow_constants.h
+++ b/GUI/coregui/mainwindow/mainwindow_constants.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MAINWINDOW_CONSTANTS_H
-#define MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
 
 #include <QString>
 
@@ -81,4 +81,4 @@ const int styled_toolbar_height = 25;
 
 } // namespace Constants
 
-#endif // MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/coregui/mainwindow/newprojectdialog.h b/GUI/coregui/mainwindow/newprojectdialog.h
index fb3f85152fc..728c51da960 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.h
+++ b/GUI/coregui/mainwindow/newprojectdialog.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef NEWPROJECTDIALOG_H
-#define NEWPROJECTDIALOG_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_NEWPROJECTDIALOG_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_NEWPROJECTDIALOG_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QDialog>
@@ -60,4 +60,4 @@ private:
     bool m_valid_projectPath;
 };
 
-#endif // NEWPROJECTDIALOG_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_NEWPROJECTDIALOG_H
diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/coregui/mainwindow/projectdocument.h
index 09ef6414f94..637429bf611 100644
--- a/GUI/coregui/mainwindow/projectdocument.h
+++ b/GUI/coregui/mainwindow/projectdocument.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTDOCUMENT_H
-#define PROJECTDOCUMENT_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTDOCUMENT_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTDOCUMENT_H
 
 #include "GUI/coregui/mainwindow/ProjectFlags.h"
 #include "Wrap/WinDllMacros.h"
@@ -108,4 +108,4 @@ private:
     OutputDataIOService* m_dataService;
 };
 
-#endif // PROJECTDOCUMENT_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTDOCUMENT_H
diff --git a/GUI/coregui/mainwindow/projectmanager.h b/GUI/coregui/mainwindow/projectmanager.h
index b847df611c9..6f1a727670d 100644
--- a/GUI/coregui/mainwindow/projectmanager.h
+++ b/GUI/coregui/mainwindow/projectmanager.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PROJECTMANAGER_H
-#define PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTMANAGER_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -87,4 +87,4 @@ private:
     SaveService* m_saveService;
 };
 
-#endif // PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_PROJECTMANAGER_H
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/coregui/mainwindow/tooltipdatabase.h
index 2a0518c55be..d9319b6f008 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.h
+++ b/GUI/coregui/mainwindow/tooltipdatabase.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TOOLTIPDATABASE_H
-#define TOOLTIPDATABASE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MAINWINDOW_TOOLTIPDATABASE_H
+#define BORNAGAIN_GUI_COREGUI_MAINWINDOW_TOOLTIPDATABASE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -43,4 +43,4 @@ private:
     static QMap<QString, QString> m_tagToToolTip;
 };
 
-#endif // TOOLTIPDATABASE_H
+#endif // BORNAGAIN_GUI_COREGUI_MAINWINDOW_TOOLTIPDATABASE_H
diff --git a/GUI/coregui/utils/CustomEventFilters.h b/GUI/coregui/utils/CustomEventFilters.h
index cb23f338857..f831b4f37f5 100644
--- a/GUI/coregui/utils/CustomEventFilters.h
+++ b/GUI/coregui/utils/CustomEventFilters.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CUSTOMEVENTFILTERS_H
-#define CUSTOMEVENTFILTERS_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_CUSTOMEVENTFILTERS_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_CUSTOMEVENTFILTERS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QObject>
@@ -112,4 +112,4 @@ protected:
     QWidget* m_parent;
 };
 
-#endif // CUSTOMEVENTFILTERS_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_CUSTOMEVENTFILTERS_H
diff --git a/GUI/coregui/utils/FancyLabel.h b/GUI/coregui/utils/FancyLabel.h
index 7f493161cb0..f22a6a31c13 100644
--- a/GUI/coregui/utils/FancyLabel.h
+++ b/GUI/coregui/utils/FancyLabel.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FANCYLABEL_H
-#define FANCYLABEL_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_FANCYLABEL_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_FANCYLABEL_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QLabel>
@@ -41,4 +41,4 @@ private:
     int m_current_index;
 };
 
-#endif // FANCYLABEL_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_FANCYLABEL_H
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h
index 0964edb1e13..5aa1b8d1058 100644
--- a/GUI/coregui/utils/GUIHelpers.h
+++ b/GUI/coregui/utils/GUIHelpers.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIHELPERS_H
-#define GUIHELPERS_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_GUIHELPERS_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_GUIHELPERS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QStringList>
@@ -87,4 +87,4 @@ inline std::ostream& operator<<(std::ostream& stream, const QString& str)
     return stream;
 }
 
-#endif // GUIHELPERS_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_GUIHELPERS_H
diff --git a/GUI/coregui/utils/GUIMessage.h b/GUI/coregui/utils/GUIMessage.h
index 276c693b2fe..a5510112077 100644
--- a/GUI/coregui/utils/GUIMessage.h
+++ b/GUI/coregui/utils/GUIMessage.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIMESSAGE_H
-#define GUIMESSAGE_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_GUIMESSAGE_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_GUIMESSAGE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -43,4 +43,4 @@ private:
     QString m_messageDescription;
 };
 
-#endif // GUIMESSAGE_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_GUIMESSAGE_H
diff --git a/GUI/coregui/utils/ImportDataInfo.h b/GUI/coregui/utils/ImportDataInfo.h
index 45083425f1d..55fe63ed9f4 100644
--- a/GUI/coregui/utils/ImportDataInfo.h
+++ b/GUI/coregui/utils/ImportDataInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMPORTDATAINFO_H
-#define IMPORTDATAINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_IMPORTDATAINFO_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_IMPORTDATAINFO_H
 
 #include "Core/Instrument/IUnitConverter.h"
 #include "Wrap/WinDllMacros.h"
@@ -47,4 +47,4 @@ private:
     AxesUnits m_units;
 };
 
-#endif // IMPORTDATAINFO_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_IMPORTDATAINFO_H
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/coregui/utils/ItemIDFactory.h
index 40eef9a0cff..4c0977de8dc 100644
--- a/GUI/coregui/utils/ItemIDFactory.h
+++ b/GUI/coregui/utils/ItemIDFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITEMIDFACTORY_H
-#define ITEMIDFACTORY_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_ITEMIDFACTORY_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_ITEMIDFACTORY_H
 
 #include <QMap>
 #include <QUuid>
@@ -46,4 +46,4 @@ private:
     QMap<SessionItem*, QString> ItemtoIDMap;
 };
 
-#endif // ITEMIDFACTORY_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_ITEMIDFACTORY_H
diff --git a/GUI/coregui/utils/LayoutUtils.h b/GUI/coregui/utils/LayoutUtils.h
index f151a3f02ea..7d82000adfb 100644
--- a/GUI/coregui/utils/LayoutUtils.h
+++ b/GUI/coregui/utils/LayoutUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef LAYOUTUTILS_H
-#define LAYOUTUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_LAYOUTUTILS_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_LAYOUTUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -43,4 +43,4 @@ BA_CORE_API_ void clearGridLayout(QGridLayout* layout, bool deleteWidgets = true
 BA_CORE_API_ QWidget* placeHolder();
 } // namespace LayoutUtils
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_LAYOUTUTILS_H
diff --git a/GUI/coregui/utils/MessageService.h b/GUI/coregui/utils/MessageService.h
index cd41c6e8c36..af5288f590f 100644
--- a/GUI/coregui/utils/MessageService.h
+++ b/GUI/coregui/utils/MessageService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESSAGESERVICE_H
-#define MESSAGESERVICE_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_MESSAGESERVICE_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_MESSAGESERVICE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QMap>
@@ -51,4 +51,4 @@ private:
     QList<GUIMessage*> m_messages;
 };
 
-#endif // MESSAGESERVICE_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_MESSAGESERVICE_H
diff --git a/GUI/coregui/utils/StyleUtils.h b/GUI/coregui/utils/StyleUtils.h
index 091c6f748c4..aeb66e0381a 100644
--- a/GUI/coregui/utils/StyleUtils.h
+++ b/GUI/coregui/utils/StyleUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STYLEUTILS_H
-#define STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_STYLEUTILS_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_STYLEUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QFont>
@@ -62,4 +62,4 @@ BA_CORE_API_ int PropertyPanelWidth();
 
 } // namespace StyleUtils
 
-#endif
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_STYLEUTILS_H
diff --git a/GUI/coregui/utils/hostosinfo.h b/GUI/coregui/utils/hostosinfo.h
index bbcef47c953..5e6b9aa2220 100644
--- a/GUI/coregui/utils/hostosinfo.h
+++ b/GUI/coregui/utils/hostosinfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef HOSTOSINFO_H
-#define HOSTOSINFO_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_HOSTOSINFO_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_HOSTOSINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -117,4 +117,4 @@ BA_CORE_API_ bool HostOsInfo::isAnyUnixHost()
 
 } // namespace GUI_OS_Utils
 
-#endif // HOSTOSINFO_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_HOSTOSINFO_H
diff --git a/GUI/coregui/utils/qstringutils.h b/GUI/coregui/utils/qstringutils.h
index cc29f4d670c..3b4f9419096 100644
--- a/GUI/coregui/utils/qstringutils.h
+++ b/GUI/coregui/utils/qstringutils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef QSTRINGUTILS_H
-#define QSTRINGUTILS_H
+#ifndef BORNAGAIN_GUI_COREGUI_UTILS_QSTRINGUTILS_H
+#define BORNAGAIN_GUI_COREGUI_UTILS_QSTRINGUTILS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <QString>
@@ -25,4 +25,4 @@ BA_CORE_API_ QString withTildeHomePath(const QString& path);
 
 }
 
-#endif // QSTRINGUTILS_H
+#endif // BORNAGAIN_GUI_COREGUI_UTILS_QSTRINGUTILS_H
diff --git a/GUI/main/appoptions.h b/GUI/main/appoptions.h
index 53dd5f6ec6b..077abc096e3 100644
--- a/GUI/main/appoptions.h
+++ b/GUI/main/appoptions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef APPOPTIONS_H
-#define APPOPTIONS_H
+#ifndef BORNAGAIN_GUI_MAIN_APPOPTIONS_H
+#define BORNAGAIN_GUI_MAIN_APPOPTIONS_H
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/positional_options.hpp>
@@ -70,4 +70,4 @@ private:
     bpo::variables_map m_variables_map; //! parsed variables
 };
 
-#endif // APPOPTIONS_H
+#endif // BORNAGAIN_GUI_MAIN_APPOPTIONS_H
diff --git a/Tests/Functional/Core/CoreSpecial/BatchSimulation.h b/Tests/Functional/Core/CoreSpecial/BatchSimulation.h
index 4439dbeb26b..8e81d68b671 100644
--- a/Tests/Functional/Core/CoreSpecial/BatchSimulation.h
+++ b/Tests/Functional/Core/CoreSpecial/BatchSimulation.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BATCHSIMULATION_H
-#define BATCHSIMULATION_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_BATCHSIMULATION_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_BATCHSIMULATION_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -25,4 +25,4 @@ protected:
     bool runTest();
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_BATCHSIMULATION_H
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h
index 92794791d17..0189d00ff07 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COREIOPATHTEST_H
-#define COREIOPATHTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPATHTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPATHTEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -27,4 +27,4 @@ public:
     bool runTest();
 };
 
-#endif // COREIOPATHTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPATHTEST_H
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
index 0b2e7bfe560..4ba55fabfe7 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COREIOPERFORMANCETEST_H
-#define COREIOPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPERFORMANCETEST_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Tests/Functional/TestMachinery/Benchmark.h"
@@ -51,4 +51,4 @@ private:
     std::vector<TestResults> m_test_results;
 };
 
-#endif // COREIOPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_COREIOPERFORMANCETEST_H
diff --git a/Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.h b/Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.h
index e821d782c8f..1c932640f9e 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.h
+++ b/Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CORESPECIALTESTFACTORY_H
-#define CORESPECIALTESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_CORESPECIALTESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_CORESPECIALTESTFACTORY_H
 
 #include "Tests/Functional/TestMachinery/FunctionalTestFactory.h"
 
@@ -26,4 +26,4 @@ public:
     CoreSpecialTestFactory();
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_CORESPECIALTESTFACTORY_H
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.h b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.h
index fecc5fdc859..73c1c3ca248 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.h
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FOURIERTRANSFORMATIONTEST_H
-#define FOURIERTRANSFORMATIONTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_FOURIERTRANSFORMATIONTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_FOURIERTRANSFORMATIONTEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -28,4 +28,4 @@ private:
     bool test_fft(const std::string& input_image_name, const std::string& reference_fft_name);
 };
 
-#endif // FOURIERTRANSFORMATIONTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_FOURIERTRANSFORMATIONTEST_H
diff --git a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
index fdd5f53eedc..b62531089c9 100644
--- a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
+++ b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceBuilder.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTALPERFORMANCEBUILDER_H
-#define MESOCRYSTALPERFORMANCEBUILDER_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCEBUILDER_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCEBUILDER_H
 
 #include "Core/Material/Material.h"
 #include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -53,4 +53,4 @@ private:
     int m_tilt_steps;
 };
 
-#endif // FOURIERTRANSFORMATIONTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCEBUILDER_H
diff --git a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.h b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.h
index c15f9b9acd8..3300e3d9166 100644
--- a/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.h
+++ b/Tests/Functional/Core/CoreSpecial/MesoCrystalPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MESOCRYSTALPERFORMANCETEST_H
-#define MESOCRYSTALPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCETEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -25,4 +25,4 @@ protected:
     bool runTest();
 };
 
-#endif // FOURIERTRANSFORMATIONTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MESOCRYSTALPERFORMANCETEST_H
diff --git a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.h b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.h
index 24eb5524e7f..9f2b4e407a9 100644
--- a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.h
+++ b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTITHREADPERFORMANCETEST_H
-#define MULTITHREADPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <map>
@@ -52,4 +52,4 @@ private:
     TestResult test_case(const std::string& sim_type, int nrepetitions, int nthreads) const;
 };
 
-#endif // MULTITHREADPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETEST_H
diff --git a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h
index 15aba9d5c91..058a34db06e 100644
--- a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h
+++ b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTITHREADPERFORMANCETESTCOMPONENTS_H
-#define MULTITHREADPERFORMANCETESTCOMPONENTS_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETESTCOMPONENTS_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETESTCOMPONENTS_H
 
 #include <memory>
 
@@ -37,4 +37,4 @@ std::unique_ptr<Simulation> CreateMCGISAS();
 
 } // namespace TestComponents
 
-#endif // MULTITHREADPERFORMANCETESTCOMPONENTS_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTITHREADPERFORMANCETESTCOMPONENTS_H
diff --git a/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.h b/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.h
index 1bc79a4dce7..ea4b271e59c 100644
--- a/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.h
+++ b/Tests/Functional/Core/CoreSpecial/MultilayerPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MULTILAYERPERFORMANCETEST_H
-#define MULTILAYERPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTILAYERPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTILAYERPERFORMANCETEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -28,4 +28,4 @@ private:
     bool runTest() override;
 };
 
-#endif // MULTILAYERPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESPECIAL_MULTILAYERPERFORMANCETEST_H
diff --git a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h
index 50cac7de6e6..50524685053 100644
--- a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h
+++ b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CORESTANDARDTEST_H
-#define CORESTANDARDTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESTANDARDTEST_CORESTANDARDTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESTANDARDTEST_CORESTANDARDTEST_H
 
 #include "Tests/Functional/TestMachinery/IStandardTest.h"
 
@@ -30,4 +30,4 @@ public:
     bool runTest() final;
 };
 
-#endif // CORESTANDARDTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_CORESTANDARDTEST_CORESTANDARDTEST_H
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h
index ece97694ed4..24ae8451bf1 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CORESELFCONSISTENCYTEST_H
-#define CORESELFCONSISTENCYTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <memory>
@@ -38,4 +38,4 @@ private:
     double m_threshold;
 };
 
-#endif // CORESELFCONSISTENCYTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETEST_H
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.h b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.h
index b52f4f59cb8..00183f38982 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.h
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SELFCONSISTENCETESTSERVICE_H
-#define SELFCONSISTENCETESTSERVICE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETESTSERVICE_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETESTSERVICE_H
 
 //! @class SelfConsistenceTestService
 //! @brief Contains static method to run self-consistence functional test from standalone
@@ -25,4 +25,4 @@ public:
     static bool execute(int argc, char** argv);
 };
 
-#endif // SELFCONSISTENCETESTSERVICE_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_CORE_SELFCONSISTENCETEST_SELFCONSISTENCETESTSERVICE_H
diff --git a/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h b/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h
index 1ec005a8f15..9328a6ec672 100644
--- a/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h
+++ b/Tests/Functional/Fit/FitObjective/AdjustMinimizerPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ADJUSTMINIMIZERPLAN_H
-#define ADJUSTMINIMIZERPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_ADJUSTMINIMIZERPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_ADJUSTMINIMIZERPLAN_H
 
 #include "Tests/Functional/Fit/FitObjective/FitPlan.h"
 
@@ -28,4 +28,4 @@ public:
     bool checkMinimizer(Fit::Minimizer& minimizer);
 };
 
-#endif //  ADJUSTMINIMIZERPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_ADJUSTMINIMIZERPLAN_H
diff --git a/Tests/Functional/Fit/FitObjective/FitObjectiveTest.h b/Tests/Functional/Fit/FitObjective/FitObjectiveTest.h
index 79837ac0f5c..7cbda20e984 100644
--- a/Tests/Functional/Fit/FitObjective/FitObjectiveTest.h
+++ b/Tests/Functional/Fit/FitObjective/FitObjectiveTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBJECTIVETEST_H
-#define FITOBJECTIVETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETEST_H
 
 #include "Tests/Functional/TestMachinery/IMinimizerTest.h"
 
@@ -29,4 +29,4 @@ protected:
     std::unique_ptr<MinimizerTestPlan> createPlan() const;
 };
 
-#endif // FITOBJECTIVETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETEST_H
diff --git a/Tests/Functional/Fit/FitObjective/FitObjectiveTestCases.h b/Tests/Functional/Fit/FitObjective/FitObjectiveTestCases.h
index 48c01693cba..60bb012bddf 100644
--- a/Tests/Functional/Fit/FitObjective/FitObjectiveTestCases.h
+++ b/Tests/Functional/Fit/FitObjective/FitObjectiveTestCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBJECTIVETESTCASES_H
-#define FITOBJECTIVETESTCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTCASES_H
 
 //! Collection of FitObjective tests.
 
@@ -107,4 +107,4 @@ public:
     OffSpecFitTest();
 };
 
-#endif //   MINIMIZERTESTCASES_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTCASES_H
diff --git a/Tests/Functional/Fit/FitObjective/FitObjectiveTestFactory.h b/Tests/Functional/Fit/FitObjective/FitObjectiveTestFactory.h
index 48c4b1dee21..317a84ac4d8 100644
--- a/Tests/Functional/Fit/FitObjective/FitObjectiveTestFactory.h
+++ b/Tests/Functional/Fit/FitObjective/FitObjectiveTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITOBJECTIVETESTFACTORY_H
-#define FITOBJECTIVETESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTFACTORY_H
 
 #include "Tests/Functional/TestMachinery/FunctionalTestFactory.h"
 
@@ -25,4 +25,4 @@ public:
     FitObjectiveTestFactory();
 };
 
-#endif // FITOBJECTIVETESTFACTORY_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITOBJECTIVETESTFACTORY_H
diff --git a/Tests/Functional/Fit/FitObjective/FitPlan.h b/Tests/Functional/Fit/FitObjective/FitPlan.h
index 57edb7f98be..a1fceec2eab 100644
--- a/Tests/Functional/Fit/FitObjective/FitPlan.h
+++ b/Tests/Functional/Fit/FitObjective/FitPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPLAN_H
-#define FITPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLAN_H
 
 #include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
 #include <memory>
@@ -52,4 +52,4 @@ protected:
     bool m_residual_based;
 };
 
-#endif // FITPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLAN_H
diff --git a/Tests/Functional/Fit/FitObjective/FitPlanCases.h b/Tests/Functional/Fit/FitObjective/FitPlanCases.h
index 40e51cd6b0d..dabf0e21393 100644
--- a/Tests/Functional/Fit/FitObjective/FitPlanCases.h
+++ b/Tests/Functional/Fit/FitObjective/FitPlanCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPLANCASES_H
-#define FITPLANCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANCASES_H
 
 #include "Tests/Functional/Fit/FitObjective/FitPlan.h"
 
@@ -95,4 +95,4 @@ public:
     ~OffSpecFitPlan() override = default;
 };
 
-#endif //  FITPLANCASES_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANCASES_H
diff --git a/Tests/Functional/Fit/FitObjective/FitPlanFactory.h b/Tests/Functional/Fit/FitObjective/FitPlanFactory.h
index 15279e82e4b..427a1893dc0 100644
--- a/Tests/Functional/Fit/FitObjective/FitPlanFactory.h
+++ b/Tests/Functional/Fit/FitObjective/FitPlanFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FITPLANFACTORY_H
-#define FITPLANFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANFACTORY_H
 
 #include "Core/StandardSamples/IFactory.h"
 #include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
@@ -26,4 +26,4 @@ public:
     FitPlanFactory();
 };
 
-#endif //   FITPLANFACTORY_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_FITOBJECTIVE_FITPLANFACTORY_H
diff --git a/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h b/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h
index c6c23beefcc..c6b5af01e79 100644
--- a/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h
+++ b/Tests/Functional/Fit/Minimizer/FunctionTestPlanCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FUNCTIONTESTPLANCASES_H
-#define FUNCTIONTESTPLANCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANCASES_H
 
 #include "Tests/Functional/Fit/Minimizer/ResidualTestPlan.h"
 #include "Tests/Functional/Fit/Minimizer/ScalarTestPlan.h"
@@ -77,4 +77,4 @@ public:
     TestMinimizerPlan();
 };
 
-#endif //  FUNCTIONTESTPLANCASES_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANCASES_H
diff --git a/Tests/Functional/Fit/Minimizer/FunctionTestPlanFactory.h b/Tests/Functional/Fit/Minimizer/FunctionTestPlanFactory.h
index 5e349e78e8c..16da87d850a 100644
--- a/Tests/Functional/Fit/Minimizer/FunctionTestPlanFactory.h
+++ b/Tests/Functional/Fit/Minimizer/FunctionTestPlanFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FUNCTIONTESTPLANFACTORY_H
-#define FUNCTIONTESTPLANFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANFACTORY_H
 
 #include "Core/StandardSamples/IFactory.h"
 #include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
@@ -26,4 +26,4 @@ public:
     FunctionTestPlanFactory();
 };
 
-#endif //   FUNCTIONTESTPLANFACTORY_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_FUNCTIONTESTPLANFACTORY_H
diff --git a/Tests/Functional/Fit/Minimizer/MinimizerTest.h b/Tests/Functional/Fit/Minimizer/MinimizerTest.h
index 5d575e1e371..da9551be80d 100644
--- a/Tests/Functional/Fit/Minimizer/MinimizerTest.h
+++ b/Tests/Functional/Fit/Minimizer/MinimizerTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERTEST_H
-#define MINIMIZERTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTEST_H
 
 #include "Tests/Functional/TestMachinery/IMinimizerTest.h"
 
@@ -29,4 +29,4 @@ protected:
     std::unique_ptr<MinimizerTestPlan> createPlan() const;
 };
 
-#endif // MINIMIZERTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTEST_H
diff --git a/Tests/Functional/Fit/Minimizer/MinimizerTestCases.h b/Tests/Functional/Fit/Minimizer/MinimizerTestCases.h
index 9c82c7f28a8..1b7d226d978 100644
--- a/Tests/Functional/Fit/Minimizer/MinimizerTestCases.h
+++ b/Tests/Functional/Fit/Minimizer/MinimizerTestCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERTESTCASES_H
-#define MINIMIZERTESTCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTCASES_H
 
 //! Collection of minimizer tests.
 
@@ -139,4 +139,4 @@ public:
     TestMinimizerV1();
 };
 
-#endif //   MINIMIZERTESTCASES_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTCASES_H
diff --git a/Tests/Functional/Fit/Minimizer/MinimizerTestFactory.h b/Tests/Functional/Fit/Minimizer/MinimizerTestFactory.h
index 00b268f9ced..070bf1d4c85 100644
--- a/Tests/Functional/Fit/Minimizer/MinimizerTestFactory.h
+++ b/Tests/Functional/Fit/Minimizer/MinimizerTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERTESTFACTORY_H
-#define MINIMIZERTESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTFACTORY_H
 
 #include "Tests/Functional/TestMachinery/FunctionalTestFactory.h"
 
@@ -25,4 +25,4 @@ public:
     MinimizerTestFactory();
 };
 
-#endif // MINIMIZERTESTFACTORY_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_MINIMIZERTESTFACTORY_H
diff --git a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.h b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.h
index 094e2f35335..2725d31a495 100644
--- a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.h
+++ b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef RESIDUALTESTPLAN_H
-#define RESIDUALTESTPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_RESIDUALTESTPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_RESIDUALTESTPLAN_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
@@ -39,4 +39,4 @@ private:
     test_funct_t m_test_func;
 };
 
-#endif // RESIDUALTESTPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_RESIDUALTESTPLAN_H
diff --git a/Tests/Functional/Fit/Minimizer/ScalarTestPlan.h b/Tests/Functional/Fit/Minimizer/ScalarTestPlan.h
index 653f7c88f97..d983221cad9 100644
--- a/Tests/Functional/Fit/Minimizer/ScalarTestPlan.h
+++ b/Tests/Functional/Fit/Minimizer/ScalarTestPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef SCALARTESTPLAN_H
-#define SCALARTESTPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_SCALARTESTPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_SCALARTESTPLAN_H
 
 #include "Fit/Kernel/KernelTypes.h"
 #include "Tests/Functional/TestMachinery/MinimizerTestPlan.h"
@@ -38,4 +38,4 @@ private:
     double m_tolerance_on_minimum;
 };
 
-#endif // SCALARTESTPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_FIT_MINIMIZER_SCALARTESTPLAN_H
diff --git a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
index 6356f0edcb4..ef79762f0d3 100644
--- a/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
+++ b/Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef CSVIMPORTASSISTANTPERFORMANCETEST_H
-#define CSVIMPORTASSISTANTPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
 
 #include "GUI/coregui/Models/SpecularDataItem.h"
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
@@ -42,4 +42,4 @@ protected:
 private:
 };
 
-#endif // CSVIMPORTASSISTANTPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
diff --git a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h
index 4026e9e0aeb..ec412e9cc72 100644
--- a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h
+++ b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUIPERFORMANCETEST_H
-#define GUIPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <QString>
@@ -41,4 +41,4 @@ private:
     QString m_sample_name;
 };
 
-#endif // GUIPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
diff --git a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h
index f27730341d9..06cbc4ed93d 100644
--- a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h
+++ b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUISAVELOADPROJECT_H
-#define GUISAVELOADPROJECT_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISAVELOADPROJECT_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISAVELOADPROJECT_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <QMap>
@@ -54,4 +54,4 @@ private:
     QMap<QString, QVector<DataXML>> m_results;
 };
 
-#endif // GUISAVELOADPROJECT_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISAVELOADPROJECT_H
diff --git a/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.h b/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.h
index bf253f06157..5eb6f241703 100644
--- a/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.h
+++ b/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUISPECIALTESTFACTORY_H
-#define GUISPECIALTESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISPECIALTESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISPECIALTESTFACTORY_H
 
 #include "Tests/Functional/TestMachinery/FunctionalTestFactory.h"
 
@@ -26,4 +26,4 @@ public:
     GUISpecialTestFactory();
 };
 
-#endif // GUISPECIALTESTFACTORY_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUISPECIALTESTFACTORY_H
diff --git a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.h b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.h
index 33a89a53a1c..09ead98dd98 100644
--- a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.h
+++ b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUITRANSLATIONTEST_H
-#define GUITRANSLATIONTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUITRANSLATIONTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUITRANSLATIONTEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <map>
@@ -63,4 +63,4 @@ private:
     std::string m_simulationName, m_sampleName;
 };
 
-#endif // GUITRANSLATIONTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUITRANSLATIONTEST_H
diff --git a/Tests/Functional/GUI/GUISpecial/TranslationCases.h b/Tests/Functional/GUI/GUISpecial/TranslationCases.h
index 93915098929..6262fe9df7b 100644
--- a/Tests/Functional/GUI/GUISpecial/TranslationCases.h
+++ b/Tests/Functional/GUI/GUISpecial/TranslationCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TRANSLATIONCASES_H
-#define TRANSLATIONCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_TRANSLATIONCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_TRANSLATIONCASES_H
 
 #include "Tests/Functional/GUI/GUISpecial/GUITranslationTest.h"
 
@@ -131,4 +131,4 @@ public:
     ~MagneticSpheresTranslationTest();
 };
 
-#endif // TRANSLATIONCASES_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_TRANSLATIONCASES_H
diff --git a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h
index 0bae20f591e..41c7dd4eb4b 100644
--- a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h
+++ b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef GUISTANDARDTEST_H
-#define GUISTANDARDTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISTANDARDTEST_GUISTANDARDTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISTANDARDTEST_GUISTANDARDTEST_H
 
 #include "Tests/Functional/TestMachinery/IStandardTest.h"
 
@@ -29,4 +29,4 @@ public:
     bool runTest() final;
 };
 
-#endif // GUISTANDARDTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISTANDARDTEST_GUISTANDARDTEST_H
diff --git a/Tests/Functional/Python/PyEmbedded/PyEmbeddedTestFactory.h b/Tests/Functional/Python/PyEmbedded/PyEmbeddedTestFactory.h
index cb0e044f8ac..e9d9a56fe49 100644
--- a/Tests/Functional/Python/PyEmbedded/PyEmbeddedTestFactory.h
+++ b/Tests/Functional/Python/PyEmbedded/PyEmbeddedTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYEMBEDDEDTESTFACTORY_H
-#define PYEMBEDDEDTESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_PYEMBEDDEDTESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_PYEMBEDDEDTESTFACTORY_H
 
 #include "Tests/Functional/TestMachinery/FunctionalTestFactory.h"
 
@@ -26,4 +26,4 @@ public:
     PyEmbeddedTestFactory();
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_PYEMBEDDEDTESTFACTORY_H
diff --git a/Tests/Functional/Python/PyEmbedded/TestCases.h b/Tests/Functional/Python/PyEmbedded/TestCases.h
index 94019410e16..1ba53a04316 100644
--- a/Tests/Functional/Python/PyEmbedded/TestCases.h
+++ b/Tests/Functional/Python/PyEmbedded/TestCases.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTCASES_H
-#define TESTCASES_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_TESTCASES_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_TESTCASES_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 
@@ -89,4 +89,4 @@ protected:
     bool runTest();
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYEMBEDDED_TESTCASES_H
diff --git a/Tests/Functional/Python/PyStandard/PyStandardTest.h b/Tests/Functional/Python/PyStandard/PyStandardTest.h
index 62c0ffebae5..113a0dd2360 100644
--- a/Tests/Functional/Python/PyStandard/PyStandardTest.h
+++ b/Tests/Functional/Python/PyStandard/PyStandardTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PYSTANDARDTEST_H
-#define PYSTANDARDTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYSTANDARD_PYSTANDARDTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYSTANDARD_PYSTANDARDTEST_H
 
 #include "Tests/Functional/TestMachinery/IStandardTest.h"
 
@@ -28,4 +28,4 @@ public:
     bool runTest() final;
 };
 
-#endif // PYSTANDARDTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_PYTHON_PYSTANDARD_PYSTANDARDTEST_H
diff --git a/Tests/Functional/TestMachinery/Benchmark.h b/Tests/Functional/TestMachinery/Benchmark.h
index 9c69bbc8ad3..0d16dcf2118 100644
--- a/Tests/Functional/TestMachinery/Benchmark.h
+++ b/Tests/Functional/TestMachinery/Benchmark.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BENCHMARK_H
-#define BENCHMARK_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
 
 #include "Core/Tools/OrderedMap.h"
 #include "Fit/Tools/WallclockTimer.h"
@@ -62,4 +62,4 @@ private:
     BenchmarkMap m_data;
 };
 
-#endif // COREIOTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
diff --git a/Tests/Functional/TestMachinery/FunctionalTestFactory.h b/Tests/Functional/TestMachinery/FunctionalTestFactory.h
index 0df1e5f1d38..e580d05e3ef 100644
--- a/Tests/Functional/TestMachinery/FunctionalTestFactory.h
+++ b/Tests/Functional/TestMachinery/FunctionalTestFactory.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef FUNCTIONALTESTFACTORY_H
-#define FUNCTIONALTESTFACTORY_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_FUNCTIONALTESTFACTORY_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_FUNCTIONALTESTFACTORY_H
 
 #include "Core/StandardSamples/IFactory.h"
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
@@ -26,4 +26,4 @@ public:
     std::unique_ptr<IFunctionalTest> createTest(std::string& test_name);
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_FUNCTIONALTESTFACTORY_H
diff --git a/Tests/Functional/TestMachinery/IFunctionalTest.h b/Tests/Functional/TestMachinery/IFunctionalTest.h
index abb2472b292..f3c0c04d603 100644
--- a/Tests/Functional/TestMachinery/IFunctionalTest.h
+++ b/Tests/Functional/TestMachinery/IFunctionalTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IFUNCTIONALTEST_H
-#define IFUNCTIONALTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IFUNCTIONALTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IFUNCTIONALTEST_H
 
 #include "Core/Basics/INamed.h"
 #include <map>
@@ -44,4 +44,4 @@ protected:
     std::string m_description;
 };
 
-#endif // IFUNCTIONALTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IFUNCTIONALTEST_H
diff --git a/Tests/Functional/TestMachinery/IMinimizerTest.h b/Tests/Functional/TestMachinery/IMinimizerTest.h
index 999e4f032ee..55e078e98e7 100644
--- a/Tests/Functional/TestMachinery/IMinimizerTest.h
+++ b/Tests/Functional/TestMachinery/IMinimizerTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IMINIMIZERTEST_H
-#define IMINIMIZERTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IMINIMIZERTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IMINIMIZERTEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <memory>
@@ -42,4 +42,4 @@ protected:
     std::string m_fit_plan_name;
 };
 
-#endif // IMINIMIZERTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_IMINIMIZERTEST_H
diff --git a/Tests/Functional/TestMachinery/IStandardTest.h b/Tests/Functional/TestMachinery/IStandardTest.h
index 0f80fb2df7d..2b8ebdbb8a4 100644
--- a/Tests/Functional/TestMachinery/IStandardTest.h
+++ b/Tests/Functional/TestMachinery/IStandardTest.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ISTANDARDTEST_H
-#define ISTANDARDTEST_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ISTANDARDTEST_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ISTANDARDTEST_H
 
 #include "Tests/Functional/TestMachinery/IFunctionalTest.h"
 #include <memory>
@@ -40,4 +40,4 @@ protected:
     double m_threshold;
 };
 
-#endif // ISTANDARDTEST_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ISTANDARDTEST_H
diff --git a/Tests/Functional/TestMachinery/ITestService.h b/Tests/Functional/TestMachinery/ITestService.h
index 751c3b5e265..99b5ca0f804 100644
--- a/Tests/Functional/TestMachinery/ITestService.h
+++ b/Tests/Functional/TestMachinery/ITestService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef ITESTSERVICE_H
-#define ITESTSERVICE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ITESTSERVICE_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ITESTSERVICE_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -30,4 +30,4 @@ public:
     virtual bool execute(int argc, char** argv) = 0;
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_ITESTSERVICE_H
diff --git a/Tests/Functional/TestMachinery/MinimizerTestPlan.h b/Tests/Functional/TestMachinery/MinimizerTestPlan.h
index 33e37fe0b79..f8eff04c93f 100644
--- a/Tests/Functional/TestMachinery/MinimizerTestPlan.h
+++ b/Tests/Functional/TestMachinery/MinimizerTestPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERTESTPLAN_H
-#define MINIMIZERTESTPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_MINIMIZERTESTPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_MINIMIZERTESTPLAN_H
 
 #include "Tests/Functional/TestMachinery/ParameterPlan.h"
 #include "Wrap/WinDllMacros.h"
@@ -52,4 +52,4 @@ protected:
     std::vector<ParameterPlan> m_parameter_plan; //! initial/expected parameter values
 };
 
-#endif // MINIMIZERTESTPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_MINIMIZERTESTPLAN_H
diff --git a/Tests/Functional/TestMachinery/ParameterPlan.h b/Tests/Functional/TestMachinery/ParameterPlan.h
index c918af6c43e..27493d9eb63 100644
--- a/Tests/Functional/TestMachinery/ParameterPlan.h
+++ b/Tests/Functional/TestMachinery/ParameterPlan.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef PARAMETERPLAN_H
-#define PARAMETERPLAN_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_PARAMETERPLAN_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_PARAMETERPLAN_H
 
 #include "Fit/Kernel/Parameter.h"
 #include "Wrap/WinDllMacros.h"
@@ -41,4 +41,4 @@ private:
     Fit::Parameter m_parameter; //!< initial parameter settings
 };
 
-#endif // PARAMETERPLAN_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_PARAMETERPLAN_H
diff --git a/Tests/Functional/TestMachinery/StandardTestCatalogue.h b/Tests/Functional/TestMachinery/StandardTestCatalogue.h
index 5d50412a7e2..1aebd993beb 100644
--- a/Tests/Functional/TestMachinery/StandardTestCatalogue.h
+++ b/Tests/Functional/TestMachinery/StandardTestCatalogue.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STANDARDTESTCATALOGUE_H
-#define STANDARDTESTCATALOGUE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
 
 #include "Tests/Functional/TestMachinery/StandardTestInfo.h"
 #include "Wrap/WinDllMacros.h"
@@ -46,4 +46,4 @@ private:
     std::map<std::string, StandardTestInfo> m_catalogue;
 };
 
-#endif // STANDARDTESTCATALOGUE_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
diff --git a/Tests/Functional/TestMachinery/StandardTestInfo.h b/Tests/Functional/TestMachinery/StandardTestInfo.h
index d5fd5439891..9a9a0d57057 100644
--- a/Tests/Functional/TestMachinery/StandardTestInfo.h
+++ b/Tests/Functional/TestMachinery/StandardTestInfo.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STANDARDTESTINFO_H
-#define STANDARDTESTINFO_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTINFO_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTINFO_H
 
 #include "Wrap/WinDllMacros.h"
 #include <string>
@@ -43,4 +43,4 @@ public:
     double m_threshold;
 };
 
-#endif // STANDARDTESTINFO_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTINFO_H
diff --git a/Tests/Functional/TestMachinery/StandardTestService.h b/Tests/Functional/TestMachinery/StandardTestService.h
index 147b2a7b735..60748ce005d 100644
--- a/Tests/Functional/TestMachinery/StandardTestService.h
+++ b/Tests/Functional/TestMachinery/StandardTestService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef STANDARDTESTSERVICE_H
-#define STANDARDTESTSERVICE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTSERVICE_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTSERVICE_H
 
 #include "Wrap/WinDllMacros.h"
 #include <memory>
@@ -52,4 +52,4 @@ private:
     }
 };
 
-#endif // STANDARDTESTSERVICE_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTSERVICE_H
diff --git a/Tests/Functional/TestMachinery/TestService.h b/Tests/Functional/TestMachinery/TestService.h
index 7a3f972dda8..d53cc6bbbab 100644
--- a/Tests/Functional/TestMachinery/TestService.h
+++ b/Tests/Functional/TestMachinery/TestService.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTSERVICE_H
-#define TESTSERVICE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTSERVICE_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTSERVICE_H
 
 #include "Tests/Functional/TestMachinery/ITestService.h"
 #include <boost/format.hpp>
@@ -55,4 +55,4 @@ private:
     T m_test_factory;
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTSERVICE_H
diff --git a/Tests/Functional/TestMachinery/TestUtils.h b/Tests/Functional/TestMachinery/TestUtils.h
index f1f899d7e6a..4db38dd61a7 100644
--- a/Tests/Functional/TestMachinery/TestUtils.h
+++ b/Tests/Functional/TestMachinery/TestUtils.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef TESTUTILS_H
-#define TESTUTILS_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTUTILS_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTUTILS_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Tests/Functional/TestMachinery/StandardTestInfo.h"
@@ -34,4 +34,4 @@ BA_CORE_API_ bool runPython(const std::string& py_command);
 
 } // namespace TestUtils
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_TESTUTILS_H
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
index 478d230ee30..32d8285d318 100644
--- a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
+++ b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
@@ -1,5 +1,5 @@
-#ifndef FITTINGTESTHELPER_H
-#define FITTINGTESTHELPER_H
+#ifndef BORNAGAIN_TESTS_UNITTESTS_CORE_FITTING_FITTINGTESTHELPER_H
+#define BORNAGAIN_TESTS_UNITTESTS_CORE_FITTING_FITTINGTESTHELPER_H
 
 #include "Core/Instrument/OutputData.h"
 #include "Core/Material/MaterialFactoryFuncs.h"
@@ -52,4 +52,4 @@ public:
     size_t size() const { return m_nx * m_ny; }
 };
 
-#endif // FITTINGTESTHELPER_H
+#endif // BORNAGAIN_TESTS_UNITTESTS_CORE_FITTING_FITTINGTESTHELPER_H
diff --git a/Tests/UnitTests/GUI/Comparators.h b/Tests/UnitTests/GUI/Comparators.h
index 7e2217b1916..fce8cd0edf3 100644
--- a/Tests/UnitTests/GUI/Comparators.h
+++ b/Tests/UnitTests/GUI/Comparators.h
@@ -1,5 +1,5 @@
-#ifndef COMPARATORS_H
-#define COMPARATORS_H
+#ifndef BORNAGAIN_TESTS_UNITTESTS_GUI_COMPARATORS_H
+#define BORNAGAIN_TESTS_UNITTESTS_GUI_COMPARATORS_H
 
 //! Helper class to register custom variants comparators and to report
 //! unit tests if comparators should be tested.
@@ -14,4 +14,4 @@ private:
     static bool m_is_registered;
 };
 
-#endif // COMPARATORS_H
+#endif // BORNAGAIN_TESTS_UNITTESTS_GUI_COMPARATORS_H
diff --git a/Tests/UnitTests/GUI/TestSessionItemControllerHelper.h b/Tests/UnitTests/GUI/TestSessionItemControllerHelper.h
index 5435a43475a..75cb608bcef 100644
--- a/Tests/UnitTests/GUI/TestSessionItemControllerHelper.h
+++ b/Tests/UnitTests/GUI/TestSessionItemControllerHelper.h
@@ -1,5 +1,5 @@
-#ifndef TESTSESSIONITEMCONTROLLERHELPER_H
-#define TESTSESSIONITEMCONTROLLERHELPER_H
+#ifndef BORNAGAIN_TESTS_UNITTESTS_GUI_TESTSESSIONITEMCONTROLLERHELPER_H
+#define BORNAGAIN_TESTS_UNITTESTS_GUI_TESTSESSIONITEMCONTROLLERHELPER_H
 
 #include <QObject>
 class SessionItem;
@@ -43,4 +43,4 @@ public:
     bool m_is_subscribed;
 };
 
-#endif
+#endif // BORNAGAIN_TESTS_UNITTESTS_GUI_TESTSESSIONITEMCONTROLLERHELPER_H
diff --git a/Tests/UnitTests/utilities/google_test.h b/Tests/UnitTests/utilities/google_test.h
index 66763ab981f..a41e6fb09f8 100644
--- a/Tests/UnitTests/utilities/google_test.h
+++ b/Tests/UnitTests/utilities/google_test.h
@@ -1,5 +1,5 @@
-#ifndef GOOGLE_TEST_H
-#define GOOGLE_TEST_H
+#ifndef BORNAGAIN_TESTS_UNITTESTS_UTILITIES_GOOGLE_TEST_H
+#define BORNAGAIN_TESTS_UNITTESTS_UTILITIES_GOOGLE_TEST_H
 
 #ifdef _MSC_VER
 #define _VARIADIC_MAX 10
@@ -16,4 +16,4 @@
 
 #include <memory>
 
-#endif
+#endif // BORNAGAIN_TESTS_UNITTESTS_UTILITIES_GOOGLE_TEST_H
diff --git a/Wrap/WinDllMacros.h b/Wrap/WinDllMacros.h
index 8b92875799a..f1d478403a2 100644
--- a/Wrap/WinDllMacros.h
+++ b/Wrap/WinDllMacros.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef WINDLLMACROS_H
-#define WINDLLMACROS_H
+#ifndef BORNAGAIN_WRAP_WINDLLMACROS_H
+#define BORNAGAIN_WRAP_WINDLLMACROS_H
 
 #ifdef _WIN32
 
@@ -31,4 +31,4 @@
 #define BA_CORE_API_
 #endif
 
-#endif // WINDLLMACROS_H
+#endif // BORNAGAIN_WRAP_WINDLLMACROS_H
diff --git a/unused/ComponentParameter.h b/unused/ComponentParameter.h
index d99c785a1df..459e161a8e4 100644
--- a/unused/ComponentParameter.h
+++ b/unused/ComponentParameter.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef COMPONENTPARAMETER_H
-#define COMPONENTPARAMETER_H
+#ifndef BORNAGAIN_UNUSED_COMPONENTPARAMETER_H
+#define BORNAGAIN_UNUSED_COMPONENTPARAMETER_H
 
 #include "Core/Parametrization/IParameter.h"
 #include "Core/Scattering/ISample.h"
@@ -46,4 +46,4 @@ public:
 protected:
 };
 
-#endif // COMPONENTPARAMETER_H
+#endif // BORNAGAIN_UNUSED_COMPONENTPARAMETER_H
diff --git a/unused/MatrixSpecularInfoMapTest.h b/unused/MatrixSpecularInfoMapTest.h
index 54ed687287d..503ee3f5cf0 100644
--- a/unused/MatrixSpecularInfoMapTest.h
+++ b/unused/MatrixSpecularInfoMapTest.h
@@ -1,5 +1,5 @@
-#ifndef MATRIXSPECULARINFOMAPTEST_H
-#define MATRIXSPECULARINFOMAPTEST_H
+#ifndef BORNAGAIN_UNUSED_MATRIXSPECULARINFOMAPTEST_H
+#define BORNAGAIN_UNUSED_MATRIXSPECULARINFOMAPTEST_H
 
 #include "Core/Basics/MathConstants.h"
 #include "Core/Material/MaterialFactoryFuncs.h"
@@ -79,4 +79,4 @@ TEST_F(MatrixSpecularInfoMapTest, getCoefficients)
     EXPECT_NEAR(lambda0.imag(), P_rt_coeffs->getKz()(1).imag(), 1e-6);
 }
 
-#endif // MATRIXSPECULARINFOMAPTEST_H
+#endif // BORNAGAIN_UNUSED_MATRIXSPECULARINFOMAPTEST_H
diff --git a/unused/ScalarSpecularInfoMapTest.h b/unused/ScalarSpecularInfoMapTest.h
index 08854b8866c..535f1f1c976 100644
--- a/unused/ScalarSpecularInfoMapTest.h
+++ b/unused/ScalarSpecularInfoMapTest.h
@@ -1,5 +1,5 @@
-#ifndef SCALARSPECULARINFOMAPTEST_H
-#define SCALARSPECULARINFOMAPTEST_H
+#ifndef BORNAGAIN_UNUSED_SCALARSPECULARINFOMAPTEST_H
+#define BORNAGAIN_UNUSED_SCALARSPECULARINFOMAPTEST_H
 
 #include "Core/Basics/MathConstants.h"
 #include "Core/Material/MaterialFactoryFuncs.h"
@@ -83,4 +83,4 @@ TEST_F(ScalarSpecularInfoMapTest, getCoefficients)
     EXPECT_NEAR(lambda0.imag(), P_rt_coeffs->getScalarKz().imag(), 1e-6);
 }
 
-#endif // SCALARSPECULARINFOMAPTEST_H
+#endif // BORNAGAIN_UNUSED_SCALARSPECULARINFOMAPTEST_H
diff --git a/unused/ScanningMinimizer.h b/unused/ScanningMinimizer.h
index 7a0bc8bd4b4..1ebdeb32890 100644
--- a/unused/ScanningMinimizer.h
+++ b/unused/ScanningMinimizer.h
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MINIMIZERSCAN_H
-#define MINIMIZERSCAN_H
+#ifndef BORNAGAIN_UNUSED_SCANNINGMINIMIZER_H
+#define BORNAGAIN_UNUSED_SCANNINGMINIMIZER_H
 
 #include "Fit/Minimizer/IMinimizer.h"
 #include "FitSuiteParameters.h"
@@ -60,4 +60,4 @@ private:
     function_chi2_t m_fcn;
 };
 
-#endif // MINIMIZERSCAN_H
+#endif // BORNAGAIN_UNUSED_SCANNINGMINIMIZER_H
-- 
GitLab