diff --git a/Core/Contrib/RoughMultiLayerContribution.cpp b/Core/Contrib/RoughMultiLayerContribution.cpp
index 960ddbc7e88498a75d757c20b1c3118308288f6d..b49fbd4409a4153032ae1b50522b96ca1dd7e247 100644
--- a/Core/Contrib/RoughMultiLayerContribution.cpp
+++ b/Core/Contrib/RoughMultiLayerContribution.cpp
@@ -18,8 +18,6 @@
 #include "Resample/Element/DiffuseElement.h"
 #include "Resample/Flux/ScalarFlux.h"
 #include "Resample/Processed/ProcessedSample.h"
-#include "Resample/Slice/Slice.h"
-#include "Resample/Slice/SliceStack.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
diff --git a/Core/Fitting/FitObjective.cpp b/Core/Fitting/FitObjective.cpp
index 43126917456875efc1680588ac67c8640d2d35f5..a9f84f5e7517c82615bef133d33620679af6285d 100644
--- a/Core/Fitting/FitObjective.cpp
+++ b/Core/Fitting/FitObjective.cpp
@@ -14,7 +14,6 @@
 
 #include "Core/Fitting/FitObjective.h"
 #include "Core/Fitting/FitStatus.h"
-#include "Core/Fitting/IterationInfo.h"
 #include "Core/Fitting/ObjectiveMetric.h"
 #include "Core/Fitting/ObjectiveMetricUtils.h"
 #include "Core/Fitting/PyFittingCallbacks.h"
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 5f81d8a6eb4107a469f6d93cec79d3642007973c..8c0f916e4cc28db8ca9688766936fd00820865c9 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "Core/Simulation/DepthProbeSimulation.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Core/Background/IBackground.h"
 #include "Core/Computation/DepthProbeComputation.h"
 #include "Device/Beam/Beam.h"
