From 8f580a9e4675d577e21d052998ff91a947f6bacb Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 29 May 2026 00:28:20 +0200
Subject: [PATCH] blackoilbrinemodules.hh: only include where needed

---
 flow/flow_brine.cpp                             |  1 +
 flow/flow_brine_energy.cpp                      |  1 +
 flow/flow_brine_precsalt_vapwat.cpp             |  1 +
 flow/flow_brine_saltprecipitation.cpp           |  1 +
 flow/flow_gaswater_brine.cpp                    |  1 +
 flow/flow_gaswater_saltprec_energy.cpp          |  1 +
 flow/flow_gaswater_saltprec_vapwat.cpp          |  1 +
 flow/flow_oilwater_brine.cpp                    |  1 +
 .../BlackOilIntensiveQuantitiesGlobalIndex.hpp  |  1 -
 opm/models/blackoil/blackoilbrinemodules.hh     | 17 +----------------
 .../blackoil/blackoilintensivequantities.hh     |  1 -
 opm/models/blackoil/blackoillocalresidual.hh    |  1 -
 .../blackoil/blackoillocalresidualtpfa.hh       |  1 -
 opm/models/blackoil/blackoilmodel.hh            |  1 -
 opm/models/blackoil/blackoilmodules.hpp         |  1 +
 opm/models/blackoil/blackoilprimaryvariables.hh |  1 -
 opm/models/blackoil/blackoilratevector.hh       |  1 -
 opm/simulators/wells/StandardWell.hpp           |  1 -
 18 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/flow/flow_brine.cpp b/flow/flow_brine.cpp
index ada143a7f2..d3cb4026d3 100644
--- a/flow/flow_brine.cpp
+++ b/flow/flow_brine.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
diff --git a/flow/flow_brine_energy.cpp b/flow/flow_brine_energy.cpp
index 6b116fbaac..4547db7b2c 100644
--- a/flow/flow_brine_energy.cpp
+++ b/flow/flow_brine_energy.cpp
@@ -16,6 +16,7 @@
 */
 #include "config.h"
 
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 #include <opm/simulators/flow/Main.hpp>
diff --git a/flow/flow_brine_precsalt_vapwat.cpp b/flow/flow_brine_precsalt_vapwat.cpp
index fb4011dac7..a30d814dc8 100644
--- a/flow/flow_brine_precsalt_vapwat.cpp
+++ b/flow/flow_brine_precsalt_vapwat.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_brine_precsalt_vapwat.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
diff --git a/flow/flow_brine_saltprecipitation.cpp b/flow/flow_brine_saltprecipitation.cpp
index 961fa8bd1e..a56d431d88 100644
--- a/flow/flow_brine_saltprecipitation.cpp
+++ b/flow/flow_brine_saltprecipitation.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_brine_saltprecipitation.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
diff --git a/flow/flow_gaswater_brine.cpp b/flow/flow_gaswater_brine.cpp
index 292635148e..69f1c7457c 100644
--- a/flow/flow_gaswater_brine.cpp
+++ b/flow/flow_gaswater_brine.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_gaswater_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_gaswater_saltprec_energy.cpp b/flow/flow_gaswater_saltprec_energy.cpp
index c55cf76550..684a3486c1 100644
--- a/flow/flow_gaswater_saltprec_energy.cpp
+++ b/flow/flow_gaswater_saltprec_energy.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_gaswater_saltprec_energy.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_gaswater_saltprec_vapwat.cpp b/flow/flow_gaswater_saltprec_vapwat.cpp
index 660b40c087..2ad2fa9000 100644
--- a/flow/flow_gaswater_saltprec_vapwat.cpp
+++ b/flow/flow_gaswater_saltprec_vapwat.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_gaswater_saltprec_vapwat.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flow/flow_oilwater_brine.cpp b/flow/flow_oilwater_brine.cpp
index 9b7cda56cb..f1d90ccf3f 100644
--- a/flow/flow_oilwater_brine.cpp
+++ b/flow/flow_oilwater_brine.cpp
@@ -19,6 +19,7 @@
 #include <flow/flow_oilwater_brine.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
index 296a5f6be3..b0f4862454 100644
--- a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+++ b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -46,7 +46,6 @@
 #include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
