From b063fcd089153af6e54aae5f75d4ed533109bd1f Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 26 Apr 2021 11:57:06 +0200
Subject: [PATCH] remove some unnecessary includes

from tests and a few schedule classes
---
 opm/output/eclipse/AggregateUDQData.hpp            |  9 ---------
 opm/parser/eclipse/EclipseState/EclipseConfig.hpp  |  2 --
 opm/parser/eclipse/EclipseState/Grid/FieldData.hpp |  1 -
 opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp |  2 --
 .../Schedule/OilVaporizationProperties.hpp         |  1 -
 .../eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp |  2 --
 opm/parser/eclipse/Parser/ParserRecord.hpp         |  1 -
 tests/parser/ConnectionTests.cpp                   |  5 +----
 tests/parser/CopyRegTests.cpp                      |  3 ---
 tests/parser/DeckValueTests.cpp                    |  2 --
 tests/parser/EclipseGridTests.cpp                  |  1 -
 tests/parser/EclipseStateTests.cpp                 |  1 -
 tests/parser/EventTests.cpp                        |  1 -
 tests/parser/FieldPropsTests.cpp                   |  2 --
 .../integration/EclipseGridCreateFromDeck.cpp      |  1 -
 tests/rst_test.cpp                                 | 14 ++++----------
 16 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/opm/output/eclipse/AggregateUDQData.hpp b/opm/output/eclipse/AggregateUDQData.hpp
index 424038c34..8674b17ac 100644
--- a/opm/output/eclipse/AggregateUDQData.hpp
+++ b/opm/output/eclipse/AggregateUDQData.hpp
@@ -23,15 +23,6 @@
 #include <opm/output/eclipse/WindowedArray.hpp>
 #include <opm/io/eclipse/PaddedOutputString.hpp>
 
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
-
 #include <cstddef>
 #include <string>
 #include <vector>
diff --git a/opm/parser/eclipse/EclipseState/EclipseConfig.hpp b/opm/parser/eclipse/EclipseState/EclipseConfig.hpp
index bc7c8111e..6ba8ec3ef 100644
--- a/opm/parser/eclipse/EclipseState/EclipseConfig.hpp
+++ b/opm/parser/eclipse/EclipseState/EclipseConfig.hpp
@@ -20,8 +20,6 @@
 #ifndef OPM_ECLIPSE_CONFIG_HPP
 #define OPM_ECLIPSE_CONFIG_HPP
 
-#include <memory>
-
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
 
diff --git a/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp b/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp
index 4451e276c..58eee7c18 100644
--- a/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/FieldData.hpp
@@ -22,7 +22,6 @@
 
 #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/Keywords.hpp>
-#include <opm/parser/eclipse/EclipseState/Grid/FieldData.hpp>
 #include <opm/parser/eclipse/Deck/value_status.hpp>
 
 #include <string>
diff --git a/opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp b/opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
index fc17e0db0..c8e2b6a5e 100644
--- a/opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
@@ -20,8 +20,6 @@
 #ifndef OPM_MINPVMODE_HPP
 #define OPM_MINPVMODE_HPP
 
