diff --git a/GUI/Model/Fit/MinimizerItem.cpp b/GUI/Model/Fit/MinimizerItem.cpp
index 967c3a0f6b97a108883c07ce206cfbf83af61e97..99050ebc5e8baeb48fad50c9a93cea54abbb6a16 100644
--- a/GUI/Model/Fit/MinimizerItem.cpp
+++ b/GUI/Model/Fit/MinimizerItem.cpp
@@ -21,7 +21,6 @@
 #include "Fit/Adapter/Minuit2Minimizer.h"
 #include "Fit/Adapter/SimAnMinimizer.h"
 #include "GUI/Model/Fit/MinimizerItemCatalog.h"
-#include "GUI/Model/Group/GroupInfo.h"
 
 namespace {
 
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/Model/From/FromDomain.cpp
index e426d7389a2d7d183d5c3f101eb33d9ef3edbc6b..81500e1a484c7c731eb9868bda2d617b848f7f58 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/Model/From/FromDomain.cpp
@@ -41,20 +41,13 @@
 #include "GUI/Model/Instrument/RectangularDetectorItem.h"
 #include "GUI/Model/Instrument/ResolutionFunctionItems.h"
 #include "GUI/Model/Instrument/SphericalDetectorItem.h"
-#include "GUI/Model/Sample/FTDecayFunctionItems.h"
-#include "GUI/Model/Sample/FTDistributionItems.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/ItemWithParticles.h"
-#include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/LayerItem.h"
-#include "GUI/Model/Sample/LayerRoughnessItems.h"
 #include "GUI/Model/Sample/MesoCrystalItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/Model/Sample/RotationItems.h"
-#include "GUI/Model/Types/UIntDescriptor.h"
-#include "GUI/Model/Types/VectorItem.h"
 #include "GUI/Util/Error.h"
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/Model/Group/ItemCatalog.cpp b/GUI/Model/Group/ItemCatalog.cpp
index 62d59ee1faeab4819605275f715bfb3d859acf01..00761ec9054a7343d32a782f853202f6b8c51732 100644
--- a/GUI/Model/Group/ItemCatalog.cpp
+++ b/GUI/Model/Group/ItemCatalog.cpp
@@ -40,19 +40,14 @@
 #include "GUI/Model/Instrument/SpecularBeamInclinationItem.h"
 #include "GUI/Model/Instrument/SphericalDetectorItem.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Sample/FTDecayFunctionItems.h"
-#include "GUI/Model/Sample/FTDistributionItems.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/InterferenceItems.h"
-#include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/MesoCrystalItem.h"
 #include "GUI/Model/Sample/ParticleCompositionItem.h"
 #include "GUI/Model/Sample/ParticleCoreShellItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Model/Session/RealLimitsItems.h"
-#include "GUI/Model/Session/SimulationOptionsItem.h"
-#include "GUI/Model/Types/VectorItem.h"
 #include "GUI/Util/Error.h"
 
 ItemCatalog::ItemCatalog()
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index a86d913cd1c0d7e18c874061ba68e3c83cf1751b..7a18be09145e5d131499663e93efb0934e3978da 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -19,14 +19,10 @@
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Fit/FitSuiteItem.h"
-#include "GUI/Model/Fit/ParameterTreeItems.h"
 #include "GUI/Model/IO/ItemFileNameUtils.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Job/JobItemUtils.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
-#include "GUI/Model/Session/SessionXML.h"
-#include "GUI/Model/Session/SimulationOptionsItem.h"
 #include "GUI/Util/DeserializationException.h"
 #include "GUI/Util/Error.h"
 
diff --git a/GUI/Model/Job/JobModelFunctions.cpp b/GUI/Model/Job/JobModelFunctions.cpp
index 9c4966f4812b3c8f3033d10f5f68245ed79c76e5..a991f0bf909355bffabeba083d99fd3cf5ccb94a 100644
--- a/GUI/Model/Job/JobModelFunctions.cpp
+++ b/GUI/Model/Job/JobModelFunctions.cpp
@@ -23,14 +23,12 @@
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Fit/FitSuiteItem.h"
 #include "GUI/Model/Fit/MinimizerItem.h"
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/IO/ItemFileNameUtils.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/JobItemUtils.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
-#include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Util/Error.h"
 #include "GUI/Util/Path.h"
 #include <map>
diff --git a/GUI/Model/Job/ParameterTreeUtils.cpp b/GUI/Model/Job/ParameterTreeUtils.cpp
index 6ab820e38d7c8fa9274b1f7c037ab8cebf01892f..a2d324ad08022dfaa02b72e725e2a22300f278c8 100644
--- a/GUI/Model/Job/ParameterTreeUtils.cpp
+++ b/GUI/Model/Job/ParameterTreeUtils.cpp
@@ -14,20 +14,17 @@
 
 #include "GUI/Model/Job/ParameterTreeUtils.h"
 #include "GUI/Model/Fit/ParameterTreeItems.h"
-#include "GUI/Model/Group/GroupItem.h"
 #include "GUI/Model/Group/PropertyItem.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Sample/FTDecayFunctionItemCatalogs.h"
 #include "GUI/Model/Sample/FTDistributionItemCatalogs.h"
-#include "GUI/Model/Sample/FTDistributionItems.h"
 #include "GUI/Model/Sample/FormFactorItemCatalog.h"
 #include "GUI/Model/Sample/InterferenceItemCatalog.h"
 #include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/ItemWithParticlesCatalog.h"
 #include "GUI/Model/Sample/Lattice2DItemCatalog.h"
-#include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/MesoCrystalItem.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
@@ -36,7 +33,6 @@
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Model/Sample/RotationItemCatalog.h"
-#include "GUI/Model/Types/VectorDescriptor.h"
 
 namespace {