From 4359470ad4f8d9bcd5a5945115ab06142d133fcb Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 21 Nov 2018 19:38:23 +0100
Subject: [PATCH] [fix] headercheck

---
 dumux/common/typetraits/utility.hh                          | 3 +++
 dumux/discretization/staggered/elementfluxvariablescache.hh | 2 ++
 dumux/freeflow/compositional/volumevariables.hh             | 2 +-
 dumux/freeflow/nonisothermal/model.hh                       | 1 +
 dumux/geomechanics/poroelastic/iofields.hh                  | 1 +
 dumux/io/grid/gmshgriddatahandle.hh                         | 1 +
 dumux/io/grid/griddata.hh                                   | 2 ++
 dumux/io/loadsolution.hh                                    | 3 +++
 dumux/material/binarycoefficients/brine_co2.hh              | 1 +
 dumux/material/components/tabulatedcomponent.hh             | 5 +++++
 dumux/material/eos/pengrobinson.hh                          | 5 -----
 dumux/material/fluidstates/2p2c.hh                          | 1 +
 dumux/material/fluidstates/compositional.hh                 | 1 +
 dumux/material/fluidsystems/base.hh                         | 2 ++
 dumux/multidomain/boundary/stokesdarcy/couplingdata.hh      | 2 ++
 dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh   | 1 +
 dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh    | 3 +++
 dumux/multidomain/couplingjacobianpattern.hh                | 1 +
 dumux/multidomain/embedded/circlepoints.hh                  | 2 ++
 dumux/multidomain/embedded/extendedsourcestencil.hh         | 6 ++++++
 dumux/multidomain/facet/box/couplingmanager.hh              | 1 +
 dumux/multidomain/facet/codimonegridadapter.hh              | 1 +
 dumux/multidomain/facet/couplingmapper.hh                   | 2 ++
 dumux/multidomain/facet/couplingmapperbase.hh               | 2 ++
 dumux/multidomain/facet/gmshreader.hh                       | 1 +
 dumux/multidomain/staggeredcouplingmanager.hh               | 1 +
 dumux/multidomain/subdomainboxlocalassembler.hh             | 2 ++
 dumux/multidomain/subdomaincclocalassembler.hh              | 2 ++
 dumux/multidomain/subdomainstaggeredlocalassembler.hh       | 3 +++
 dumux/porousmediumflow/1pnc/iofields.hh                     | 2 +-
 dumux/porousmediumflow/2p1c/primaryvariableswitch.hh        | 1 +
 dumux/porousmediumflow/3p/iofields.hh                       | 1 +
 dumux/porousmediumflow/3p3c/iofields.hh                     | 2 ++
 .../porousmediumflow/compositional/primaryvariableswitch.hh | 2 ++
 dumux/porousmediumflow/mineralization/iofields.hh           | 1 +
 dumux/porousmediumflow/mineralization/model.hh              | 2 ++
 dumux/porousmediumflow/mpnc/iofields.hh                     | 1 +
 dumux/porousmediumflow/nonequilibrium/iofields.hh           | 1 +
 dumux/porousmediumflow/nonisothermal/iofields.hh            | 1 +
 dumux/porousmediumflow/nonisothermal/model.hh               | 1 +
 dumux/porousmediumflow/sequential/gridadapt.hh              | 4 +++-
 dumux/porousmediumflow/sequential/onemodelproblem.hh        | 1 +
 dumux/porousmediumflow/sequential/variableclassadaptive.hh  | 1 +
 dumux/porousmediumflow/tracer/iofields.hh                   | 1 +
 test/multidomain/boundary/darcydarcy/1p_1p/problem.hh       | 1 +
 test/multidomain/boundary/darcydarcy/1p_2p/problem.hh       | 1 +
 .../boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh         | 1 +
 .../boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh        | 1 +
 test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh   | 2 ++
 test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh      | 2 ++
 test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh   | 1 +
 test/porousmediumflow/1p/implicit/incompressible/problem.hh | 1 +
 test/porousmediumflow/2p/implicit/cornerpoint/problem.hh    | 5 +++++
 .../2p/implicit/cornerpoint/spatialparams.hh                | 5 +++++
 .../2p2c/implicit/mpnccomparison/iofields.hh                | 1 +
 55 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/dumux/common/typetraits/utility.hh b/dumux/common/typetraits/utility.hh
