From e0a6e56588006073112817b1b058dae0d6b8dd15 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 30 Apr 2021 11:33:40 +0200
Subject: [PATCH] WellGroupHelpers: use forwarding

---
 opm/simulators/wells/WellGroupHelpers.cpp | 6 +++++-
 opm/simulators/wells/WellGroupHelpers.hpp | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/opm/simulators/wells/WellGroupHelpers.cpp b/opm/simulators/wells/WellGroupHelpers.cpp
index 12cba2d6e..73e03a8f9 100644
--- a/opm/simulators/wells/WellGroupHelpers.cpp
+++ b/opm/simulators/wells/WellGroupHelpers.cpp
@@ -20,9 +20,13 @@
 
 #include <config.h>
 #include <opm/simulators/wells/WellGroupHelpers.hpp>
-#include <opm/simulators/wells/TargetCalculator.hpp>
+
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
+#include <opm/simulators/wells/GroupState.hpp>
+#include <opm/simulators/wells/TargetCalculator.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <algorithm>
 #include <stack>
 #include <vector>
diff --git a/opm/simulators/wells/WellGroupHelpers.hpp b/opm/simulators/wells/WellGroupHelpers.hpp
index b10e04334..fe92a0e2b 100644
--- a/opm/simulators/wells/WellGroupHelpers.hpp
+++ b/opm/simulators/wells/WellGroupHelpers.hpp
@@ -24,9 +24,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
-#include <opm/simulators/utils/DeferredLogger.hpp>
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/simulators/wells/GroupState.hpp>
 
@@ -40,6 +37,9 @@
 namespace Opm
 {
 
+class DeferredLogger;
+class VFPProdProperties;
+
 
 namespace WellGroupHelpers
 {