Merge pull request #946 from jokva/clean-up-header

Improve includes from opm-parser

opm/core/grid/GridManager.cpp

@@ -25,6 +25,8 @@
 #include <opm/core/grid/cornerpoint_grid.h>
 #include <opm/core/grid/MinpvProcessor.hpp>
 #include <opm/common/ErrorMacros.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 

opm/core/io/eclipse/EclipseGridInspector.cpp

@@ -41,6 +41,9 @@
 #include <opm/common/ErrorMacros.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/DeckKeyword.hpp>
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <stdexcept>
 #include <numeric>
 #include <cmath>

opm/core/io/eclipse/EclipseReader.cpp

@@ -28,6 +28,7 @@
 #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
+#include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
 #include <algorithm>

opm/core/io/eclipse/EclipseWriter.cpp

@@ -40,6 +40,7 @@
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Utility/SpecgridWrapper.hpp>
 #include <opm/parser/eclipse/Utility/WelspecsWrapper.hpp>
+#include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>

opm/core/props/IncompPropertiesSinglePhase.cpp

@@ -25,6 +25,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 namespace Opm

opm/core/props/pvt/PvtConstCompr.hpp

@@ -22,6 +22,8 @@
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
 #include <opm/common/ErrorMacros.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 #include <vector>

opm/core/props/pvt/PvtInterface.hpp

@@ -20,6 +20,8 @@
 #ifndef OPM_PVTINTERFACE_HEADER_INCLUDED
 #define OPM_PVTINTERFACE_HEADER_INCLUDED
 
+#include <vector>
+
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 

opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp

@@ -24,6 +24,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>