From 2709ed6f9f6d270c12bac5b83a07228a3c0f54c3 Mon Sep 17 00:00:00 2001
From: hanchuan <>
Date: Mon, 7 Jun 2021 16:06:49 +0200
Subject: [PATCH] [headercheck] Fix missing headers and non ISO C++11 code

---
 dumux/assembly/jacobianpattern.hh                         | 4 ++--
 dumux/common/numeqvector.hh                               | 2 ++
 dumux/common/properties/model.hh                          | 1 +
 dumux/discretization/porenetwork/fvelementgeometry.hh     | 2 ++
 dumux/nonlinear/primaryvariableswitchadapter.hh           | 1 +
 dumux/porenetwork/2p/newtonconsistencychecks.hh           | 1 +
 dumux/porenetwork/common/poreproperties.hh                | 1 +
 test/multidomain/boundary/darcydarcy/1p_1p/properties.hh  | 6 ++++++
 test/multidomain/boundary/darcydarcy/1p_2p/properties.hh  | 3 +++
 .../1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh     | 2 +-
 .../1p2c_1p2c/diffusionlawcomparison/properties.hh        | 1 +
 .../boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh       | 2 +-
 .../boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh      | 2 +-
 .../boundary/stokesdarcy/1p2c_1p2c/properties.hh          | 2 +-
 .../boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh   | 2 +-
 .../boundary/stokesdarcy/1p2c_2p2c/properties.hh          | 1 +
 .../boundary/stokesdarcy/1p3c_1p3c/properties.hh          | 1 +
 .../stokesdarcy/1p_1p/convergencetest/properties.hh       | 1 +
 test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh | 1 +
 test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh | 1 +
 .../embedded/1d3d/1p2c_richards2c/properties.hh           | 1 +
 test/multidomain/embedded/1d3d/1p_1p/properties.hh        | 7 ++++---
 test/multidomain/embedded/1d3d/1p_richards/properties.hh  | 5 ++++-
 test/multidomain/embedded/2d3d/1p_1p/properties.hh        | 1 +
 test/multidomain/facet/1p_1p/analytical/properties.hh     | 1 +
 test/multidomain/facet/1p_1p/gravity/properties.hh        | 1 +
 test/multidomain/facet/1p_1p/linearprofile/properties.hh  | 1 +
 test/multidomain/facet/1p_1p/threedomain/properties.hh    | 1 +
 test/multidomain/facet/1pnc_1pnc/properties.hh            | 8 +++++++-
 test/multidomain/facet/tracer_tracer/properties.hh        | 1 +
 test/porousmediumflow/1p/incompressible/properties.hh     | 1 +
 test/porousmediumflow/2p/adaptive/properties.hh           | 7 +++++++
 test/porousmediumflow/mpnc/kinetic/problem.hh             | 2 ++
 .../mpnc/thermalnonequilibrium/problem.hh                 | 1 +
 34 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index d3be1809c7..c96f0df137 100644
--- a/dumux/assembly/jacobianpattern.hh
+++ b/dumux/assembly/jacobianpattern.hh
@@ -179,10 +179,10 @@ Dune::MatrixIndexSet getFEJacobianPattern(const FEBasis& feBasis)
 
         const auto& finiteElement = localView.tree().finiteElement();
         const auto numLocalDofs = finiteElement.localBasis().size();
