diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index d3be1809c711aadc35eaeef0d71ca007003173eb..c96f0df1370233febb4ae040d149d4780cc394fb 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 54ae1591031b7598973724c2bb57f118c534367d..f85961b47d1451867e41e561311302b75d8d263e 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 ef00b49990447201bf39bb4739bdbe926ec74708..8ff5d65d86fa88177d759e67cbfb182acc507422 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 269ee1c665e8fff8f7568c1a8c1a7cbe5c94b64c..7b24fe81ef3b9e645d3209015113c5cadb444bc6 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 95b160c36a6a315d1402c199321f5e229f383e6a..9d3a95459c73ca631a4c83fd88c474e78b87dd72 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 3a84b2e0396645e13ae32e4a1ec89566cab730dd..1d4b852cad578327e5cab504e0c38a92f919c397 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 2c9889b271dce5093c25e12864a96772d09a2952..5074342325ec9e708a72d75e5a4dc2a1c4c17edd 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 364a5789b0d4e857eacf3af9f8196734b1d16a5f..48a018b7170b8e24d091d0a05083cd1fa621f71c 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 97d588ea541f40be1fe7cd29712661050dc25ac6..28a512f615265cd64c7d0db245f3aebb399e3434 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 4029df89cb56f9fdfd9d6d9db0dccd7a68f63b57..1d3f644390f53179f4f3b4f5d2211f49d645386e 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 4b214a26d1c689a1d6c15624f80f3606864e6752..b535c71874ea96b7b02a8562267d8d28ca84bfc3 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 37caacc18d5a36fcdb21a73aec8a0dbe8560cad2..0051a702d61aa31527c969129b298827cd1fd611 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 f84ce0b4e25aa8774620ad544680120d07e922ac..e00ca826ae5e0d0ea9b329bbf64616e60f9fe67e 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 bb009fbc90fb45be2019103b016bcf3265c980d5..8c51a1d6eaa9b42354804766f07eb314c00d2353 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 e72690fb9a542dadee287b5f36c2600e1d8cccd7..918b54cdfa80f9c26fb07c521da95395db4b3902 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 e41d5fccd9827928f4f7be996d3c30361956486d..88e4a6d48b100669290383962219d2e8f4936f9d 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 6c4f11abe7d2dc8d5100b617d044fd447d6277e1..14d9f014b5d2ae85fec10faf5b738a7004b2b443 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 2cd4e8589e20497f47a779c3e0802eaf90036d3b..9eaf930c4196a183fa6d6148bd93f00497ce29f7 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 a467e05dbe638468918de12dff3821574c8a729f..b35dcaacc8c96e7f94979b7fe6f97b516bf36a68 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 241633a04986f02d5df4adbd6ce63a5662b09c13..575e0120e2cc954d30393905e6db0601c5997d06 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 30736ee640587356462282e0c89bd7f55406495a..8bb213258bee9c4c4492f70aa918c498b66eec94 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 cf69a554ba1c7ee7044bfc3b79943c9eb3b0c885..4015365691738bc8c8d00802b9b5236a48268c1d 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 f46eb2786e745937e05cb66863671d2f42ce3ab0..1442d57e3ccefe38a8d49675f8abd69bedbb5df6 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 247e12993e1ab8bb94b3f91b29ddfb0eec202f5e..f8fafcb40701e7cfd8a1592648dd0a0853dce987 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 d5c3ea9e295acd2aaaf29026cd8e566dc18eb5f6..48576d25dbe01a892107cd9a9379798ae8a8a0de 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 091ebd407b9222a3a13fc15eafeb8465189968fb..0cf655fbded1293752c90be84cf732e68cc821ee 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 a6fcc55a8337b36d8d17a6cb3d47a3c2a73b6c89..4bfe9d165b85104473d2531ed3dcfba887a51b7f 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 d0dcecee27a1e1d810199bb3f745cc9d12717062..75b3f6788b2abc652c0e914cf9889651cffb44e2 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 1f9f8c5d3652ef31bd292efee3585c358441b4a8..55c157bf55253a81ef0a5063990e3ce399e0e9b7 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 d7f2d468e150a90424b35dbb18f01168f338462c..494ba46ca5d21c02549e7185fbb3bdf22772c576 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 b0d26c4f52c03f7d9430fe303b085b48af7097ed..5c59e2dfa12c2480f5796d5d1cdaf7ce32cda143 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 2fc9123634415a705e79d76a84a5c7e0f7a18faf..620e917cecf41dc986340a62f23d73f8cfd51750 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 e5e6554528d82e64252e5f19a3c3d60b19d2532c..4b02a21406033039db0c0786731ce8e56320ffd4 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 b4df7bde65d137140fbed6e0d27062e9f2a5bf45..875f28f04c492afe6c501a5b918e12dec7fdae97 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 {