index b5fd002676..f6328087b1 100644
--- a/dumux/common/typetraits/utility.hh
+++ b/dumux/common/typetraits/utility.hh
@@ -25,6 +25,9 @@
 #ifndef DUMUX_COMMON_TYPETRAITS_UTILITY_HH
 #define DUMUX_COMMON_TYPETRAITS_UTILITY_HH
 
+#include <cstddef>
+#include <utility>
+
 namespace Dumux {
 
 /*
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index 0e68cad30f..f30291b232 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -29,6 +29,8 @@
 #include <iterator>
 #include <vector>
 
+#include <dune/common/exceptions.hh>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/freeflow/compositional/volumevariables.hh b/dumux/freeflow/compositional/volumevariables.hh
index 4383670724..b9d9ac8690 100644
--- a/dumux/freeflow/compositional/volumevariables.hh
+++ b/dumux/freeflow/compositional/volumevariables.hh
@@ -25,8 +25,8 @@
 #ifndef DUMUX_FREEFLOW_NC_VOLUMEVARIABLES_HH
 #define DUMUX_FREEFLOW_NC_VOLUMEVARIABLES_HH
 
+#include <array>
 #include <dune/common/exceptions.hh>
-
 #include <dumux/freeflow/volumevariables.hh>
 
 namespace Dumux {
diff --git a/dumux/freeflow/nonisothermal/model.hh b/dumux/freeflow/nonisothermal/model.hh
index c8d057b5cc..87b7099d59 100644
--- a/dumux/freeflow/nonisothermal/model.hh
+++ b/dumux/freeflow/nonisothermal/model.hh
@@ -43,6 +43,7 @@
 #ifndef DUMUX_FREEFLOW_NI_MODEL_HH
 #define DUMUX_FREEFLOW_NI_MODEL_HH
 
+#include <string>
 #include "indices.hh"
 
 namespace Dumux {
diff --git a/dumux/geomechanics/poroelastic/iofields.hh b/dumux/geomechanics/poroelastic/iofields.hh
index 262475c5b6..7c8193084d 100644
--- a/dumux/geomechanics/poroelastic/iofields.hh
+++ b/dumux/geomechanics/poroelastic/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_POROELASTIC_IO_FIELDS_HH
 #define DUMUX_POROELASTIC_IO_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/io/grid/gmshgriddatahandle.hh b/dumux/io/grid/gmshgriddatahandle.hh
index a5a932e884..acedf218c7 100644
--- a/dumux/io/grid/gmshgriddatahandle.hh
+++ b/dumux/io/grid/gmshgriddatahandle.hh
@@ -26,6 +26,7 @@
 
 #include <memory>
 #include <algorithm>
+#include <map>
 
 #include <dune/common/parallel/collectivecommunication.hh>
 #include <dune/grid/common/partitionset.hh>
diff --git a/dumux/io/grid/griddata.hh b/dumux/io/grid/griddata.hh
index 3b83df33bb..f960d0f489 100644
--- a/dumux/io/grid/griddata.hh
+++ b/dumux/io/grid/griddata.hh
@@ -32,6 +32,8 @@
 #include <dune/common/parallel/collectivecommunication.hh>
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/common/gridfactory.hh>
+#include <dune/grid/io/file/dgfparser/parser.hh>
+#include <dune/grid/io/file/dgfparser/gridptr.hh>
 
 // UGGrid specific includes
 #if HAVE_UG
diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh
index da1c8640c5..2d5b7b86eb 100644
--- a/dumux/io/loadsolution.hh
+++ b/dumux/io/loadsolution.hh
@@ -34,11 +34,14 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/indices.hh>
+#include <dune/grid/common/partitionset.hh>
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/typetraits/isvalid.hh>
 #include <dumux/common/typetraits/vector.hh>
 #include <dumux/io/vtk/vtkreader.hh>
+#include <dumux/discretization/method.hh>
+
 
 namespace Dumux {
 namespace Detail {
diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh
index d901d65331..2ac59a94a7 100644
--- a/dumux/material/binarycoefficients/brine_co2.hh
+++ b/dumux/material/binarycoefficients/brine_co2.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_BINARY_COEFF_BRINE_CO2_HH
 #define DUMUX_BINARY_COEFF_BRINE_CO2_HH
 
+#include <dumux/common/parameters.hh>
 #include <dumux/material/components/brine.hh>
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/co2.hh>
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 08fe858bdc..8dd866d98f 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -1078,6 +1078,11 @@ typename RawComponent::Scalar TabulatedComponent<RawComponent, useVaporPressure>
 template <class RawComponent, bool useVaporPressure>
 unsigned TabulatedComponent<RawComponent, useVaporPressure>::nDensity_;
 
+// forward declaration
+template <class Component>
+struct IsAqueous;
+
+// we are aqueous if the raw compont is so
 template <class RawComponent, bool useVaporPressure>
 struct IsAqueous<TabulatedComponent<RawComponent, useVaporPressure>> : public IsAqueous<RawComponent> {};
 
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index a61c178f49..588760ffe1 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -146,11 +146,7 @@ public:
                                      int phaseIdx,
                                      bool isGasPhase)
     {
-        Valgrind::CheckDefined(fs.temperature(phaseIdx));
-        Valgrind::CheckDefined(fs.pressure(phaseIdx));
-
         Scalar Vm = 0;
-        Valgrind::SetUndefined(Vm);
 
         Scalar T = fs.temperature(phaseIdx);
         Scalar p = fs.pressure(phaseIdx);
@@ -213,7 +209,6 @@ public:
             }
         }
 
-        Valgrind::CheckDefined(Vm);
         using std::isfinite;
         assert(isfinite(Vm) && Vm > 0);
         return Vm;
diff --git a/dumux/material/fluidstates/2p2c.hh b/dumux/material/fluidstates/2p2c.hh
index c7dc190ec8..2814d86bae 100644
--- a/dumux/material/fluidstates/2p2c.hh
+++ b/dumux/material/fluidstates/2p2c.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_2P2C_FLUID_STATE_HH
 #define DUMUX_2P2C_FLUID_STATE_HH
 
+#include <cmath>
 #include <dune/common/deprecated.hh>
 
 namespace Dumux {
diff --git a/dumux/material/fluidstates/compositional.hh b/dumux/material/fluidstates/compositional.hh
index 7c429efc2b..b15c708aed 100644
--- a/dumux/material/fluidstates/compositional.hh
+++ b/dumux/material/fluidstates/compositional.hh
@@ -30,6 +30,7 @@
 #include <cmath>
 #include <type_traits>
 #include <cassert>
+#include <array>
 
 #include <dune/common/exceptions.hh>
 
diff --git a/dumux/material/fluidsystems/base.hh b/dumux/material/fluidsystems/base.hh
index 3da0a5c280..9aa6dce75d 100644
--- a/dumux/material/fluidsystems/base.hh
+++ b/dumux/material/fluidsystems/base.hh
@@ -25,6 +25,8 @@
 #define DUMUX_BASE_FLUID_SYSTEM_HH
 
 #include <string>
+
+#include <dune/common/exceptions.hh>
 #include <dumux/common/typetraits/typetraits.hh>
 #include "nullparametercache.hh"
 
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
index 2d8d3d8195..2f4c3997c0 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
@@ -27,6 +27,8 @@
 #ifndef DUMUX_STOKES_DARCY_COUPLINGDATA_HH
 #define DUMUX_STOKES_DARCY_COUPLINGDATA_HH
 
+#include <numeric>
+
 #include <dumux/common/properties.hh>
 #include <dumux/common/math.hh>
 #include <dumux/multidomain/couplingmanager.hh>
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
index 308f2c0318..04b0cdd29e 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
@@ -34,6 +34,7 @@
 #include <dune/common/exceptions.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/multidomain/staggeredcouplingmanager.hh>
+#include <dumux/discretization/staggered/elementsolution.hh>
 
 #include "couplingdata.hh"
 #include "couplingmapper.hh"
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
index ab1eb2a54b..ea9ae18f42 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
@@ -32,8 +32,11 @@
 #include <string>
 #include <utility>
 #include <memory>
+#include <unordered_map>
+#include <vector>
 
 #include <dune/common/timer.hh>
+#include <dune/common/exceptions.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
 
diff --git a/dumux/multidomain/couplingjacobianpattern.hh b/dumux/multidomain/couplingjacobianpattern.hh
index 257d967355..34a195859a 100644
--- a/dumux/multidomain/couplingjacobianpattern.hh
+++ b/dumux/multidomain/couplingjacobianpattern.hh
@@ -26,6 +26,7 @@
 #define DUMUX_MUTLIDOMAIN_COUPLING_JACOBIAN_PATTERN_HH
 
 #include <type_traits>
+#include <dune/common/indices.hh>
 #include <dune/istl/matrixindexset.hh>
 #include <dumux/discretization/method.hh>
 
diff --git a/dumux/multidomain/embedded/circlepoints.hh b/dumux/multidomain/embedded/circlepoints.hh
index 92b2db3b19..6de3801dcb 100644
--- a/dumux/multidomain/embedded/circlepoints.hh
+++ b/dumux/multidomain/embedded/circlepoints.hh
@@ -29,6 +29,8 @@
 #include <vector>
 #include <cmath>
 
+#include <dune/common/exceptions.hh>
+
 namespace Dumux {
 namespace EmbeddedCoupling {
 
diff --git a/dumux/multidomain/embedded/extendedsourcestencil.hh b/dumux/multidomain/embedded/extendedsourcestencil.hh
index 22ab62a371..ead7fb11a7 100644
--- a/dumux/multidomain/embedded/extendedsourcestencil.hh
+++ b/dumux/multidomain/embedded/extendedsourcestencil.hh
@@ -27,7 +27,13 @@
 #define DUMUX_MULTIDOMAIN_EMBEDDED_EXTENDEDSOURCESTENCIL_HH
 
 #include <vector>
+
+#include <dune/common/indices.hh>
+
 #include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/numericdifferentiation.hh>
+#include <dumux/discretization/method.hh>
 
 namespace Dumux {
 namespace EmbeddedCoupling {
diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh
index 6a1190ed49..6c5f2b9acd 100644
--- a/dumux/multidomain/facet/box/couplingmanager.hh
+++ b/dumux/multidomain/facet/box/couplingmanager.hh
@@ -32,6 +32,7 @@
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/elementsolution.hh>
 #include <dumux/multidomain/couplingmanager.hh>
+#include <dumux/multidomain/facet/couplingmanager.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/facet/codimonegridadapter.hh b/dumux/multidomain/facet/codimonegridadapter.hh
index d97456ee7c..b49b0cb016 100644
--- a/dumux/multidomain/facet/codimonegridadapter.hh
+++ b/dumux/multidomain/facet/codimonegridadapter.hh
@@ -26,6 +26,7 @@
 #ifndef DUMUX_FACETCOUPLING_CODIM_ONE_GRID_ADAPTER_HH
 #define DUMUX_FACETCOUPLING_CODIM_ONE_GRID_ADAPTER_HH
 
+#include <memory>
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/geometry/referenceelements.hh>
 
diff --git a/dumux/multidomain/facet/couplingmapper.hh b/dumux/multidomain/facet/couplingmapper.hh
index 7990b4156f..495c65bf0c 100644
--- a/dumux/multidomain/facet/couplingmapper.hh
+++ b/dumux/multidomain/facet/couplingmapper.hh
@@ -23,6 +23,8 @@
 #ifndef DUMUX_FACETCOUPLING_MAPPER_HH
 #define DUMUX_FACETCOUPLING_MAPPER_HH
 
+#include <memory>
+
 #include <dune/common/indices.hh>
 #include <dumux/discretization/method.hh>
 
diff --git a/dumux/multidomain/facet/couplingmapperbase.hh b/dumux/multidomain/facet/couplingmapperbase.hh
index 34793958a9..f61908f32f 100644
--- a/dumux/multidomain/facet/couplingmapperbase.hh
+++ b/dumux/multidomain/facet/couplingmapperbase.hh
@@ -26,8 +26,10 @@
 #include <vector>
 #include <unordered_map>
 #include <algorithm>
+#include <memory>
 
 #include <dune/common/indices.hh>
+#include <dune/common/exceptions.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/facet/gmshreader.hh b/dumux/multidomain/facet/gmshreader.hh
index a2f3b4069c..ca67816af6 100644
--- a/dumux/multidomain/facet/gmshreader.hh
+++ b/dumux/multidomain/facet/gmshreader.hh
@@ -29,6 +29,7 @@
 #include <iostream>
 #include <sstream>
 #include <typeinfo>
+#include <unordered_map>
 
 #include <dune/common/timer.hh>
 #include <dune/common/version.hh>
diff --git a/dumux/multidomain/staggeredcouplingmanager.hh b/dumux/multidomain/staggeredcouplingmanager.hh
index a1ff234f32..60c90bdd0a 100644
--- a/dumux/multidomain/staggeredcouplingmanager.hh
+++ b/dumux/multidomain/staggeredcouplingmanager.hh
@@ -28,6 +28,7 @@
 
 #include <dumux/multidomain/couplingmanager.hh>
 #include <dumux/assembly/numericepsilon.hh>
+#include <dumux/discretization/method.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh
index 487912202e..85bde2e8ea 100644
--- a/dumux/multidomain/subdomainboxlocalassembler.hh
+++ b/dumux/multidomain/subdomainboxlocalassembler.hh
@@ -27,6 +27,8 @@
 #define DUMUX_MULTIDOMAIN_BOX_LOCAL_ASSEMBLER_HH
 
 #include <dune/common/reservedvector.hh>
+#include <dune/common/indices.hh>
+#include <dune/common/hybridutilities.hh>
 #include <dune/grid/common/gridenums.hh> // for GhostEntity
 #include <dune/istl/matrixindexset.hh>
 
diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh
index 918e1401c2..f2de3ab3ce 100644
--- a/dumux/multidomain/subdomaincclocalassembler.hh
+++ b/dumux/multidomain/subdomaincclocalassembler.hh
@@ -26,7 +26,9 @@
 #ifndef DUMUX_MULTIDOMAIN_CC_LOCAL_ASSEMBLER_HH
 #define DUMUX_MULTIDOMAIN_CC_LOCAL_ASSEMBLER_HH
 
+#include <dune/common/indices.hh>
 #include <dune/common/reservedvector.hh>
+#include <dune/common/hybridutilities.hh>
 #include <dune/grid/common/gridenums.hh> // for GhostEntity
 #include <dune/istl/matrixindexset.hh>
 
diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
index 738477a410..8291157bce 100644
--- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh
+++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
@@ -27,6 +27,8 @@
 #define DUMUX_MULTIDOMAIN_STAGGERED_LOCAL_ASSEMBLER_HH
 
 #include <dune/common/reservedvector.hh>
+#include <dune/common/indices.hh>
+#include <dune/common/hybridutilities.hh>
 #include <dune/grid/common/gridenums.hh> // for GhostEntity
 
 #include <dumux/common/reservedblockvector.hh>
@@ -36,6 +38,7 @@
 #include <dumux/common/typetraits/utility.hh>
 #include <dumux/assembly/diffmethod.hh>
 #include <dumux/assembly/fvlocalassemblerbase.hh>
+#include <dumux/discretization/staggered/elementsolution.hh>
 
 namespace Dumux {
 
diff --git a/dumux/porousmediumflow/1pnc/iofields.hh b/dumux/porousmediumflow/1pnc/iofields.hh
index c48ba433c8..f442e41044 100644
--- a/dumux/porousmediumflow/1pnc/iofields.hh
+++ b/dumux/porousmediumflow/1pnc/iofields.hh
@@ -25,7 +25,7 @@
 #define DUMUX_ONEPNC_IO_FIELDS_HH
 
 #include <string>
-
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
index 53724af63e..238357d04e 100644
--- a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
@@ -26,6 +26,7 @@
 
 #include <iostream>
 
+#include <dumux/porousmediumflow/2p/formulation.hh>
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/3p/iofields.hh b/dumux/porousmediumflow/3p/iofields.hh
index 3b8138622a..735115a60d 100644
--- a/dumux/porousmediumflow/3p/iofields.hh
+++ b/dumux/porousmediumflow/3p/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_THREEP_IO_FIELDS_HH
 #define DUMUX_THREEP_IO_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/3p3c/iofields.hh b/dumux/porousmediumflow/3p3c/iofields.hh
index 9b24517a1e..d1c0ae3f53 100644
--- a/dumux/porousmediumflow/3p3c/iofields.hh
+++ b/dumux/porousmediumflow/3p3c/iofields.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_THREEPTHREEC_IO_FIELDS_HH
 #define DUMUX_THREEPTHREEC_IO_FIELDS_HH
 
+#include <array>
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 6b20f89266..daf8668dd4 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
 #include <dumux/discretization/method.hh>
diff --git a/dumux/porousmediumflow/mineralization/iofields.hh b/dumux/porousmediumflow/mineralization/iofields.hh
index 62124d295b..7d11bc4c33 100644
--- a/dumux/porousmediumflow/mineralization/iofields.hh
+++ b/dumux/porousmediumflow/mineralization/iofields.hh
@@ -25,6 +25,7 @@
 #ifndef DUMUX_MINERALIZATION_IO_FIELDS_HH
 #define DUMUX_MINERALIZATION_IO_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/mineralization/model.hh b/dumux/porousmediumflow/mineralization/model.hh
index 45f6dd5942..e93e2ddc42 100644
--- a/dumux/porousmediumflow/mineralization/model.hh
+++ b/dumux/porousmediumflow/mineralization/model.hh
@@ -30,6 +30,8 @@
 #ifndef DUMUX_MINERALIZATION_MODEL_HH
 #define DUMUX_MINERALIZATION_MODEL_HH
 
+#include <string>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/porousmediumflow/mpnc/iofields.hh b/dumux/porousmediumflow/mpnc/iofields.hh
index ee9d59c61a..2d1b54bc91 100644
--- a/dumux/porousmediumflow/mpnc/iofields.hh
+++ b/dumux/porousmediumflow/mpnc/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_MPNC_IO_FIELDS_HH
 #define DUMUX_MPNC_IO_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/nonequilibrium/iofields.hh b/dumux/porousmediumflow/nonequilibrium/iofields.hh
index bece5487af..514d828143 100644
--- a/dumux/porousmediumflow/nonequilibrium/iofields.hh
+++ b/dumux/porousmediumflow/nonequilibrium/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_NONEQUILBRIUM_OUTPUT_FIELDS_HH
 #define DUMUX_NONEQUILBRIUM_OUTPUT_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/nonisothermal/iofields.hh b/dumux/porousmediumflow/nonisothermal/iofields.hh
index ed979301a3..c046400280 100644
--- a/dumux/porousmediumflow/nonisothermal/iofields.hh
+++ b/dumux/porousmediumflow/nonisothermal/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_ENERGY_OUTPUT_FIELDS_HH
 #define DUMUX_ENERGY_OUTPUT_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/nonisothermal/model.hh b/dumux/porousmediumflow/nonisothermal/model.hh
index 12d5cfdf0e..f22172f11a 100644
--- a/dumux/porousmediumflow/nonisothermal/model.hh
+++ b/dumux/porousmediumflow/nonisothermal/model.hh
@@ -53,6 +53,7 @@
 #ifndef DUMUX_NONISOTHERMAL_MODEL_HH
 #define DUMUX_NONISOTHERMAL_MODEL_HH
 
+#include <string>
 #include <dumux/porousmediumflow/nonisothermal/indices.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh
index 5b4e604c3e..78a79a94c4 100644
--- a/dumux/porousmediumflow/sequential/gridadapt.hh
+++ b/dumux/porousmediumflow/sequential/gridadapt.hh
@@ -23,9 +23,11 @@
 #ifndef DUMUX_GRIDADAPT_HH
 #define DUMUX_GRIDADAPT_HH
 
+#include <unordered_map>
+#include <dune/grid/common/partitionset.hh>
+
 #include "properties.hh"
 #include "gridadaptproperties.hh"
-#include <unordered_map>
 
 namespace Dumux
 {
diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh
index 1d0fa37f5c..9e24db747b 100644
--- a/dumux/porousmediumflow/sequential/onemodelproblem.hh
+++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh
@@ -20,6 +20,7 @@
 #ifndef DUMUX_ONE_MODEL_PROBLEM_HH
 #define DUMUX_ONE_MODEL_PROBLEM_HH
 
+#include <dune/common/shared_ptr.hh>
 #include <dumux/common/properties/propertysystemmacros.hh>
 #include <dumux/porousmediumflow/sequential/properties.hh>
 #include <dumux/io/vtkmultiwriter.hh>
diff --git a/dumux/porousmediumflow/sequential/variableclassadaptive.hh b/dumux/porousmediumflow/sequential/variableclassadaptive.hh
index bb0d26f0cf..1bddd21a7f 100644
--- a/dumux/porousmediumflow/sequential/variableclassadaptive.hh
+++ b/dumux/porousmediumflow/sequential/variableclassadaptive.hh
@@ -19,6 +19,7 @@
 #ifndef DUMUX_VARIABLECLASS_ADAPTIVE_HH
 #define DUMUX_VARIABLECLASS_ADAPTIVE_HH
 
+#include <dune/grid/common/partitionset.hh>
 #include <dune/grid/utility/persistentcontainer.hh>
 #include <dumux/linear/vectorexchange.hh>
 #include "variableclass.hh"
diff --git a/dumux/porousmediumflow/tracer/iofields.hh b/dumux/porousmediumflow/tracer/iofields.hh
index 94cae16f18..98718ad4c8 100644
--- a/dumux/porousmediumflow/tracer/iofields.hh
+++ b/dumux/porousmediumflow/tracer/iofields.hh
@@ -26,6 +26,7 @@
 
 #include <string>
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
index af68fdfed9..80351ef5f0 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_ONEP_SUB_TEST_PROBLEM_HH
 #define DUMUX_ONEP_SUB_TEST_PROBLEM_HH
 
+#include <dune/common/indices.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include "spatialparams.hh"
 
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
index f63c5e2e7d..08dfa176f0 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_ONEP_SUB_TEST_PROBLEM_HH
 #define DUMUX_ONEP_SUB_TEST_PROBLEM_HH
 
+#include <dune/common/indices.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include "spatialparams.hh"
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index 8db08d2972..1355704c09 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -27,6 +27,7 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 #include <dumux/porousmediumflow/2p2c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 7bacec4fd6..332558984f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -32,6 +32,7 @@
 #include <dumux/freeflow/navierstokes/problem.hh>
 #include <dumux/discretization/staggered/freeflow/properties.hh>
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 namespace Dumux
 {
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
index fca4b0bee3..4b3342413a 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
@@ -39,6 +39,8 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
+#include <dumux/multidomain/embedded/couplingmanager1d3d.hh> // for coupling mode
+
 #include "spatialparams_bloodflow.hh"
 
 namespace Dumux {
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index 5f490de02f..2b9a66ba8e 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -44,6 +44,8 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
+#include <dumux/multidomain/embedded/couplingmanager1d3d.hh> // for coupling mode
+
 #include "spatialparams_tissue.hh"
 
 namespace Dumux {
diff --git a/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh b/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh
index 1b3376a106..00cd079572 100644
--- a/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh
+++ b/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh
@@ -23,6 +23,7 @@
 #ifndef DUMUX_TEST_TPFAFACETCOUPLING_TRACER_FLUIDSYSTEM_HH
 #define DUMUX_TEST_TPFAFACETCOUPLING_TRACER_FLUIDSYSTEM_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/material/fluidsystems/base.hh>
 
 namespace Dumux {
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index cf51ae7517..4a505b6d2a 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -26,6 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
+#include <dumux/common/quad.hh>
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
 #include <dumux/discretization/cellcentered/mpfa/properties.hh>
 #include <dumux/discretization/box/properties.hh>
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
index 64ab5201e1..3802455deb 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
@@ -23,6 +23,7 @@
 #ifndef DUMUX_TWOP_CORNERPOINT_TEST_PROBLEM_HH
 #define DUMUX_TWOP_CORNERPOINT_TEST_PROBLEM_HH
 
+#if HAVE_OPM_GRID
 #include <opm/grid/CpGrid.hpp>
 
 #include <dumux/discretization/cellcentered/tpfa/properties.hh>
@@ -264,4 +265,8 @@ private:
 
 } // end namespace Dumux
 
+#else
+#warning "The opm-grid module is needed to use this class!"
+#endif
+
 #endif
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
index 52873727f9..be0a829f8b 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
@@ -23,6 +23,7 @@
 #ifndef DUMUX_TWOP_CORNERPOINT_TEST_SPATIAL_PARAMS_HH
 #define DUMUX_TWOP_CORNERPOINT_TEST_SPATIAL_PARAMS_HH
 
+#if HAVE_OPM_GRID
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 
 #include <dumux/material/spatialparams/fv.hh>
@@ -202,4 +203,8 @@ private:
 
 } // end namespace Dumux
 
+#else
+#warning "The opm-grid module is needed to use this class!"
+#endif
+
 #endif
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh
index 8f42a26678..de56ae98b8 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/iofields.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_TWOPTWOC_MPNC_IO_FIELDS_HH
 #define DUMUX_TWOPTWOC_MPNC_IO_FIELDS_HH
 
+#include <dune/common/deprecated.hh>
 #include <dumux/io/name.hh>
 
 namespace Dumux {
-- 
GitLab