-        for (size_t i = 0; i < numLocalDofs; i++)
+        for (std::size_t i = 0; i < numLocalDofs; i++)
         {
             const auto dofIdxI = localView.index(i);
-            for (size_t j = 0; j < numLocalDofs; j++)
+            for (std::size_t j = 0; j < numLocalDofs; j++)
             {
                 const auto dofIdxJ = localView.index(j);
                 pattern.add(dofIdxI, dofIdxJ);
diff --git a/dumux/common/numeqvector.hh b/dumux/common/numeqvector.hh
index 54ae159103..f85961b47d 100644
--- a/dumux/common/numeqvector.hh
+++ b/dumux/common/numeqvector.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_COMMON_NUMEQVECTOR_HH
 #define DUMUX_COMMON_NUMEQVECTOR_HH
 
+#include <cstddef>
+
 namespace Dumux {
 
 template<class PrimaryVariables>
diff --git a/dumux/common/properties/model.hh b/dumux/common/properties/model.hh
index ef00b49990..8ff5d65d86 100644
--- a/dumux/common/properties/model.hh
+++ b/dumux/common/properties/model.hh
@@ -25,6 +25,7 @@
 #define DUMUX_MODEL_PROPERTIES_HH
 
 #include <dune/common/fvector.hh>
+#include <dune/common/deprecated.hh>
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/balanceequationopts.hh>
diff --git a/dumux/discretization/porenetwork/fvelementgeometry.hh b/dumux/discretization/porenetwork/fvelementgeometry.hh
index 269ee1c665..7b24fe81ef 100644
--- a/dumux/discretization/porenetwork/fvelementgeometry.hh
+++ b/dumux/discretization/porenetwork/fvelementgeometry.hh
@@ -25,6 +25,8 @@
 #define DUMUX_DISCRETIZATION_PNM_FV_ELEMENT_GEOMETRY_HH
 
 #include <optional>
+#include <array>
+
 #include <dumux/common/indextraits.hh>
 #include <dumux/discretization/scvandscvfiterators.hh>
 
diff --git a/dumux/nonlinear/primaryvariableswitchadapter.hh b/dumux/nonlinear/primaryvariableswitchadapter.hh
index 95b160c36a..9d3a95459c 100644
--- a/dumux/nonlinear/primaryvariableswitchadapter.hh
+++ b/dumux/nonlinear/primaryvariableswitchadapter.hh
@@ -26,6 +26,7 @@
 
 #include <memory>
 #include <dune/common/std/type_traits.hh>
+#include <dumux/common/parameters.hh>
 
 namespace Dumux {
 namespace Detail {
diff --git a/dumux/porenetwork/2p/newtonconsistencychecks.hh b/dumux/porenetwork/2p/newtonconsistencychecks.hh
index 3a84b2e039..1d4b852cad 100644
--- a/dumux/porenetwork/2p/newtonconsistencychecks.hh
+++ b/dumux/porenetwork/2p/newtonconsistencychecks.hh
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <dune/common/exceptions.hh>
 #include <dumux/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/discretization/localview.hh>
 
 namespace Dumux::PoreNetwork {
diff --git a/dumux/porenetwork/common/poreproperties.hh b/dumux/porenetwork/common/poreproperties.hh
index 2c9889b271..5074342325 100644
--- a/dumux/porenetwork/common/poreproperties.hh
+++ b/dumux/porenetwork/common/poreproperties.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_PNM_BASE_PORE_PROPERTIES_HH
 #define DUMUX_PNM_BASE_PORE_PROPERTIES_HH
 
+#include <cmath>
 #include <string>
 #include <dune/common/exceptions.hh>
 
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh b/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh
index 364a5789b0..48a018b717 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh
@@ -24,6 +24,12 @@
 #ifndef DUMUX_ONEP_SUB_TEST_PROPERTIES_HH
 #define DUMUX_ONEP_SUB_TEST_PROPERTIES_HH
 
+#include <dune/grid/yaspgrid.hh>
+
+#if DOMAINSPLIT==1
+#include <dune/subgrid/subgrid.hh>
+#endif
+
 #include <dumux/common/properties.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh b/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh
index 97d588ea54..28a512f615 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh
@@ -26,6 +26,9 @@
 
 #include <config.h>
 
+#include <dune/grid/yaspgrid.hh>
+#include <dune/subgrid/subgrid.hh>
+
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/2p/model.hh>
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index 4029df89cb..1d3f644390 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -30,7 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
index 4b214a26d1..b535c71874 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
@@ -43,6 +43,7 @@
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "problem_darcy.hh"
 #include "problem_stokes.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index 37caacc18d..0051a702d6 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -29,7 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/common/timeloop.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
index f84ce0b4e2..e00ca826ae 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/common/timeloop.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 #include <dumux/freeflow/navierstokes/problem.hh>
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
index bb009fbc90..8c51a1d6ea 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
@@ -39,7 +39,7 @@
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-
+#include <dumux/multidomain/staggeredtraits.hh>
 #include "problem_darcy.hh"
 #include "problem_stokes.hh"
 #include "spatialparams.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh
index e72690fb9a..918b54cdfa 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh
@@ -30,7 +30,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
 #include <dumux/material/fluidsystems/1padapter.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
-
+#include <dumux/discretization/staggered/freeflow/properties.hh>
 #include "problem_stokes.hh"
 
 namespace Dumux::Properties {
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh
index e41d5fccd9..88e4a6d48b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh
@@ -38,6 +38,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "problem_darcy.hh"
 #include "problem_stokes.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
index 6c4f11abe7..14d9f014b5 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
@@ -34,6 +34,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "h2n2co2fluidsystem.hh"
 #include "problem_darcy.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh
index 2cd4e8589e..9eaf930c41 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh
@@ -35,6 +35,7 @@
 #include <dumux/porousmediumflow/1p/model.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "spatialparams.hh"
 #include "problem_darcy.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh
index a467e05dbe..b35dcaacc8 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh
@@ -36,6 +36,7 @@
 #include <dumux/discretization/staggered/freeflow/properties.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "spatialparams.hh"
 #include "problem_darcy.hh"
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh
index 241633a049..575e0120e2 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh
@@ -42,6 +42,7 @@
 #include <dumux/material/fluidsystems/1padapter.hh>
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
 
 #include "problem_darcy.hh"
 #include "problem_stokes.hh"
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
index 30736ee640..8bb213258b 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
@@ -40,6 +40,7 @@
 #include <dumux/material/fluidsystems/liquidphase2c.hh>
 
 #include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "problem_soil.hh"
 #include "problem_root.hh"
diff --git a/test/multidomain/embedded/1d3d/1p_1p/properties.hh b/test/multidomain/embedded/1d3d/1p_1p/properties.hh
index cf69a554ba..4015365691 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/properties.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/properties.hh
@@ -26,13 +26,13 @@
 
 // default to tpfa for both domains
 #ifndef BULKTYPETAG
-#define BULKTYPETAG=TissueCC
+#define BULKTYPETAG TissueCC
 #endif
 #ifndef LOWDIMTYPETAG
-#define LOWDIMTYPETAG=BloodFlowCC
+#define LOWDIMTYPETAG BloodFlowCC
 #endif
 #ifndef COUPLINGMODE
-#define COUPLINGMODE=Embedded1d3dCouplingMode::Average
+#define COUPLINGMODE Embedded1d3dCouplingMode::Average
 #endif
 
 #include <dune/grid/yaspgrid.hh>
@@ -48,6 +48,7 @@
 #include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
 
 #include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "problem_tissue.hh"
 #include "spatialparams_tissue.hh"
diff --git a/test/multidomain/embedded/1d3d/1p_richards/properties.hh b/test/multidomain/embedded/1d3d/1p_richards/properties.hh
index f46eb2786e..1442d57e3c 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/properties.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/properties.hh
@@ -23,7 +23,9 @@
  */
 #ifndef DUMUX_ROOTSOIL_PROPERTIES_HH
 #define DUMUX_ROOTSOIL_PROPERTIES_HH
-
+#ifndef SOILTYPETAG
+#define SOILTYPETAG SoilCC
+#endif
 #include <dune/grid/yaspgrid.hh>
 #include <dune/foamgrid/foamgrid.hh>
 
@@ -39,6 +41,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
 #include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "problem_soil.hh"
 #include "problem_root.hh"
diff --git a/test/multidomain/embedded/2d3d/1p_1p/properties.hh b/test/multidomain/embedded/2d3d/1p_1p/properties.hh
index 247e12993e..f8fafcb407 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/properties.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/properties.hh
@@ -34,6 +34,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
 #include <dumux/multidomain/embedded/couplingmanager2d3d.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "spatialparams.hh"
 #include "problem_matrix.hh"
diff --git a/test/multidomain/facet/1p_1p/analytical/properties.hh b/test/multidomain/facet/1p_1p/analytical/properties.hh
index d5c3ea9e29..48576d25db 100644
--- a/test/multidomain/facet/1p_1p/analytical/properties.hh
+++ b/test/multidomain/facet/1p_1p/analytical/properties.hh
@@ -35,6 +35,7 @@
 #include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
 #include <dumux/multidomain/facet/couplingmapper.hh>
 #include <dumux/multidomain/facet/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include <dumux/discretization/box.hh>
 #include <dumux/discretization/cctpfa.hh>
diff --git a/test/multidomain/facet/1p_1p/gravity/properties.hh b/test/multidomain/facet/1p_1p/gravity/properties.hh
index 091ebd407b..0cf655fbde 100644
--- a/test/multidomain/facet/1p_1p/gravity/properties.hh
+++ b/test/multidomain/facet/1p_1p/gravity/properties.hh
@@ -38,6 +38,7 @@
 #include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
 #include <dumux/multidomain/facet/couplingmapper.hh>
 #include <dumux/multidomain/facet/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "spatialparams.hh"
 #include "problem_bulk.hh"
diff --git a/test/multidomain/facet/1p_1p/linearprofile/properties.hh b/test/multidomain/facet/1p_1p/linearprofile/properties.hh
index a6fcc55a83..4bfe9d165b 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/properties.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/properties.hh
@@ -36,6 +36,7 @@
 #include <dumux/multidomain/facet/box/properties.hh>
 #include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
 #include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 
diff --git a/test/multidomain/facet/1p_1p/threedomain/properties.hh b/test/multidomain/facet/1p_1p/threedomain/properties.hh
index d0dcecee27..75b3f6788b 100644
--- a/test/multidomain/facet/1p_1p/threedomain/properties.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/properties.hh
@@ -36,6 +36,7 @@
 #include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
 #include <dumux/multidomain/facet/couplingmapper.hh>
 #include <dumux/multidomain/facet/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 
 #include <dumux/discretization/box.hh>
diff --git a/test/multidomain/facet/1pnc_1pnc/properties.hh b/test/multidomain/facet/1pnc_1pnc/properties.hh
index 1f9f8c5d36..55c157bf55 100644
--- a/test/multidomain/facet/1pnc_1pnc/properties.hh
+++ b/test/multidomain/facet/1pnc_1pnc/properties.hh
@@ -24,6 +24,12 @@
 #ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
 #define DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
 
+#ifndef BULKTYPETAG
+#define BULKTYPETAG OnePNCBulkTpfa
+#endif
+#ifndef FACETTYPETAG
+#define FACETTYPETAG OnePNCFacetTpfa
+#endif
 #ifndef DIMWORLD
 #define DIMWORLD 2
 #endif
@@ -41,7 +47,7 @@
 #include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
 #include <dumux/multidomain/facet/couplingmapper.hh>
 #include <dumux/multidomain/facet/couplingmanager.hh>
-
+#include <dumux/multidomain/traits.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 
 #include "problem_facet.hh"
diff --git a/test/multidomain/facet/tracer_tracer/properties.hh b/test/multidomain/facet/tracer_tracer/properties.hh
index d7f2d468e1..494ba46ca5 100644
--- a/test/multidomain/facet/tracer_tracer/properties.hh
+++ b/test/multidomain/facet/tracer_tracer/properties.hh
@@ -37,6 +37,7 @@
 #include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
 #include <dumux/multidomain/facet/couplingmapper.hh>
 #include <dumux/multidomain/facet/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include <dumux/discretization/box.hh>
 #include <dumux/discretization/cctpfa.hh>
diff --git a/test/porousmediumflow/1p/incompressible/properties.hh b/test/porousmediumflow/1p/incompressible/properties.hh
index b0d26c4f52..5c59e2dfa1 100644
--- a/test/porousmediumflow/1p/incompressible/properties.hh
+++ b/test/porousmediumflow/1p/incompressible/properties.hh
@@ -33,6 +33,7 @@
 #include <dune/common/quadmath.hh>
 #endif
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/io/grid/gridmanager_yasp.hh>
 #include <dumux/discretization/cctpfa.hh>
 #include <dumux/discretization/ccmpfa.hh>
 #include <dumux/discretization/box.hh>
diff --git a/test/porousmediumflow/2p/adaptive/properties.hh b/test/porousmediumflow/2p/adaptive/properties.hh
index 2fc9123634..620e917cec 100644
--- a/test/porousmediumflow/2p/adaptive/properties.hh
+++ b/test/porousmediumflow/2p/adaptive/properties.hh
@@ -26,9 +26,16 @@
 #ifndef DUMUX_LENSPROBLEM_ADAPTIVE_PROPERTIES_HH
 #define DUMUX_LENSPROBLEM_ADAPTIVE_PROPERTIES_HH
 
+#if HAVE_DUNE_UGGRID
+#include <dune/grid/uggrid.hh>
+#endif
+#if HAVE_DUNE_ALUGRID
+#include <dune/alugrid/grid.hh>
+#endif
 #include <test/porousmediumflow/2p/incompressible/problem.hh>
 #include "../incompressible/properties.hh"
 #include "problem.hh"
+#include "pointsourceproblem.hh"
 
 // Type tags for the adaptive versions of the two-phase incompressible problem
 namespace Dumux::Properties {
diff --git a/test/porousmediumflow/mpnc/kinetic/problem.hh b/test/porousmediumflow/mpnc/kinetic/problem.hh
index e5e6554528..4b02a21406 100644
--- a/test/porousmediumflow/mpnc/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/kinetic/problem.hh
@@ -41,6 +41,8 @@
 #include <dumux/common/numeqvector.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/mpnc/pressureformulation.hh>
+#include <dumux/material/binarycoefficients/h2o_n2.hh>
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
 
 namespace Dumux {
diff --git a/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
index b4df7bde65..875f28f04c 100644
--- a/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
@@ -36,6 +36,7 @@
 #include <dumux/common/numeqvector.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/mpnc/pressureformulation.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 
 namespace Dumux {
-- 
GitLab