diff --git a/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.cpp b/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.cpp
index faefa84b81ff61caafe2d335fa9eae808531ea7e..76b738a1f4d14e45592167f4518e1e0aa6e89321 100644
--- a/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.cpp
+++ b/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.cpp
@@ -9,7 +9,11 @@
  *
  */
 
+#include "BaseLib/ConfigTree.h"
+#include "BaseLib/Error.h"
+
 #include "CreateFlowAndTemperatureControl.h"
+#include "RefrigerantProperties.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.h b/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.h
index c415df4895040b33ff51acb77f455addd1792270..2696d164c705b96d0c5ade08f8b2bfdfc8515033 100644
--- a/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.h
+++ b/ProcessLib/HeatTransportBHE/BHE/CreateFlowAndTemperatureControl.h
@@ -11,10 +11,21 @@
 
 #pragma once
 
-#include "BaseLib/ConfigTree.h"
-#include "BaseLib/Error.h"
+#include <map>
+#include <memory>
+#include <string>
+
 #include "FlowAndTemperatureControl.h"
-#include "RefrigerantProperties.h"
+
+namespace BaseLib
+{
+class ConfigTree;
+}
+
+namespace MathLib
+{
+class PiecewiseLinearInterpolation;
+}
 
 namespace ProcessLib
 {
@@ -22,6 +33,8 @@ namespace HeatTransportBHE
 {
 namespace BHE
 {
+class RefrigerantProperties;
+
 FlowAndTemperatureControl createFlowAndTemperatureControl(
     BaseLib::ConfigTree const& config,
     std::map<std::string,