-#include <string>
-
 namespace Opm {
     
     namespace MinpvMode {
diff --git a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp b/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
index c13c2d098..323c4919f 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
@@ -20,7 +20,6 @@
 #define DRSDT_HPP
 
 #include <string>
-#include <memory>
 #include <vector>
 
 namespace Opm
diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp b/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
index 371dfe755..c8cc9efbf 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
@@ -21,8 +21,6 @@
 #ifndef UDQINPUT__HPP_
 #define UDQINPUT__HPP_
 
-#include <memory>
-
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
 
 namespace Opm {
diff --git a/opm/parser/eclipse/Parser/ParserRecord.hpp b/opm/parser/eclipse/Parser/ParserRecord.hpp
index 9eb9acbc8..201e5c1ed 100644
--- a/opm/parser/eclipse/Parser/ParserRecord.hpp
+++ b/opm/parser/eclipse/Parser/ParserRecord.hpp
@@ -31,7 +31,6 @@ namespace Opm {
     class Deck;
     class DeckRecord;
     class ParseContext;
-    class ParserItem;
     class RawRecord;
     class ErrorGuard;
     class UnitSystem;
diff --git a/tests/parser/ConnectionTests.cpp b/tests/parser/ConnectionTests.cpp
index 7b0c43d67..e167482a0 100644
--- a/tests/parser/ConnectionTests.cpp
+++ b/tests/parser/ConnectionTests.cpp
@@ -24,12 +24,10 @@
 #define BOOST_TEST_MODULE CompletionTests
 #include <boost/test/unit_test.hpp>
 
+#include <opm/common/utility/ActiveGridCells.hpp>
 #include <opm/parser/eclipse/Python/Python.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/Deck/DeckItem.hpp>
-#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
-#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
@@ -37,7 +35,6 @@
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 
-#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/common/OpmLog/KeywordLocation.hpp>
 
diff --git a/tests/parser/CopyRegTests.cpp b/tests/parser/CopyRegTests.cpp
index 401ff7da9..6cc74b249 100644
--- a/tests/parser/CopyRegTests.cpp
+++ b/tests/parser/CopyRegTests.cpp
@@ -27,13 +27,10 @@
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 
-#include <opm/parser/eclipse/Deck/DeckSection.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
 
 static Opm::Deck createDeckInvalidArray1() {
diff --git a/tests/parser/DeckValueTests.cpp b/tests/parser/DeckValueTests.cpp
index 25244b8c0..e632bf019 100644
--- a/tests/parser/DeckValueTests.cpp
+++ b/tests/parser/DeckValueTests.cpp
@@ -29,8 +29,6 @@
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/B.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckValue.hpp>
diff --git a/tests/parser/EclipseGridTests.cpp b/tests/parser/EclipseGridTests.cpp
index aac450d33..100348f89 100644
--- a/tests/parser/EclipseGridTests.cpp
+++ b/tests/parser/EclipseGridTests.cpp
@@ -33,7 +33,6 @@
 #define BOOST_TEST_MODULE EclipseGridTests
 #include <boost/test/unit_test.hpp>
 
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckSection.hpp>
diff --git a/tests/parser/EclipseStateTests.cpp b/tests/parser/EclipseStateTests.cpp
index 0e4b47192..f9afe1fb8 100644
--- a/tests/parser/EclipseStateTests.cpp
+++ b/tests/parser/EclipseStateTests.cpp
@@ -30,7 +30,6 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
diff --git a/tests/parser/EventTests.cpp b/tests/parser/EventTests.cpp
index 36c2e5d08..95bdbcf2e 100644
--- a/tests/parser/EventTests.cpp
+++ b/tests/parser/EventTests.cpp
@@ -24,7 +24,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp>
-#include <opm/common/utility/TimeService.hpp>
 
 
 
diff --git a/tests/parser/FieldPropsTests.cpp b/tests/parser/FieldPropsTests.cpp
index 55b659a59..1e180aa9f 100644
--- a/tests/parser/FieldPropsTests.cpp
+++ b/tests/parser/FieldPropsTests.cpp
@@ -44,8 +44,6 @@
 #include <opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp>
 #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 
-#include <opm/common/utility/OpmInputError.hpp>
-
 #include "src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp"
 
 using namespace Opm;
diff --git a/tests/parser/integration/EclipseGridCreateFromDeck.cpp b/tests/parser/integration/EclipseGridCreateFromDeck.cpp
index 15a6d765a..7f845d98c 100644
--- a/tests/parser/integration/EclipseGridCreateFromDeck.cpp
+++ b/tests/parser/integration/EclipseGridCreateFromDeck.cpp
@@ -27,7 +27,6 @@
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/parser/eclipse/Deck/DeckSection.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
diff --git a/tests/rst_test.cpp b/tests/rst_test.cpp
index bef736749..ecc44dc31 100644
--- a/tests/rst_test.cpp
+++ b/tests/rst_test.cpp
@@ -21,24 +21,18 @@
 #include <unordered_map>
 #include <vector>
 
-#include <opm/io/eclipse/rst/state.hpp>
-#include <opm/io/eclipse/ERst.hpp>
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Python/Python.hpp>
 
+#include <opm/io/eclipse/ERst.hpp>
+#include <opm/io/eclipse/rst/state.hpp>
+
 #include <opm/parser/eclipse/Parser/Parser.hpp>
-#include <opm/parser/eclipse/Parser/ParseContext.hpp>
-#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/StreamLog.hpp>
-#include <opm/common/OpmLog/LogUtil.hpp>
 
 void initLogging() {
     std::shared_ptr<Opm::StreamLog> cout_log = std::make_shared<Opm::StreamLog>(std::cout, Opm::Log::DefaultMessageTypes);