From 17963b07c1d89a653ce23d70f75bb5e723771141 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 30 Apr 2021 10:46:52 +0200
Subject: [PATCH] ParallelRestart: use forwarding

---
 opm/simulators/utils/ParallelRestart.cpp |  7 +++++
 opm/simulators/utils/ParallelRestart.hpp | 33 +++++++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 0f0b4cbd6..b57a06590 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -25,6 +25,13 @@
 #include <ctime>
 #include <cstring>
 #include <dune/common/parallel/mpitraits.hh>
+#include <opm/output/data/Cells.hpp>
+#include <opm/output/data/Groups.hpp>
+#include <opm/output/data/GuideRateValue.hpp>
+#include <opm/output/data/Solution.hpp>
+#include <opm/output/data/Wells.hpp>
+#include <opm/output/eclipse/EclipseIO.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 
 #define HANDLE_AS_POD(T) \
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index baa061a90..4fa07bee4 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -24,10 +24,6 @@
 #endif
 
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/output/eclipse/RestartValue.hpp>
-#include <opm/output/eclipse/EclipseIO.hpp>
-#include <opm/output/eclipse/Summary.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp>
 #include <opm/common/utility/TimeService.hpp>
 
 #include <dune/common/parallel/mpihelper.hh>
@@ -40,11 +36,40 @@
 #include <tuple>
 #include <typeinfo>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 namespace Opm
 {
 
+class EclipseIO;
+class SummaryState;
+class RestartKey;
+class RestartValue;
+
+namespace data
+{
+class CellData;
+class Connection;
+class CurrentControl;
+class GroupAndNetworkValues;
+class GroupConstraints;
+class GroupData;
+class GroupGuideRates;
+class GuideRateValue;
+class NodeData;
+class Rates;
+class Segment;
+class Solution;
+class Well;
+class WellRates;
+}
+
+namespace Action
+{
+class State;
+}
+
 namespace Mpi
 {
 template<class T>