@@ -21,7 +20,6 @@
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Detector/SpecularDetector1D.h"
 #include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
 #include "Param/Distrib/Distributions.h"
 #include "Resample/Flux/IFlux.h"
 
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 0ddcfe6c16531f4bc409ca435d101e2bd35438c9..2c7ada1b341f66713e9c8ed32aa75156869230af 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -17,7 +17,6 @@
 #include "Device/Data/OutputData.h"
 #include "Device/Detector/IDetector.h"
 #include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
 #include "Resample/Element/DiffuseElement.h"
 
 GISASSimulation::GISASSimulation(const Beam& beam, const MultiLayer& sample,
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index 2fae666341200ca8a33418e75a5bd564b3bab97b..b517c3bbbfbd9a26f5f1c8331dbb6ba65535adfb 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -19,7 +19,6 @@
 #include "Device/Beam/Beam.h"
 #include "Device/Detector/DetectorContext.h"
 #include "Device/Detector/IDetector2D.h"
-#include "Device/Instrument/Instrument.h"
 #include "Resample/Element/DiffuseElement.h"
 
 ISimulation2D::ISimulation2D(const Beam& beam, const MultiLayer& sample, const IDetector& detector)
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index 394c20b0ec51f3c70d36d9c63dcc9c5c59c219e5..b48633500a4ff8576ceb3148951637dfc3c3f7fa 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "Core/Simulation/OffSpecularSimulation.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Pixel/RectangularPixel.h"
 #include "Base/Utils/Assert.h"
 #include "Device/Beam/Beam.h"
@@ -21,7 +20,6 @@
 #include "Device/Detector/RectangularDetector.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
 #include "Param/Distrib/Distributions.h"
 #include "Resample/Element/DiffuseElement.h"
 
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index bf0dc549bdbea77f29cc7f92419c706e6986e54e..1e3c500ddce0bef65ae8ac53a8281a8d5ca2f439 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -24,7 +24,6 @@
 #include "Device/Data/OutputData.h"
 #include "Device/Detector/SpecularDetector1D.h"
 #include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
 #include "Param/Distrib/Distributions.h"
 #include "Resample/Element/SpecularElement.h"
 #include "Resample/Processed/ProcessedSample.h"
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index 59d3ecf740aec3caf4bdb8beabb303e4910d7d4d..46e9cf482d0aec7b3c7ab9877b599450ef5782c0 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -22,7 +22,6 @@
 
 #include "Base/Types/CloneableVector.h"
 #include "Base/Vector/Direction.h"
-#include "Base/Vector/Vectors3D.h"
 #include "Device/Coord/ICoordSystem.h"
 
 class Beam;
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 108f728d57ce06605511ef174bcd24a446977664..50c52fda1c7d4368f66bc7f414b950b902e25fa5 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -18,7 +18,6 @@
 
 #include "Base/Types/CloneableVector.h"
 #include "Base/Types/ICloneable.h"
-#include "Base/Vector/Vectors3D.h"
 #include "Device/Coord/Axes.h"
 #include "Device/Detector/SimulationAreaIterator.h"
 #include "Device/Pol/PolFilter.h"
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index ba29772781c8a645f36cd715b707f137c830a12e..7fcb466fa9081507473457c3d6e440dec23019e5 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -14,7 +14,6 @@
 
 #include "GUI/Model/Data/RealDataItem.h"
 #include "Device/Data/DataUtils.h"
-#include "GUI/Model/Data/ApplicationModels.h"
 #include "GUI/Model/Data/ImportDataInfo.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/MaskItems.h"
@@ -25,7 +24,6 @@
 #include "GUI/Model/IO/DataLoaders1D.h"
 #include "GUI/Model/IO/ItemFileNameUtils.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
-#include "GUI/Model/Instrument/InstrumentModel.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobItemUtils.h"
 #include "GUI/Model/Job/JobModelFunctions.h"
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index 77c97e8a9800f01ee56571e97f7d41ab1680081d..3a4c2520f5cb95b180a75a60c1dac8eee4cd94ce 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/Main/ProjectManager.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/Model/Data/ApplicationModels.h"
 #include "GUI/Model/IO/ProjectUtils.h"
 #include "GUI/Model/State/SessionData.h"
 #include "GUI/Util/Error.h"
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index 9f680d9e7f7902e240c439bf1ed9ff464fb6736f..13281aa3d77cf0c6d6e1bac3b9939a2c8c34367d 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -16,7 +16,6 @@
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialItemUtils.h"
 #include "GUI/Model/Session/SessionFlags.h"
-#include "GUI/Model/Session/SessionItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Common/ScientificSpinBox.h"
 #include "GUI/View/PropertyEditor/MultiComboPropertyEditor.h"
diff --git a/Resample/Processed/ProcessedLayout.cpp b/Resample/Processed/ProcessedLayout.cpp
index 8a5fae23d9d8e0fbc009bd5c3c17c4fac81d4fc7..4306911d349fce5f8673c8a5fecabaef2af05b82 100644
--- a/Resample/Processed/ProcessedLayout.cpp
+++ b/Resample/Processed/ProcessedLayout.cpp
@@ -17,20 +17,11 @@
 #include "Resample/Coherence/FFSum.h"
 #include "Resample/DWBA/DWBA_Pol.h"
 #include "Resample/DWBA/DWBA_Scalar.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 #include "Sample/Aggregate/IInterference.h"
 #include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Material/Admixtures.h"
 #include "Sample/Particle/IParticle.h"
 #include "Sample/Particle/SlicedParticle.h"
-#include "Sample/Scattering/IFormFactor.h"
-#include "Sample/Scattering/Rotations.h"
-
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
 
 namespace {
 
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index f9014c64d21047b1b0d4bdfce277ae7f8bf0e236..9110f624e53a73ff4c6401462ad991e82cc4db48 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -18,8 +18,6 @@
 #include "Resample/Options/SimulationOptions.h"
 #include "Resample/Processed/ParticleRegions.h"
 #include "Resample/Processed/ProcessedLayout.h"
-#include "Resample/Slice/Slice.h"
-#include "Resample/Slice/SliceStack.h"
 #include "Resample/Specular/ComputeFluxMagnetic.h"
 #include "Resample/Specular/ComputeFluxScalar.h"
 #include "Sample/Interface/LayerRoughness.h"
@@ -30,7 +28,6 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Scattering/ZLimits.h"
 
 namespace {
 
diff --git a/Resample/Slice/KzComputation.cpp b/Resample/Slice/KzComputation.cpp
index fa00e75c47e37f9e3b25c2eacff908458dccb136..dc5136a8dacfa421928282b523fcfd88b3f6ac6c 100644
--- a/Resample/Slice/KzComputation.cpp
+++ b/Resample/Slice/KzComputation.cpp
@@ -15,7 +15,6 @@
 #include "Resample/Slice/KzComputation.h"
 #include "Base/Const/Units.h"
 #include "Base/Math/Constants.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 
 namespace {
diff --git a/Resample/Slice/ProfileHelper.cpp b/Resample/Slice/ProfileHelper.cpp
index d4c68e1f42c0ef20e15f182bbf20fb856257e47a..da467074fa8e8824ba8bda26faf3940e8389967a 100644
--- a/Resample/Slice/ProfileHelper.cpp
+++ b/Resample/Slice/ProfileHelper.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "Resample/Slice/ProfileHelper.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 #include "Sample/Interface/LayerRoughness.h"
 
diff --git a/Resample/Specular/ComputeFluxMagnetic.cpp b/Resample/Specular/ComputeFluxMagnetic.cpp
index b4573cfad5f70117e98f2b4360f20ecf179c76bd..3213018d1e59c66c59cbada33aa1b4bda622b6f7 100644
--- a/Resample/Specular/ComputeFluxMagnetic.cpp
+++ b/Resample/Specular/ComputeFluxMagnetic.cpp
@@ -17,7 +17,6 @@
 #include "Base/Utils/Assert.h"
 #include "Resample/Flux/MatrixFlux.h"
 #include "Resample/Slice/KzComputation.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 #include "Resample/Specular/TransitionMagneticNevot.h"
 #include "Resample/Specular/TransitionMagneticTanh.h"
diff --git a/Resample/Specular/ComputeFluxScalar.cpp b/Resample/Specular/ComputeFluxScalar.cpp
index 728e8708e62ad465b204bfe91c1c095e36e8fabd..e904a626efcd795b8ca4aef1de70a3c6b94bd627 100644
--- a/Resample/Specular/ComputeFluxScalar.cpp
+++ b/Resample/Specular/ComputeFluxScalar.cpp
@@ -18,11 +18,9 @@
 #include "Base/Utils/Assert.h"
 #include "Resample/Flux/ScalarFlux.h"
 #include "Resample/Slice/KzComputation.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/RoughnessModels.h"
 #include <Eigen/Dense>
 #include <stdexcept>
 
diff --git a/Tests/Unit/Core/SimDataPairTest.cpp b/Tests/Unit/Core/SimDataPairTest.cpp
index b8b14c5a4829e2259de37275d45441898a2d40de..a0a86eb4442b50d15c09303f6488e64cbe1f9f5b 100644
--- a/Tests/Unit/Core/SimDataPairTest.cpp
+++ b/Tests/Unit/Core/SimDataPairTest.cpp
@@ -1,5 +1,4 @@
 #include "Core/Fitting/SimDataPair.h"
-#include "Device/Data/OutputData.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/FittingTestHelper.h"
 #include <numeric>
diff --git a/Tests/Unit/Core/SpecularScanTest.cpp b/Tests/Unit/Core/SpecularScanTest.cpp
index 70d1458984a9d250e39e1e1fd4b1f5673508d77c..c9b5fbe1ae966ce2b4ed6c1ce86cec81a5f04235 100644
--- a/Tests/Unit/Core/SpecularScanTest.cpp
+++ b/Tests/Unit/Core/SpecularScanTest.cpp
@@ -7,7 +7,6 @@
 #include "Core/Scan/ScanResolution.h"
 #include "Param/Distrib/RangedDistributions.h"
 #include "Resample/Element/SpecularElement.h"
-#include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/DetectorMaskTest.cpp b/Tests/Unit/Device/DetectorMaskTest.cpp
index 2b6c7400dff0de29544b3798c8bfc9a3e106187c..50b3b65af87c859c5d99158faa03da71e73ec896 100644
--- a/Tests/Unit/Device/DetectorMaskTest.cpp
+++ b/Tests/Unit/Device/DetectorMaskTest.cpp
@@ -1,5 +1,4 @@
 #include "Device/Mask/DetectorMask.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Device/Mask/Polygon.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/SimulationAreaTest.cpp b/Tests/Unit/Device/SimulationAreaTest.cpp
index 6345063281089e35aca5b8587e42707d21a551fe..5ecf981c19aa876206a80349853dea54c1f4b3a8 100644
--- a/Tests/Unit/Device/SimulationAreaTest.cpp
+++ b/Tests/Unit/Device/SimulationAreaTest.cpp
@@ -1,4 +1,3 @@
-#include "Device/Detector/SimulationAreaIterator.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Device/Mask/Rectangle.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/SphericalDetectorTest.cpp b/Tests/Unit/Device/SphericalDetectorTest.cpp
index 9eae8e59226435e50d899894347159e9fd7fc095..69411a82b7839aa805c63cadc4f2df550d8bbdf4 100644
--- a/Tests/Unit/Device/SphericalDetectorTest.cpp
+++ b/Tests/Unit/Device/SphericalDetectorTest.cpp
@@ -1,5 +1,4 @@
 #include "Device/Detector/SphericalDetector.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Mask/DetectorMask.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index b49c4bf7c113824cc22105e4222569ba68d7c4f5..f98082dad546750617081f7177ee3044279ce4f1 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,15 +1,12 @@
 #include "GUI/Model/Component/ComponentProxyModel.h"
 #include "GUI/Model/Component/ComponentProxyStrategy.h"
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Model/Session/ModelUtils.h"
-#include "GUI/Model/Session/SessionModel.h"
 #include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Util/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/GUI/Utils.h"
 #include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index 05e79e62910ee7f4a9de981ff3108b7645b02796..24e64376f095541d8859ec3788bc9a8b38afe208 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,5 +1,4 @@
 #include "GUI/Model/Component/ComponentUtils.h"
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Session/SessionModel.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 3b878fe1b65b6af58ff010eb66bd2cf736af71a2..e9700ed40a2e5f879711fa5e3e8112f7a9bae696 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,5 +1,3 @@
-#include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Data/DataProperties.h"
 #include "GUI/Model/Data/DataPropertyContainer.h"
 #include "GUI/Model/Data/RealDataModel.h"
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index 83c625879a87f53e23a95e2c0986491301eee9bf..3ec1bf2d1701e95032f11628b50967adc4f09be7 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -7,7 +7,6 @@
 #include "GUI/Model/Sample/SampleModel.h"
 #include "GUI/Model/Session/SessionItemUtils.h"
 #include "GUI/Model/Session/SimulationOptionsItem.h"
-#include "GUI/Util/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QtTest>
 
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 60abdcffbd131736f7501056603c72d931d995ec..1272782c18e27185d2fabdcbef82df02adc04c32 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,6 +1,5 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Data/ImportDataInfo.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/RealDataItem.h"
diff --git a/Tests/Unit/GUI/TestParticleItem.cpp b/Tests/Unit/GUI/TestParticleItem.cpp
index a4e0de423fb125546f506fd6cc1bdf9dffb776fc..7328b81ed7ccb6b11dc8b6a1225456455ebb5cd4 100644
--- a/Tests/Unit/GUI/TestParticleItem.cpp
+++ b/Tests/Unit/GUI/TestParticleItem.cpp
@@ -1,4 +1,3 @@
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Sample/ParticleCompositionItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/SampleModel.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index a42bc0db46248c842126f28c85e2718e4f9899ea..beb8760355f260848e1701ff7af37c01fa846bda 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,4 +1,3 @@
-#include "GUI/Model/Data/ApplicationModels.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/RealDataModel.h"
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index 327e4c8071a157c4f42a4c7e8bda01eed322e2e5..2f7244022cdbcf839ef83cef589d29e58d174dc6 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,6 +1,5 @@
 #include "GUI/Model/Component/ComponentProxyModel.h"
 #include "GUI/Model/Component/ComponentProxyStrategy.h"
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Group/PropertyItem.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/ParticleItem.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 580e168598c5eb9c5e4ddfe2ec7caada5a484356..708b4a1975a9166a6e531ba7d32cfac014821126 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,4 +1,3 @@
-#include "GUI/Model/Data/ApplicationModels.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/RealDataModel.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 1888af06b63d2b4b638aa5ecbf52bc61759e02db..0ddcb2fb48e8b986109a0fc69034be2afff840db 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,7 +1,6 @@
 #include "Base/Axis/PointwiseAxis.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Model/Data/ApplicationModels.h"
-#include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/PointwiseAxisItem.h"
 #include "GUI/Model/Group/GroupItem.h"
@@ -9,7 +8,6 @@
 #include "GUI/Model/IO/ProjectUtils.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Instrument/InstrumentModel.h"
-#include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobModel.h"
 #include "GUI/Model/Job/JobModelFunctions.h"
diff --git a/Tests/Unit/Resample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp
index 0a134fd0731932374f73af1c77d448803b22824d..d295b60bb9990732b6f27780b0ba33b4d3048483 100644
--- a/Tests/Unit/Resample/MaterialTest.cpp
+++ b/Tests/Unit/Resample/MaterialTest.cpp
@@ -1,9 +1,6 @@
 #include "Base/Const/Units.h"
 #include "Base/Vector/Transform3D.h"
 #include "Base/Vector/WavevectorInfo.h"
-#include "Sample/Material/Admixtures.h"
-#include "Sample/Material/MaterialBySLDImpl.h"
-#include "Sample/Material/RefractiveMaterialImpl.h"
 #include "Sample/Scattering/Rotations.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/Unit/Resample/MultilayerAveragingTest.cpp b/Tests/Unit/Resample/MultilayerAveragingTest.cpp
index 7dadc85594e476d4b45767d44d5af81e4349b80f..be331119fd574815e4844f72f16a1b6b1df65a12 100644
--- a/Tests/Unit/Resample/MultilayerAveragingTest.cpp
+++ b/Tests/Unit/Resample/MultilayerAveragingTest.cpp
@@ -1,7 +1,5 @@
 #include "Resample/Options/SimulationOptions.h"
 #include "Resample/Processed/ProcessedSample.h"
-#include "Resample/Slice/Slice.h"
-#include "Resample/Slice/SliceStack.h"
 #include "Sample/Aggregate/Interference2DLattice.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorCylinder.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 5dab64f2b9e3ec0cb34d6a2a1147dfd1d5f84252..7afac3407d83ea6c7caaa2537a63166139323d29 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2469,48 +2469,6 @@ C++ includes: ResolutionFunction2DGaussian.h
 // File: structIDetector_1_1RoiOfAxis.xml
 
 
-// File: classScanResolution.xml
-%feature("docstring") ScanResolution "
-
-Container for reflectivity resolution data.
-
-C++ includes: ScanResolution.h
-";
-
-%feature("docstring")  ScanResolution::~ScanResolution "ScanResolution::~ScanResolution() override
-";
-
-%feature("docstring")  ScanResolution::clone "ScanResolution* ScanResolution::clone() const override=0
-";
-
-%feature("docstring")  ScanResolution::distribution "const IRangedDistribution* ScanResolution::distribution() const
-";
-
-%feature("docstring")  ScanResolution::nSamples "size_t ScanResolution::nSamples() const
-";
-
-%feature("docstring")  ScanResolution::generateSamples "virtual DistrOutput ScanResolution::generateSamples(double mean, size_t n_times) const =0
-";
-
-%feature("docstring")  ScanResolution::generateSamples "virtual DistrOutput ScanResolution::generateSamples(const std::vector< double > &mean) const =0
-";
-
-%feature("docstring")  ScanResolution::stdDevs "virtual std::vector<double> ScanResolution::stdDevs(double mean, size_t n_times) const =0
-";
-
-%feature("docstring")  ScanResolution::stdDevs "virtual std::vector<double> ScanResolution::stdDevs(const std::vector< double > &mean) const =0
-";
-
-%feature("docstring")  ScanResolution::empty "bool ScanResolution::empty() const
-";
-
-%feature("docstring")  ScanResolution::name "virtual std::string ScanResolution::name() const =0
-";
-
-%feature("docstring")  ScanResolution::delta "virtual double ScanResolution::delta() const =0
-";
-
-
 // File: classSimulationAreaIterator.xml
 %feature("docstring") SimulationAreaIterator "
 
@@ -2823,9 +2781,6 @@ Returns default units to convert to.
 // File: namespace_0d63.xml
 
 
-// File: namespace_0d92.xml
-
-
 // File: namespaceDataUtils.xml
 
 
@@ -3288,12 +3243,6 @@ make Swappable
 // File: ResolutionFunction2DGaussian_8h.xml
 
 
-// File: ScanResolution_8cpp.xml
-
-
-// File: ScanResolution_8h.xml
-
-
 // File: deprecated.xml
 
 
diff --git a/auto/Wrap/doxygenFit.i b/auto/Wrap/doxygenFit.i
index ec44a379932bf9ed2bac3713016fe44e5f64ec6d..a280c4f63e3339fbf1407bc2f6c850a59a0a3e3e 100644
--- a/auto/Wrap/doxygenFit.i
+++ b/auto/Wrap/doxygenFit.i
@@ -1894,30 +1894,6 @@ Update configuration after a fit using the  FitResult.
 ";
 
 
-// File: classFitOptions.xml
-%feature("docstring") FitOptions "
-
-General fitting options.
-
-C++ includes: FitOptions.h
-";
-
-%feature("docstring")  FitOptions::FitOptions "FitOptions::FitOptions()
-";
-
-%feature("docstring")  FitOptions::derivEpsilon "double FitOptions::derivEpsilon() const
-";
-
-%feature("docstring")  FitOptions::setDerivEpsilon "void FitOptions::setDerivEpsilon(double deriv_epsilon)
-";
-
-%feature("docstring")  FitOptions::stepFactor "double FitOptions::stepFactor() const
-";
-
-%feature("docstring")  FitOptions::setStepFactor "void FitOptions::setStepFactor(double step_factor)
-";
-
-
 // File: classROOT_1_1Fit_1_1FitResult.xml
 %feature("docstring") ROOT::Fit::FitResult "
 
@@ -12580,22 +12556,22 @@ Retrieve the dimension of the function
 // File: namespace_0d217.xml
 
 
-// File: namespace_0d229.xml
+// File: namespace_0d227.xml
 
 
-// File: namespace_0d243.xml
+// File: namespace_0d241.xml
 
 
-// File: namespace_0d245.xml
+// File: namespace_0d243.xml
 
 
-// File: namespace_0d253.xml
+// File: namespace_0d251.xml
 
 
-// File: namespace_0d262.xml
+// File: namespace_0d260.xml
 
 
-// File: namespace_0d275.xml
+// File: namespace_0d273.xml
 
 
 // File: namespace_0d65.xml
@@ -14617,12 +14593,6 @@ Decaying sinus from lmfit tutorial.
 // File: SimAnMinimizer_8h.xml
 
 
-// File: FitOptions_8cpp.xml
-
-
-// File: FitOptions_8h.xml
-
-
 // File: Kernel_8cpp.xml