From 26cd7ab9936b4110fcd64e8c1ff3fc8649daa789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Tue, 25 Jun 2024 10:20:41 +0200
Subject: [PATCH] Move opm/core/props to opm/simulators/utils

The opm/core directory is no longer meaningful, and it contains only
components which might collectively be described as simulator
utilities.
---
 CMakeLists_files.cmake                        | 36 +++++++++----------
 examples/printvfp.cpp                         |  4 +--
 opm/simulators/flow/BlackoilModel.hpp         |  7 ++--
 opm/simulators/flow/FlowProblem.hpp           |  4 +--
 opm/simulators/flow/countGlobalCells.hpp      |  2 +-
 .../timestepping/AdaptiveTimeStepping.hpp     |  4 +--
 .../utils}/BlackoilPhases.cpp                 |  4 +--
 .../utils}/BlackoilPhases.hpp                 |  0
 .../utils}/phaseUsageFromDeck.cpp             |  2 +-
 .../utils}/phaseUsageFromDeck.hpp             |  2 +-
 .../utils}/satfunc/RelpermDiagnostics.cpp     |  6 ++--
 .../utils}/satfunc/RelpermDiagnostics.hpp     |  0
 .../wells/BlackoilWellModel_impl.hpp          |  9 +++--
 opm/simulators/wells/GasLiftGroupInfo.hpp     |  3 +-
 .../wells/GasLiftSingleWellGeneric.hpp        |  5 +--
 opm/simulators/wells/GasLiftStage2.hpp        |  3 +-
 .../wells/GroupEconomicLimitsChecker.hpp      |  3 +-
 opm/simulators/wells/GroupState.hpp           | 15 ++++----
 .../wells/MultisegmentWellAssemble.cpp        |  5 +--
 .../wells/MultisegmentWellSegments.cpp        |  2 +-
 opm/simulators/wells/RateConverter.hpp        |  5 +--
 .../wells/RegionAttributeHelpers.hpp          |  4 ++-
 .../wells/RegionAverageCalculator.hpp         |  3 +-
 opm/simulators/wells/SingleWellState.hpp      |  3 +-
 opm/simulators/wells/StandardWellAssemble.cpp |  4 +--
 .../wells/StandardWellConnections.cpp         |  5 +--
 opm/simulators/wells/WGState.cpp              |  3 +-
 opm/simulators/wells/WellAssemble.hpp         |  2 +-
 opm/simulators/wells/WellBhpThpCalculator.cpp |  4 +--
 opm/simulators/wells/WellConstraints.cpp      |  4 +--
 opm/simulators/wells/WellGroupConstraints.cpp |  5 +--
 opm/simulators/wells/WellInterface.hpp        |  3 +-
 .../wells/WellInterfaceFluidSystem.hpp        |  5 ++-
 opm/simulators/wells/WellState.hpp            |  6 ++--
 tests/test_relpermdiagnostics.cpp             | 11 ++++--
 tests/test_wellstate.cpp                      |  7 ++--
 36 files changed, 110 insertions(+), 80 deletions(-)
 rename opm/{core/props => simulators/utils}/BlackoilPhases.cpp (97%)
 rename opm/{core/props => simulators/utils}/BlackoilPhases.hpp (100%)
 rename opm/{core/props => simulators/utils}/phaseUsageFromDeck.cpp (98%)
 rename opm/{core/props => simulators/utils}/phaseUsageFromDeck.hpp (96%)
 rename opm/{core/props => simulators/utils}/satfunc/RelpermDiagnostics.cpp (99%)
 rename opm/{core/props => simulators/utils}/satfunc/RelpermDiagnostics.hpp (100%)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 3b5c6401a..d1c1ecbca 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -56,10 +56,6 @@ endmacro()
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  opm/core/props/BlackoilPhases.cpp
-  opm/core/props/phaseUsageFromDeck.cpp
-  opm/core/props/satfunc/RelpermDiagnostics.cpp
-  opm/simulators/timestepping/SimulatorReport.cpp
   opm/simulators/flow/ActionHandler.cpp
   opm/simulators/flow/Banners.cpp
   opm/simulators/flow/CollectDataOnIORank.cpp
