diff --git a/GUI/Items/GroupItem.h b/GUI/Items/GroupItem.h
index a1febaf14c29e11c68748dec54e1769d0ebe0088..b353f61443ff9015c4ebb4510d2afc61e0399de1 100644
--- a/GUI/Items/GroupItem.h
+++ b/GUI/Items/GroupItem.h
@@ -17,7 +17,6 @@
 
 #include "GUI/Items/GroupItemController.h"
 #include "GUI/Items/SessionItem.h"
-#include "GUI/Models/Group/GroupInfo.h"
 #include <memory>
 
 class GroupInfo;
diff --git a/GUI/Items/InterferenceItems.cpp b/GUI/Items/InterferenceItems.cpp
index 79907bb8db05a0cfc0b33a6ee922c41494ae3a1a..72bda46847b54c1b228b16a13d55c8f75b75281b 100644
--- a/GUI/Items/InterferenceItems.cpp
+++ b/GUI/Items/InterferenceItems.cpp
@@ -16,10 +16,7 @@
 #include "Base/Const/Units.h"
 #include "GUI/Items/FTDecayFunctionItems.h"
 #include "GUI/Items/FTDistributionItems.h"
-#include "GUI/Items/GroupItem.h"
 #include "GUI/Items/Lattice2DItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
 #include "Sample/Aggregate/Interferences.h"
 
 // TODO (when back compatibility will be broken  again)
diff --git a/GUI/Items/MaterialItem.cpp b/GUI/Items/MaterialItem.cpp
index 282b2229622420c48e136abdbead60576df1e4c5..3f8ad7831c0472cbe2847cf27cf8c4f38da6b5fe 100644
--- a/GUI/Items/MaterialItem.cpp
+++ b/GUI/Items/MaterialItem.cpp
@@ -15,9 +15,7 @@
 #include "GUI/Items/MaterialItem.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Items/MaterialDataItems.h"
-#include "GUI/Items/VectorItem.h"
 #include "GUI/Models/Group/GroupInfo.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/utils/Helpers.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
diff --git a/GUI/Items/MesoCrystalItem.cpp b/GUI/Items/MesoCrystalItem.cpp
index 3969758707fea289f41481012af558b00b0ee0b0..84b6ad893a22149ac88ad72de93099d6cc29496f 100644
--- a/GUI/Items/MesoCrystalItem.cpp
+++ b/GUI/Items/MesoCrystalItem.cpp
@@ -18,9 +18,7 @@
 #include "GUI/Items/ParticleCoreShellItem.h"
 #include "GUI/Items/ParticleItem.h"
 #include "GUI/Items/SessionItemUtils.h"
-#include "GUI/Items/VectorItem.h"
 #include "GUI/Models/Domain/TransformToDomain.h"
-#include "GUI/Models/Group/GroupInfo.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/utils/Error.h"
 #include "Sample/Particle/Crystal.h"
diff --git a/GUI/Items/MesoCrystalItem.h b/GUI/Items/MesoCrystalItem.h
index ee9aabf62d99a66b78762eac029658c6bbaedd7c..961db6a460d38bc791768277d3ba03c19879ba4d 100644
--- a/GUI/Items/MesoCrystalItem.h
+++ b/GUI/Items/MesoCrystalItem.h
@@ -18,7 +18,6 @@
 #include "Base/Vector/Vectors3D.h"
 #include "GUI/Items/ItemWithParticles.h"
 #include "GUI/Items/SessionModel.h"
-#include "GUI/Models/Group/SelectionDescriptor.h"
 #include "Sample/Lattice/Lattice3D.h"
 
 class FormFactorItem;
