diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index c60f01ead86c9b2f79b30e2ba21cf54433783357..8495f5a21180f23cf3d6ffe69cb8b833ef4353b9 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -7,6 +7,8 @@
  *
  */
 
+#include "ProcessVariable.h"
+
 #include <boost/property_tree/ptree.hpp>
 #include "logog/include/logog.hpp"
 
@@ -16,7 +18,6 @@
 #include "UniformDirichletBoundaryCondition.h"
 #include "InitialCondition.h"
 
-#include "ProcessVariable.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/ProcessVariable.h b/ProcessLib/ProcessVariable.h
index 5e83b1127592799ca70e7ade87e6a8ec5692c8b3..7421eb48da5251242ad5bc9c2e9ad35f75ec37f0 100644
--- a/ProcessLib/ProcessVariable.h
+++ b/ProcessLib/ProcessVariable.h
@@ -12,17 +12,28 @@
 
 #include <boost/property_tree/ptree.hpp>
 
-#include "GeoLib/GEOObjects.h"
-#include "MeshLib/Mesh.h"
 
-#include "MeshGeoToolsLib/MeshNodeSearcher.h"
-#include "MeshGeoToolsLib/BoundaryElementsSearcher.h"
-
-#include "NeumannBcConfig.h"
 #include "NeumannBc.h"
 
+namespace MeshGeoToolsLib
+{
+    class MeshNodeSearcher;
+    class BoundaryElementsSearcher;
+}
+
+namespace MeshLib
+{
+    class Mesh;
+}
+
+namespace GeoLib
+{
+    class GEOObjects;
+}
+
 namespace ProcessLib
 {
+    class NeumannBcConfig;
     class InitialCondition;
     class UniformDirichletBoundaryCondition;
 }