diff --git a/ProcessLib/HydroMechanics/LocalAssemblerInterface.h b/ProcessLib/HydroMechanics/LocalAssemblerInterface.h
index a71b74122e2d1df108af8e519db9ee43dd57b814..fb41eea21637ca0d1b81c4983fe010309e5c525a 100644
--- a/ProcessLib/HydroMechanics/LocalAssemblerInterface.h
+++ b/ProcessLib/HydroMechanics/LocalAssemblerInterface.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "NumLib/Extrapolation/ExtrapolatableElement.h"
 #include "ProcessLib/LocalAssemblerInterface.h"
 
 namespace ProcessLib
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
index 4920d2dbbbfd831bd6ab6e784f35311e3f406529..804efe03754a388ec0fa3b858a062442b20f383d 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
@@ -9,6 +9,12 @@
 
 #pragma once
 
+#include <vector>
+
+#include <Eigen/Eigen>
+
+#include "NumLib/Fem/CoordinatesMapping/ShapeMatrices.h"
+
 namespace ProcessLib
 {
 namespace LIE
diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
index f0b1de80875bbbcb8cfecd1784a1a9019f8bdd65..c31f992becb5ea6a1f1b23e04ae8b087f34df7e2 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -17,6 +17,8 @@
 #include <vector>
 #include <typeindex>
 
+#include "MaterialLib/PorousMedium/Permeability/Permeability.h"
+#include "MaterialLib/PorousMedium/Storage/Storage.h"
 #include "MathLib/LinAlg/Eigen/EigenMapTools.h"
 #include "NumLib/Extrapolation/ExtrapolatableElement.h"
 #include "NumLib/DOF/DOFTableUtil.h"
diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
index c15e63b5a50564ade46165798234dee4757804c4..bafb35327de3896175649b9e922939c41b9a4b50 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
@@ -18,21 +18,9 @@
 
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
-
-namespace MaterialLib
-{
-namespace Fluid
-{
-class FluidProperties;
-}
-
-namespace PorousMedium
-{
-class Permeability;
-class Porosity;
-class Storage;
-}
-}
+#include "MaterialLib/PorousMedium/Permeability/Permeability.h"
+#include "MaterialLib/PorousMedium/Porosity/Porosity.h"
+#include "MaterialLib/PorousMedium/Storage/Storage.h"
 
 namespace BaseLib
 {
diff --git a/ProcessLib/PhaseField/PhaseFieldFEM.h b/ProcessLib/PhaseField/PhaseFieldFEM.h
index 336306dd8f4d45bb0caa9865da57c1d627362371..f4fcd3e3aae3a666b2dff1f216bf852c3f8d6ad1 100644
--- a/ProcessLib/PhaseField/PhaseFieldFEM.h
+++ b/ProcessLib/PhaseField/PhaseFieldFEM.h
@@ -18,6 +18,7 @@
 #include "NumLib/Fem/ShapeMatrixPolicy.h"
 #include "ProcessLib/Deformation/BMatrixPolicy.h"
 #include "ProcessLib/Deformation/LinearBMatrix.h"
+#include "ProcessLib/Parameter/SpatialPosition.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
 #include "LocalAssemblerInterface.h"
diff --git a/ProcessLib/PhaseField/PhaseFieldProcessData.h b/ProcessLib/PhaseField/PhaseFieldProcessData.h
index 0766cfe05cdc8cd891611dd650225ca6556a8de4..7184f64298b4c091e92e005d3fc42b423484360e 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcessData.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcessData.h
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <Eigen/Eigen>
+
 #include <memory>
 #include <utility>
 
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcessData.h b/ProcessLib/SmallDeformation/SmallDeformationProcessData.h
index 9f1c913452a51874f904f52cbaf9416686e06a21..6d3545a7949f883b8baff08ebf7bbb5dd273b461 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcessData.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcessData.h
@@ -12,6 +12,10 @@
 #include <memory>
 #include <utility>
 
+#include <Eigen/Eigen>
+
+#include "ProcessLib/Parameter/Parameter.h"
+
 namespace MaterialLib
 {
 namespace Solids
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
index b9f5b340cb16d66a557d92d5e966203f0a2c4e5e..00c47f122f1479267fe4071471ff007c5ea50382 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
@@ -12,6 +12,8 @@
 #include <memory>
 #include <utility>
 
+#include <Eigen/Eigen>
+
 #include "ProcessLib/Parameter/Parameter.h"
 
 namespace MaterialLib