diff --git a/Base/Pixel/SimulationElement.cpp b/Base/Pixel/SimulationElement.cpp
index 9fc4da7b7db674dcec4b1e539ba522ab7fef2081..25d31821ee4202d15fa6393ff36201a3e0165df3 100644
--- a/Base/Pixel/SimulationElement.cpp
+++ b/Base/Pixel/SimulationElement.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Base/Pixel/SimulationElement.h"
-#include "Base/Pixel/IPixel.h"
SimulationElement::SimulationElement(double wavelength, double alpha_i, double phi_i,
std::unique_ptr<IPixel> pixel)
diff --git a/Base/Pixel/SimulationElement.h b/Base/Pixel/SimulationElement.h
index 99b21af3c2beec08015e8bd8228a1feb45185cc6..cfc2890870a4eab11fe9e3ff679d748e46ec8d31 100644
--- a/Base/Pixel/SimulationElement.h
+++ b/Base/Pixel/SimulationElement.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_PIXEL_SIMULATIONELEMENT_H
#include "Base/Types/Complex.h"
-#include "Base/Vector/Vectors3D.h"
#include "Base/Pixel/IPixel.h"
#include "Base/Pixel/PolarizationHandler.h"
#include <memory>
diff --git a/Core/Aggregate/IInterferenceFunction.h b/Core/Aggregate/IInterferenceFunction.h
index 7573aafdad3f313307e60f4b5571c46455cedcdc..257b877acda90a25f0d343cf561b569ce50b8dba 100644
--- a/Core/Aggregate/IInterferenceFunction.h
+++ b/Core/Aggregate/IInterferenceFunction.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
#define BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/ISample.h"
//! Pure virtual base class of interference functions.
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.cpp b/Core/Aggregate/InterferenceFunction1DLattice.cpp
index 7c95fab48b7ae0443d65f17af8f1f7e7cd09d085..dd3110176f118ad756b35ae45bb0cacbafc05273 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction1DLattice.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction1DLattice.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Assert.h"
#include "Core/Correlations/FTDecay1D.h"
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.cpp b/Core/Aggregate/InterferenceFunction2DLattice.cpp
index f8c8687d95e53ed467617881ab4aa3facbf94280..b3e15d1b701e2d5e6f04b329eb68ca57c225c487 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DLattice.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Integrator.h"
#include "Param/Base/RealParameter.h"
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
index 61dbb4ef89c007f8ee4df1e55ce23ef8c6a973b7..b58af7c1bd560a35fae31b7092086e400e1858e0 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Integrator.h"
#include "Param/Base/ParameterPool.h"
diff --git a/Core/Aggregate/ParticleLayout.cpp b/Core/Aggregate/ParticleLayout.cpp
index af28244428e75ecedc0b46074bb0bc0de2870d28..de602ace6c29e635c5dcd779879025f68aab6667 100644
--- a/Core/Aggregate/ParticleLayout.cpp
+++ b/Core/Aggregate/ParticleLayout.cpp
@@ -14,7 +14,6 @@
#include "Core/Aggregate/ParticleLayout.h"
#include "Base/Types/Exceptions.h"
-#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Aggregate/InterferenceFunctionNone.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleDistribution.h"
diff --git a/Core/Aggregate/ParticleLayout.h b/Core/Aggregate/ParticleLayout.h
index 23dc133e419ae852f181e90cefb03094fe4daae4..3c08be544a0d36a9ff7a060901733b3cbc401551 100644
--- a/Core/Aggregate/ParticleLayout.h
+++ b/Core/Aggregate/ParticleLayout.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
#define BORNAGAIN_CORE_AGGREGATE_PARTICLELAYOUT_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Correlations/ILayout.h"
#include "Core/Scattering/Rotations.h"
#include <memory>
diff --git a/Core/Beam/Beam.h b/Core/Beam/Beam.h
index 9cb4afef5f69c08f9fb03724651274c58cf9f729..43646d8fa62fdb1bea3cc36b2ba625f1232249a0 100644
--- a/Core/Beam/Beam.h
+++ b/Core/Beam/Beam.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_BEAM_BEAM_H
#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Param/Node/INode.h"
class IFootprintFactor;
diff --git a/Core/Computation/DWBAComputation.h b/Core/Computation/DWBAComputation.h
index d9eee3bbbdd8b453c7af4f91bd6913bc5f0549a0..b1adc50aff6bddbebf6ddca2e8b74b624be70c31 100644
--- a/Core/Computation/DWBAComputation.h
+++ b/Core/Computation/DWBAComputation.h
@@ -17,7 +17,6 @@
#include "Core/Computation/DWBASingleComputation.h"
#include "Core/Computation/IComputation.h"
-#include "Core/RT/SimulationOptions.h"
class MultiLayer;
class SimulationElement;
diff --git a/Core/Computation/DepthProbeComputation.h b/Core/Computation/DepthProbeComputation.h
index e0f06ddeaee988442c58d3d0a5cb19984348b152..848ace035642bf3bb54c8e1b7f62568559698b14 100644
--- a/Core/Computation/DepthProbeComputation.h
+++ b/Core/Computation/DepthProbeComputation.h
@@ -17,7 +17,6 @@
#include "Core/Computation/DepthProbeComputationTerm.h"
#include "Core/Computation/IComputation.h"
-#include "Core/RT/SimulationOptions.h"
class MultiLayer;
diff --git a/Core/Computation/DepthProbeComputationTerm.cpp b/Core/Computation/DepthProbeComputationTerm.cpp
index 82039bcf3f3c0c69f9687b3860f6853a47dd7262..e5aa0051f8f3344b02d5af623a685ac9a64e599b 100644
--- a/Core/Computation/DepthProbeComputationTerm.cpp
+++ b/Core/Computation/DepthProbeComputationTerm.cpp
@@ -18,7 +18,6 @@
#include "Core/Computation/DepthProbeElement.h"
#include "Core/Computation/ProcessedSample.h"
#include "Core/Multilayer/IFresnelMap.h"
-#include "Core/RT/ILayerRTCoefficients.h"
DepthProbeComputationTerm::DepthProbeComputationTerm(const ProcessedSample* p_sample)
: mp_sample{p_sample}
diff --git a/Core/Computation/GISASSpecularComputation.cpp b/Core/Computation/GISASSpecularComputation.cpp
index f0e6721a0a5f75c67b750bb0e51cc3156aa7724f..73ce21cbbb8525a85a25d2de37fe2c7d078bc9d0 100644
--- a/Core/Computation/GISASSpecularComputation.cpp
+++ b/Core/Computation/GISASSpecularComputation.cpp
@@ -15,7 +15,6 @@
#include "Core/Computation/GISASSpecularComputation.h"
#include "Core/Multilayer/IFresnelMap.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Core/RT/ILayerRTCoefficients.h"
GISASSpecularComputation::GISASSpecularComputation(const IFresnelMap* p_fresnel_map)
: mp_fresnel_map{p_fresnel_map}
diff --git a/Core/Computation/ProcessedSample.cpp b/Core/Computation/ProcessedSample.cpp
index b80f3e97bf14dc2a67c1dc53ff29beebfc142019..c85f14ba4227ec3e77eabd6ad9b227ba543a8f7b 100644
--- a/Core/Computation/ProcessedSample.cpp
+++ b/Core/Computation/ProcessedSample.cpp
@@ -18,10 +18,8 @@
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MatrixFresnelMap.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/MultiLayerUtils.h"
#include "Core/Multilayer/ScalarFresnelMap.h"
-#include "Core/Multilayer/Slice.h"
#include "Core/Particle/HomogeneousRegion.h"
#include "Core/RT/SimulationOptions.h"
diff --git a/Core/Computation/ProcessedSample.h b/Core/Computation/ProcessedSample.h
index 8bb8585706d141b37157fe0007a9733185799355..4d3c61667d4d9148c3858a2fde7c70b8780ffc66 100644
--- a/Core/Computation/ProcessedSample.h
+++ b/Core/Computation/ProcessedSample.h
@@ -15,8 +15,6 @@
#ifndef BORNAGAIN_CORE_COMPUTATION_PROCESSEDSAMPLE_H
#define BORNAGAIN_CORE_COMPUTATION_PROCESSEDSAMPLE_H
-#include "Base/Vector/Vectors3D.h"
-#include "Core/Material/Material.h"
#include "Core/Multilayer/Slice.h"
#include <map>
#include <memory>
diff --git a/Core/Computation/ProfileHelper.h b/Core/Computation/ProfileHelper.h
index 8e7f8bd0b39bfb4fef4a2de80a454735c3629bb6..ce4a0d0df3cdd47b35437e856315ee713873bba3 100644
--- a/Core/Computation/ProfileHelper.h
+++ b/Core/Computation/ProfileHelper.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_COMPUTATION_PROFILEHELPER_H
#define BORNAGAIN_CORE_COMPUTATION_PROFILEHELPER_H
-#include "Base/Types/Complex.h"
#include "Core/Material/Material.h"
#include <utility>
#include <vector>
diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 46641f38bbd766b47aa38ebbe30dd7a103418ae2..78a59d166d00fbf1b47ee0af5ee1a666de8559aa 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -20,9 +20,7 @@
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/Slice.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Core/RT/ILayerRTCoefficients.h"
#include <cerf>
diff --git a/Core/Computation/SpecularComputation.cpp b/Core/Computation/SpecularComputation.cpp
index 51f0ab2489a8b66782c8cee5c04563c1d03e3e76..44b61de358d1c720972385f7dd2efd2278056329 100644
--- a/Core/Computation/SpecularComputation.cpp
+++ b/Core/Computation/SpecularComputation.cpp
@@ -16,7 +16,6 @@
#include "Core/Computation/ProcessedSample.h"
#include "Core/Computation/ProgressHandler.h"
#include "Core/Computation/SpecularStrategyBuilder.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
static_assert(std::is_copy_constructible<SpecularComputation>::value == false,
diff --git a/Core/Computation/SpecularComputation.h b/Core/Computation/SpecularComputation.h
index 6054bf49c2ee6ae79470fb35d3f39b20ad79bc4d..99a937f5388966ce12b57a080e339212a45eab2a 100644
--- a/Core/Computation/SpecularComputation.h
+++ b/Core/Computation/SpecularComputation.h
@@ -17,7 +17,6 @@
#include "Core/Computation/IComputation.h"
#include "Core/Computation/SpecularComputationTerm.h"
-#include "Core/RT/SimulationOptions.h"
class MultiLayer;
class SpecularSimulationElement;
diff --git a/Core/Computation/SpecularComputationTerm.cpp b/Core/Computation/SpecularComputationTerm.cpp
index 220b512e0dff5dbb2b96fe531b2cca68c46f7759..299ee8ab3f6d7b30c0ae2a440dbdbd47179c5f73 100644
--- a/Core/Computation/SpecularComputationTerm.cpp
+++ b/Core/Computation/SpecularComputationTerm.cpp
@@ -16,7 +16,6 @@
#include "Core/Computation/DelayedProgressCounter.h"
#include "Core/Multilayer/SpecularScalarStrategy.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
-#include "Core/RT/ScalarRTCoefficients.h"
SpecularComputationTerm::SpecularComputationTerm(std::unique_ptr<ISpecularStrategy> strategy)
: m_Strategy(std::move(strategy)){};
diff --git a/Core/Computation/SpecularStrategyBuilder.h b/Core/Computation/SpecularStrategyBuilder.h
index a05258a78ac812d351d7e0e29147835cddbd5da7..9fdf655c2b1e6b926f29a12dfcb67cdc5807ac2f 100644
--- a/Core/Computation/SpecularStrategyBuilder.h
+++ b/Core/Computation/SpecularStrategyBuilder.h
@@ -17,7 +17,6 @@
#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/RoughnessModels.h"
class SpecularStrategyBuilder
{
diff --git a/Core/Correlations/FTDecay1D.cpp b/Core/Correlations/FTDecay1D.cpp
index 57fc118cc04cf3db68746e96e8c58261b267da59..86100b7f7f09bd7ac194bc13b693ce4c76a7eca5 100644
--- a/Core/Correlations/FTDecay1D.cpp
+++ b/Core/Correlations/FTDecay1D.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Correlations/FTDecay1D.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Utils/MathFunctions.h"
#include <algorithm>
diff --git a/Core/Correlations/FTDecay2D.cpp b/Core/Correlations/FTDecay2D.cpp
index 33182ed17e12a0309e22aae236080df5cde86465..95e44c8cdcff70c06b91607657da49f611888857 100644
--- a/Core/Correlations/FTDecay2D.cpp
+++ b/Core/Correlations/FTDecay2D.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Correlations/FTDecay2D.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Utils/MathFunctions.h"
#include <algorithm>
diff --git a/Core/Correlations/FTDistributions2D.cpp b/Core/Correlations/FTDistributions2D.cpp
index 4fbcc4274673b7f3cad0f46858966df1bf9c1ebd..1c29ded315ceb7f239110b3fa6f18ee8adda4f34 100644
--- a/Core/Correlations/FTDistributions2D.cpp
+++ b/Core/Correlations/FTDistributions2D.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Correlations/FTDistributions2D.h"
-#include "Base/Const/MathConstants.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Integrator.h"
#include "Base/Utils/MathFunctions.h"
diff --git a/Core/Correlations/IPeakShape.h b/Core/Correlations/IPeakShape.h
index c800d07ef6535e9c17e640027a235a7b8881a126..aea3fb63ec2acb4831f43bd4a7546fb9c0dbfeee 100644
--- a/Core/Correlations/IPeakShape.h
+++ b/Core/Correlations/IPeakShape.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
#define BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/ISample.h"
//! Pure virtual interface class that defines the peak shape of a Bragg peak.
diff --git a/Core/Detector/DetectionProperties.h b/Core/Detector/DetectionProperties.h
index 6cfd4f1dfe4b7864c300bb681e63f37ce74c7b9e..ca3bc6a903ab1a8be530525dd001dede9d505f87 100644
--- a/Core/Detector/DetectionProperties.h
+++ b/Core/Detector/DetectionProperties.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_DETECTOR_DETECTIONPROPERTIES_H
#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Param/Node/INode.h"
//! Detector properties (efficiency, transmission).
diff --git a/Core/Detector/DetectorFunctions.cpp b/Core/Detector/DetectorFunctions.cpp
index 9f9cb3950c1087aa51f26498b64cc028b62d19f1..081740bdcb98360151a4b7ebb219200e17e59f65 100644
--- a/Core/Detector/DetectorFunctions.cpp
+++ b/Core/Detector/DetectorFunctions.cpp
@@ -15,7 +15,6 @@
#include "Core/Detector/DetectorFunctions.h"
#include "Core/Data/OutputData.h"
#include "Core/Detector/SimulationArea.h"
-#include "Core/Detector/SimulationAreaIterator.h"
#include "Fit/Tools/StringUtils.h"
#include <algorithm>
#include <cctype>
diff --git a/Core/Detector/IDetector.cpp b/Core/Detector/IDetector.cpp
index e7875b39a3de5472378e3a70f3094381e4fb826d..e0e1f47fa70dfb620169f95329983d9f44ea5157 100644
--- a/Core/Detector/IDetector.cpp
+++ b/Core/Detector/IDetector.cpp
@@ -13,14 +13,11 @@
// ************************************************************************** //
#include "Core/Detector/IDetector.h"
-#include "Base/Axis/IAxis.h"
-#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Detector/SimulationArea.h"
#include "Base/Pixel/SimulationElement.h"
#include "Core/Resolution/ConvolutionDetectorResolution.h"
-#include "Core/Resolution/IDetectorResolution.h"
IDetector::IDetector()
{
diff --git a/Core/Detector/IDetector.h b/Core/Detector/IDetector.h
index ed609baf71130e3f270a381ea9884dc5b8f4b690..fc52e4f6b823f7745ae9f993ffa81ceb2fd9a2de 100644
--- a/Core/Detector/IDetector.h
+++ b/Core/Detector/IDetector.h
@@ -16,11 +16,9 @@
#define BORNAGAIN_CORE_DETECTOR_IDETECTOR_H
#include "Base/Types/CloneableVector.h"
-#include "Base/Types/ICloneable.h"
#include "Core/Detector/DetectionProperties.h"
#include "Core/Detector/SimulationAreaIterator.h"
#include "Core/Unit/IUnitConverter.h"
-#include "Param/Node/INode.h"
class Beam;
class DetectorMask;
diff --git a/Core/Detector/RegionOfInterest.cpp b/Core/Detector/RegionOfInterest.cpp
index 427c5afec373937d1310d302638c809e47563d5b..1d96653561c2a23e1ae56eb6124736b5c44026e9 100644
--- a/Core/Detector/RegionOfInterest.cpp
+++ b/Core/Detector/RegionOfInterest.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Detector/RegionOfInterest.h"
-#include "Base/Types/Exceptions.h"
#include "Core/Detector/IDetector2D.h"
#include "Core/Mask/Rectangle.h"
diff --git a/Core/Detector/SimulationArea.cpp b/Core/Detector/SimulationArea.cpp
index 602bdfa7c133d44bb6cc1fa8a4438ef4bc88847b..5a798c7f5c2152eaf1770708dd187d62f76615d2 100644
--- a/Core/Detector/SimulationArea.cpp
+++ b/Core/Detector/SimulationArea.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Detector/SimulationArea.h"
-#include "Base/Types/Exceptions.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/IDetector.h"
#include "Core/Detector/RegionOfInterest.h"
diff --git a/Core/Detector/SimulationAreaIterator.cpp b/Core/Detector/SimulationAreaIterator.cpp
index 262de5c0254cf826ce4db576741932962a257306..3e2832e8b61d46236883aea0b37e5676d0c6c55d 100644
--- a/Core/Detector/SimulationAreaIterator.cpp
+++ b/Core/Detector/SimulationAreaIterator.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "Core/Detector/SimulationAreaIterator.h"
#include "Core/Detector/IDetector2D.h"
#include "Core/Detector/SimulationArea.h"
diff --git a/Core/Detector/SphericalDetector.cpp b/Core/Detector/SphericalDetector.cpp
index ab8c5b01d1e0b294aa12a9435d15d05ae8a5b05f..3fd3b6eae375b1cb82e80773e6079556a53c3d44 100644
--- a/Core/Detector/SphericalDetector.cpp
+++ b/Core/Detector/SphericalDetector.cpp
@@ -17,7 +17,6 @@
#include "Base/Const/Units.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/SphericalPixel.h"
-#include "Base/Pixel/IPixel.h"
#include "Base/Pixel/SimulationElement.h"
#include "Core/Resolution/IDetectorResolution.h"
diff --git a/Core/Export/SampleLabelHandler.cpp b/Core/Export/SampleLabelHandler.cpp
index aa12f1ddfa1c85c34858e3b2aeff3b1cd8dba2c3..688559b789872da7948ff7582d6e8eda99f7d464 100644
--- a/Core/Export/SampleLabelHandler.cpp
+++ b/Core/Export/SampleLabelHandler.cpp
@@ -14,7 +14,6 @@
#include "Core/Export/SampleLabelHandler.h"
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Material/Material.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Particle/MesoCrystal.h"
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index c8604847f36f60b8054e5b9e9dcecb43a537e2b6..08f63cea2c44bf2a9564b780e013c0373b4cf313 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -14,14 +14,11 @@
#include "Core/Export/SampleToPython.h"
#include "Base/Utils/PyFmt.h"
-#include "Base/Vector/Transform3D.h"
#include "Core/Aggregate/InterferenceFunctions.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Export/INodeUtils.h"
#include "Core/Export/SampleLabelHandler.h"
#include "Core/Instrument/PyFmt2.h"
-#include "Core/Lattice/Lattice.h"
-#include "Core/Material/Material.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
@@ -32,7 +29,6 @@
#include "Core/Particle/ParticleComposition.h"
#include "Core/Particle/ParticleCoreShell.h"
#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Scattering/IFormFactor.h"
#include "Param/Varia/ParameterUtils.h"
#include <iomanip>
#include <map>
diff --git a/Core/Fitting/FitObjective.cpp b/Core/Fitting/FitObjective.cpp
index ea011148717e4a124c50aafed7aa543f3cf13363..46fe8da4d6c3688bf9b65c88e200d47a3972ddfc 100644
--- a/Core/Fitting/FitObjective.cpp
+++ b/Core/Fitting/FitObjective.cpp
@@ -18,10 +18,7 @@
#include "Core/Fitting/ObjectiveMetricUtils.h"
#include "Core/Fitting/PyFittingCallbacks.h"
#include "Core/Instrument/ChiSquaredModule.h"
-#include "Core/Intensity/ArrayUtils.h"
#include "Core/Simulation/Simulation.h"
-#include "Fit/Kernel/MinimizerResult.h"
-#include "Fit/Kernel/Parameters.h"
#include <stdexcept>
class IMetricWrapper
diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h
index 8d6522c4fa49def87db5c69d75aacfdd6495be3a..a179452ac46ec0dee1496443eb166cbad5f84036 100644
--- a/Core/Fitting/FitObjective.h
+++ b/Core/Fitting/FitObjective.h
@@ -15,8 +15,6 @@
#ifndef BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
#define BORNAGAIN_CORE_FITTING_FITOBJECTIVE_H
-#include "Core/Data/OutputData.h"
-#include "Core/Fitting/FitTypes.h"
#include "Core/Fitting/IterationInfo.h"
#include "Core/Fitting/SimDataPair.h"
#include "Core/Intensity/ArrayUtils.h"
diff --git a/Core/Fitting/FitPrintService.cpp b/Core/Fitting/FitPrintService.cpp
index 7618ff27aabdc3bc24633e9dba7d9aa5c5a49d1a..3964a7675383b1a8930644fffb610dcf1d1ec667 100644
--- a/Core/Fitting/FitPrintService.cpp
+++ b/Core/Fitting/FitPrintService.cpp
@@ -14,7 +14,6 @@
#include "Core/Fitting/FitPrintService.h"
#include "Core/Fitting/FitObjective.h"
-#include "Fit/Kernel/MinimizerResult.h"
#include "Fit/Tools/StringUtils.h"
#include <iomanip>
#include <iostream>
diff --git a/Core/Fitting/FitStatus.h b/Core/Fitting/FitStatus.h
index db435ce43ef0dda7e4c6efe49f9388c94477e764..a0f57f4e12671f77bb6345b454696f24bfeadb1f 100644
--- a/Core/Fitting/FitStatus.h
+++ b/Core/Fitting/FitStatus.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_FITTING_FITSTATUS_H
#include "Core/Fitting/FitObserver.h"
-#include "Core/Fitting/FitTypes.h"
#include "Core/Fitting/IterationInfo.h"
#include <functional>
#include <vector>
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index e244320af016a680d550828d9ad60f6ea6db7fab..449d889f8a444ea7792a5e3eca4a489d16245da1 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Fitting/SimDataPair.h"
-#include "Core/Data/OutputData.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
diff --git a/Core/HardParticle/HardParticles.h b/Core/HardParticle/HardParticles.h
index 6c45b17fe5e537ca96f2e3c37cb1907ff903916d..054f8a69d29dc4f7e2e902b5fdd2d7fc520b1434 100644
--- a/Core/HardParticle/HardParticles.h
+++ b/Core/HardParticle/HardParticles.h
@@ -27,7 +27,6 @@
#include "Core/HardParticle/FormFactorDodecahedron.h"
#include "Core/HardParticle/FormFactorDot.h"
#include "Core/HardParticle/FormFactorEllipsoidalCylinder.h"
-#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/HardParticle/FormFactorFullSpheroid.h"
#include "Core/HardParticle/FormFactorHemiEllipsoid.h"
#include "Core/HardParticle/FormFactorHollowSphere.h"
diff --git a/Core/Histo/Histogram2D.cpp b/Core/Histo/Histogram2D.cpp
index 25bc0501f11d9cb1dc0c523d012a7f245d21068c..6e7e1af13bb43496c4c785b844f252cccb13a557 100644
--- a/Core/Histo/Histogram2D.cpp
+++ b/Core/Histo/Histogram2D.cpp
@@ -15,7 +15,6 @@
#include "Core/Histo/Histogram2D.h"
#include "Base/Axis/VariableBinAxis.h"
#include "Core/Histo/Histogram1D.h"
-#include "Core/Intensity/ArrayUtils.h"
#include <memory>
Histogram2D::Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)
diff --git a/Core/Histo/IHistogram.cpp b/Core/Histo/IHistogram.cpp
index 3d68110312a694218257d9efc697d4b5db620c0f..f3efdaa695f3913d1c9a5092aea3ff9f60615d3b 100644
--- a/Core/Histo/IHistogram.cpp
+++ b/Core/Histo/IHistogram.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "Core/Histo/IHistogram.h"
#include "Core/Histo/Histogram1D.h"
#include "Core/Histo/Histogram2D.h"
#include "Core/Histo/IntensityDataIOFactory.h" // TODO rm
diff --git a/Core/Histo/IHistogram.h b/Core/Histo/IHistogram.h
index 86fbcb86e45086aabf1ea13297ef9db5ed00968f..e8cc305b42dc8724bda4fb8eb7a0ec26491dd592 100644
--- a/Core/Histo/IHistogram.h
+++ b/Core/Histo/IHistogram.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_INTENSITY_IHISTOGRAM_H
#define BORNAGAIN_CORE_INTENSITY_IHISTOGRAM_H
-#include "Base/Utils/PyObject.h"
#include "Core/Data/CumulativeValue.h"
#include "Core/Data/OutputData.h"
diff --git a/Core/Histo/SimulationResult.cpp b/Core/Histo/SimulationResult.cpp
index 232a379837f6b36ca4ff138af2842560a326850f..bcf60fd8f01d23caf672a55d39e15ae8719a1c77 100644
--- a/Core/Histo/SimulationResult.cpp
+++ b/Core/Histo/SimulationResult.cpp
@@ -13,8 +13,6 @@
// ************************************************************************** //
#include "Core/Histo/SimulationResult.h"
-#include "Base/Axis/FixedBinAxis.h"
-#include "Core/Data/OutputData.h"
#include "Core/Histo/Histogram2D.h"
SimulationResult::SimulationResult(const OutputData<double>& data,
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index 03f9b0c80b42db2adcebdeb522f10113ac57fe29..43f3fe45a50444432d3ee734c09e8d3ffc9183b4 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -14,7 +14,6 @@
#include "Core/InputOutput/OutputDataReadStrategy.h"
#include "Base/Axis/PointwiseAxis.h"
-#include "Core/Data/OutputData.h"
#include "Core/InputOutput/DataFormatUtils.h"
#include "Core/InputOutput/TiffHandler.h"
#include "Core/Intensity/ArrayUtils.h"
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index 9bd86aab5507902bdfe0a199c1a7c38a60f88078..57b28e520bec60507204341f407df2a3c74f70ee 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/InputOutput/OutputDataWriteStrategy.h"
-#include "Core/Data/OutputData.h" // needed by some compilers
#include "Core/InputOutput/TiffHandler.h"
#include "Core/Intensity/ArrayUtils.h"
#include <cmath>
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 1b1d5cad97531972936804cce891d18ef6ec7462..afe1cdce855ab5d160a065f238b654bb39135cd2 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Instrument/Instrument.h"
-#include "Core/Beam/Beam.h"
#include "Core/Detector/DetectorFunctions.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Histo/Histogram2D.h"
diff --git a/Core/Instrument/Instrument.h b/Core/Instrument/Instrument.h
index 34475e4c97922e9c3d537e60eb9610bf3f7dcd73..013d81d53e1f39f5bcfeab054fb9af66ffbca0f9 100644
--- a/Core/Instrument/Instrument.h
+++ b/Core/Instrument/Instrument.h
@@ -17,7 +17,6 @@
#include "Core/Beam/Beam.h"
#include "Core/Detector/IDetector.h"
-#include "Param/Node/INode.h"
#include <memory>
template <class T> class OutputData;
diff --git a/Core/Instrument/IntensityDataFunctions.cpp b/Core/Instrument/IntensityDataFunctions.cpp
index 909cee9b8ea92dfa311bd59f70e84fb1d851f814..56eacf0bb18ad5893b3b5266bafa4b487a17b101 100644
--- a/Core/Instrument/IntensityDataFunctions.cpp
+++ b/Core/Instrument/IntensityDataFunctions.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Detector/IDetector.h"
#include "Core/Histo/IHistogram.h"
#include "Core/Histo/SimulationResult.h"
#include "Core/Instrument/FourierTransform.h"
diff --git a/Core/Instrument/PyFmt2.cpp b/Core/Instrument/PyFmt2.cpp
index 4ce65aa37efd735de72c89462cdef39b67c39517..4c31df0ec764e0981ce6c566a60058da7cfc5850 100644
--- a/Core/Instrument/PyFmt2.cpp
+++ b/Core/Instrument/PyFmt2.cpp
@@ -25,7 +25,6 @@
#include "Core/Mask/Polygon.h"
#include "Core/Mask/Rectangle.h"
#include "Fit/Tools/StringUtils.h"
-#include "Param/Base/IParameterized.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
diff --git a/Core/Instrument/SpectrumUtils.cpp b/Core/Instrument/SpectrumUtils.cpp
index 4ee4bd812ce0ae6d1faed781515ffa6e2535754c..ea88c3b44608ce04bfdd249272ff4725ed48c641 100644
--- a/Core/Instrument/SpectrumUtils.cpp
+++ b/Core/Instrument/SpectrumUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Instrument/SpectrumUtils.h"
-#include "Core/Intensity/ArrayUtils.h"
#include <tspectrum.h>
#include <cmath>
diff --git a/Core/Intensity/ArrayUtils.cpp b/Core/Intensity/ArrayUtils.cpp
index 830ce586e15f5bb65a4b401ec47ab63ff8394351..927f0ae0b7ddc9208e6ae6d142fa5b777a38d753 100644
--- a/Core/Intensity/ArrayUtils.cpp
+++ b/Core/Intensity/ArrayUtils.cpp
@@ -15,7 +15,6 @@
#ifdef BORNAGAIN_PYTHON
#include "Core/Intensity/ArrayUtils.h"
-#include "Base/Types/Exceptions.h"
#include "Base/Utils/PythonCore.h"
PyObject* ArrayUtils::createNumpyArray(const std::vector<double>& data)
diff --git a/Core/Lattice/ILatticeOrientation.cpp b/Core/Lattice/ILatticeOrientation.cpp
index a26ddcdc5697383398f8a04b6d3296debd81fa86..fafe086e50c8eeeadabad5393927bbfceb6e64f5 100644
--- a/Core/Lattice/ILatticeOrientation.cpp
+++ b/Core/Lattice/ILatticeOrientation.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Lattice/ILatticeOrientation.h"
-#include "Base/Vector/EigenCore.h"
namespace
{
diff --git a/Core/Lattice/Lattice.h b/Core/Lattice/Lattice.h
index b53266d38c4f0df6a6db4118d8209f510bcb401f..c749abcef595bcae53927de0a6158b953cdd7037 100644
--- a/Core/Lattice/Lattice.h
+++ b/Core/Lattice/Lattice.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_LATTICE_LATTICE_H
#define BORNAGAIN_CORE_LATTICE_LATTICE_H
-#include "Base/Vector/Vectors3D.h"
#include "Param/Node/INode.h"
#include <vector>
diff --git a/Core/Lattice/LatticeUtils.h b/Core/Lattice/LatticeUtils.h
index 08e663860ff0569cfb118a8842191ed80c8c5a91..44df6e240bc13f45bbdeb33a814f57959445f504 100644
--- a/Core/Lattice/LatticeUtils.h
+++ b/Core/Lattice/LatticeUtils.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
#define BORNAGAIN_CORE_LATTICE_LATTICEUTILS_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Lattice/Lattice.h"
class ILatticeOrientation;
diff --git a/Core/Material/MagneticMaterialImpl.h b/Core/Material/MagneticMaterialImpl.h
index 307d450f36e4ac063a95938fe1adccfd335f4f30..55dcb74578a1ffbde439573054bc26237be8d71b 100644
--- a/Core/Material/MagneticMaterialImpl.h
+++ b/Core/Material/MagneticMaterialImpl.h
@@ -15,9 +15,6 @@
#ifndef BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
#define BORNAGAIN_CORE_MATERIAL_MAGNETICMATERIALIMPL_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Material/BaseMaterialImpl.h"
class Transform3D;
diff --git a/Core/Material/Material.cpp b/Core/Material/Material.cpp
index 278d87c4b30ca76b270d1720996f9aeb93305891..f4dc2742eb9aad675c5381834d99fb83adb73d03 100644
--- a/Core/Material/Material.cpp
+++ b/Core/Material/Material.cpp
@@ -15,7 +15,6 @@
#include "Core/Material/Material.h"
#include "Base/Types/Exceptions.h"
#include "Base/Vector/Transform3D.h"
-#include "Core/Material/BaseMaterialImpl.h"
#include "Core/Material/WavevectorInfo.h"
#include <typeinfo>
diff --git a/Core/Material/Material.h b/Core/Material/Material.h
index 7e7e2bba65fa5cdc5ae25700505e5b878e7c981d..40210741ce3e34fcebcf73705085a70e02d10779 100644
--- a/Core/Material/Material.h
+++ b/Core/Material/Material.h
@@ -15,9 +15,6 @@
#ifndef BORNAGAIN_CORE_MATERIAL_MATERIAL_H
#define BORNAGAIN_CORE_MATERIAL_MATERIAL_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Material/BaseMaterialImpl.h"
#include <memory>
#include <vector>
diff --git a/Core/Material/MaterialBySLDImpl.h b/Core/Material/MaterialBySLDImpl.h
index 8f321129ea48dbb63595e3e177671cef6d5b170f..023ed36fa91319d5bf571a427c0b142784bf0cef 100644
--- a/Core/Material/MaterialBySLDImpl.h
+++ b/Core/Material/MaterialBySLDImpl.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_MATERIAL_MATERIALBYSLDIMPL_H
#include "Core/Material/MagneticMaterialImpl.h"
-#include "Core/Material/Material.h"
#include "Core/Material/MaterialFactoryFuncs.h"
//! Material implementation based on wavelength-independent data (valid for a range of wavelengths)
diff --git a/Core/Material/MaterialFactoryFuncs.cpp b/Core/Material/MaterialFactoryFuncs.cpp
index f1f53831ba33657e3d1e16536db68309c18460f5..590236ca248f11168bcabcc00197b640691c12da 100644
--- a/Core/Material/MaterialFactoryFuncs.cpp
+++ b/Core/Material/MaterialFactoryFuncs.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Base/Const/Units.h"
#include "Core/Material/MaterialBySLDImpl.h"
#include "Core/Material/MaterialUtils.h"
diff --git a/Core/Material/MaterialUtils.cpp b/Core/Material/MaterialUtils.cpp
index c7b811cd41bc34851e834e2405c0957c4be4133d..f7c59efba9b3287e852ae3332bb534f87500635e 100644
--- a/Core/Material/MaterialUtils.cpp
+++ b/Core/Material/MaterialUtils.cpp
@@ -14,7 +14,6 @@
#include "Core/Material/MaterialUtils.h"
#include "Base/Const/PhysicalConstants.h"
-#include "Core/Material/Material.h"
using PhysConsts::g_factor_n;
using PhysConsts::h_bar;
diff --git a/Core/Material/MaterialUtils.h b/Core/Material/MaterialUtils.h
index 3216d84170fc65fb4ca18797bfd57efef3d6d8aa..8f997942c60ce122ccfad2865428875f69c18194 100644
--- a/Core/Material/MaterialUtils.h
+++ b/Core/Material/MaterialUtils.h
@@ -15,9 +15,6 @@
#ifndef BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
#define BORNAGAIN_CORE_MATERIAL_MATERIALUTILS_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Material/Material.h"
//! A number of materials-related helper functions for internal use
diff --git a/Core/Multilayer/FormFactorCoherentPart.cpp b/Core/Multilayer/FormFactorCoherentPart.cpp
index 4a90db65da627506444d73339605a11f3caa525f..f898e22faef7ad1ae284d36b8d33eb8f13b660e4 100644
--- a/Core/Multilayer/FormFactorCoherentPart.cpp
+++ b/Core/Multilayer/FormFactorCoherentPart.cpp
@@ -16,7 +16,6 @@
#include "Core/Material/WavevectorInfo.h"
#include "Core/Multilayer/IFresnelMap.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Core/RT/ILayerRTCoefficients.h"
#include "Core/Scattering/IFormFactor.h"
FormFactorCoherentPart::FormFactorCoherentPart(IFormFactor* p_ff) : mP_ff(p_ff) {}
diff --git a/Core/Multilayer/FormFactorCoherentSum.h b/Core/Multilayer/FormFactorCoherentSum.h
index 579274e86050d5908bcec0ffc6ff87d66b514bcb..fbf32dadf54532b0fa0c5198bfa20407b2f801fb 100644
--- a/Core/Multilayer/FormFactorCoherentSum.h
+++ b/Core/Multilayer/FormFactorCoherentSum.h
@@ -15,8 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTSUM_H
#define BORNAGAIN_CORE_MULTILAYER_FORMFACTORCOHERENTSUM_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
#include "Core/Multilayer/FormFactorCoherentPart.h"
#include <vector>
diff --git a/Core/Multilayer/IFresnelMap.cpp b/Core/Multilayer/IFresnelMap.cpp
index 56dc22cf40b82922888758c980007c12ca4496be..3c84f7abc99174dbc077d89a28514af4a0df6f1a 100644
--- a/Core/Multilayer/IFresnelMap.cpp
+++ b/Core/Multilayer/IFresnelMap.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/Multilayer/IFresnelMap.h"
-#include "Core/Multilayer/Slice.h"
IFresnelMap::IFresnelMap(std::unique_ptr<ISpecularStrategy> strategy)
: m_use_cache(true), m_Strategy(std::move(strategy))
diff --git a/Core/Multilayer/IFresnelMap.h b/Core/Multilayer/IFresnelMap.h
index e5d97dbe9c5500aa77b8e512d15560298db8da6e..0310d96079824e41bf0dfad8eddbf2aa60929aad 100644
--- a/Core/Multilayer/IFresnelMap.h
+++ b/Core/Multilayer/IFresnelMap.h
@@ -15,10 +15,7 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
#define BORNAGAIN_CORE_MULTILAYER_IFRESNELMAP_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/ISpecularStrategy.h"
-#include "Core/Multilayer/Slice.h"
-#include "Core/RT/ILayerRTCoefficients.h"
#include <memory>
#include <vector>
diff --git a/Core/Multilayer/LayerRoughness.h b/Core/Multilayer/LayerRoughness.h
index 463a9a6937b5c90a22d485fb9f98c051a8d8da35..44db15a9674badb8c6b940ec9adb0c2214f400de 100644
--- a/Core/Multilayer/LayerRoughness.h
+++ b/Core/Multilayer/LayerRoughness.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
#define BORNAGAIN_CORE_MULTILAYER_LAYERROUGHNESS_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/ISample.h"
//! A roughness of interface between two layers.
diff --git a/Core/Multilayer/MatrixFresnelMap.cpp b/Core/Multilayer/MatrixFresnelMap.cpp
index dce82080f65b3efcf2e637d09ea92546a8f5841a..1eddca09c64057f685ae4633a4ada845e3c354b1 100644
--- a/Core/Multilayer/MatrixFresnelMap.cpp
+++ b/Core/Multilayer/MatrixFresnelMap.cpp
@@ -13,9 +13,7 @@
// ************************************************************************** //
#include "Core/Multilayer/MatrixFresnelMap.h"
-#include "Core/Multilayer/Slice.h"
#include "Core/Multilayer/SpecularMagneticOldStrategy.h"
-#include "Core/Multilayer/SpecularMagneticStrategy.h"
#include "Base/Pixel/SimulationElement.h"
#include <functional>
diff --git a/Core/Multilayer/MatrixFresnelMap.h b/Core/Multilayer/MatrixFresnelMap.h
index 92f3628a7d039e9c9eb5b33ecb3ab6eed909cef3..ce0ab5fc5f21723e46275d2ac1c52c970943738c 100644
--- a/Core/Multilayer/MatrixFresnelMap.h
+++ b/Core/Multilayer/MatrixFresnelMap.h
@@ -18,7 +18,6 @@
#include "Core/Multilayer/IFresnelMap.h"
#include "Core/Multilayer/SpecularMagneticStrategy.h"
#include "Core/RT/MatrixRTCoefficients.h"
-#include "Core/RT/MatrixRTCoefficients_v2.h"
#include <cstddef>
#include <memory>
#include <unordered_map>
diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h
index baf9e0ff7261d1b65c9a392a2e40f9fc3db75a98..8ebf57590de241d8192ff6195eba186c79c19000 100644
--- a/Core/Multilayer/MultiLayer.h
+++ b/Core/Multilayer/MultiLayer.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_MULTILAYER_MULTILAYER_H
#include "Base/Types/SafePointerVector.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/RoughnessModels.h"
#include "Core/Scattering/ISample.h"
#include "Core/Scattering/ZLimits.h"
diff --git a/Core/Multilayer/SSCAHelper.h b/Core/Multilayer/SSCAHelper.h
index aec296ae1b82cbf5ba4c417016e0a20760a7c4c2..8752f7a53834f469fc7989bdaa3b39a6b5a03433 100644
--- a/Core/Multilayer/SSCAHelper.h
+++ b/Core/Multilayer/SSCAHelper.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
#define BORNAGAIN_CORE_MULTILAYER_SSCAHELPER_H
-#include "Base/Types/Complex.h"
#include "Core/Multilayer/IInterferenceFunctionStrategy.h"
#include "Core/Multilayer/InterferenceFunctionUtils.h"
#include <Eigen/StdVector>
diff --git a/Core/Multilayer/SSCApproximationStrategy.cpp b/Core/Multilayer/SSCApproximationStrategy.cpp
index d4e04fd53cea395ae63d01fcc634344857dcfeab..dcf9a4e119cacd2caa67344f7fd058d5ab760d0c 100644
--- a/Core/Multilayer/SSCApproximationStrategy.cpp
+++ b/Core/Multilayer/SSCApproximationStrategy.cpp
@@ -15,7 +15,6 @@
#include "Core/Multilayer/SSCApproximationStrategy.h"
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Multilayer/FormFactorCoherentSum.h"
-#include "Core/Multilayer/InterferenceFunctionUtils.h"
#include "Base/Pixel/SimulationElement.h"
using InterferenceFunctionUtils::PrecomputePolarizedFormFactors;
diff --git a/Core/Multilayer/SSCApproximationStrategy.h b/Core/Multilayer/SSCApproximationStrategy.h
index e6593994515ec30858d6ffa4690f3eaefe3aabef..4e2629951c90f1649e2f847a9e28cdf475cbf7fc 100644
--- a/Core/Multilayer/SSCApproximationStrategy.h
+++ b/Core/Multilayer/SSCApproximationStrategy.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SSCAPPROXIMATIONSTRATEGY_H
-#include "Core/Multilayer/IInterferenceFunctionStrategy.h"
#include "Core/Multilayer/SSCAHelper.h"
class SimulationElement;
diff --git a/Core/Multilayer/ScalarFresnelMap.cpp b/Core/Multilayer/ScalarFresnelMap.cpp
index b900bf4ae3d92f70b39d9ed5853eb6f980b33415..9189866d6a8b34fa56a74cc8159939b5b3d2ca8b 100644
--- a/Core/Multilayer/ScalarFresnelMap.cpp
+++ b/Core/Multilayer/ScalarFresnelMap.cpp
@@ -13,10 +13,7 @@
// ************************************************************************** //
#include "Core/Multilayer/ScalarFresnelMap.h"
-#include "Base/Vector/Vectors3D.h"
-#include "Core/Multilayer/Slice.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Core/RT/ScalarRTCoefficients.h"
#include <functional>
ScalarFresnelMap::ScalarFresnelMap(std::unique_ptr<ISpecularStrategy> strategy)
diff --git a/Core/Multilayer/ScalarFresnelMap.h b/Core/Multilayer/ScalarFresnelMap.h
index 42e59486a3b9b48e657b1404a19ab2e823f9199c..a797642f3d5ff3697c68f88eb5975aa40826e31f 100644
--- a/Core/Multilayer/ScalarFresnelMap.h
+++ b/Core/Multilayer/ScalarFresnelMap.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_MULTILAYER_SCALARFRESNELMAP_H
#include "Core/Multilayer/IFresnelMap.h"
-#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/RT/ScalarRTCoefficients.h"
#include <cstddef>
#include <unordered_map>
diff --git a/Core/Multilayer/SpecularMagneticNewNCStrategy.h b/Core/Multilayer/SpecularMagneticNewNCStrategy.h
index d3d6092c12c6c34749e803c72e0271e482962d20..896e74f3851e0c449fd89a9a6aa774ec868937d5 100644
--- a/Core/Multilayer/SpecularMagneticNewNCStrategy.h
+++ b/Core/Multilayer/SpecularMagneticNewNCStrategy.h
@@ -15,9 +15,7 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWNCSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWNCSTRATEGY_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/SpecularMagneticNewStrategy.h"
-#include "Core/RT/MatrixRTCoefficients_v3.h"
#include <memory>
#include <vector>
diff --git a/Core/Multilayer/SpecularMagneticNewStrategy.cpp b/Core/Multilayer/SpecularMagneticNewStrategy.cpp
index 493eaef6036a36cad9663a62e455b7a10dfa0340..613bec2b4e1eb425f1ee5e350930a8075d6347ed 100644
--- a/Core/Multilayer/SpecularMagneticNewStrategy.cpp
+++ b/Core/Multilayer/SpecularMagneticNewStrategy.cpp
@@ -16,7 +16,6 @@
#include "Base/Const/PhysicalConstants.h"
#include "Core/Multilayer/KzComputation.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Multilayer/Slice.h"
namespace
{
diff --git a/Core/Multilayer/SpecularMagneticNewStrategy.h b/Core/Multilayer/SpecularMagneticNewStrategy.h
index 54a5fa15f72e26f62783a2aad6b0f18854a43e33..8abd702241bbc6098c3a422d55f7fcbdb3c47455 100644
--- a/Core/Multilayer/SpecularMagneticNewStrategy.h
+++ b/Core/Multilayer/SpecularMagneticNewStrategy.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWSTRATEGY_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/RT/MatrixRTCoefficients_v3.h"
#include <memory>
diff --git a/Core/Multilayer/SpecularMagneticNewTanhStrategy.h b/Core/Multilayer/SpecularMagneticNewTanhStrategy.h
index e3eb7df5ef1be599085731f62787269711fec04a..7585b8e7fc5d3250eee41950001b95b9d7af29e3 100644
--- a/Core/Multilayer/SpecularMagneticNewTanhStrategy.h
+++ b/Core/Multilayer/SpecularMagneticNewTanhStrategy.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICNEWTANHSTRATEGY_H
#include "Core/Multilayer/SpecularMagneticNewStrategy.h"
-#include "Core/RT/MatrixRTCoefficients_v3.h"
//! Implements the magnetic Fresnel computation with the analytical Tanh roughness
//!
diff --git a/Core/Multilayer/SpecularMagneticOldStrategy.cpp b/Core/Multilayer/SpecularMagneticOldStrategy.cpp
index ec6191c7e94971d4209728ed38dbb57c990fb558..0218cd808b2e4cc8149e9a49043b44b5fee481ad 100644
--- a/Core/Multilayer/SpecularMagneticOldStrategy.cpp
+++ b/Core/Multilayer/SpecularMagneticOldStrategy.cpp
@@ -17,7 +17,6 @@
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/Slice.h"
#include <Eigen/LU>
namespace
diff --git a/Core/Multilayer/SpecularMagneticOldStrategy.h b/Core/Multilayer/SpecularMagneticOldStrategy.h
index b3953e3af1f1a91c4072c10b892403056967c93e..6cdee37c0081bf6b01415d9376a07835eb724f08 100644
--- a/Core/Multilayer/SpecularMagneticOldStrategy.h
+++ b/Core/Multilayer/SpecularMagneticOldStrategy.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICOLDSTRATEGY_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/RT/MatrixRTCoefficients.h"
#include <memory>
diff --git a/Core/Multilayer/SpecularMagneticStrategy.cpp b/Core/Multilayer/SpecularMagneticStrategy.cpp
index 9be4f125906d3911106042e6e2ac2fbe7792315e..6fba5ef5ff6d6585b886246edcfd428d753cf95d 100644
--- a/Core/Multilayer/SpecularMagneticStrategy.cpp
+++ b/Core/Multilayer/SpecularMagneticStrategy.cpp
@@ -15,7 +15,6 @@
#include "Core/Multilayer/SpecularMagneticStrategy.h"
#include "Base/Const/PhysicalConstants.h"
#include "Core/Multilayer/KzComputation.h"
-#include "Core/Multilayer/Slice.h"
namespace
{
diff --git a/Core/Multilayer/SpecularMagneticStrategy.h b/Core/Multilayer/SpecularMagneticStrategy.h
index b2f4fc4fd7cdae3ac12964a25fe1e963c56a874c..e0f51bfc937ef9efe0a13e206658c6b6475a81d8 100644
--- a/Core/Multilayer/SpecularMagneticStrategy.h
+++ b/Core/Multilayer/SpecularMagneticStrategy.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SPECULARMAGNETICSTRATEGY_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/RT/MatrixRTCoefficients_v2.h"
#include <memory>
diff --git a/Core/Multilayer/SpecularScalarStrategy.cpp b/Core/Multilayer/SpecularScalarStrategy.cpp
index bcd6516e1985a0dc4b51cffccd3652c270b7c050..ffd7d60845aeb2f8b96183bb14ec1476f2c5b57e 100644
--- a/Core/Multilayer/SpecularScalarStrategy.cpp
+++ b/Core/Multilayer/SpecularScalarStrategy.cpp
@@ -16,7 +16,6 @@
#include "Core/Multilayer/KzComputation.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
-#include "Core/Multilayer/Slice.h"
#include <Eigen/Dense>
#include <stdexcept>
diff --git a/Core/Multilayer/SpecularScalarStrategy.h b/Core/Multilayer/SpecularScalarStrategy.h
index 6dca1d9c587e1ded55022760e49b38d135fd88dd..225d1a2bda1edb6966626ddcc0395d0da71119d5 100644
--- a/Core/Multilayer/SpecularScalarStrategy.h
+++ b/Core/Multilayer/SpecularScalarStrategy.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
#define BORNAGAIN_CORE_MULTILAYER_SPECULARSCALARSTRATEGY_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Multilayer/ISpecularStrategy.h"
#include "Core/RT/ScalarRTCoefficients.h"
#include <memory>
diff --git a/Core/Particle/Crystal.h b/Core/Particle/Crystal.h
index db94d569e869fc1033034b0aed948a50eec79f30..a58abf9db926548a8eae71d45ea3161ee09903f3 100644
--- a/Core/Particle/Crystal.h
+++ b/Core/Particle/Crystal.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
#define BORNAGAIN_CORE_PARTICLE_CRYSTAL_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Lattice/Lattice.h"
#include "Core/Particle/IClusteredParticles.h"
diff --git a/Core/Particle/IAbstractParticle.h b/Core/Particle/IAbstractParticle.h
index 844d56cb73f73acd738233b66711e31c802f1a42..cdeafe45813c99c14d829a181929fe34ffd33c47 100644
--- a/Core/Particle/IAbstractParticle.h
+++ b/Core/Particle/IAbstractParticle.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
#define BORNAGAIN_CORE_PARTICLE_IABSTRACTPARTICLE_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/ISample.h"
class IRotation;
diff --git a/Core/Particle/IClusteredParticles.h b/Core/Particle/IClusteredParticles.h
index 561aed47b4aab10d0521d93c4352ad983bc44b02..a5c8967b66306d679887850bca5ec0eb8a57e28c 100644
--- a/Core/Particle/IClusteredParticles.h
+++ b/Core/Particle/IClusteredParticles.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
#define BORNAGAIN_CORE_PARTICLE_ICLUSTEREDPARTICLES_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Particle/HomogeneousRegion.h"
#include "Core/Scattering/ISample.h"
diff --git a/Core/Particle/IParticle.cpp b/Core/Particle/IParticle.cpp
index cb1b13f97125b06d1fcebe5385d05edc80123d22..40ccbc9f5e149df16c14c295e36bcc48d6da0f18 100644
--- a/Core/Particle/IParticle.cpp
+++ b/Core/Particle/IParticle.cpp
@@ -16,7 +16,6 @@
#include "Core/Particle/SlicedParticle.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/Rotations.h"
-#include "Core/Scattering/ZLimits.h"
#include "Param/Base/RealParameter.h"
IParticle::~IParticle() = default;
diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h
index 1bf750ed6eb33809cf2e042111931df2a1398eff..09243667d13fbf2d7374af7067a203b0b756c636 100644
--- a/Core/Particle/IParticle.h
+++ b/Core/Particle/IParticle.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_PARTICLE_IPARTICLE_H
#include "Base/Types/SafePointerVector.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Particle/IAbstractParticle.h"
#include <memory>
diff --git a/Core/Particle/Particle.h b/Core/Particle/Particle.h
index 7f628bb20b45e3672931217edf2e90bbef092c93..8582d3dba2d3502744c321cf06da9588d1216587 100644
--- a/Core/Particle/Particle.h
+++ b/Core/Particle/Particle.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_PARTICLE_PARTICLE_H
#define BORNAGAIN_CORE_PARTICLE_PARTICLE_H
-#include "Core/Material/Material.h"
#include "Core/Particle/IParticle.h"
#include "Core/Scattering/FormFactorDecoratorMaterial.h"
#include "Core/Scattering/FormFactorDecoratorRotation.h"
diff --git a/Core/Particle/ParticleDistribution.cpp b/Core/Particle/ParticleDistribution.cpp
index ee3dbacf1f659d49767d7ac94075e8b6d4d8041c..a6afe013c0bffbfd8ac89482fb77400d2ddb5c76 100644
--- a/Core/Particle/ParticleDistribution.cpp
+++ b/Core/Particle/ParticleDistribution.cpp
@@ -18,7 +18,6 @@
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
#include "Param/Varia/ParameterUtils.h"
#include <map>
diff --git a/Core/RT/ScalarRTCoefficients.h b/Core/RT/ScalarRTCoefficients.h
index 60984ae72e0b01d254ac0529d0be55f0faa51fba..9dc91fd9923c70e4b1c3a5292e1b30c3b16a3b92 100644
--- a/Core/RT/ScalarRTCoefficients.h
+++ b/Core/RT/ScalarRTCoefficients.h
@@ -15,8 +15,6 @@
#ifndef BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
#define BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
#include "Core/RT/ILayerRTCoefficients.h"
//! Specular reflection and transmission coefficients in a layer in case
diff --git a/Core/SampleBuilderEngine/SampleProvider.h b/Core/SampleBuilderEngine/SampleProvider.h
index 8d7d5ce1b06ebfa1d6fa049e536a5747d26d29d9..e0d024f7f2806b40e40bee7f679a9a1485d49cc4 100644
--- a/Core/SampleBuilderEngine/SampleProvider.h
+++ b/Core/SampleBuilderEngine/SampleProvider.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_SAMPLEBUILDERENGINE_SAMPLEPROVIDER_H
#include "Core/SampleBuilderEngine/SampleBuilderNode.h"
-#include "Param/Node/INode.h"
class MultiLayer;
diff --git a/Core/Scan/AngularSpecScan.cpp b/Core/Scan/AngularSpecScan.cpp
index 38e2a137f00a9262ed75263e9bfaf314e0e2d41f..50f6ec6b3dc09fd7d8a38ff82633bffdbc998782 100644
--- a/Core/Scan/AngularSpecScan.cpp
+++ b/Core/Scan/AngularSpecScan.cpp
@@ -20,9 +20,7 @@
#include "Core/Instrument/PyFmt2.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/Resolution/ScanResolution.h"
-#include "Fit/Tools/RealLimits.h"
#include "Param/Distrib/RangedDistributions.h"
-#include "Param/Varia/ParameterSample.h"
namespace
{
diff --git a/Core/Scan/QSpecScan.cpp b/Core/Scan/QSpecScan.cpp
index a9a0041dfb7ce7b8e3890f9880cd1b4056d9c053..89d78ba076add014550a35d95050367e7465fb88 100644
--- a/Core/Scan/QSpecScan.cpp
+++ b/Core/Scan/QSpecScan.cpp
@@ -19,9 +19,7 @@
#include "Core/Instrument/PyFmt2.h"
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/Resolution/ScanResolution.h"
-#include "Fit/Tools/RealLimits.h"
#include "Param/Distrib/RangedDistributions.h"
-#include "Param/Varia/ParameterSample.h"
namespace
{
diff --git a/Core/Scattering/FormFactorDecoratorMaterial.h b/Core/Scattering/FormFactorDecoratorMaterial.h
index c9993b7069d9a30920e23cfce8dfd86f9c1ebd80..e24bcee12b16ae1e60eb668d8ac19e1eb241ebb4 100644
--- a/Core/Scattering/FormFactorDecoratorMaterial.h
+++ b/Core/Scattering/FormFactorDecoratorMaterial.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
#define BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORMATERIAL_H
-#include "Core/Material/Material.h"
#include "Core/Scattering/IFormFactorDecorator.h"
#include <memory>
diff --git a/Core/Scattering/FormFactorDecoratorPositionFactor.h b/Core/Scattering/FormFactorDecoratorPositionFactor.h
index 1cc4ae8778af957b9bc111cdbacf6a0f359d6c4d..aa593b2cd82be332f3a7ec49afb5c5e444d65919 100644
--- a/Core/Scattering/FormFactorDecoratorPositionFactor.h
+++ b/Core/Scattering/FormFactorDecoratorPositionFactor.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
#define BORNAGAIN_CORE_SCATTERING_FORMFACTORDECORATORPOSITIONFACTOR_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/IFormFactorDecorator.h"
//! Decorates a form factor with a position dependent phase factor.
diff --git a/Core/Scattering/IFormFactor.cpp b/Core/Scattering/IFormFactor.cpp
index 621dd013058f8cad13ee189e85235685fa917ce0..9cff554e7868d2c3f2684bd8e6a7d40e2ad8a72f 100644
--- a/Core/Scattering/IFormFactor.cpp
+++ b/Core/Scattering/IFormFactor.cpp
@@ -12,13 +12,10 @@
//
// ************************************************************************** //
-#include "Core/Scattering/IFormFactor.h"
-#include "Base/Types/Exceptions.h"
#include "Core/Material/WavevectorInfo.h"
#include "Core/RT/ILayerRTCoefficients.h"
#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/Scattering/Rotations.h"
#include <memory>
#include <utility>
diff --git a/Core/Scattering/IFormFactor.h b/Core/Scattering/IFormFactor.h
index e4e9137a0a92090b544e5461edd092724a51c23e..7748aa75f76021f35267033cd83391e776b47f35 100644
--- a/Core/Scattering/IFormFactor.h
+++ b/Core/Scattering/IFormFactor.h
@@ -15,9 +15,6 @@
#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
#define BORNAGAIN_CORE_SCATTERING_IFORMFACTOR_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/EigenCore.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Material/Material.h"
#include "Core/Scattering/ISample.h"
#include "Core/Scattering/ZLimits.h"
diff --git a/Core/Scattering/IFormFactorBorn.h b/Core/Scattering/IFormFactorBorn.h
index a846ec85d719ed03263f70957aaca658a8038e46..3ae953a25277a70d2e4ecc2c24daca01d38a8207 100644
--- a/Core/Scattering/IFormFactorBorn.h
+++ b/Core/Scattering/IFormFactorBorn.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
#define BORNAGAIN_CORE_SCATTERING_IFORMFACTORBORN_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/IFormFactor.h"
class IShape;
diff --git a/Core/Scattering/Rotations.h b/Core/Scattering/Rotations.h
index a66ea707f6027cdbad81b04b23bf1ad8dc3ad937..2f8a4fafc36650f862173495f80125ffb88340d1 100644
--- a/Core/Scattering/Rotations.h
+++ b/Core/Scattering/Rotations.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_SCATTERING_ROTATIONS_H
#include "Base/Types/ICloneable.h"
-#include "Base/Vector/Vectors3D.h"
#include "Param/Node/INode.h"
class Transform3D;
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 67ff7b9decb65c18c5fa019e574c45bbab86ba52..870359f4508171671260de2613d764a2727808aa 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -14,7 +14,6 @@
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Base/Const/MathConstants.h"
-#include "Base/Utils/Assert.h"
#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index bb808934f72f6c52b9f3404261975bfa93d92e82..5eeb61fb3572def716688f42b720ffc5b96ca7f8 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
#include "Core/Computation/DepthProbeElement.h"
-#include "Core/Data/OutputData.h"
#include "Core/RT/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 819399408619a8b178dc9695b05c60102a33f7af..5d8b67f38b6303288f3c4c1e4d748e43ee2c5ab9 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -17,7 +17,6 @@
#include "Core/Computation/IBackground.h"
#include "Core/Histo/Histogram2D.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Base/Pixel/SimulationElement.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Core/Simulation/UnitConverterUtils.h"
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index 931bf0273c8fd51af69864e639703d489ac1692b..2fd35ca754e9a1f096adb1e38eebb674ed46fef9 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -17,7 +17,6 @@
#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Histo/Histogram2D.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Base/Pixel/SimulationElement.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index df9293eb244117dc020cb7c28a3633f7e78844fb..434d84f6ce71bd5b0c53ffeff24c96397308eee5 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -23,7 +23,6 @@
#include "Core/Simulation/UnitConverterUtils.h"
#include "Fit/Tools/StringUtils.h"
#include "Param/Base/ParameterPool.h"
-#include "Param/Varia/ParameterSample.h"
#include <gsl/gsl_errno.h>
#include <iomanip>
#include <iostream>
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index b259d6d30b45cbc87a2ea04185ac3da895320881..9627435a8ef2184c95163307f213f294a59483f0 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -22,7 +22,6 @@
#include "Core/RT/SimulationOptions.h"
#include "Core/SampleBuilderEngine/SampleProvider.h"
#include "Param/Distrib/DistributionHandler.h"
-#include "Param/Node/INode.h"
template <class T> class OutputData;
class IBackground;
diff --git a/Core/Simulation/Simulation2D.h b/Core/Simulation/Simulation2D.h
index e26e09191312b1417c6388c66549660358c120f3..82e85a3abde75b12cfbada93455cb467ecce496c 100644
--- a/Core/Simulation/Simulation2D.h
+++ b/Core/Simulation/Simulation2D.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATION2D_H
#define BORNAGAIN_CORE_SIMULATION_SIMULATION2D_H
-#include "Core/Histo/SimulationResult.h"
#include "Core/Simulation/Simulation.h"
class DetectorContext;
diff --git a/Core/Simulation/SimulationFactory.cpp b/Core/Simulation/SimulationFactory.cpp
index fd0ffb5ad94f95b6c9fb416345a6f6d63dc3575e..24565818b7a163bd1cdaecbda82581ac98d950f0 100644
--- a/Core/Simulation/SimulationFactory.cpp
+++ b/Core/Simulation/SimulationFactory.cpp
@@ -14,7 +14,6 @@
#include "Core/Simulation/SimulationFactory.h"
#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/SpecularSimulation.h"
#include "Core/Simulation/StandardSimulations.h"
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index f64328410272f47fbe6da7e9da6daacb91ed8949..51fe3971fd7924358a7c7f4b76e460888baef471 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -25,7 +25,6 @@
#include "Core/Multilayer/SpecularSimulationElement.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Core/Scan/AngularSpecScan.h"
-#include "Core/Scan/ISpecularScan.h"
#include "Core/Unit/UnitConverter1D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 2a445e900ec1d48f63ff2c7f2d60314720a80b3c..603792d0b32c9f236b542aa0bc7bbca44c0c3bab 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
#define BORNAGAIN_CORE_SIMULATION_SPECULARSIMULATION_H
-#include "Core/Data/OutputData.h"
#include "Core/RT/ILayerRTCoefficients.h"
#include "Core/Simulation/Simulation.h"
diff --git a/Core/Simulation/StandardSimulations.cpp b/Core/Simulation/StandardSimulations.cpp
index 68126d9e9ff17ce3bbadd1fe247e7b623af7d5cc..81e2902dfb829e262e10e093cfaa99c209bcfb71 100644
--- a/Core/Simulation/StandardSimulations.cpp
+++ b/Core/Simulation/StandardSimulations.cpp
@@ -14,7 +14,6 @@
#include "Core/Simulation/StandardSimulations.h"
#include "Base/Const/Units.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Core/Beam/FootprintGauss.h"
#include "Core/Beam/FootprintSquare.h"
#include "Core/Computation/ConstantBackground.h"
diff --git a/Core/Simulation/UnitConverterUtils.cpp b/Core/Simulation/UnitConverterUtils.cpp
index 628f2cb260cd4e4f43a47e34206b8c9767011a7d..b90d658e9496a1bba3b57cf5f1254dd05a08592f 100644
--- a/Core/Simulation/UnitConverterUtils.cpp
+++ b/Core/Simulation/UnitConverterUtils.cpp
@@ -13,11 +13,9 @@
// ************************************************************************** //
#include "Core/Simulation/UnitConverterUtils.h"
-#include "Core/Data/OutputData.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
-#include "Core/Instrument/Instrument.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.cpp b/Core/StandardSamples/CoreShellParticleBuilder.cpp
index 9cdbbd288de544d604dded02df17b6db39c18d2c..22806f8f03eeacb32e20b0cca33f5432187d3191 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.cpp
+++ b/Core/StandardSamples/CoreShellParticleBuilder.cpp
@@ -16,7 +16,6 @@
#include "Base/Const/Units.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Particle/Particle.h"
diff --git a/Core/StandardSamples/CylindersBuilder.cpp b/Core/StandardSamples/CylindersBuilder.cpp
index f1ccfc678653bc2a40d6e176d9abd2624e7fc60b..758d3aeb09dbed319fbe15c3bdef4ea58762273b 100644
--- a/Core/StandardSamples/CylindersBuilder.cpp
+++ b/Core/StandardSamples/CylindersBuilder.cpp
@@ -20,7 +20,6 @@
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Particle/Particle.h"
-#include "Core/Scattering/Rotations.h"
#include "Core/StandardSamples/ReferenceMaterials.h"
// -----------------------------------------------------------------------------
diff --git a/Core/StandardSamples/FeNiBilayerBuilder.cpp b/Core/StandardSamples/FeNiBilayerBuilder.cpp
index 46b170e5bb0d98a52ac2973b99c718c5000ee3e2..1820fb593455b3a695ff76ac434b358fb25d82a2 100644
--- a/Core/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Core/StandardSamples/FeNiBilayerBuilder.cpp
@@ -16,12 +16,10 @@
#include "Core/StandardSamples/FeNiBilayerBuilder.h"
#include "Base/Const/PhysicalConstants.h"
#include "Base/Const/Units.h"
-#include "Base/Types/Complex.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/RoughnessModels.h"
namespace
{
diff --git a/Core/StandardSamples/MagneticLayersBuilder.cpp b/Core/StandardSamples/MagneticLayersBuilder.cpp
index 62ca263cddbd588e000648012d87f1c9dc212394..2d98b33755e49bc4f59ceb50dff5d347a2b43ac3 100644
--- a/Core/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Core/StandardSamples/MagneticLayersBuilder.cpp
@@ -21,7 +21,6 @@
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/RoughnessModels.h"
#include "Core/Particle/Particle.h"
namespace
diff --git a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
index 832f230f3d240ddca4889a16e0de8b88aad9a3da..298f0c7ad46e8445dc814b9c32d10bc8e5bf53d5 100644
--- a/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
#define BORNAGAIN_CORE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Core/StandardSamples/MultiLayerWithRoughnessBuilder.h"
//! Builds sample: layers with correlated roughness.
diff --git a/Core/StandardSamples/ParaCrystalBuilder.cpp b/Core/StandardSamples/ParaCrystalBuilder.cpp
index 83a26e55d403e180daf6353535f9c4eed470e850..f1722d2d0a6d544f9d1917d03db34a6178256cfa 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.cpp
+++ b/Core/StandardSamples/ParaCrystalBuilder.cpp
@@ -18,7 +18,6 @@
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Correlations/FTDistributions2D.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index 94b2bf04366c37b10ecc2d410f33c1d2201df4d8..662fcf415e35b780bb30c6924f7518bad17f2b9d 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -27,7 +27,6 @@
#include "Core/StandardSamples/ReferenceMaterials.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterPattern.h"
-#include "Param/Varia/ParameterSample.h"
MultiLayer* CylindersWithSizeDistributionBuilder::buildSample() const
{
diff --git a/Core/StandardSamples/ParticleInVacuumBuilder.cpp b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
index a2c09a3a7c4992e3997470312c8af7a0c804202e..e00f3d1955afdba98c0410e18aa6c55f0538380e 100644
--- a/Core/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
@@ -14,7 +14,6 @@
#include "Core/StandardSamples/ParticleInVacuumBuilder.h"
#include "Base/Const/Units.h"
-#include "Base/Types/Exceptions.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Multilayer/Layer.h"
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 715077b5110d8c95917ccf72d6f82c5d44bcc6ab..48a3df1a9d7582bfe6a0f7ed3e7fceae45477cdb 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -28,7 +28,6 @@
#include "Core/StandardSamples/MagneticParticlesBuilder.h"
#include "Core/StandardSamples/MesoCrystalBuilder.h"
#include "Core/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
-#include "Core/StandardSamples/MultiLayerWithRoughnessBuilder.h"
#include "Core/StandardSamples/MultipleLayoutBuilder.h"
#include "Core/StandardSamples/ParaCrystalBuilder.h"
#include "Core/StandardSamples/ParticleCompositionBuilder.h"
diff --git a/Core/Unit/UnitConverter1D.cpp b/Core/Unit/UnitConverter1D.cpp
index 393a496a49474e41d23f57c4241977ca45898d5d..770ddc60024315c1c7c90c8fa0be75281be824de 100644
--- a/Core/Unit/UnitConverter1D.cpp
+++ b/Core/Unit/UnitConverter1D.cpp
@@ -15,7 +15,6 @@
#include "Core/Unit/UnitConverter1D.h"
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Core/Beam/Beam.h"
#include "Core/Data/OutputData.h"
diff --git a/Fit/RootAdapter/GeneticMinimizer.cpp b/Fit/RootAdapter/GeneticMinimizer.cpp
index b9aa375d5b73faa869edc1283eb1cb46752caf68..1b429e6994d19143d1fd7e91d82fef6ee28923a1 100644
--- a/Fit/RootAdapter/GeneticMinimizer.cpp
+++ b/Fit/RootAdapter/GeneticMinimizer.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/Kernel/Parameter.h"
#include <Math/GeneticMinimizer.h>
namespace
diff --git a/Fit/RootAdapter/MinimizerResultUtils.cpp b/Fit/RootAdapter/MinimizerResultUtils.cpp
index a1c9110b6102aea2da463c18e62603da99b717ea..a00fba4cfa1343d3964dfe9462a2602737de0401 100644
--- a/Fit/RootAdapter/MinimizerResultUtils.cpp
+++ b/Fit/RootAdapter/MinimizerResultUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Fit/RootAdapter/MinimizerResultUtils.h"
-#include "Fit/Kernel/Parameters.h"
#include "Fit/RootAdapter/RootMinimizerAdapter.h"
#include "Fit/Tools/MinimizerUtils.h"
#include <boost/format.hpp>
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.cpp b/Fit/RootAdapter/RootMinimizerAdapter.cpp
index cd141ec5796ff72f55125af984cf8abb4cd04902..18e90b4cf750d48cedd9f6caa2457f4b0c1a51d0 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.cpp
+++ b/Fit/RootAdapter/RootMinimizerAdapter.cpp
@@ -13,8 +13,6 @@
// ************************************************************************** //
#include "Fit/RootAdapter/RootMinimizerAdapter.h"
-#include "Fit/Kernel/Parameter.h"
-#include "Fit/Kernel/Parameters.h"
#include "Fit/RootAdapter/MinimizerResultUtils.h"
#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
#include "Fit/RootAdapter/RootResidualFunction.h"
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.cpp b/Fit/RootAdapter/ScalarFunctionAdapter.cpp
index 3891fe16c9079833bd79e790ed353cb4142b285f..d0b29aa5df134b00ef9a6afd1a1f45f5a489a3b9 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.cpp
+++ b/Fit/RootAdapter/ScalarFunctionAdapter.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Fit/RootAdapter/ScalarFunctionAdapter.h"
-#include "Fit/Kernel/KernelTypes.h"
#include "Fit/RootAdapter/RootScalarFunction.h"
using namespace Fit;
diff --git a/GUI/ba3d/model/geometry.h b/GUI/ba3d/model/geometry.h
index eff4a19c4a4c0889ae01bd993518f57e498903c4..1f380b629bc50e05411752c2a3d0104dedabd87e 100644
--- a/GUI/ba3d/model/geometry.h
+++ b/GUI/ba3d/model/geometry.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
#define BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
-#include "GUI/ba3d/def.h"
#include "GUI/ba3d/model/geometry_inc.h"
#include <QObject>
#include <QVector>
diff --git a/GUI/ba3d/model/model.h b/GUI/ba3d/model/model.h
index 68ec83d80d9f3c849b8f8f009494268996cb4dfc..660b2bb7dafc04ef38666542a9dab9407712558c 100644
--- a/GUI/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -15,7 +15,6 @@
#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"
#include "GUI/ba3d/view/camera.h"
#include <QVector>
diff --git a/GUI/ba3d/model/object.cpp b/GUI/ba3d/model/object.cpp
index e270ef7982a45165895594f8b0e68e9d9743ca2c..ef9a18fb9b1318ea1c6d8003ef3db45213d55c73 100644
--- a/GUI/ba3d/model/object.cpp
+++ b/GUI/ba3d/model/object.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "GUI/ba3d/model/object.h"
#include "GUI/ba3d/view/canvas.h"
#include "GUI/ba3d/model/geometry.h"
#include "GUI/ba3d/model/model.h"
diff --git a/GUI/ba3d/model/object.h b/GUI/ba3d/model/object.h
index bf906dabe94d2e244a01e6224753b543728a6c4f..b818780212da050705d398aa5c0aa0b37176435f 100644
--- a/GUI/ba3d/model/object.h
+++ b/GUI/ba3d/model/object.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
#define BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
-#include "GUI/ba3d/def.h"
#include "GUI/ba3d/model/geometry_inc.h"
#include <QColor>
#include <QMatrix4x4>
diff --git a/GUI/ba3d/view/canvas.cpp b/GUI/ba3d/view/canvas.cpp
index 0160a9ddb5316065a2c68391215ea6c1d21b86a4..2e0f48fc7fd375ef5de9483c946ecfd4b7f40d0b 100644
--- a/GUI/ba3d/view/canvas.cpp
+++ b/GUI/ba3d/view/canvas.cpp
@@ -17,7 +17,6 @@
#include "GUI/ba3d/model/model.h"
#include "Base/Utils/Assert.h"
#include "GUI/ba3d/view/buffer.h"
-#include "GUI/ba3d/view/camera.h"
#include "GUI/ba3d/view/program.h"
#include <QMouseEvent>
diff --git a/GUI/ba3d/widget.cpp b/GUI/ba3d/widget.cpp
index 389d3c59c1a7c43ab0d5f7df73287552f4da8fd3..6ec9f357b2ff7e1198a09f8d1c269a8ee4b51308 100644
--- a/GUI/ba3d/widget.cpp
+++ b/GUI/ba3d/widget.cpp
@@ -14,7 +14,6 @@
#include "GUI/ba3d/widget.h"
#include "GUI/ba3d/model/model.h"
-#include "GUI/ba3d/view/camera.h"
#include "GUI/ba3d/view/canvas.h"
#include "GUI/ba3d/view/program.h"
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 20fbd45ba829d0a9b8ddb09036dbd604b77b74e3..10b3ef00fa5a98ee568ab983ce3236d019b385a6 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Models/ApplicationModels.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Scattering/ISample.h"
#include "Core/Simulation/OffSpecSimulation.h"
#include "Core/Simulation/StandardSimulations.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index c867e51b6b1341307b1ba994dbd0e07f3ebb5e1f..c29bc93dd4d50d3fb02f277d1bd6bcb903e4d468 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "Base/Const/Units.h"
-#include "Base/Utils/Assert.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
#include "GUI/coregui/Models/RealLimitsItems.h"
diff --git a/GUI/coregui/Models/BeamItems.cpp b/GUI/coregui/Models/BeamItems.cpp
index 5bee7d58a8e373eee3b45913f9ec1159deaa2770..a0b258c4c600e93f3868002783093b1538a5059c 100644
--- a/GUI/coregui/Models/BeamItems.cpp
+++ b/GUI/coregui/Models/BeamItems.cpp
@@ -14,12 +14,9 @@
#include "GUI/coregui/Models/BeamItems.h"
#include "Base/Const/Units.h"
-#include "Base/Utils/Assert.h"
#include "Base/Axis/IAxis.h"
#include "Core/Beam/Beam.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
-#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
#include "GUI/coregui/Models/FootprintItems.h"
#include "GUI/coregui/Models/GroupItem.h"
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.cpp b/GUI/coregui/Models/ComponentProxyStrategy.cpp
index 26419c78b642666025787371de42c3bdb6af0572..656844fe7ecd6dd2d740326132fe1cf91e9c1220 100644
--- a/GUI/coregui/Models/ComponentProxyStrategy.cpp
+++ b/GUI/coregui/Models/ComponentProxyStrategy.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Models/ComponentProxyModel.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ModelPath.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
index ea016ac0331ddce8fec17b6d7616107c93b80f68..a542bc962b7bac7ee54ffa7c5658aa3ff92a9bb2 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
@@ -17,7 +17,6 @@
#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Models/BeamDistributionItem.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Models/TransformToDomain.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index f5d0e5d50321b3ed64ee3fe47128f6131f86edc7..b06bcf8e026a59fb7166f557bc4a4e4953025cea 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -19,10 +19,8 @@
#include "Core/Simulation/UnitConverterUtils.h"
#include "Core/Unit/UnitConverter1D.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/ParticleDistributionItem.h"
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index 899e5680416fd5fa1d19f0918be7359aaffd865f..83c1f4cc4c8a7151a1142ec18535a7c309f3a25d 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -16,7 +16,6 @@
#include "Base/Const/Units.h"
#include "Core/Beam/IFootprintFactor.h"
#include "Core/Computation/IBackground.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Scan/AngularSpecScan.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
@@ -24,12 +23,10 @@
#include "Core/Simulation/SpecularSimulation.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/FootprintItems.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/SimulationOptionsItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index ae45fe4253a46fd81e4a7f258323e6a058081a02..29f47bed48cf30b164a3ea54597357293d361657 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Models/FitParameterItems.h"
-#include "Fit/Kernel/Parameter.h"
#include "Fit/Kernel/Parameters.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/JobItem.h"
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index 822d0f942fc105ca697c1f170e9d176b842e69f8..8ecc29f923ac479fccb1c6994674fb7f79efd3cb 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -16,7 +16,6 @@
#include "Base/Const/Units.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/HardParticle/HardParticles.h"
-#include "Core/Material/Material.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Multilayer/MultiLayerUtils.h"
@@ -41,7 +40,6 @@
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Models/TransformationItem.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 252d4666d52824bcffff2424b59e626e80ef1a39..672c5f3b01b09f6a4320e1c668eaacde6fffc3f6 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -17,9 +17,7 @@
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecSimulation.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/SpecularSimulation.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
#include "GUI/coregui/Models/InstrumentItems.h"
diff --git a/GUI/coregui/Models/InstrumentItems.cpp b/GUI/coregui/Models/InstrumentItems.cpp
index 16f5dc11afe0810aeefece00ca43e978e0af9325..1ab2ad3a0faeffc52226690fbf210a15367aaae3 100644
--- a/GUI/coregui/Models/InstrumentItems.cpp
+++ b/GUI/coregui/Models/InstrumentItems.cpp
@@ -16,9 +16,7 @@
#include "Core/Detector/IDetector2D.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Unit/UnitConverter1D.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/GroupItem.h"
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index 8cec633b0b9dc507fa9ba7f24e5ce14f8d2b6db7..c6fb0d59c4ee0f935025c59a998a55d769ff8a98 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ProjectionItems.h"
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 61d658585ceb4426609e46a55983fedc65bf0eff..61ed2fd3f57b9c83ac0fa55b4862aabe23db9902 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -15,9 +15,6 @@
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunctions.h"
-#include "Core/Correlations/FTDecay1D.h"
-#include "Core/Correlations/FTDecay2D.h"
-#include "Core/Correlations/FTDistributions2D.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/GroupItem.h"
diff --git a/GUI/coregui/Models/ItemCatalog.cpp b/GUI/coregui/Models/ItemCatalog.cpp
index 945c556d1d6586b8f9c7cbf9366e9ffc1a675b47..de57baa658d72dcc2fd9e82b16c8e32cd09a7c8f 100644
--- a/GUI/coregui/Models/ItemCatalog.cpp
+++ b/GUI/coregui/Models/ItemCatalog.cpp
@@ -13,16 +13,13 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ItemCatalog.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
-#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/FitParameterItems.h"
@@ -30,7 +27,6 @@
#include "GUI/coregui/Models/FootprintItems.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/JobItem.h"
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 854750eedaee26f7f8b6679b63694d5397906194..1b7a007cce846ee79214c25a0536f27c2cf990ad 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Models/JobItem.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/Data1DViewItem.h"
#include "GUI/coregui/Models/FitSuiteItem.h"
#include "GUI/coregui/Models/InstrumentItems.h"
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index 8b86f62f8ed03132ed888db7bc8d8dec3c61dc04..1dc4f60694f392b96364eb093940bd5e04a62467 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Models/JobItemUtils.h"
#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/UnitConverterUtils.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DomainObjectBuilder.h"
#include "GUI/coregui/Models/InstrumentItems.h"
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index b7419f943362379427a436aca41df440e8bb09fb..e7bafb1993dd83c3ec3fbb8d3be2529f6accaa31 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -12,11 +12,9 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Models/MaterialItem.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 6b588f1dc5cdc17ba06817ac46f6544e8863b14a..f6ba211decec3fb972bb28f2f1ff3339c1b158ad 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -22,7 +22,6 @@
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Models/TransformToDomain.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterUtils.h"
namespace
diff --git a/GUI/coregui/Models/ProxyModelStrategy.cpp b/GUI/coregui/Models/ProxyModelStrategy.cpp
index bdddd167dd32cec121e6e5055ed56dfbdc1d4c28..cfd80746dc758ef57d526f0dc66da1860186422e 100644
--- a/GUI/coregui/Models/ProxyModelStrategy.cpp
+++ b/GUI/coregui/Models/ProxyModelStrategy.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Models/ProxyModelStrategy.h"
#include "GUI/coregui/Models/ComponentProxyModel.h"
#include "GUI/coregui/Models/ModelUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
diff --git a/GUI/coregui/Models/RealLimitsItems.h b/GUI/coregui/Models/RealLimitsItems.h
index d8304e89957ce7b1d2c9c560fe49fe04d11ddc26..0c84664fad627a8ecff07c785629bca203321952 100644
--- a/GUI/coregui/Models/RealLimitsItems.h
+++ b/GUI/coregui/Models/RealLimitsItems.h
@@ -15,7 +15,6 @@
#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"
class BA_CORE_API_ RealLimitsItem : public SessionItem
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index 2c743646d16b928614be41acd846c010783d9935..813abafceb4d56bb0975929732fbe12c357adfa9 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_GUI_COREGUI_MODELS_ROTATIONITEMS_H
#include "GUI/coregui/Models/SessionItem.h"
-#include "Wrap/WinDllMacros.h"
class IRotation;
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index e7436457137dee69b8454d3a23cb553d3d86eac0..436d616bbd30909a258d8c82e5658e6819a6d64e 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "Base/Utils/Assert.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ItemFactory.h"
#include "GUI/coregui/Models/ParameterTranslators.h"
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/coregui/Models/SessionItemUtils.cpp
index 2a9f9668db5ff5be90bfe6bc340f5bc84716854d..1ca9c4c53afb3dbba63a573998182f23d2e48d83 100644
--- a/GUI/coregui/Models/SessionItemUtils.cpp
+++ b/GUI/coregui/Models/SessionItemUtils.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Models/GroupInfoCatalog.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Models/SpecularBeamInclinationItem.cpp b/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
index 277dee2f6ec3fe80bfd475e3aa37100a22c468b7..a1ad3dacf70845a6cbff55288b45bd42a942c600 100644
--- a/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
+++ b/GUI/coregui/Models/SpecularBeamInclinationItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "Base/Const/Units.h"
-#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/PointwiseAxisItem.h"
diff --git a/GUI/coregui/Models/SpecularDataItem.cpp b/GUI/coregui/Models/SpecularDataItem.cpp
index 187906f0a1ed531304b7050008b89c78301e1b66..d7111cab1838987957a2305b8793e727274bf6bd 100644
--- a/GUI/coregui/Models/SpecularDataItem.cpp
+++ b/GUI/coregui/Models/SpecularDataItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Models/SpecularDataItem.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/JobItemUtils.h"
#include "GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 8f540845df9eb3e14c1d612d10c7cd3684701d17..a1dc039e0deafbda301def145214ba42adda9ed4 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -15,14 +15,10 @@
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunctions.h"
-#include "Base/Axis/FixedBinAxis.h"
-#include "Core/Beam/Beam.h"
#include "Core/Beam/FootprintGauss.h"
#include "Core/Beam/FootprintSquare.h"
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
-#include "Core/Correlations/FTDistributions1D.h"
-#include "Core/Correlations/FTDistributions2D.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Detector/SphericalDetector.h"
@@ -36,7 +32,6 @@
#include "Core/Multilayer/LayerInterface.h"
#include "Core/Multilayer/LayerRoughness.h"
#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleDistribution.h"
#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "Core/Resolution/ScanResolution.h"
@@ -47,8 +42,6 @@
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
-#include "GUI/coregui/Models/BeamItems.h"
-#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/FootprintItems.h"
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index 5e803a582c661279c24e660834666ee2584e3583..158787ff640fd60456de83e3303186c86c2573c2 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -25,7 +25,6 @@
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/FTDecayFunctionItems.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/JobItem.h"
@@ -51,7 +50,6 @@
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Varia/ParameterPattern.h"
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 064a128e615cadc0b5790214a07492b6344d5ade..002f88f096d243a975eb82ab4ff716c0930d3e1d 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -17,7 +17,6 @@
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Beam/Beam.h"
#include "Core/Instrument/Instrument.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
index a346d891299a750ac121a65dd1f3e4e1186bd247..bd28f4396d15fee9a57f498b00f2b7bf58f9be35 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
@@ -28,7 +28,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
#include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
#include <QDebug>
#include <stdexcept>
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index 59340a0cac5f3806d8a7551fef901be10f3cbda6..d5b2c24d41364ca70eaef1c2516dbf13efaa7ea8 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -32,7 +32,6 @@
#define BORNAGAIN_GUI_COREGUI_VIEWS_ACCORDIONWIDGET_CONTENTPANE_H
#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
-#include "GUI/coregui/Views/AccordionWidget/ClickableFrame.h"
#include <QFrame>
#include <QHBoxLayout>
#include <QPainter>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index cf7f2c2d44d16bb0fd143c43e49bba9f3e3868d4..67eccefb722afd060d011936170ee02ad79b64ed 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/CommonWidgets/ItemComboWidget.h"
#include "Base/Utils/Assert.h"
#include "GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h"
-#include "GUI/coregui/Views/CommonWidgets/SessionItemWidget.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include <QComboBox>
#include <QEvent>
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index c467479df555af1e61f1fccd5e51e2bb20590566..7d4addbb9f1a66a893409f6aae554b19d2a692be 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h"
#include "GUI/coregui/Models/SessionDecorationModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QListView>
diff --git a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
index f184740af48a7afbbb862063867ad0014553ec33..3005195df91f5f2aa9f9848e4c3813a8e02859c0 100644
--- a/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.cpp
@@ -13,13 +13,10 @@
// ************************************************************************** //
#include "GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h"
-#include "Core/Data/OutputData.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Simulation/Simulation.h"
-#include "Fit/Kernel/KernelTypes.h"
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/Kernel/Parameters.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/coregui/Models/DataItem.h"
#include "GUI/coregui/Models/DomainSimulationBuilder.h"
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
index 378816dfd10b2a5525b60f1ea8b362dded06e703..2736139af4a4e00def5125629188872edf9a678b 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
@@ -19,7 +19,6 @@
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Views/FitWidgets/FitLog.h"
#include "GUI/coregui/Views/FitWidgets/FitObjectiveBuilder.h"
-#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
#include "GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h"
#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index ff06be296ba7102befa3f26a64ea4c90ee87087a..6c0a6a4628494474e5f582f8f6bfbfd2f2557dcf 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -14,9 +14,7 @@
#include "GUI/coregui/Views/FitWidgets/GUIFitObserver.h"
#include "Core/Fitting/FitObjective.h"
-#include "Fit/Kernel/MinimizerResult.h"
#include "Fit/Tools/MinimizerUtils.h"
-#include "GUI/coregui/Views/FitWidgets/FitProgressInfo.h"
#include "GUI/coregui/utils/GUIHelpers.h"
GUIFitObserver::GUIFitObserver(QObject* parent)
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
index 53e825fabd6f0e2c51be5a4cacc8fe433f82ee68..43fa5a6754b1946d9f44c5fc066ac0b08d248bb2 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/FitWidgets/HistogramPlot.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
-#include "GUI/coregui/utils/StyleUtils.h"
HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(new QCustomPlot)
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
index e800a123415fdada6b188005f6d79bddb32ad0b5..e6e054a9d21f0f067a15905967128e05444aae91 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.cpp
@@ -12,12 +12,10 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportAssistant.h"
#include "Core/InputOutput/DataFormatUtils.cpp"
// TODO avoid importing a cpp file
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QFileDialog>
#include <QFormLayout>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
index ff2f19311a336475eeff57e5d7f3e926274a089c..6b39bca2616c97f38d93ec6d62909dbe0120f11a 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h
@@ -16,7 +16,6 @@
#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"
#include <QTableWidget>
#include <set>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
index ae5f267114f546b38056932c09035a97dc931161..b902a6ee46bcb3179d4488c0e1007e6d40aa51ec 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.cpp
@@ -13,10 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h"
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/TableContextMenu.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QFileDialog>
#include <QFormLayout>
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
index 12a5b3d7bf64a8c65fcc420a598c5b4f7d901b47..7216c21f9f367e1dcfe0d96f4a43960526606ab8 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/DataSelector.h
@@ -15,11 +15,8 @@
#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"
#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.h"
-#include "GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvNamespace.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include <QAction>
#include <QComboBox>
#include <QDialog>
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
index db451e12d50fbf4756508db923c9e39d6f08220d..665b6d6b6cf6dffc925810b7e0740c5477968adc 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h"
-#include "Base/Utils/Assert.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
index 811ef509a92c0da0452959a3420956185ed16982..28e436f2d61d790ccdf4622cfcc10a0691128695 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h"
-#include "Core/Data/OutputData.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
@@ -24,7 +23,6 @@
#include "GUI/coregui/mainwindow/AppSvc.h"
#include "GUI/coregui/mainwindow/projectmanager.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include <QAction>
#include <QApplication>
#include <QFileDialog>
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 65d78c4f08ec6a72773a583413967773cc74b0c0..45fb6e18f0a09e90304be920a68386ba58e22d9d 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/InfoWidgets/DistributionEditor.h"
#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/GroupItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionWidget.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include <QBoxLayout>
diff --git a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index 23936058fb1a3b9771aceaff95a374419470334e..2f977e71073b157993d147cc20c80174b81446f1 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -13,8 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
-#include "GUI/coregui/Models/BeamDistributionItem.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index 974653ba7c7c38b966907a6d863ef77c039d4c52..36833ef4822a5dd98cf416d4604eca2f1a3cb638 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h"
#include "GUI/coregui/Models/AxesItems.h"
-#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
index 7a3d7ea1353d7a1d0d7ed92dd69e4c8c705662ad..91e3f6a3253d238ebb2be7f25b6edd7bf9b804fd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/InstrumentWidgets/GISASBeamEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index a1041129c390080c6d99158bf6d240875ece10c4..889be9d2c2d178cbed05e1c7001b04d0a461b2ba 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h"
#include "GUI/coregui/Models/InstrumentModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include <QAction>
#include <QListView>
#include <QMenu>
diff --git a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
index 41b0963f643cfe4c2d40aa0cbfc39e06dbae80d1..c45fd57d6d6b01766e194bad452547bd28d4c51d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/InstrumentWidgets/OffSpecBeamEditor.h"
#include "GUI/coregui/Models/BeamDistributionItem.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
#include "GUI/coregui/Views/InfoWidgets/DistributionDialog.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
index e41af72b241a5ae71056a4c9221a265bb6cb967c..02181317408de9f3bf4e8993c7569ec7ae0fdc1e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
diff --git a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
index b2f99c8cdaef4f30a631b9f354c06d9992ecf8c0..cf692ab72f51174e342ba8be2411e7068174dc06 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.cpp
@@ -13,8 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/InstrumentWidgets/SpecularBeamEditor.h"
-#include "GUI/coregui/Models/BeamDistributionItem.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/SpecularBeamInclinationItem.h"
#include "GUI/coregui/Views/CommonWidgets/ColumnResizer.h"
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index 3012e5ce88cfb9aa484de432a33e1f7d682bb9bb..a536c50d4599d451802804ab93868e7d20f42ce2 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -20,7 +20,6 @@
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/coregui/Views/IntensityDataWidgets/PlotEventInfo.h"
-#include "GUI/coregui/utils/StyleUtils.h"
namespace
{
diff --git a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp
index c81a5a7699c39f6353d1a2f88a3c0b3e9b679826..e2c31798fc042dfb28c315f754153d617ac1a0fd 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/IntensityDataWidgets/FontScalingEvent.h"
#include "Base/Utils/Assert.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMap.h"
-#include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
#include <qcustomplot.h>
#include <QResizeEvent>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
index 4bd11968694817be1b52fe9321066e42d6ab7dfb..44b9a7fec2a416c8ef7714c7beac02cfb7b63b1d 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
@@ -19,7 +19,6 @@
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/ProjectionItems.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/FitWidgets/plot_constants.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h"
#include <qcustomplot.h>
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp
index d20042eeb529901cfd0ee84d5721117cc1f6f176..3167f7dfa3f6d1d26061b668fc5fc47cb551a7dc 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlot.h"
#include "GUI/coregui/Views/IntensityDataWidgets/ScientificPlotEvent.h"
#include <qcustomplot.h>
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
index 196143bd4b979b03bf8c297f0043597b964aad24..f2eebc823b108b9f3fdf0a9852a89fa730d90773 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Models/JobItem.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/Views/JobWidgets/JobResultsPresenter.h"
-#include "GUI/coregui/Views/JobWidgets/JobViewFlags.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index 106ec0b08973c95cc337390a21e91766d6bb0d2c..edbde635861a561eb385b0097a4146ca97199b0b 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -19,7 +19,6 @@
#include "GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorActions.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h"
-#include "GUI/coregui/mainwindow/StyledToolBar.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <minisplitter.h>
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 246af0e2e3db310ca5994cf8660915ad6a953e27..ab495b11c023783e73e7a75957a16a1ca48f5b27 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -21,7 +21,6 @@
#include "GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/coregui/Views/JobWidgets/JobViewActivities.h"
-#include "GUI/coregui/Views/JobWidgets/JobViewFlags.h"
#include <QDockWidget>
namespace
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
index ef024024c67879e23f519e0dcebb5b18abb2afc5..21e641303c78100e275bc7d631c805144650966e 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h"
#include "GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
#include <QButtonGroup>
#include <QLabel>
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
index 5606a2f7781a9780fd2e720d9da56510de6fa8e3..4ccc4cf21cd7f4411c03577091656a3edbfa9d59 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/MaskWidgets/EllipseView.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Views/MaskWidgets/SizeHandleElement.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
index e5f20038cf4144266f1a337642787d0b09cca393..858d209f545039bda642e083fc27a90444b76367 100644
--- a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
#include <QAction>
#include <QGraphicsSceneContextMenuEvent>
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index fbfc6f91937d1f6969dbbf59737782d7a977ea4a..74e1ee4e5e257a5f9ff9f49a963f7dd4abd16518 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/MaskWidgets/LineViews.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
#include <QCursor>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index ff0716ddea0eb90ebf8907abf3057ed9d3752c94..92e8e0ed38b8a310310706cef5970c2564e24e1d 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/MaskWidgets/MaskAllView.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
#include <QBrush>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 47af7004027e533a9ab59da68fb6644edc4d20dd..0d12036a226cc731b85c38dbe33ef2a92c16b2a6 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/SessionModel.h"
-#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
#include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentEditor.h"
#include <QListView>
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index fa12bd6d046500ab6cf7899f2283c47e713c1f57..dce4ba03c3b0ff398cb64ee20ef835089e4ee3ea 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -15,12 +15,8 @@
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h"
-#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
-#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h"
#include "GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h"
#include "GUI/coregui/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/coregui/Views/MaskWidgets/PolygonView.h"
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index a47f22a66cd4f4b486c08531ec96adcfec9c44fb..60235f5b8e955980555d37d3c45e001e937e8804 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -13,10 +13,8 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/RegionOfInterest.h"
-#include "Core/Mask/IShape2D.h"
#include "GUI/coregui/Models/IntensityDataItem.h"
#include "GUI/coregui/Models/MaskItems.h"
#include "GUI/coregui/Models/SessionModel.h"
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
index 7bf78aee22eaec8f96f951ab88a1ff5a51a33854..d3a103d060663decda8ac9e8a503ccda1b1b812b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
@@ -15,14 +15,12 @@
#include "GUI/coregui/Views/MaskWidgets/MaskViewFactory.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/MaskWidgets/EllipseView.h"
-#include "GUI/coregui/Views/MaskWidgets/IShape2DView.h"
#include "GUI/coregui/Views/MaskWidgets/IntensityDataView.h"
#include "GUI/coregui/Views/MaskWidgets/LineViews.h"
#include "GUI/coregui/Views/MaskWidgets/MaskAllView.h"
#include "GUI/coregui/Views/MaskWidgets/MaskContainerView.h"
#include "GUI/coregui/Views/MaskWidgets/PolygonPointView.h"
#include "GUI/coregui/Views/MaskWidgets/PolygonView.h"
-#include "GUI/coregui/Views/MaskWidgets/RectangleView.h"
#include "GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 111cbae95f37860da8c7081c7117035186ebda3a..590fc66f060d1ececec4edae554be64a04b6cead 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/MaskWidgets/SizeHandleElement.h"
#include "GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h"
-#include "GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h"
#include <QGraphicsSceneHoverEvent>
#include <QPainter>
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index cce5df81b53866a9cc76cf2c0633813bcf557fe6..ca0aefdcce7890fdf5f5ebce8295edafcef5258a 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -13,9 +13,7 @@
// ************************************************************************** //
#include "GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialEditor.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/mainwindow/mainwindow_constants.h"
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 01d933badf26dc2dd5fc0925dfe3b66e5e704c6d..e556367354850221e3a754fab2c4f096d542b392 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -17,7 +17,6 @@
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialItemContainer.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index 222a8ae363b11dc0f4b675da48cd7a90dca1236a..a92ba253c597a0fb6d090e477502c701343447d1 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Views/InfoWidgets/GroupInfoBox.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/coregui/Views/PropertyEditor/ComponentView.h"
#include <QBoxLayout>
#include <QGroupBox>
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
index fd478ca82934fe1c87b969546f61b5c92913ca86..f12a8428c3dffa023ca71c91dc0a19dcb5d3eff2 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/ComponentFlatView.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
#include "GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h"
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
index 805a13cd5c3bef4cae71f52ce5e595e431d2c981..c306be840eceb7ab24364e7df8ebe8a3a7489d68 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/GroupItemController.h"
#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "GUI/coregui/utils/CustomEventFilters.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
index e322109d57327dded782cd79efdfc92c2fd57cd6..3c70fb1ec93ae59c6d2a997080ef58188898c382 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,13 +13,11 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "Fit/Tools/RealLimits.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/GroupItemController.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/JobWidgets/ScientificSpinBox.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
-#include "GUI/coregui/Views/PropertyEditor/CustomEditors.h"
#include "GUI/coregui/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include "GUI/coregui/utils/CustomEventFilters.h"
#include <QLabel>
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
index 1186c3c3e9a35ba2306aa9f24ad3545b3e36db5e..d70bc53f111a1a284b2ea371d3901f91b6d478e6 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index c1e0a8ab5e9ebb9b44baa38a5b97214be1b36b3a..e5089ba4b28943fb5d980379c5692bcb8bf5de78 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -14,11 +14,9 @@
#include "GUI/coregui/Views/PropertyEditor/TestComponentView.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Scattering/ISample.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
#include "GUI/coregui/Models/MaterialDataItems.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionModelDelegate.h"
diff --git a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
index 7f53720907d95f6515462132b85d23d2e90f2dbe..ca680c3f87d0911a73f7b5bed460498b67527194 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/IPositionBuilder.h"
#include "Core/Aggregate/InterferenceFunctions.h"
-#include "Core/Lattice/Lattice2D.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
#include <cmath>
#include <random>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
index d069a3d69638f870a5f48cc507de6e1645737075..217a1e1f1f645f087ca5d290182a26d73447356e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
@@ -14,8 +14,6 @@
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
-#include "Core/Correlations/FTDistributions2D.h"
-#include "Core/Lattice/Lattice2D.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
namespace
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index 88d6d98d95c520836f860d916b038cd854e5925a..51a00ba41667d72103219fcfaca206be7405cf36 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -17,7 +17,6 @@
#include "Core/Aggregate/InterferenceFunctions.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleCoreShell.h"
-#include "GUI/ba3d/model/layer.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -28,7 +27,6 @@
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 28d276e404d402705b8e117a728d3632a228917a..338bcd3d73ccc160d9960cf157d32efd62e2777f 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -17,13 +17,9 @@
#include "Base/Types/Exceptions.h"
#include "Core/Aggregate/InterferenceFunctions.h"
#include "Core/Particle/FormFactorCrystal.h"
-#include "Core/Particle/IParticle.h"
#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleCoreShell.h"
-#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Scattering/IFormFactorDecorator.h"
-#include "Core/Scattering/Rotations.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/LayerItem.h"
@@ -37,7 +33,6 @@
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
#include "GUI/coregui/Models/RotationItems.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/TransformationItem.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.h"
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
index 4452aa70420d00d655b88d9fa0f992f29d2244b1..ed0eee6e33662595375f1c849cb99d1d7442d902 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilderUtils.h
@@ -15,7 +15,6 @@
#ifndef BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
#define BORNAGAIN_GUI_COREGUI_VIEWS_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
-#include "Base/Vector/Vectors3D.h"
#include "Core/Scattering/Rotations.h"
#include <QVector3D>
#include <memory>
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index 975c3932b8572fedfa959a86bb6880daa86a6e1b..1ca03b31e773b360ebf76da016dc46b1b14e5942 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -16,13 +16,9 @@
#include "Base/Const/Units.h"
#include "Base/Types/Exceptions.h"
#include "Core/HardParticle/HardParticles.h"
-#include "Core/Particle/IParticle.h"
#include "Core/Particle/MesoCrystal.h"
#include "Core/Particle/Particle.h"
#include "Core/Particle/ParticleCoreShell.h"
-#include "Core/Particle/ParticleDistribution.h"
-#include "Core/Scattering/IFormFactor.h"
-#include "GUI/ba3d/model/particles.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index 3f7bb07777721ae327c9ab8f1bf94120a78cac18..5f865ae145835a0e26f3298d274d74798c52a0c0 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -15,14 +15,12 @@
#include "GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h"
#include "Base/Const/Units.h"
#include "Core/HardParticle/HardParticles.h"
-#include "Core/Particle/ParticleComposition.h"
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/GUIDomainSampleVisitor.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/ParticleCompositionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h"
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index baa39c01865caeb337c4baeae97a9b52400d100c..b8cbe5d215b45ce8496e32dbbd439bbd2b38e2d5 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -16,7 +16,6 @@
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
-#include "GUI/coregui/Views/SampleDesigner/NodeEditorPort.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/StyleUtils.h"
#include <QObject>
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 741881b984dd2a96b47cf3c29ff5f61dea0e2a52..d69a0afc5b22d16a9a7cf319792e111f2d71d31e 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -23,11 +23,8 @@
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionGraphicsItem.h"
-#include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerMimeData.h"
-#include "GUI/coregui/Views/SampleDesigner/IView.h"
#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
#include "GUI/coregui/Views/SampleDesigner/NodeEditor.h"
#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 55094908a307ac79c611d1805e161a834a895f3a..6a1f3ab3d7c0ce87a0733fed5e7ad0f7efe5c904 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -12,10 +12,8 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Views/SampleDesigner/ILayerView.h"
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index f0d1e83f280f48ea9eac6e357a4178e64555bcdb..8ff881fdaae5d639604ec54850c5a0aa40553ba1 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/SampleDesigner/LayerView.h"
#include "GUI/coregui/Models/LayerItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h"
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
index 5f071a6f6600fd22e90f81f81064bd831c2e00c2..9ae74a1c17a95080171fc8c61d56c33fb7090c3d 100644
--- a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/SampleDesigner/MesoCrystalView.h"
#include "GUI/coregui/Models/MesoCrystalItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/utils/StyleUtils.h"
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 3445d7e3935cd2c9e9d23cd1c5b70f62cd3b9857..201103445c0460af4b571e2108a58991112782bb 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index ebbe4fa02e8a53c7778765e3626a9eed413189dc..744ad421dd215fbc09053edbed51857423565378 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -15,7 +15,6 @@
#include "GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h"
#include "Base/Utils/Assert.h"
#include "GUI/coregui/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/coregui/Views/SampleDesigner/NodeEditorPort.h"
#include <QBrush>
#include <QGraphicsScene>
#include <QPainter>
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index 49f7fc92b4a2582f66cdf48ab04a8b345937f5ab..371e86cb777ae912343b7f75852f3eccc14a8fa4 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/utils/StyleUtils.h"
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index ca2537410a0314c7aed4bdee9946f4bc3b8b6e59..4f5794719e5c5fda9b30a5628e8d2e903516beae 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,7 +14,6 @@
#include "GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h"
#include "GUI/coregui/Models/ParticleCoreShellItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Views/SampleDesigner/DesignerHelper.h"
#include "GUI/coregui/utils/StyleUtils.h"
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index b6e2744a0842fd1e12fe39063f6b030b53175396..398c7bcd880b60f5d87d25aa3857c1aeb987cd7b 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -16,8 +16,6 @@
#include "Core/Scattering/ISample.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/FilterPropertyProxy.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/coregui/Views/SampleDesigner/DesignerView.h"
#include "GUI/coregui/Views/SampleDesigner/MultiLayerView.h"
SampleDesigner::SampleDesigner(QWidget* parent)
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index df07845e74bb3106e972ae59d6f81fd8b005821a..1d821a288bbd9484cc0236c570f522fdce206e18 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -22,7 +22,6 @@
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SpecularDataItem.h"
-#include "GUI/coregui/Views/AccordionWidget/AccordionWidget.h"
#include "GUI/coregui/Views/AccordionWidget/ContentPane.h"
#include "GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/coregui/Views/MaskWidgets/MaskEditor.h"
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
index 3f509e7aa3ddb607864c399cd0ee2f8fe614c5e7..082c590f0aece2320e1e9b2532b2676655e46385 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
@@ -54,7 +54,6 @@
#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"
#include <QtDesigner/formbuilder.h>
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index e7a3ce8aa3e0bc27c39679f4932d8d011c8a6897..66b116a83cd7524859a894001aee72634680ae59 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "GUI/coregui/mainwindow/projectdocument.h"
-#include "Base/Utils/Assert.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/JobModel.h"
#include "GUI/coregui/mainwindow/OutputDataIOService.h"
diff --git a/GUI/coregui/utils/ImportDataInfo.cpp b/GUI/coregui/utils/ImportDataInfo.cpp
index 38b0d99967a7fa59e9c9102887d91f3a19e3dce9..d39fb46817d1b7ab5ed3b381556cfba64c5fc073 100644
--- a/GUI/coregui/utils/ImportDataInfo.cpp
+++ b/GUI/coregui/utils/ImportDataInfo.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "GUI/coregui/utils/ImportDataInfo.h"
#include "Core/Data/OutputData.h"
#include "Core/Unit/AxisNames.h"
#include "GUI/coregui/Models/JobItemUtils.h"
diff --git a/Param/Base/IParameterized.cpp b/Param/Base/IParameterized.cpp
index e3ed27393c3db4ae1a5d56a2c9cb40a1ad5ad80e..8f51f8c76d71e25dcee69b38c1dff7bfdc858d27 100644
--- a/Param/Base/IParameterized.cpp
+++ b/Param/Base/IParameterized.cpp
@@ -14,7 +14,6 @@
#include "Param/Base/IParameterized.h"
#include "Base/Types/Exceptions.h"
-#include "Fit/Tools/RealLimits.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include <iostream>
diff --git a/Param/Base/IterationStrategy.cpp b/Param/Base/IterationStrategy.cpp
index c55b3fa78706a0a8679b2990b4d21378d8dd4718..502aa4c21f16b7adaa8ba53ec8d6b34cf1319f68 100644
--- a/Param/Base/IterationStrategy.cpp
+++ b/Param/Base/IterationStrategy.cpp
@@ -14,7 +14,6 @@
#include "Param/Base/IterationStrategy.h"
#include "Base/Utils/Assert.h"
-#include "Param/Node/INode.h"
#include "Param/Node/NodeIterator.h"
PreorderStrategy::PreorderStrategy() = default;
diff --git a/Param/Base/ParameterPool.cpp b/Param/Base/ParameterPool.cpp
index 360e2bffe9de9e50ed6ff169d00d61df25f50af1..9b2a9ac47368fa428306878a3a877b763dc3844b 100644
--- a/Param/Base/ParameterPool.cpp
+++ b/Param/Base/ParameterPool.cpp
@@ -15,7 +15,6 @@
#include "Param/Base/ParameterPool.h"
#include "Base/Types/Exceptions.h"
#include "Base/Utils/Assert.h"
-#include "Fit/Tools/RealLimits.h"
#include "Fit/Tools/StringUtils.h"
#include "Param/Base/RealParameter.h"
#include <algorithm>
diff --git a/Param/Distrib/DistributionHandler.cpp b/Param/Distrib/DistributionHandler.cpp
index 1c79089ed18a5cacba99e586ca33aa5d60c035a6..3fbb62ccd8f0b57f80c6cf33c941bbcf147c73d3 100644
--- a/Param/Distrib/DistributionHandler.cpp
+++ b/Param/Distrib/DistributionHandler.cpp
@@ -16,7 +16,6 @@
#include "Base/Types/Exceptions.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
DistributionHandler::DistributionHandler() : m_nbr_combinations(1)
{
diff --git a/Param/Distrib/ParameterDistribution.cpp b/Param/Distrib/ParameterDistribution.cpp
index 0f32a7a28b88e60d3b5d541836e53c3f536d7a98..7e77a5b1864db28748dc0ae9cce6ba8a819b3d79 100644
--- a/Param/Distrib/ParameterDistribution.cpp
+++ b/Param/Distrib/ParameterDistribution.cpp
@@ -15,7 +15,6 @@
#include "Param/Distrib/ParameterDistribution.h"
#include "Base/Types/Exceptions.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
ParameterDistribution::ParameterDistribution(const std::string& par_name,
const IDistribution1D& distribution,
diff --git a/Param/Node/INode.cpp b/Param/Node/INode.cpp
index b5701f57d04365b98295b5baaf353273df6aa183..e4841468c6031fe4fe4925719dc6987b186b3285 100644
--- a/Param/Node/INode.cpp
+++ b/Param/Node/INode.cpp
@@ -12,9 +12,7 @@
//
// ************************************************************************** //
-#include "Param/Node/INode.h"
#include "Base/Utils/Algorithms.h"
-#include "Base/Utils/Assert.h"
#include "Param/Base/IterationStrategy.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
diff --git a/Param/Node/INodeVisitor.cpp b/Param/Node/INodeVisitor.cpp
index 43b6d1095e4002e29566d20ac4ab0e664b7a0d5b..110d528178e10551c6c415fe9fb6e0ba7d57de44 100644
--- a/Param/Node/INodeVisitor.cpp
+++ b/Param/Node/INodeVisitor.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Param/Base/IterationStrategy.h"
-#include "Param/Node/INode.h"
#include "Param/Node/NodeIterator.h"
void VisitNodesPreorder(const INode& node, INodeVisitor& visitor)
diff --git a/Param/Node/NodeUtils.cpp b/Param/Node/NodeUtils.cpp
index ad2af2b5b9352fde5efa6f612d1cf4b79f92178c..31904bf3e3c68ce9d17f6ac9bb99defbb4e28be2 100644
--- a/Param/Node/NodeUtils.cpp
+++ b/Param/Node/NodeUtils.cpp
@@ -17,7 +17,6 @@
#include "Param/Base/IterationStrategy.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
-#include "Param/Node/INode.h"
#include "Param/Node/NodeIterator.h"
#include <algorithm>
#include <functional>
diff --git a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
index 440db924a421b886d07956878934f8cf62d9a765..5d913e732b55453d5cd5c4b7ecb06515e6bff358 100644
--- a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
+++ b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "BATesting.h"
-#include "Base/Utils/Assert.h"
#include "Base/Utils/FileSystemUtils.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
diff --git a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
index ec730845f2ae9f980a25744a32dbe069519d109f..a860f40f09b4e206b9eda08d051b6be0e7275968 100644
--- a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
+++ b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
@@ -12,7 +12,6 @@
// ************************************************************************** //
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
index 270ccec638d4b0ee71825f7b75c9a13dde359ffd..0d4eff3afd98c61da9cd846ac010668ccb48d6e1 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
@@ -14,7 +14,6 @@
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
-#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
index 9478dfc155dc1b5edf9483fc27aa94a3287e476d..6e86bbb1ca7994f6969d0544d300e3d962937f19 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
@@ -14,7 +14,6 @@
#include "BATesting.h"
#include "Base/Utils/FileSystemUtils.h"
-#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.cpp b/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.cpp
index 7fd423118644159ca46503c8be8243ecc658cc58..ce96edc84fa9e1e72e2c7de37aced328b6e014f1 100644
--- a/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.cpp
+++ b/Tests/Functional/Core/Fitting/AdjustMinimizerPlan.cpp
@@ -15,9 +15,7 @@
#include "Tests/Functional/Core/Fitting/AdjustMinimizerPlan.h"
#include "Base/Const/Units.h"
#include "Core/Fitting/FitObjective.h"
-#include "Fit/Kernel/KernelTypes.h"
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/Kernel/Parameters.h"
#include <iostream>
namespace
diff --git a/Tests/Functional/Core/Fitting/FitTests.cpp b/Tests/Functional/Core/Fitting/FitTests.cpp
index 9c038318b7b25af2a2464d7257aa267d6dfa6a0f..5a7095c786798c9e20f1628ee10e96cda8fa32d2 100644
--- a/Tests/Functional/Core/Fitting/FitTests.cpp
+++ b/Tests/Functional/Core/Fitting/FitTests.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/TestEngine/MinimizerTestPlan.h"
#include "Tests/Functional/Core/Fitting/PlanFactory.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Core/Fitting/Plan.cpp b/Tests/Functional/Core/Fitting/Plan.cpp
index 32082e08db94b0f081aa5c4413a4e028b8d4aa6d..07b22743ecbbe43f230c666e98b70cce30290f0e 100644
--- a/Tests/Functional/Core/Fitting/Plan.cpp
+++ b/Tests/Functional/Core/Fitting/Plan.cpp
@@ -17,9 +17,7 @@
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
-#include "Fit/Kernel/KernelTypes.h"
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/Kernel/Parameters.h"
Plan::Plan(const std::string& name, bool residual_based)
: MinimizerTestPlan(name), m_residual_based(residual_based)
diff --git a/Tests/Functional/Core/Fitting/PlanCases.cpp b/Tests/Functional/Core/Fitting/PlanCases.cpp
index 8a3c1e9f1d8697504fceca225d937d5b6f476e7e..92425e443ca1424bd48ebc77547b47ec670f9e93 100644
--- a/Tests/Functional/Core/Fitting/PlanCases.cpp
+++ b/Tests/Functional/Core/Fitting/PlanCases.cpp
@@ -16,8 +16,6 @@
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
#include "Core/Aggregate/ParticleLayout.h"
-#include "Core/Correlations/FTDecay1D.h"
-#include "Core/Correlations/FTDecay2D.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/HardParticle/FormFactorCylinder.h"
@@ -27,7 +25,6 @@
#include "Core/Multilayer/MultiLayer.h"
#include "Core/Particle/Particle.h"
#include "Core/Simulation/GISASSimulation.h"
-#include "Fit/Kernel/Parameters.h"
using namespace Fit;
diff --git a/Tests/Functional/Core/Std/Check.cpp b/Tests/Functional/Core/Std/Check.cpp
index 7a2010b5ac04ab3604226a705dc294473c5835e2..243d61f9d81e2a4c257ff20ac1ddaedfc5cd5eab 100644
--- a/Tests/Functional/Core/Std/Check.cpp
+++ b/Tests/Functional/Core/Std/Check.cpp
@@ -14,13 +14,10 @@
#include "BABuild.h"
#include "BATesting.h"
-#include "Base/Utils/Assert.h"
#include "Base/Utils/FileSystemUtils.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include <iostream>
diff --git a/Tests/Functional/Fit/Minimizer/MinimizerTests.cpp b/Tests/Functional/Fit/Minimizer/MinimizerTests.cpp
index b5c8cec209a2b4edc2afc1ecfbee6da3743a641e..ad2d349f68f3e58cb20d6d433744895233bd84c1 100644
--- a/Tests/Functional/Fit/Minimizer/MinimizerTests.cpp
+++ b/Tests/Functional/Fit/Minimizer/MinimizerTests.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/TestEngine/MinimizerTestPlan.h"
#include "Tests/Functional/Fit/Minimizer/PlanFactory.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Fit/Minimizer/PlanCases.cpp b/Tests/Functional/Fit/Minimizer/PlanCases.cpp
index 16280c7ef4fd02a844f447dd193b4922e22f77cf..2ae4fd555c081da967a1ae10397567eb3f03a7f7 100644
--- a/Tests/Functional/Fit/Minimizer/PlanCases.cpp
+++ b/Tests/Functional/Fit/Minimizer/PlanCases.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Tests/Functional/Fit/Minimizer/PlanCases.h"
-#include "Fit/Kernel/Parameter.h"
#include "Tests/Functional/Fit/Minimizer/ClassicalTestFunctions.h"
namespace
diff --git a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
index 6ef51a51a574535e5a1db5f2789bcabcfb9be5b9..8f88b4ed22a3f95bc0f0de052c310536ff526876 100644
--- a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
+++ b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
@@ -14,7 +14,6 @@
#include "Tests/Functional/Fit/Minimizer/ResidualTestPlan.h"
#include "Fit/Kernel/Minimizer.h"
-#include "Fit/Kernel/Parameters.h"
#include "Fit/TestEngine/Numeric.h"
#include <cassert>
#include <iostream>
diff --git a/Tests/Functional/GUI/Other/SaveLoadProject.cpp b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
index 4422377b82e6d77ac817b84b36166b33e70e0dbb..d8f57b4c2187cec7c0f890ea8745af961801bc20 100644
--- a/Tests/Functional/GUI/Other/SaveLoadProject.cpp
+++ b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
@@ -14,7 +14,6 @@
#include "Tests/Functional/GUI/Other/SaveLoadProject.h"
#include "BATesting.h"
-#include "Base/Utils/Assert.h"
#include "Base/Utils/FileSystemUtils.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
diff --git a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
index 5060e4c96bd842b7728bcd3ec5817d6d388749a6..416f8e9d5d7c0bca169fae2e47e41c45609d254a 100644
--- a/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/Translate/GUITranslationTest.cpp
@@ -14,12 +14,10 @@
#include "Tests/Functional/GUI/Translate/GUITranslationTest.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Fit/Tools/StringUtils.h"
#include "GUI/coregui/Models/ApplicationModels.h"
-#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/DocumentModel.h"
#include "GUI/coregui/Models/FitParameterHelper.h"
#include "GUI/coregui/Models/GUIObjectBuilder.h"
diff --git a/Tests/Functional/Python/Std/Check.cpp b/Tests/Functional/Python/Std/Check.cpp
index 559e9c469a9991ef1a1de02c765d8ed164f5dad9..70151e8212121d027ab4ede669fcf58542591594 100644
--- a/Tests/Functional/Python/Std/Check.cpp
+++ b/Tests/Functional/Python/Std/Check.cpp
@@ -14,7 +14,6 @@
#include "BABuild.h"
#include "BATesting.h"
-#include "Base/Utils/Assert.h"
#include "Base/Utils/FileSystemUtils.h"
#include "Core/Export/ExportToPython.h"
#include "Core/Histo/IntensityDataIOFactory.h"
diff --git a/Tests/Functional/Std/Run.cpp b/Tests/Functional/Std/Run.cpp
index 77576a23b4760bd7426966018e7b2db16d655a94..a3d22c9de62b80fe8192ebb613bc579021502201 100644
--- a/Tests/Functional/Std/Run.cpp
+++ b/Tests/Functional/Std/Run.cpp
@@ -12,10 +12,7 @@
//
// ************************************************************************** //
-#include "Base/Utils/Assert.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/SampleBuilderEngine/ISampleBuilder.h"
-#include "Core/Simulation/Simulation.h"
#include "Core/Simulation/SimulationFactory.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include <iostream>
diff --git a/Tests/Performance/Core/CoreIO.cpp b/Tests/Performance/Core/CoreIO.cpp
index 2b3d0192d3a8093e1d0a6eb60b69ee04fc5c5a4f..318953e96086ec24e38d0b5b5d15ded06347ec74 100644
--- a/Tests/Performance/Core/CoreIO.cpp
+++ b/Tests/Performance/Core/CoreIO.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************** //
-#include "Base/Utils/Assert.h"
#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Fit/TestEngine/Numeric.h"
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index 2419eded4f080f20a304c4acd8a5bcbc422f60e3..bdac2c80348cb882243b18b8ffe26d55224b3f15 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -18,8 +18,6 @@
#include "Core/Detector/RectangularDetector.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Lattice/ISelectionRule.h"
-#include "Core/Lattice/Lattice.h"
-#include "Core/Material/Material.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/LayerRoughness.h"
diff --git a/Tests/UnitTests/Core/Axes/Histogram1DTest.cpp b/Tests/UnitTests/Core/Axes/Histogram1DTest.cpp
index 4268ad74c27634016ff3e77d91bbb915a512d075..08b205c0339fa901e7f15cf543a5742dbeb23173 100644
--- a/Tests/UnitTests/Core/Axes/Histogram1DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/Histogram1DTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Histo/Histogram1D.h"
-#include "Base/Types/Exceptions.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Axes/KVectorTest.cpp b/Tests/UnitTests/Core/Axes/KVectorTest.cpp
index fc416dcedd099cf932b902f879ec13e545884deb..4dfbfd2f72e289a2b0de4e69dfab3b8f9eb24c3b 100644
--- a/Tests/UnitTests/Core/Axes/KVectorTest.cpp
+++ b/Tests/UnitTests/Core/Axes/KVectorTest.cpp
@@ -1,5 +1,4 @@
#include "Base/Vector/Transform3D.h"
-#include "Base/Vector/Vectors3D.h"
#include "Tests/GTestWrapper/google_test.h"
class KVectorTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
index 5919173d89573b5649a5b193c502f9ed34929e49..3629b69ffbad13fd3c9ed3f71f423c6905873d89 100644
--- a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
+++ b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp
@@ -1,7 +1,6 @@
#include "Core/Unit/UnitConverter1D.h"
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Base/Axis/VariableBinAxis.h"
#include "Core/Beam/Beam.h"
diff --git a/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp b/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
index 5b6c621cc32f76a1e65f00d29016cb4bb47ab533..e55999e5ef56b5b9127dbee2d6206631f61d043a 100644
--- a/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Intensity/ArrayUtils.h"
-#include "Base/Axis/IAxis.h"
#include "Tests/GTestWrapper/google_test.h"
#include <vector>
diff --git a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
index d131d6d8db63ce8aa03722beaeced8d4c9908820..86debe3087073e0239472d165ad9592460551d9d 100644
--- a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp
@@ -1,4 +1,3 @@
-#include "Base/Axis/FixedBinAxis.h"
#include "Core/Data/OutputData.h"
#include "Core/InputOutput/OutputDataReadStrategy.h"
#include "Core/InputOutput/OutputDataWriteStrategy.h"
diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp b/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp
index aff7a4fedbc6985deedf15aecb3ca033f5c76170..abd02e5c36f34f50157249d30518b5ab67077d00 100644
--- a/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp
@@ -1,4 +1,3 @@
-#include "Core/Data/OutputDataIterator.h"
#include "Core/Data/OutputData.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
index 4b67935c6b60ac2c9c8af1b4dc4b2a0c97ab0491..938790462dab28fa1b1fe2f97886def088b981ea 100644
--- a/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
+++ b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp
@@ -1,6 +1,3 @@
-#include "Core/Data/OutputData.h"
-#include "Base/Utils/ThreadInfo.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/VariableBinAxis.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp b/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
index cac02bef61421271e9691b54baac1fb49cacc41c..3ed9a0584fbb78f7c5a4ab02ac49e6c03b33c5d3 100644
--- a/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp
@@ -1,4 +1,3 @@
-#include "Core/Detector/DetectorMask.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Mask/Polygon.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
index 022ac3bfbbff78bd28f533100aabf8f7bbd7c07d..32d15569631a2cf05e552838f40ced5cb025572e 100644
--- a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp
@@ -1,5 +1,4 @@
#include "Base/Const/Units.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
diff --git a/Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp b/Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp
index 7d271eb774eb374118491011cbf077d7ff37326e..65b69859b0f26ae519743bc7ffb79b9ab6233933 100644
--- a/Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp
@@ -1,5 +1,4 @@
#include "Base/Const/Units.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/RectangularDetector.h"
#include "Core/Detector/SimpleUnitConverters.h"
diff --git a/Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp b/Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp
index 8246e8e189ec91db96161804ca14a4a699a4494b..0d25d2d75af41ec9b97a22fb8e3f82983c25931a 100644
--- a/Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp
+++ b/Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Detector/RegionOfInterest.h"
-#include "Base/Types/Exceptions.h"
#include "Core/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
index 88e796625ea5e17b5ceee04ab402fab5108963c0..b21f501f76932c1b772cbf33eba34b94e8609595 100644
--- a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp
@@ -1,6 +1,5 @@
#include "Core/Detector/SpecularDetector1D.h"
#include "Base/Const/Units.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Core/Beam/Beam.h"
#include "Core/Data/OutputData.h"
#include "Core/Detector/SimulationArea.h"
diff --git a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
index baf8219e9cd3d3a6c8447888a6ae9ac950be90c0..0215346d9bfefa514616e9ff7a530348fd474334 100644
--- a/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp
@@ -1,5 +1,4 @@
#include "Base/Const/Units.h"
-#include "Base/Vector/Vectors3D.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/SimpleUnitConverters.h"
#include "Core/Detector/SphericalDetector.h"
diff --git a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
index 8e37c386c331d61492bf2a9f2fc13a1ee179bd6b..6f3578347fd61d378d97671e6c1826cceede9d2b 100644
--- a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
+++ b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp
@@ -1,9 +1,6 @@
#include "Core/Detector/SphericalDetector.h"
#include "Base/Const/Units.h"
-#include "Base/Types/Exceptions.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Core/Beam/Beam.h"
-#include "Core/Data/OutputData.h"
#include "Core/Detector/DetectorFunctions.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Detector/SimulationArea.h"
diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
index a80bf8bdd34dde0bfb01fa752af2bf96266c2dde..af1649f3a7a0de8667d65f04916ceaa3315f159d 100644
--- a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
@@ -3,7 +3,6 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Core/Instrument/PyFmt2.h"
-#include "Fit/Tools/RealLimits.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/ParameterDistribution.h"
#include "Param/Varia/PyFmtLimits.h"
diff --git a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
index da36b0ef628130c1a8757ddd8f199c3c364bac9e..01a087cdc629f117338e3442f3c34e13a54d9009 100644
--- a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Fitting/FitObjective.h"
-#include "Fit/Kernel/Parameters.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
index ab888ee1a1e75b1ef8a4fd2a43a747ba381fd373..0f47afeabf3810e138b295fc2f7ddd89aa861f50 100644
--- a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
+++ b/Tests/UnitTests/Core/Fitting/FittingTestHelper.h
@@ -2,7 +2,6 @@
#define BORNAGAIN_TESTS_UNITTESTS_CORE_FITTING_FITTINGTESTHELPER_H
#include "Base/Const/Units.h"
-#include "Core/Data/OutputData.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
diff --git a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
index 352a4527ad8dd68ad123f1172664f638b704637a..cea527178ff33d2a0bf3862d20466883642bcf71 100644
--- a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Fitting/SimDataPair.h"
-#include "Fit/Kernel/Parameters.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
index 5aacaf7bbd7b11787b62b535eb951aa56713c3a1..696a8780e85b313d4f1bc39532849e5faface7dd 100644
--- a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
@@ -1,7 +1,6 @@
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Core/Histo/Histogram2D.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
index 3cc98826d73cc2dd210ef58b55550e87850170d5..b2b8289ca92f294f547ef89dc6b33ebbf2556963 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -1,8 +1,6 @@
#include "Core/Simulation/SpecularSimulation.h"
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
-#include "Base/Types/Exceptions.h"
-#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/VariableBinAxis.h"
#include "Core/Histo/Histogram1D.h"
#include "Core/Material/MaterialFactoryFuncs.h"
diff --git a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
index 4fa265508c5827894b43641896465a2182992da9..95f2dae67a656f46ad9a623351d25b87a9e4b935 100644
--- a/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Simulation/GISASSimulation.h"
-#include "Core/Data/OutputData.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/SampleBuilderEngine/ISampleBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Other/SimulationResultTest.cpp b/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
index 55760288914417974429188ebf6263d8f015b6e7..6f2c3bcfd6caffff8dc88eabd3bec3dcb83ccba9 100644
--- a/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
+++ b/Tests/UnitTests/Core/Other/SimulationResultTest.cpp
@@ -1,5 +1,3 @@
-#include "Core/Histo/SimulationResult.h"
-#include "Core/Data/OutputData.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Other/SpectrumTest.cpp b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
index fa837b0b92586736b8158e1fa2f9ad403d0144f7..e11625fe94656942a593007cac1f9d1b90f09327 100644
--- a/Tests/UnitTests/Core/Other/SpectrumTest.cpp
+++ b/Tests/UnitTests/Core/Other/SpectrumTest.cpp
@@ -1,4 +1,3 @@
-#include "Core/Histo/Histogram2D.h"
#include "Core/Instrument/SpectrumUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <tspectrum.h>
diff --git a/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp b/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp
index 40d00dfd99c4e94946ef251c9963afc6492c44c4..77da509f59afeb85b748c41db5f75d5273c4539f 100644
--- a/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp
@@ -1,5 +1,4 @@
#include "Param/Distrib/DistributionHandler.h"
-#include "Param/Base/IParameterized.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Distrib/Distributions.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
index 0762ee518f5529d40ae72517ba7a38610c430106..f841c3472c58b5eaaedae24178ba75dd02ae67a0 100644
--- a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
@@ -1,4 +1,3 @@
-#include "Base/Const/MathConstants.h"
#include "Core/Correlations/FTDistributions1D.h"
#include "Core/Correlations/FTDistributions2D.h"
#include "Param/Base/RealParameter.h"
diff --git a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
index 115d3a0077369120c2cecdaa4bd293285ecdd9ca..2a2828394299a43e5d8441840c772f22b5830c54 100644
--- a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
@@ -1,8 +1,6 @@
#include "Param/Distrib/ParameterDistribution.h"
#include "Base/Types/Exceptions.h"
-#include "Param/Base/IParameterized.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
#include "Param/Varia/ParameterUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp b/Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp
index 9d47ec7c064253df4357a9d54d5261d5a3f74c7c..4269ebb4343a09644cbb8e8fbee6859e903d2670 100644
--- a/Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp
@@ -1,6 +1,5 @@
#include "Core/Resolution/ScanResolution.h"
#include "Param/Distrib/RangedDistributions.h"
-#include "Param/Varia/ParameterSample.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/UnitTests/Core/Sample/CrystalTest.cpp b/Tests/UnitTests/Core/Sample/CrystalTest.cpp
index 80edba8d3b9eb8f5e9b841ef70d62ae1f96bb8b5..7c4ccaadf1b11b524922fa3be71680e9c35c690f 100644
--- a/Tests/UnitTests/Core/Sample/CrystalTest.cpp
+++ b/Tests/UnitTests/Core/Sample/CrystalTest.cpp
@@ -1,5 +1,4 @@
#include "Core/Particle/Crystal.h"
-#include "Core/Lattice/Lattice.h"
#include "Core/Particle/ParticleComposition.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
index 498a4bb4d4f59c5ec508ae74a99b629e97fea357..3333495d22df38caaa089145fb16af3913c309f8 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
@@ -1,7 +1,6 @@
#include "Base/Const/MathConstants.h"
#include "Base/Const/Units.h"
#include "Core/HardParticle/HardParticles.h"
-#include "Core/Scattering/IFormFactorBorn.h"
#include "Core/Scattering/Rotations.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp b/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
index 854c632cfd748384106403d35234b3681c677b0c..c524951f1d51ba256e7a5ae8eb387dd89f566626 100644
--- a/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
@@ -1,6 +1,5 @@
#include "Core/Particle/MesoCrystal.h"
#include "Core/HardParticle/FormFactorFullSphere.h"
-#include "Core/Lattice/Lattice.h"
#include "Core/Particle/Crystal.h"
#include "Core/Particle/ParticleComposition.h"
#include "Core/Scattering/Rotations.h"
diff --git a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
index 94fcbb45db741fc98d912930c5cd45e8e0a10002..6b4aa25489d94779c3345ef4af4e0d39b46f6c7e 100644
--- a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
@@ -1,4 +1,3 @@
-#include "Base/Const/MathConstants.h"
#include "Core/Aggregate/InterferenceFunction2DLattice.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Computation/ProcessedSample.h"
@@ -6,7 +5,6 @@
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
-#include "Core/Multilayer/Slice.h"
#include "Core/Particle/Particle.h"
#include "Core/RT/SimulationOptions.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
index a7ddbf07c53e2e6a7a28ee55dc6f6fb2813ae9d5..97fddfd7ebf8e5566330f25af035ad541f47b5bf 100644
--- a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
@@ -4,7 +4,6 @@
#include "Core/HardParticle/HardParticles.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Particle/Particle.h"
-#include "Core/Scattering/Rotations.h"
#include "Tests/GTestWrapper/google_test.h"
class ParticleCoreShellTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
index 9ea14be85c8cab0581ca479a58a4347bb94cfca8..02f573edca31ef4229c74e8bf845f257d91db62b 100644
--- a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
@@ -4,7 +4,6 @@
#include "Core/Aggregate/InterferenceFunctionNone.h"
#include "Core/Export/INodeUtils.h"
#include "Core/Material/MaterialFactoryFuncs.h"
-#include "Core/Particle/IAbstractParticle.h"
#include "Core/Particle/Particle.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp b/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp
index 9f9d5f32cdc3529d88a32a9823f91958cc28968d..5f3aea1b56d48e0ce46754f5c6e61effb8e50372 100644
--- a/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp
+++ b/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp
@@ -1,5 +1,4 @@
#include "Base/Pixel/PolarizationHandler.h"
-#include "Base/Vector/EigenCore.h"
#include "Tests/GTestWrapper/google_test.h"
class PolarizationHandlerTest : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
index 9d720346b3fbfebc416e00c799bf0c77981180da..09a7f550270d63d814ef24c65bf4b3eff4cbc993 100644
--- a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
+++ b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
@@ -5,7 +5,6 @@
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/ModelUtils.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/ProxyModelStrategy.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestComponentUtils.cpp b/Tests/UnitTests/GUI/TestComponentUtils.cpp
index 43b0a815d824960a1318a6e97983134bb713dba5..8f2dfb0c0fe5583f828ab3f027bf65b590fe708f 100644
--- a/Tests/UnitTests/GUI/TestComponentUtils.cpp
+++ b/Tests/UnitTests/GUI/TestComponentUtils.cpp
@@ -1,6 +1,5 @@
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Views/PropertyEditor/ComponentUtils.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestDataItemViews.cpp b/Tests/UnitTests/GUI/TestDataItemViews.cpp
index 50b97fedfe9ad9ba96b2805ea2b4e59a516ed00e..6f43f29d634826044da54d1a54dced4673dee508 100644
--- a/Tests/UnitTests/GUI/TestDataItemViews.cpp
+++ b/Tests/UnitTests/GUI/TestDataItemViews.cpp
@@ -4,7 +4,6 @@
#include "GUI/coregui/Models/DataProperties.h"
#include "GUI/coregui/Models/DataPropertyContainer.h"
#include "GUI/coregui/Models/RealDataModel.h"
-#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/mainwindow/projectdocument.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "GUI/coregui/utils/MessageService.h"
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.cpp b/Tests/UnitTests/GUI/TestDetectorItems.cpp
index 5e6678b3aa0ab540e92ac74237a28b29ac0e10ad..60189393e21baea0de5c682a404ef03906492393 100644
--- a/Tests/UnitTests/GUI/TestDetectorItems.cpp
+++ b/Tests/UnitTests/GUI/TestDetectorItems.cpp
@@ -3,7 +3,6 @@
#include "Core/Resolution/ConvolutionDetectorResolution.h"
#include "Core/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Models/DetectorItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/InstrumentModel.h"
#include "GUI/coregui/Models/RectangularDetectorItem.h"
diff --git a/Tests/UnitTests/GUI/TestFTDistributionItems.cpp b/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
index 2c0e98b56fd0de5129105871cd5ce731285e6345..fd2eb0b838234934fb6e81825a019a6fd2ec754a 100644
--- a/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
+++ b/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
@@ -1,4 +1,3 @@
-#include "Core/Correlations/FTDistributions1D.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestGroupItem.cpp b/Tests/UnitTests/GUI/TestGroupItem.cpp
index 86b837fa42ba23ce4245adcea77def25d67eb0a4..869cebd9b42854c20ed47735218b5f1b80422bce 100644
--- a/Tests/UnitTests/GUI/TestGroupItem.cpp
+++ b/Tests/UnitTests/GUI/TestGroupItem.cpp
@@ -1,5 +1,4 @@
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Models/GroupInfo.h"
#include "GUI/coregui/Models/GroupItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
diff --git a/Tests/UnitTests/GUI/TestLayerItems.cpp b/Tests/UnitTests/GUI/TestLayerItems.cpp
index b23a2e94bf5fd3af59439e6777fbd8f92a4f7516..44b8baa280eac246316b5d8a4753b6432b7fea65 100644
--- a/Tests/UnitTests/GUI/TestLayerItems.cpp
+++ b/Tests/UnitTests/GUI/TestLayerItems.cpp
@@ -2,7 +2,6 @@
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
-#include "GUI/coregui/Models/ModelMapper.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp b/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
index daddf96361ca3089d47fab7cde41fd79c40a1882..16bbda8dd0514f77a83c4745d50038e3f63d2031 100644
--- a/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
@@ -1,4 +1,3 @@
-#include "Core/Multilayer/LayerRoughness.h"
#include "GUI/coregui/Models/LayerRoughnessItems.h"
#include "GUI/coregui/Models/TransformFromDomain.h"
#include "GUI/coregui/Models/TransformToDomain.h"
diff --git a/Tests/UnitTests/GUI/TestMapperForItem.cpp b/Tests/UnitTests/GUI/TestMapperForItem.cpp
index f4549c7e2688ada7a7b2de8272789e32214cd70a..16dd694737edf36bb7c6ba2299fb0cbefb41d8b6 100644
--- a/Tests/UnitTests/GUI/TestMapperForItem.cpp
+++ b/Tests/UnitTests/GUI/TestMapperForItem.cpp
@@ -1,7 +1,6 @@
#include "GUI/coregui/Models/LayerItem.h"
#include "GUI/coregui/Models/MultiLayerItem.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.cpp b/Tests/UnitTests/GUI/TestMaterialModel.cpp
index 82215a56f8320c9343b7b87eb3df95085d2c9175..60d47f4ce15b0e90a3928c068c3ca57fc533c2a8 100644
--- a/Tests/UnitTests/GUI/TestMaterialModel.cpp
+++ b/Tests/UnitTests/GUI/TestMaterialModel.cpp
@@ -1,5 +1,4 @@
#include "GUI/coregui/Models/MaterialDataItems.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
index ec7acd982dc5a9551c6647c862a00f3297ad8dee..5c84a85ba0b0193e57ce702bf32b0a050525bc38 100644
--- a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
+++ b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
@@ -1,9 +1,7 @@
#include "GUI/coregui/Models/LayerItem.h"
-#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/MaterialPropertyController.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
#include "GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
index 978bd1b21b4999ab3787a394ac852e5de833e8ba..e2c6b76077aeacd541351b6d1d61514e35d3f915 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
@@ -1,4 +1,3 @@
-#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
@@ -8,7 +7,6 @@
#include "GUI/coregui/Models/JobModelFunctions.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Models/RealDataModel.h"
-#include "GUI/coregui/mainwindow/OutputDataIOHistory.h"
#include "GUI/coregui/mainwindow/OutputDataIOService.h"
#include "GUI/coregui/mainwindow/ProjectUtils.h"
#include "GUI/coregui/utils/GUIHelpers.h"
diff --git a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
index fbb0ddc3e3931b55a27ee558194476cedf727375..f65ce38a4598140633facbe1409a9a4924f6f2ee 100644
--- a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
+++ b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
@@ -1,7 +1,5 @@
#include "Base/Const/Units.h"
#include "Core/Aggregate/InterferenceFunction2DParaCrystal.h"
-#include "Core/Correlations/FTDistributions2D.h"
-#include "Core/Lattice/Lattice2D.h"
#include "GUI/coregui/Models/FTDistributionItems.h"
#include "GUI/coregui/Models/InterferenceFunctionItems.h"
#include "GUI/coregui/Models/Lattice2DItems.h"
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index 06b7317dd7adb06cad12bfad3e86f8f30b50ce64..8bbb2ee2f30119902d4ee2848d71287dcfc63c76 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -1,7 +1,6 @@
#include "Core/HardParticle/HardParticles.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Particle/Particle.h"
-#include "Core/Particle/ParticleDistribution.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/MaterialModel.h"
diff --git a/Tests/UnitTests/GUI/TestParticleItem.cpp b/Tests/UnitTests/GUI/TestParticleItem.cpp
index 9160d060b02bb4baf6652123702d11a2d18fd61b..76d71cc61391f3dd7529776c9958e80592506802 100644
--- a/Tests/UnitTests/GUI/TestParticleItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleItem.cpp
@@ -3,7 +3,6 @@
#include "GUI/coregui/Models/ParticleDistributionItem.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/SampleModel.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp b/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
index 15e7746b136a7563818c1e9c6bfa83b55b2a393d..f0b6062de508259634fcdfdc00a061277720cfd8 100644
--- a/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
@@ -3,7 +3,6 @@
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ModelUtils.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/ProxyModelStrategy.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
index 20410e3dd8396b2f283936d854f6aedd8600eda0..e85ceb13ae251714f567a7e8e800bec349f5d3bb 100644
--- a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,6 +1,4 @@
#include "Core/Particle/Particle.h"
-#include "Core/Scattering/IFormFactor.h"
-#include "Core/Scattering/IFormFactorDecorator.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/ParticleItem.h"
#include "GUI/coregui/Models/ParticleLayoutItem.h"
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index bb431de4bc2413f5861a15bc11c6d12376b613a9..1c39595206cb224f21cfba4c95cce9eaa63d1d50 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -1,5 +1,4 @@
#include "Base/Axis/PointwiseAxis.h"
-#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "GUI/coregui/Models/ApplicationModels.h"
#include "GUI/coregui/Models/DataItem.h"
diff --git a/Tests/UnitTests/GUI/TestSessionItem.cpp b/Tests/UnitTests/GUI/TestSessionItem.cpp
index cb2d30975fab10a1718580a1431daf0285d1246f..a8879d30d84515f12f4ad1e9e0abdbd0862ba059 100644
--- a/Tests/UnitTests/GUI/TestSessionItem.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItem.cpp
@@ -1,4 +1,3 @@
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestSessionItemUtils.cpp b/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
index b371340fe66e83f27fcc55a11f2e55708d004c38..236443f19ff705526eb4c2cdf2426ebb0a680d58 100644
--- a/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
@@ -1,5 +1,4 @@
#include "GUI/coregui/Models/ComboProperty.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionItemUtils.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "GUI/coregui/Models/VectorItem.h"
diff --git a/Tests/UnitTests/GUI/TestSessionModel.cpp b/Tests/UnitTests/GUI/TestSessionModel.cpp
index dcab2924e5b902ad38253c59ce65597c8937011f..d27e18727f3d1bbee887404910916939009788ef 100644
--- a/Tests/UnitTests/GUI/TestSessionModel.cpp
+++ b/Tests/UnitTests/GUI/TestSessionModel.cpp
@@ -5,7 +5,6 @@
#include "GUI/coregui/Models/MaterialModel.h"
#include "GUI/coregui/Models/SampleModel.h"
#include "GUI/coregui/Models/SessionItemTags.h"
-#include "GUI/coregui/Models/SessionModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
#include <QXmlStreamWriter>
diff --git a/Tests/UnitTests/GUI/TestSessionXML.cpp b/Tests/UnitTests/GUI/TestSessionXML.cpp
index 7f5fd56202b832c1d6144a08b0c550d5775a1393..de8c008c3495df014e48ca86207f506336b9f4c6 100644
--- a/Tests/UnitTests/GUI/TestSessionXML.cpp
+++ b/Tests/UnitTests/GUI/TestSessionXML.cpp
@@ -1,6 +1,5 @@
#include "GUI/coregui/Models/FormFactorItems.h"
#include "GUI/coregui/Models/ParticleItem.h"
-#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/Models/SessionModel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
diff --git a/Tests/UnitTests/GUI/TestTranslations.cpp b/Tests/UnitTests/GUI/TestTranslations.cpp
index 772bf6446fc9614fe67f3771768c3013089da708..6e46f38070f713dbf271def872294cb86ac2d948 100644
--- a/Tests/UnitTests/GUI/TestTranslations.cpp
+++ b/Tests/UnitTests/GUI/TestTranslations.cpp
@@ -1,6 +1,4 @@
#include "GUI/coregui/Models/BeamDistributionItem.h"
-#include "GUI/coregui/Models/BeamItems.h"
-#include "GUI/coregui/Models/DistributionItems.h"
#include "GUI/coregui/Models/InstrumentItems.h"
#include "GUI/coregui/Models/ModelPath.h"
#include "GUI/coregui/Models/ParticleItem.h"
diff --git a/Tests/UnitTests/GUI/Utils.cpp b/Tests/UnitTests/GUI/Utils.cpp
index 1db9248e7537f18cae5d6dbe06f06dd2b0e33f3e..fc841174bd36b97cdcbb1087b20bc742ecb824c9 100644
--- a/Tests/UnitTests/GUI/Utils.cpp
+++ b/Tests/UnitTests/GUI/Utils.cpp
@@ -14,7 +14,6 @@
// ************************************************************************** //
#include "Tests/UnitTests/GUI/Utils.h"
-#include "Core/Data/OutputData.h"
#include "Core/Histo/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "GUI/coregui/Models/RealDataItem.h"