@@ -111,21 +107,25 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
   opm/simulators/timestepping/AdaptiveTimeStepping.cpp
   opm/simulators/timestepping/ConvergenceReport.cpp
-  opm/simulators/timestepping/TimeStepControl.cpp
+  opm/simulators/timestepping/SimulatorReport.cpp
   opm/simulators/timestepping/SimulatorTimer.cpp
   opm/simulators/timestepping/SimulatorTimerInterface.cpp
+  opm/simulators/timestepping/TimeStepControl.cpp
   opm/simulators/timestepping/gatherConvergenceReport.cpp
+  opm/simulators/utils/BlackoilPhases.cpp
   opm/simulators/utils/ComponentName.cpp
-  opm/simulators/utils/compressPartition.cpp
   opm/simulators/utils/DeferredLogger.cpp
-  opm/simulators/utils/gatherDeferredLogger.cpp
   opm/simulators/utils/ParallelFileMerger.cpp
   opm/simulators/utils/ParallelRestart.cpp
   opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
   opm/simulators/utils/PressureAverage.cpp
-  opm/simulators/utils/readDeck.cpp
   opm/simulators/utils/SerializationPackers.cpp
   opm/simulators/utils/UnsupportedFlowKeywords.cpp
+  opm/simulators/utils/compressPartition.cpp
+  opm/simulators/utils/gatherDeferredLogger.cpp
+  opm/simulators/utils/phaseUsageFromDeck.cpp
+  opm/simulators/utils/readDeck.cpp
+  opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
   opm/simulators/wells/ALQState.cpp
   opm/simulators/wells/BlackoilWellModelConstraints.cpp
   opm/simulators/wells/BlackoilWellModelGeneric.cpp
@@ -509,10 +509,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/equil/EquilibrationHelpers_impl.hpp
   opm/simulators/flow/equil/InitStateEquil.hpp
   opm/simulators/flow/equil/InitStateEquil_impl.hpp
-  opm/core/props/BlackoilPhases.hpp
-  opm/core/props/phaseUsageFromDeck.hpp
-  opm/core/props/satfunc/RelpermDiagnostics.hpp
-  opm/simulators/timestepping/SimulatorReport.hpp
   opm/simulators/wells/SegmentState.hpp
   opm/simulators/wells/WellContainer.hpp
   opm/simulators/aquifers/AquiferAnalytical.hpp
@@ -560,23 +556,27 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/TimeStepControl.hpp
   opm/simulators/timestepping/TimeStepControlInterface.hpp
   opm/simulators/timestepping/SimulatorTimer.hpp
+  opm/simulators/timestepping/SimulatorReport.hpp
   opm/simulators/timestepping/SimulatorTimerInterface.hpp
   opm/simulators/timestepping/gatherConvergenceReport.hpp
+  opm/simulators/utils/BlackoilPhases.hpp
   opm/simulators/utils/ComponentName.hpp
-  opm/simulators/utils/compressPartition.hpp
-  opm/simulators/utils/ParallelFileMerger.hpp
-  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
   opm/simulators/utils/DeferredLogger.hpp
-  opm/simulators/utils/gatherDeferredLogger.hpp
-  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
   opm/simulators/utils/ParallelEclipseState.hpp
+  opm/simulators/utils/ParallelFileMerger.hpp
   opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp
   opm/simulators/utils/ParallelRestart.hpp
+  opm/simulators/utils/PressureAverage.hpp
   opm/simulators/utils/PropsDataHandle.hpp
   opm/simulators/utils/SerializationPackers.hpp
   opm/simulators/utils/VectorVectorDataHandle.hpp
-  opm/simulators/utils/PressureAverage.hpp
+  opm/simulators/utils/compressPartition.hpp
+  opm/simulators/utils/gatherDeferredLogger.hpp
+  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/utils/phaseUsageFromDeck.hpp
   opm/simulators/utils/readDeck.hpp
+  opm/simulators/utils/satfunc/RelpermDiagnostics.hpp
   opm/simulators/wells/ALQState.hpp
   opm/simulators/wells/BlackoilWellModel.hpp
   opm/simulators/wells/BlackoilWellModel_impl.hpp