diff --git a/GUI/Items/MultiLayerItem.cpp b/GUI/Items/MultiLayerItem.cpp
index 9ea4444fdb1d194491f3ad3700aabc891df0e811..1be1a0c2b67f7bbff6f447c77e0dd5e1965be203 100644
--- a/GUI/Items/MultiLayerItem.cpp
+++ b/GUI/Items/MultiLayerItem.cpp
@@ -15,8 +15,6 @@
 #include "GUI/Items/MultiLayerItem.h"
 #include "GUI/Items/LayerItem.h"
 #include "GUI/Items/SessionModel.h"
-#include "GUI/Items/VectorItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 
 namespace {
diff --git a/GUI/Views/SampleDesigner/LayerForm.cpp b/GUI/Views/SampleDesigner/LayerForm.cpp
index 043b355d68f016e97dcf74f9250cca48c5f2f189..555a719baa4374c8538dc19dfd0e01772b1a4620 100644
--- a/GUI/Views/SampleDesigner/LayerForm.cpp
+++ b/GUI/Views/SampleDesigner/LayerForm.cpp
@@ -19,8 +19,6 @@
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/Views/SampleDesigner/WidgetMoverButton.h"
 #include "GUI/utils/ActionFactory.h"
 
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index 4ae21db043551ee41381cfc67e1c8b5dad2a2973..00bc76d588915ab37aece9b127fcddb9545faa94 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -19,8 +19,6 @@
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/FormLayouter.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
 #include "GUI/utils/ActionFactory.h"
 
 #include <QAction>
@@ -49,7 +47,6 @@ MesoCrystalForm::MesoCrystalForm(QWidget* parent, MesoCrystalItem* item, SampleE
     m_rowOfBasisTypeCombo = layouter.addRow("Basis type", m_basisCombo);
     createBasisWidgets();
 
-
     auto* collapser = GroupBoxCollapser::installIntoGroupBox(this);
 
     if (allowRemove) {
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
index 4dcc66b7cdb4dab43e1cdcc8449ffd6d08a8f018..debc0f6226cc1d327fe63b6b1f2dab266cab719a 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionForm.cpp
@@ -18,8 +18,6 @@
 #include "GUI/Views/SampleDesigner/FormLayouter.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/utils/ActionFactory.h"
 
 #include <QAction>
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index c1c0e24f5436359eb4c856fab3f8b89ba9517049..f5d479551062ed291db6e4a26b8370aadd2b9abb 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -16,7 +16,6 @@
 #include "GUI/Items/FormFactorItems.h"
 #include "GUI/Items/ParticleCoreShellItem.h"
 #include "GUI/Items/ParticleItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SampleDesigner/SampleEditorController.h"
@@ -29,7 +28,6 @@
 
 namespace {
 
-
 QComboBox* createFormFactorCombo(QWidget* parent, FormFactorItem* current)
 {
     auto* combo = new QComboBox(parent);
@@ -53,6 +51,7 @@ QComboBox* createFormFactorCombo(QWidget* parent, FormFactorItem* current)
 
 } // namespace
 
+
 ParticleCoreShellForm::ParticleCoreShellForm(QWidget* parent, ParticleCoreShellItem* item,
                                              SampleEditorController* ec, bool allowRemove)
     : QGroupBox(parent), m_item(item), m_ec(ec)
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 42e014be61f6538351548528193bb79457c058c4..94784e6d83938e08281fb67fea53014e51f0ab14 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -15,7 +15,6 @@
 #include "GUI/Views/Toplevel/SampleView.h"
 #include "GUI/CommonWidgets/DocksController.h"
 #include "GUI/Items/MultiLayerItem.h"
-#include "GUI/Models/Data/ApplicationModels.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
 #include "GUI/Project/projectdocument.h"
 #include "GUI/Views/SampleDesigner/DesignerScene.h"
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index f94c6e33e7ab867c79bbefce421def96fd8cb6d6..1569be1bd60b08723714aa42de28663c079b5f4b 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -19,7 +19,6 @@
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectdocument.h"
 #include "GUI/Project/projectmanager.h"
 #include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
 #include "GUI/Views/Toplevel/TestView.h"