diff --git a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
index b5800890a83d8001975f14161c96d3c84914d0dc..7dd0608e184fbdf89ac5fbddd0e3cf8c18966948 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
@@ -19,7 +19,12 @@
 #include "Core/Multilayer/Layer.h"
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/Particle/Particle.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 
 const double middle_layer_thickness(60.0 * Units::nanometer);
 
diff --git a/Core/StandardSamples/ParticleInVacuumBuilder.cpp b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
index 7acfdb4a0b611143927c7861634505064d2c9db0..d005787775b17dfd7a2c81270e185fb40425bd60 100644
--- a/Core/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Core/StandardSamples/ParticleInVacuumBuilder.cpp
@@ -21,7 +21,12 @@
 #include "Core/Particle/Particle.h"
 #include "Core/SampleBuilderEngine/SampleComponents.h"
 #include "Core/StandardSamples/ReferenceMaterials.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 
 namespace
 {
diff --git a/Core/includeIncludes/FormFactors.h b/Core/includeIncludes/FormFactors.h
deleted file mode 100644
index 94f003ff347425b613599b742f96c81d6fb01042..0000000000000000000000000000000000000000
--- a/Core/includeIncludes/FormFactors.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      Core/includeIncludes/FormFactors.h
-//! @brief     Includes form-factor related include files.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
-#define BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
-
-#include "Core/Particle/FormFactorWeighted.h"
-#include "Core/Scattering/FormFactorDecoratorMaterial.h"
-#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
-#include "Core/Scattering/FormFactorDecoratorRotation.h"
-#include "Core/HardParticle/HardParticles.h"
-#include "Core/SoftParticle/SoftParticles.h"
-
-#endif // BORNAGAIN_CORE_INCLUDEINCLUDES_FORMFACTORS_H
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index b458f23d44c36ff24cccb187d375c5ee2d3a39d7..a972c816960996b7b5aa59d7c6070dbc5e81e7f6 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -14,7 +14,12 @@
 
 #include "GUI/coregui/Models/FormFactorItems.h"
 #include "Core/Basics/Units.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 
 /* ------------------------------------------------ */
 
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index 348b65fd5bb3dd96d623965aabc342e3e5166336..0d8c745849b75169b9696a4e7cdba2c6539ce943 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -25,7 +25,12 @@
 #include "Core/Particle/ParticleComposition.h"
 #include "Core/Particle/ParticleCoreShell.h"
 #include "Core/Particle/ParticleDistribution.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 #include "GUI/coregui/Models/ComboProperty.h"
 #include "GUI/coregui/Models/FormFactorItems.h"
 #include "GUI/coregui/Models/LayerItem.h"
diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
index 9b92e0fa43e8127a3d679eadede0aabd80cbb99b..88ef4e07436a596b96b713545e7c5ac2103194b7 100644
--- a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
+++ b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp
@@ -3,7 +3,12 @@
 #include "Core/Material/MaterialFactoryFuncs.h"
 #include "Core/Parametrization/Distributions.h"
 #include "Core/Particle/Particle.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class ParticleDistributionTest : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.cpp b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
index 37f6b56933857b95cb3476fbc316aee13372d527..5a9e568103c4ab274d8d8764e111b6329dadb2e7 100644
--- a/Tests/UnitTests/GUI/TestFormFactorItems.cpp
+++ b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
@@ -1,5 +1,10 @@
 #include "Core/Basics/Units.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 #include "Fit/TestEngine/Numeric.h"
 #include "GUI/coregui/Models/FormFactorItems.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index 9b3066b5151296e42edcb19d45e887a1de3a9d9a..c7d82c477b2f039ca0b0ca924a3f8a2a592559b5 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -1,6 +1,11 @@
 #include "Core/Basics/Units.h"
 #include "Core/Parametrization/ParameterPool.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 #include "Core/Aggregate/InterferenceFunctions.h"
 #include "GUI/coregui/Models/FormFactorItems.h"
 #include "GUI/coregui/Models/InterferenceFunctionItems.h"
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index 52bf817015bccec54e87e544083f4ed4df8fc7d2..b1348785eac608a740c6164177da00f286dfdc13 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -2,7 +2,12 @@
 #include "Core/Parametrization/Distributions.h"
 #include "Core/Particle/Particle.h"
 #include "Core/Particle/ParticleDistribution.h"
-#include "Core/includeIncludes/FormFactors.h"
+#include "Core/Particle/FormFactorWeighted.h"
+#include "Core/Scattering/FormFactorDecoratorMaterial.h"
+#include "Core/Scattering/FormFactorDecoratorPositionFactor.h"
+#include "Core/Scattering/FormFactorDecoratorRotation.h"
+#include "Core/HardParticle/HardParticles.h"
+#include "Core/SoftParticle/SoftParticles.h"
 #include "GUI/coregui/Models/ComboProperty.h"
 #include "GUI/coregui/Models/DistributionItems.h"
 #include "GUI/coregui/Models/MaterialModel.h"