diff --git a/GUI/Model/Sample/MesocrystalItem.cpp b/GUI/Model/Sample/MesocrystalItem.cpp
index 21f4b75cd095bbe9d88a51e732b14fc05c2f14e0..789fef3c83714886e27a58bfc8b94006d6b1a2ee 100644
--- a/GUI/Model/Sample/MesocrystalItem.cpp
+++ b/GUI/Model/Sample/MesocrystalItem.cpp
@@ -15,7 +15,6 @@
 #include "GUI/Model/Sample/MesocrystalItem.h"
 #include "GUI/Model/Sample/CompoundItem.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "Sample/Particle/CoreAndShell.h"
 #include "Sample/Particle/Crystal.h"
diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp
index b37b4a9f169543b64204302e6cf38c74eee80c8f..6fbba43876e26dff3b6bc6977feaa72f3d2cf7f7 100644
--- a/GUI/Model/Sample/ParticleItem.cpp
+++ b/GUI/Model/Sample/ParticleItem.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/MaterialItem.h"
 #include "Sample/Particle/IFormFactor.h"
 #include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index 75b4c2833a0bde09c0f47500dc7bcbf9eb10830f..93b7c8cdcd0ee1b0ed0722f27c37c29000643d89 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -15,7 +15,6 @@
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Sample/CompoundItem.h"
-#include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/MesocrystalItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
diff --git a/GUI/View/Canvas/ProjectionsWidget.cpp b/GUI/View/Canvas/ProjectionsWidget.cpp
index 24b5e47a004c4f7a5e9c8bfed14184948dd4c716..32311adb48b9e0ccfeb7c8dbaa5bc2d4d241384e 100644
--- a/GUI/View/Canvas/ProjectionsWidget.cpp
+++ b/GUI/View/Canvas/ProjectionsWidget.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/Canvas/ProjectionsWidget.h"
 #include "GUI/Model/Data/Data2DItem.h"
 #include "GUI/View/Plotter/ProjectionsPlot.h"
-#include "GUI/View/Scene/MaskEditorFlags.h"
 #include <QTabWidget>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 42fe95f487fbaa6520541fe8a9c9aab3949ea243..f51228fa1020ff0430e2076577e3f995297f2864 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
 #include "GUI/Model/Sample/MaterialItem.h"
-#include "GUI/Model/Sample/MaterialModel.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Support/Style/Style.h"
 #include "GUI/View/MaterialEditor/MaterialEditorModel.h"
diff --git a/GUI/View/Sample/LatticeTypeSelectionForm.cpp b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
index 5fbc6eb1c5bcbb2a677ecf51fbe28a70bbabe6f0..29b34cbcec274ac9c626a8aafa0cd6d5fe8950a0 100644
--- a/GUI/View/Sample/LatticeTypeSelectionForm.cpp
+++ b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
@@ -14,7 +14,6 @@
 
 #include "GUI/View/Sample/LatticeTypeSelectionForm.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/Lattice2DItems.h"
 #include <QCheckBox>
 #include <QLabel>
diff --git a/GUI/View/Sample/SampleEditorController.cpp b/GUI/View/Sample/SampleEditorController.cpp
index 3797ef6a4874ee0cd9f1915e8d283b402b21d27e..0ec7f2ba22f61b439fc5e7a1a1b0636ecde3c71a 100644
--- a/GUI/View/Sample/SampleEditorController.cpp
+++ b/GUI/View/Sample/SampleEditorController.cpp
@@ -17,7 +17,6 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Sample/CompoundItem.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
-#include "GUI/Model/Sample/FormFactorItemCatalog.h"
 #include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/MaterialModel.h"
diff --git a/GUI/View/Tuning/ParameterTuningStackPresenter.cpp b/GUI/View/Tuning/ParameterTuningStackPresenter.cpp
index bfc319928cdfdc18a8aac01271fe8d0bc0ecd3ef..06d87f5672dbc566a94ec0abc0118b39a5666fca 100644
--- a/GUI/View/Tuning/ParameterTuningStackPresenter.cpp
+++ b/GUI/View/Tuning/ParameterTuningStackPresenter.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Tuning/ParameterTuningStackPresenter.h"
-#include "GUI/View/Tuning/ParameterTuningWidget.h"
 
 void ParameterTuningStackPresenter::setItem(JobItem* item, QObject* model)
 {
diff --git a/Resample/Slice/ProfileHelper.cpp b/Resample/Slice/ProfileHelper.cpp
index 50fed6f87ec34748bfacba869a6480f9087f1eb7..44ad29af92cf66c9eeddeee3779ffcd7336bb71b 100644
--- a/Resample/Slice/ProfileHelper.cpp
+++ b/Resample/Slice/ProfileHelper.cpp
@@ -15,7 +15,6 @@
 #include "Resample/Slice/ProfileHelper.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/VectorUtil.h"
-#include "Resample/Slice/SliceStack.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include <numbers>