diff --git a/examples/printvfp.cpp b/examples/printvfp.cpp
index d02d5f053..90948df74 100644
--- a/examples/printvfp.cpp
+++ b/examples/printvfp.cpp
@@ -33,9 +33,9 @@
 #include <opm/simulators/wells/VFPProperties.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
-#include <opm/input/eclipse/Units/Units.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/input/eclipse/Deck/Deck.hpp>
 
diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index 96a1ade3f..0d3d30548 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -30,8 +30,6 @@
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 
@@ -47,10 +45,13 @@
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
+
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+
 #include <opm/simulators/utils/ComponentName.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
-#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <dune/common/timer.hh>
 
diff --git a/opm/simulators/flow/FlowProblem.hpp b/opm/simulators/flow/FlowProblem.hpp
index 2c0c25b5f..2f98a9705 100644
--- a/opm/simulators/flow/FlowProblem.hpp
+++ b/opm/simulators/flow/FlowProblem.hpp
@@ -36,8 +36,6 @@
 
 #include <opm/common/utility/TimeService.hpp>
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
@@ -80,8 +78,10 @@
 #include <opm/simulators/flow/VtkTracerModule.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
+
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelSerialization.hpp>
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
 
 #include <opm/utility/CopyablePtr.hpp>
 
diff --git a/opm/simulators/flow/countGlobalCells.hpp b/opm/simulators/flow/countGlobalCells.hpp
index c4aa47a3a..8d853cc18 100644
--- a/opm/simulators/flow/countGlobalCells.hpp
+++ b/opm/simulators/flow/countGlobalCells.hpp
@@ -24,7 +24,7 @@
 #ifndef OPM_COUNTGLOBALCELLS_HEADER_INCLUDED
 #define OPM_COUNTGLOBALCELLS_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <dune/grid/common/gridview.hh>
 
diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
index b7a30e38a..2b15209d5 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@@ -14,8 +14,6 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/grid/utility/StopWatch.hpp>
 
 #include <opm/input/eclipse/Units/Units.hpp>
@@ -34,6 +32,8 @@
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
 #include <opm/simulators/timestepping/TimeStepControlInterface.hpp>
 
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
+
 #include <fmt/format.h>
 
 #include <algorithm>