diff --git a/opm/models/blackoil/blackoilbrinemodules.hh b/opm/models/blackoil/blackoilbrinemodules.hh
index 4ba480e126..b99e6bce8b 100644
--- a/opm/models/blackoil/blackoilbrinemodules.hh
+++ b/opm/models/blackoil/blackoilbrinemodules.hh
@@ -32,6 +32,7 @@
 
 #include <opm/common/utility/gpuDecorators.hpp>
 
+#include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilbrineparams.hpp>
 #include <opm/models/blackoil/blackoilproperties.hh>
 
@@ -47,9 +48,6 @@
 
 namespace Opm {
 
-template<class TypeTag, bool enableBrineV>
-class BlackOilBrineModule;
-
 /*!
  * \ingroup BlackOil
  * \brief Contains the high level supplements required to extend the black oil
@@ -342,18 +340,10 @@ private:
     static BlackOilBrineParams<Scalar> params_;
 };
 
-template<class TypeTag>
-class BlackOilBrineModule<TypeTag, false>
-{
-};
-
 template <class TypeTag>
 BlackOilBrineParams<typename BlackOilBrineModule<TypeTag, true>::Scalar>
 BlackOilBrineModule<TypeTag, true>::params_;
 
-template <class TypeTag, bool enableBrineV>
-class BlackOilBrineIntensiveQuantities;
-
 /*!
  * \ingroup BlackOil
  * \class Ewoms::BlackOilBrineIntensiveQuantities
@@ -466,11 +456,6 @@ protected:
     Scalar saltDensity_;
 };
 
-template <class TypeTag>
-class BlackOilBrineIntensiveQuantities<TypeTag, false>
-{
-};
-
 } // namespace Opm
 
 #endif
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 022d0c78ed..ca6c1c3337 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -38,7 +38,6 @@
 #include <opm/material/common/Valgrind.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
diff --git a/opm/models/blackoil/blackoillocalresidual.hh b/opm/models/blackoil/blackoillocalresidual.hh
index 25931ef0ae..49663b4f70 100644
--- a/opm/models/blackoil/blackoillocalresidual.hh
+++ b/opm/models/blackoil/blackoillocalresidual.hh
@@ -32,7 +32,6 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
index dc3bdd5f31..b98de15ac8 100644
--- a/opm/models/blackoil/blackoillocalresidualtpfa.hh
+++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -36,7 +36,6 @@
 #include <opm/material/fluidstates/BlackOilFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 17ef285875..256748e68e 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -34,7 +34,6 @@
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
 #include <opm/models/blackoil/blackoilboundaryratevector.hh>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
 #include <opm/models/blackoil/blackoildiffusionmodule.hh>
 #include <opm/models/blackoil/blackoildispersionmodule.hh>
diff --git a/opm/models/blackoil/blackoilmodules.hpp b/opm/models/blackoil/blackoilmodules.hpp
index f9ae92a22b..13e9027102 100644
--- a/opm/models/blackoil/blackoilmodules.hpp
+++ b/opm/models/blackoil/blackoilmodules.hpp
@@ -41,6 +41,7 @@ namespace Opm {
     template<class TypeTag> class T##ExtensiveQuantities<TypeTag, false> {};
 
 DECLARE_MODULE(BlackOilBioeffects)
+DECLARE_MODULE(BlackOilBrine)
 
 #undef DECLARE_MODULE
 
diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh
index ad2a853e0b..42a6b14919 100644
--- a/opm/models/blackoil/blackoilprimaryvariables.hh
+++ b/opm/models/blackoil/blackoilprimaryvariables.hh
@@ -34,7 +34,6 @@
 #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilmeanings.hh>
diff --git a/opm/models/blackoil/blackoilratevector.hh b/opm/models/blackoil/blackoilratevector.hh
index a95eabea5c..ec5e2a0541 100644
--- a/opm/models/blackoil/blackoilratevector.hh
+++ b/opm/models/blackoil/blackoilratevector.hh
@@ -35,7 +35,6 @@
 #include <opm/material/constraintsolvers/NcpFlash.hpp>
 
 #include <opm/models/blackoil/blackoilmodules.hpp>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp
index 82c89ca4ca..a60f7d5231 100644
--- a/opm/simulators/wells/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@@ -36,7 +36,6 @@
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
 #include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
-#include <opm/models/blackoil/blackoilbrinemodules.hh>
 #include <opm/models/blackoil/blackoilmodules.hpp>
 
 #include <opm/material/densead/Evaluation.hpp>