diff --git a/opm/core/props/BlackoilPhases.cpp b/opm/simulators/utils/BlackoilPhases.cpp
similarity index 97%
rename from opm/core/props/BlackoilPhases.cpp
rename to opm/simulators/utils/BlackoilPhases.cpp
index aab8ed8ee..be5971a1b 100644
--- a/opm/core/props/BlackoilPhases.cpp
+++ b/opm/simulators/utils/BlackoilPhases.cpp
@@ -21,11 +21,11 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <algorithm>
 #include <vector>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 Opm::PhaseUsage::PhaseUsage(std::vector<BlackoilPhases::PhaseIndex> phases)
 {
     std::sort(phases.begin(), phases.end());
diff --git a/opm/core/props/BlackoilPhases.hpp b/opm/simulators/utils/BlackoilPhases.hpp
similarity index 100%
rename from opm/core/props/BlackoilPhases.hpp
rename to opm/simulators/utils/BlackoilPhases.hpp
diff --git a/opm/core/props/phaseUsageFromDeck.cpp b/opm/simulators/utils/phaseUsageFromDeck.cpp
similarity index 98%
rename from opm/core/props/phaseUsageFromDeck.cpp
rename to opm/simulators/utils/phaseUsageFromDeck.cpp
index d6720fe20..c9bd30e76 100644
--- a/opm/core/props/phaseUsageFromDeck.cpp
+++ b/opm/simulators/utils/phaseUsageFromDeck.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <opm/common/ErrorMacros.hpp>
 
diff --git a/opm/core/props/phaseUsageFromDeck.hpp b/opm/simulators/utils/phaseUsageFromDeck.hpp
similarity index 96%
rename from opm/core/props/phaseUsageFromDeck.hpp
rename to opm/simulators/utils/phaseUsageFromDeck.hpp
index 57acfc858..ae7403c60 100644
--- a/opm/core/props/phaseUsageFromDeck.hpp
+++ b/opm/simulators/utils/phaseUsageFromDeck.hpp
@@ -21,7 +21,7 @@
 #ifndef OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 #define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/props/satfunc/RelpermDiagnostics.cpp b/opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
similarity index 99%
rename from opm/core/props/satfunc/RelpermDiagnostics.cpp
rename to opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
index 37f21e6c2..111c603fe 100644
--- a/opm/core/props/satfunc/RelpermDiagnostics.cpp
+++ b/opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclEpsGridProperties.hpp>
 #include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
@@ -45,10 +45,12 @@
 
 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/polyhedralgrid.hh>
+
 #ifdef HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/3d/gridview.hh>
 #endif // HAVE_DUNE_ALUGRID
+
 namespace Opm {
 
     bool RelpermDiagnostics::phaseCheck_(const EclipseState& es)
diff --git a/opm/core/props/satfunc/RelpermDiagnostics.hpp b/opm/simulators/utils/satfunc/RelpermDiagnostics.hpp
similarity index 100%
rename from opm/core/props/satfunc/RelpermDiagnostics.hpp
rename to opm/simulators/utils/satfunc/RelpermDiagnostics.hpp
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index 337807755..6354bfcf4 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -27,20 +27,23 @@
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #endif
 
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/grid/utility/cartesianToCompressed.hpp>
 
-#include <opm/input/eclipse/Units/UnitSystem.hpp>
 #include <opm/input/eclipse/Schedule/Network/Balance.hpp>
 #include <opm/input/eclipse/Schedule/Network/ExtNetwork.hpp>
 #include <opm/input/eclipse/Schedule/Well/PAvgDynamicSourceData.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellTestConfig.hpp>
+
+#include <opm/input/eclipse/Units/UnitSystem.hpp>
+
 #include <opm/simulators/wells/BlackoilWellModelConstraints.hpp>
 #include <opm/simulators/wells/ParallelPAvgDynamicSourceData.hpp>
 #include <opm/simulators/wells/ParallelWBPCalculation.hpp>
 #include <opm/simulators/wells/VFPProperties.hpp>
+
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/MPIPacker.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #if COMPILE_BDA_BRIDGE
 #include <opm/simulators/linalg/bda/WellContributions.hpp>
diff --git a/opm/simulators/wells/GasLiftGroupInfo.hpp b/opm/simulators/wells/GasLiftGroupInfo.hpp
index ee2032e2d..427fa65a2 100644
--- a/opm/simulators/wells/GasLiftGroupInfo.hpp
+++ b/opm/simulators/wells/GasLiftGroupInfo.hpp
@@ -20,9 +20,10 @@
 #ifndef OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
 #define OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/GasLiftCommon.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <optional>
 #include <string>
diff --git a/opm/simulators/wells/GasLiftSingleWellGeneric.hpp b/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
index 8341b6c18..07f3100e3 100644
--- a/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
+++ b/opm/simulators/wells/GasLiftSingleWellGeneric.hpp
@@ -20,12 +20,13 @@
 #ifndef OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
 #define OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/input/eclipse/Schedule/Well/WellProductionControls.hpp>
+
 #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
 #include <opm/simulators/wells/GasLiftCommon.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <optional>
 #include <set>
 #include <stdexcept>
diff --git a/opm/simulators/wells/GasLiftStage2.hpp b/opm/simulators/wells/GasLiftStage2.hpp
index f6b86df90..e0f5ae3d8 100644
--- a/opm/simulators/wells/GasLiftStage2.hpp
+++ b/opm/simulators/wells/GasLiftStage2.hpp
@@ -20,9 +20,10 @@
 #ifndef OPM_GASLIFT_STAGE2_HEADER_INCLUDED
 #define OPM_GASLIFT_STAGE2_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <memory>
 #include <optional>
diff --git a/opm/simulators/wells/GroupEconomicLimitsChecker.hpp b/opm/simulators/wells/GroupEconomicLimitsChecker.hpp
index cd1efe9ad..9401574ba 100644
--- a/opm/simulators/wells/GroupEconomicLimitsChecker.hpp
+++ b/opm/simulators/wells/GroupEconomicLimitsChecker.hpp
@@ -20,7 +20,8 @@
 #ifndef OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
 #define OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp>
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 
diff --git a/opm/simulators/wells/GroupState.hpp b/opm/simulators/wells/GroupState.hpp
index bd52158a2..15f90dab6 100644
--- a/opm/simulators/wells/GroupState.hpp
+++ b/opm/simulators/wells/GroupState.hpp
@@ -20,15 +20,18 @@
 #ifndef OPM_GROUPSTATE_HEADER_INCLUDED
 #define OPM_GROUPSTATE_HEADER_INCLUDED
 
+#include <opm/input/eclipse/EclipseState/Phase.hpp>
+
+#include <opm/input/eclipse/Schedule/Group/GPMaint.hpp>
+#include <opm/input/eclipse/Schedule/Group/Group.hpp>
+
+#include <opm/simulators/wells/WellContainer.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <vector>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/input/eclipse/Schedule/Group/Group.hpp>
-#include <opm/input/eclipse/EclipseState/Phase.hpp>
-#include <opm/input/eclipse/Schedule/Group/GPMaint.hpp>
-#include <opm/simulators/wells/WellContainer.hpp>
-
 namespace Opm {
 
 template<class Scalar>
diff --git a/opm/simulators/wells/MultisegmentWellAssemble.cpp b/opm/simulators/wells/MultisegmentWellAssemble.cpp
index 83f76d416..935a1935f 100644
--- a/opm/simulators/wells/MultisegmentWellAssemble.cpp
+++ b/opm/simulators/wells/MultisegmentWellAssemble.cpp
@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/MultisegmentWellAssemble.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/MultisegmentWellAssemble.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -30,6 +29,8 @@
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/simulators/wells/MultisegmentWellEquations.hpp>
 #include <opm/simulators/wells/MultisegmentWellPrimaryVariables.hpp>
 #include <opm/simulators/wells/WellAssemble.hpp>
diff --git a/opm/simulators/wells/MultisegmentWellSegments.cpp b/opm/simulators/wells/MultisegmentWellSegments.cpp
index cec579c00..c38de130f 100644
--- a/opm/simulators/wells/MultisegmentWellSegments.cpp
+++ b/opm/simulators/wells/MultisegmentWellSegments.cpp
@@ -41,7 +41,7 @@
 #include <opm/simulators/wells/SegmentState.hpp>
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <fmt/format.h>
 
diff --git a/opm/simulators/wells/RateConverter.hpp b/opm/simulators/wells/RateConverter.hpp
index fb96c6c41..af1ecda84 100644
--- a/opm/simulators/wells/RateConverter.hpp
+++ b/opm/simulators/wells/RateConverter.hpp
@@ -22,11 +22,12 @@
 #ifndef OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 #define OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/grid/utility/RegionMapping.hpp>
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+
 #include <opm/simulators/wells/RegionAttributeHelpers.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
 #include <dune/grid/common/gridenums.hh>
diff --git a/opm/simulators/wells/RegionAttributeHelpers.hpp b/opm/simulators/wells/RegionAttributeHelpers.hpp
index edd3e420d..ac676135c 100644
--- a/opm/simulators/wells/RegionAttributeHelpers.hpp
+++ b/opm/simulators/wells/RegionAttributeHelpers.hpp
@@ -23,10 +23,12 @@
 #ifndef OPM_REGIONATTRIBUTEHELPERS_HPP_HEADER_INCLUDED
 #define OPM_REGIONATTRIBUTEHELPERS_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/grid/utility/RegionMapping.hpp>
 
 #include <dune/grid/common/gridenums.hh>
+
 #include <algorithm>
 #include <memory>
 #include <stdexcept>
diff --git a/opm/simulators/wells/RegionAverageCalculator.hpp b/opm/simulators/wells/RegionAverageCalculator.hpp
index 2603ddf69..5b18467e1 100644
--- a/opm/simulators/wells/RegionAverageCalculator.hpp
+++ b/opm/simulators/wells/RegionAverageCalculator.hpp
@@ -20,8 +20,9 @@
 #ifndef OPM_REGIONAVERAGECALCULATOR_HPP_HEADER_INCLUDED
 #define OPM_REGIONAVERAGECALCULATOR_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/RegionAttributeHelpers.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 #include <dune/grid/common/gridenums.hh>
diff --git a/opm/simulators/wells/SingleWellState.hpp b/opm/simulators/wells/SingleWellState.hpp
index c2948bb61..445642b39 100644
--- a/opm/simulators/wells/SingleWellState.hpp
+++ b/opm/simulators/wells/SingleWellState.hpp
@@ -29,7 +29,8 @@
 #include <opm/simulators/wells/SegmentState.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
-#include <opm/core/props/BlackoilPhases.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 namespace Opm {
 
diff --git a/opm/simulators/wells/StandardWellAssemble.cpp b/opm/simulators/wells/StandardWellAssemble.cpp
index 0ee742301..1de99ae22 100644
--- a/opm/simulators/wells/StandardWellAssemble.cpp
+++ b/opm/simulators/wells/StandardWellAssemble.cpp
@@ -22,8 +22,6 @@
 #include <config.h>
 #include <opm/simulators/wells/StandardWellAssemble.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -38,6 +36,8 @@
 #include <opm/simulators/wells/WellInterfaceFluidSystem.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm {
 
 //! \brief Class administering assembler access to equation system.
diff --git a/opm/simulators/wells/StandardWellConnections.cpp b/opm/simulators/wells/StandardWellConnections.cpp
index 7e577928e..d8d4b8577 100644
--- a/opm/simulators/wells/StandardWellConnections.cpp
+++ b/opm/simulators/wells/StandardWellConnections.cpp
@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/StandardWellConnections.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/StandardWellConnections.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -30,7 +29,9 @@
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 #include <opm/simulators/wells/WellInterfaceIndices.hpp>
 #include <opm/simulators/wells/WellState.hpp>
diff --git a/opm/simulators/wells/WGState.cpp b/opm/simulators/wells/WGState.cpp
index 49c4af1bd..1a8b74232 100644
--- a/opm/simulators/wells/WGState.cpp
+++ b/opm/simulators/wells/WGState.cpp
@@ -21,9 +21,10 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/WGState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm {
 
 template<class Scalar>
diff --git a/opm/simulators/wells/WellAssemble.hpp b/opm/simulators/wells/WellAssemble.hpp
index 865f5b3e0..e4df1c152 100644
--- a/opm/simulators/wells/WellAssemble.hpp
+++ b/opm/simulators/wells/WellAssemble.hpp
@@ -24,7 +24,7 @@
 #ifndef OPM_WELL_ASSEMBLE_HEADER_INCLUDED
 #define OPM_WELL_ASSEMBLE_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellEnums.hpp>
diff --git a/opm/simulators/wells/WellBhpThpCalculator.cpp b/opm/simulators/wells/WellBhpThpCalculator.cpp
index 8d60eb99c..4b3ccadc2 100644
--- a/opm/simulators/wells/WellBhpThpCalculator.cpp
+++ b/opm/simulators/wells/WellBhpThpCalculator.cpp
@@ -20,12 +20,11 @@
 */
 
 #include <config.h>
+
 #include <opm/simulators/wells/WellBhpThpCalculator.hpp>
 
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/input/eclipse/Schedule/VFPInjTable.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Units/Units.hpp>
@@ -33,6 +32,7 @@
 
 #include <opm/material/densead/Evaluation.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 #include <opm/simulators/wells/VFPProperties.hpp>
diff --git a/opm/simulators/wells/WellConstraints.cpp b/opm/simulators/wells/WellConstraints.cpp
index 55a28f356..7da123c31 100644
--- a/opm/simulators/wells/WellConstraints.cpp
+++ b/opm/simulators/wells/WellConstraints.cpp
@@ -20,12 +20,12 @@
 */
 
 #include <config.h>
+
 #include <opm/simulators/wells/WellConstraints.hpp>
 
 #include <opm/input/eclipse/Schedule/Well/WVFPEXP.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <opm/simulators/wells/SingleWellState.hpp>
diff --git a/opm/simulators/wells/WellGroupConstraints.cpp b/opm/simulators/wells/WellGroupConstraints.cpp
index 29803697b..b4d25b1f5 100644
--- a/opm/simulators/wells/WellGroupConstraints.cpp
+++ b/opm/simulators/wells/WellGroupConstraints.cpp
@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/WellGroupConstraints.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/WellGroupConstraints.hpp>
 
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 
@@ -30,6 +29,8 @@
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm
 {
 
diff --git a/opm/simulators/wells/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
index 9d43ff88b..957bbfe6f 100644
--- a/opm/simulators/wells/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@@ -37,8 +37,6 @@ namespace Opm {
 
 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
@@ -52,6 +50,7 @@ namespace Opm {
 
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <dune/common/fmatrix.hh>
diff --git a/opm/simulators/wells/WellInterfaceFluidSystem.hpp b/opm/simulators/wells/WellInterfaceFluidSystem.hpp
index bd2a64f91..e151ce02f 100644
--- a/opm/simulators/wells/WellInterfaceFluidSystem.hpp
+++ b/opm/simulators/wells/WellInterfaceFluidSystem.hpp
@@ -25,9 +25,12 @@
 #define OPM_WELLINTERFACE_FLUID_SYSTEM_HEADER_INCLUDED
 
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
-#include <opm/core/props/BlackoilPhases.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <limits>
+#include <optional>
+#include <vector>
 
 namespace Opm
 {
diff --git a/opm/simulators/wells/WellState.hpp b/opm/simulators/wells/WellState.hpp
index 7ddfddff7..4e091b554 100644
--- a/opm/simulators/wells/WellState.hpp
+++ b/opm/simulators/wells/WellState.hpp
@@ -24,15 +24,12 @@
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/input/eclipse/Schedule/Events.hpp>
 
 #include <opm/output/data/Wells.hpp>
 
-#include <opm/simulators/utils/ParallelCommunication.hpp>
 #include <opm/simulators/wells/ALQState.hpp>
 #include <opm/simulators/wells/GlobalWellInfo.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
@@ -40,6 +37,9 @@
 #include <opm/simulators/wells/SingleWellState.hpp>
 #include <opm/simulators/wells/WellContainer.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/ParallelCommunication.hpp>
+
 #include <functional>
 #include <map>
 #include <optional>
diff --git a/tests/test_relpermdiagnostics.cpp b/tests/test_relpermdiagnostics.cpp
index bd2d8c08f..ad92b7b19 100644
--- a/tests/test_relpermdiagnostics.cpp
+++ b/tests/test_relpermdiagnostics.cpp
@@ -23,8 +23,10 @@
 
 #define BOOST_TEST_MODULE RelpermDiagnostics
 
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/version.hpp>
 #if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
@@ -32,19 +34,22 @@
 #else
 #include <boost/test/tools/floating_point_comparison.hpp>
 #endif
+
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
+
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/CounterLog.hpp>
 
 #include <opm/grid/CpGrid.hpp>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-#include <opm/input/eclipse/Parser/Parser.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
+#include <opm/input/eclipse/Parser/Parser.hpp>
+
 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
 #else
diff --git a/tests/test_wellstate.cpp b/tests/test_wellstate.cpp
index c156ecd42..a0ce202f3 100644
--- a/tests/test_wellstate.cpp
+++ b/tests/test_wellstate.cpp
@@ -39,6 +39,7 @@
 #include <opm/input/eclipse/Schedule/UDQ/UDQParams.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellConnections.hpp>
+
 #include <opm/simulators/wells/GlobalWellInfo.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
@@ -48,14 +49,14 @@
 #include <opm/simulators/wells/WellContainer.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
+
 #include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/grid/GridHelpers.hpp>
 #include <opm/grid/GridManager.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/input/eclipse/Deck/Deck.hpp>
 
 #include <opm/input/eclipse/Parser/Parser.hpp>