diff --git a/dumux/discretization/facecentered/staggered/connectivitymap.hh b/dumux/discretization/facecentered/staggered/connectivitymap.hh
index 659270555a8b368deb2d23e21ae1a0e0ad354bae..a908d9459e9684b6b0a637c4db363abedc39c9dc 100644
--- a/dumux/discretization/facecentered/staggered/connectivitymap.hh
+++ b/dumux/discretization/facecentered/staggered/connectivitymap.hh
@@ -26,7 +26,8 @@
#include <algorithm>
#include <vector>
-
+#include <dune/grid/common/partitionset.hh>
+#include <dune/grid/common/gridenums.hh>
#include <dumux/common/indextraits.hh>
namespace Dumux {
diff --git a/dumux/discretization/facecentered/staggered/elementvolumevariables.hh b/dumux/discretization/facecentered/staggered/elementvolumevariables.hh
index 0c7cd0c5981ec426c53fe544ef0187274c7ce519..b991f7627171da8a24462d525dc631721f947839 100644
--- a/dumux/discretization/facecentered/staggered/elementvolumevariables.hh
+++ b/dumux/discretization/facecentered/staggered/elementvolumevariables.hh
@@ -29,6 +29,8 @@
#include <vector>
#include <utility>
+#include <dumux/discretization/elementsolution.hh>
+
namespace Dumux {
/*!
diff --git a/dumux/discretization/facecentered/staggered/fvelementgeometry.hh b/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
index fcb365c8e94f303d86a7cf8988d81d8b4b04e847..4280259586b690d95265933277fe4b26cfb6395d 100644
--- a/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
@@ -31,6 +31,7 @@
#include <dumux/common/indextraits.hh>
#include <dune/common/iteratorrange.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/discretization/scvandscvfiterators.hh>
#include <dumux/discretization/facecentered/staggered/normalaxis.hh>
#include <dumux/discretization/facecentered/staggered/consistentlyorientedgrid.hh>
diff --git a/dumux/discretization/facecentered/staggered/geometryhelper.hh b/dumux/discretization/facecentered/staggered/geometryhelper.hh
index 73013f44f2b392f1b1c2d4bae3e93aec627c8b8d..fbcf5069b4ef00788b8fd70e7e31fcd6e02f1afd 100644
--- a/dumux/discretization/facecentered/staggered/geometryhelper.hh
+++ b/dumux/discretization/facecentered/staggered/geometryhelper.hh
@@ -26,6 +26,7 @@
#include <array>
#include <cassert>
+#include <dune/common/exceptions.hh>
#include <dumux/common/indextraits.hh>
#include <dumux/discretization/facecentered/staggered/gridsupportsconcavecorners.hh>
diff --git a/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh b/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
index 74af768414f5daffd6deef6fbb9d6f1c5fcb4d56..a83d1f1b1ea1140a8dc07e24e467df8b15167582 100644
--- a/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
+++ b/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
@@ -29,6 +29,7 @@
#include <dune/common/float_cmp.hh>
#include <dumux/common/indextraits.hh>
#include <dumux/common/math.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/discretization/facecentered/staggered/normalaxis.hh>
#include <dumux/discretization/facecentered/staggered/consistentlyorientedgrid.hh>
diff --git a/dumux/discretization/walldistance.hh b/dumux/discretization/walldistance.hh
index 8ed975881f132fa39874a8d6fb8e383d03afd7c0..528ab1e635af31387b6aeca2438e4ccd295f1d75 100644
--- a/dumux/discretization/walldistance.hh
+++ b/dumux/discretization/walldistance.hh
@@ -32,6 +32,8 @@
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/shared_ptr.hh>
+#include <dune/common/reservedvector.hh>
+#include <dune/grid/common/partitionset.hh>
#include <dumux/common/tag.hh>
#include <dumux/common/indextraits.hh>
diff --git a/dumux/flux/box/dispersionflux.hh b/dumux/flux/box/dispersionflux.hh
index bb5e81bee461f115820df68bc2c54800a73f3c69..0e496e569ecf17967dd88f33f935d2374a098621 100644
--- a/dumux/flux/box/dispersionflux.hh
+++ b/dumux/flux/box/dispersionflux.hh
@@ -33,6 +33,7 @@
#include <dumux/discretization/method.hh>
#include <dumux/discretization/extrusion.hh>
#include <dumux/flux/traits.hh>
+#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
diff --git a/dumux/flux/cctpfa/dispersionflux.hh b/dumux/flux/cctpfa/dispersionflux.hh
index a89024c9e6250421318aa1e84b3bc0090ebde27f..4a77270c3e1ee50e2b05c4856987d55b56644e55 100644
--- a/dumux/flux/cctpfa/dispersionflux.hh
+++ b/dumux/flux/cctpfa/dispersionflux.hh
@@ -34,6 +34,7 @@
#include <dumux/discretization/extrusion.hh>
#include <dumux/discretization/cellcentered/tpfa/computetransmissibility.hh>
#include <dumux/flux/traits.hh>
+#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
diff --git a/dumux/flux/dispersionflux_fwd.hh b/dumux/flux/dispersionflux_fwd.hh
index fd402ea0d437c8c930e4e4b4e6b8fe7f78410600..783a2f1fbfde234f04d5ef494a0da08cd8c044fd 100644
--- a/dumux/flux/dispersionflux_fwd.hh
+++ b/dumux/flux/dispersionflux_fwd.hh
@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh>
#include <dumux/discretization/method.hh>
+#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
diff --git a/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh b/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
index 094a40d484033f19eafbb91da91d6f9b12d1d5b7..bbf9e2bccacc3ef37e6f491043a16ee7ad21ea8d 100644
--- a/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
+++ b/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
@@ -23,7 +23,7 @@
*/
#ifndef DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYRECONSTRUCTION_HH
#define DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYRECONSTRUCTION_HH
-
+#include <algorithm>
#include <dumux/discretization/method.hh>
namespace Dumux {
diff --git a/dumux/freeflow/rans/boundarytypes.hh b/dumux/freeflow/rans/boundarytypes.hh
index 5d715030600ba68ef980c4a464e9c0909bd6d39f..42f3d730fd9930706d00a74822ec2ec7ea9027e0 100644
--- a/dumux/freeflow/rans/boundarytypes.hh
+++ b/dumux/freeflow/rans/boundarytypes.hh
@@ -24,6 +24,8 @@
#ifndef FREEFLOW_RANS_BOUNDARY_TYPES_HH
#define FREEFLOW_RANS_BOUNDARY_TYPES_HH
+#include <dune/common/exceptions.hh>
+
#include <dumux/common/typetraits/typetraits.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
diff --git a/dumux/freeflow/turbulencemodel.hh b/dumux/freeflow/turbulencemodel.hh
index 90bf19d280f27ccb17d82942674addf495b23cd6..fa29bc768c6de38c09b8b2ddb7bc547f3f088fb5 100644
--- a/dumux/freeflow/turbulencemodel.hh
+++ b/dumux/freeflow/turbulencemodel.hh
@@ -25,6 +25,7 @@
#define DUMUX_FREEFLOW_TURBLENCEMODEL_HH
#include <string>
+#include <dumux/common/exceptions.hh>
namespace Dumux {
diff --git a/dumux/geomechanics/poroelastic/localresidual.hh b/dumux/geomechanics/poroelastic/localresidual.hh
index d43efc18611af8157dbfb682829cb3859b4e0b5c..1a3edc8a28e05979ad5103b201f01ed9b2a78406 100644
--- a/dumux/geomechanics/poroelastic/localresidual.hh
+++ b/dumux/geomechanics/poroelastic/localresidual.hh
@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/numeqvector.hh>
+#include <dumux/common/deprecated.hh>
#include <dumux/geomechanics/elastic/localresidual.hh>
namespace Dumux {
diff --git a/dumux/geomechanics/spatialparamstraits_.hh b/dumux/geomechanics/spatialparamstraits_.hh
index a6de661f72e454b89f16fc71088f1fc7c573021e..ea815e5d7d9485e3da161fa8053936ed8060989e 100644
--- a/dumux/geomechanics/spatialparamstraits_.hh
+++ b/dumux/geomechanics/spatialparamstraits_.hh
@@ -23,8 +23,10 @@
*/
#ifndef DUMUX_GEOMECHANICS_SPATIAL_PARAMS_TRAITS__HH
#define DUMUX_GEOMECHANICS_SPATIAL_PARAMS_TRAITS__HH
-#ifndef DOXYGEN
+#include <utility>
+
+#ifndef DOXYGEN
namespace Dumux::Detail {
// helper struct detecting if the user-defined spatial params class has a lameParamsAtPos function
diff --git a/dumux/io/vtk/intersectionwriter.hh b/dumux/io/vtk/intersectionwriter.hh
index 26d6b20b25dde9da746b580c7abd166c41e48ec8..dc714043cebf81e4fb57761a781859f9b8ef3db9 100644
--- a/dumux/io/vtk/intersectionwriter.hh
+++ b/dumux/io/vtk/intersectionwriter.hh
@@ -32,6 +32,7 @@
#include <dune/grid/io/file/vtk/basicwriter.hh>
#include <dune/grid/io/file/vtk/function.hh>
#include <dune/grid/io/file/vtk/skeletonfunction.hh>
+#include <dumux/common/parameters.hh>
namespace Dumux::Detail {
diff --git a/dumux/material/fluidmatrixinteractions/dispersiontensors/fulltensor.hh b/dumux/material/fluidmatrixinteractions/dispersiontensors/fulltensor.hh
index 911ce3a371302e9dd487c71460880e81052a5fed..426546258ff502ce983752932692ee7d076e77b4 100644
--- a/dumux/material/fluidmatrixinteractions/dispersiontensors/fulltensor.hh
+++ b/dumux/material/fluidmatrixinteractions/dispersiontensors/fulltensor.hh
@@ -24,6 +24,9 @@
#ifndef DUMUX_MATERIAL_FLUIDMATRIX_DISPERSIONTENSORS_FULLTENSOR_HH
#define DUMUX_MATERIAL_FLUIDMATRIX_DISPERSIONTENSORS_FULLTENSOR_HH
+#include <dune/common/fmatrix.hh>
+#include <dumux/common/properties.hh>
+
namespace Dumux {
template<class TypeTag>
diff --git a/dumux/material/fluidmatrixinteractions/dispersiontensors/scheidegger.hh b/dumux/material/fluidmatrixinteractions/dispersiontensors/scheidegger.hh
index 23cd65c4b8117d78bd95e5de1ac1d621d0518932..d2e8f57c95c471b1795d382b0ef4fa1ddf8d3c16 100644
--- a/dumux/material/fluidmatrixinteractions/dispersiontensors/scheidegger.hh
+++ b/dumux/material/fluidmatrixinteractions/dispersiontensors/scheidegger.hh
@@ -27,7 +27,13 @@
#include <algorithm>
#include <cmath>
#include <dune/common/math.hh>
+#include <dune/common/std/type_traits.hh>
+#include <dune/common/fmatrix.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/discretization/method.hh>
#include <dumux/flux/facetensoraverage.hh>
+#include <dumux/flux/traits.hh>
namespace Dumux {
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/couplingmapper.hh b/dumux/multidomain/boundary/freeflowporenetwork/couplingmapper.hh
index b721a49bb6c00741cc7be4095133bcadc55ad7a1..8271cfb92e9e5cf9722001d23efce422dda5843d 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/couplingmapper.hh
+++ b/dumux/multidomain/boundary/freeflowporenetwork/couplingmapper.hh
@@ -35,6 +35,7 @@
#include <dune/common/timer.hh>
#include <dune/common/exceptions.hh>
#include <dune/common/indices.hh>
+#include <dune/common/reservedvector.hh>
#include <dune/geometry/axisalignedcubegeometry.hh>
#include <dumux/geometry/diameter.hh>
diff --git a/dumux/multidomain/couplingmanager.hh b/dumux/multidomain/couplingmanager.hh
index 890b4f7a3269d2794f8a80a9d4c370b0ed420f3f..d9c430fee840789735f095b45ad0edb18b07adb2 100644
--- a/dumux/multidomain/couplingmanager.hh
+++ b/dumux/multidomain/couplingmanager.hh
@@ -31,6 +31,9 @@
#include <dune/common/exceptions.hh>
#include <dune/common/indices.hh>
#include <dune/common/shared_ptr.hh>
+#include <dune/common/hybridutilities.hh>
+#include <dune/istl/multitypeblockvector.hh>
+
#include <dumux/assembly/numericepsilon.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/typetraits/typetraits.hh>
diff --git a/dumux/multidomain/embedded/localrefinementquadrature.hh b/dumux/multidomain/embedded/localrefinementquadrature.hh
index c39168469bd4c8e5c56f2257ce94563706cf1e87..e71371d71a76d77de73131e581d14e340eb95476 100644
--- a/dumux/multidomain/embedded/localrefinementquadrature.hh
+++ b/dumux/multidomain/embedded/localrefinementquadrature.hh
@@ -30,6 +30,8 @@
#include <utility>
#include <algorithm>
+#include <dune/common/exceptions.hh>
+
namespace Dumux {
/*!
diff --git a/dumux/multidomain/staggeredfreeflow/couplingmanager.hh b/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
index 4db220b1ca8614132befa684f80d2b52c56c1620..f97deb25bc5e811dca5b4510097e0c7f0772c788 100644
--- a/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
+++ b/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
@@ -32,6 +32,7 @@
#include <dune/common/exceptions.hh>
#include <dune/common/indices.hh>
+#include <dune/common/float_cmp.hh>
#include <dumux/assembly/numericepsilon.hh>
#include <dumux/common/properties.hh>
diff --git a/dumux/parallel/multithreading.hh b/dumux/parallel/multithreading.hh
index b8bf23402e5cc4fa7ea589ae40bbebcdbb8f6a93..379a3e623fcdf4fe83db286b092f4b2a38de3d22 100644
--- a/dumux/parallel/multithreading.hh
+++ b/dumux/parallel/multithreading.hh
@@ -25,6 +25,8 @@
#ifndef DUMUX_PARALLEL_MULTITHREADING_HH
#define DUMUX_PARALLEL_MULTITHREADING_HH
+#include <type_traits>
+
#ifndef DUMUX_MULTITHREADING_BACKEND
#define DUMUX_MULTITHREADING_BACKEND Serial
#endif
diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh
index fefff8ed512c8ad5cc3cb2610481b323adc582d1..a7197427d1588ee0fc0cdaf5385133e50229a2b8 100644
--- a/dumux/porousmediumflow/compositional/localresidual.hh
+++ b/dumux/porousmediumflow/compositional/localresidual.hh
@@ -31,6 +31,7 @@
#include <dumux/common/deprecated.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/numeqvector.hh>
+#include <dumux/discretization/method.hh>
#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
diff --git a/dumux/python/common/volumevariables.hh b/dumux/python/common/volumevariables.hh
index cce94ab1cbe7cb55abdb0b34761472961d4d440b..3c574796e2637e52583186357487f9d3c58629b4 100644
--- a/dumux/python/common/volumevariables.hh
+++ b/dumux/python/common/volumevariables.hh
@@ -1,6 +1,7 @@
#ifndef DUMUX_PYTHON_COMMON_VOLUMEVARIABLES_HH
#define DUMUX_PYTHON_COMMON_VOLUMEVARIABLES_HH
+#include <dune/common/std/type_traits.hh>
#include <dune/python/pybind11/pybind11.h>
#include <dune/python/pybind11/stl.h>
diff --git a/dumux/python/porousmediumflow/velocityoutput.hh b/dumux/python/porousmediumflow/velocityoutput.hh
index 1b53c62d7c608bc7526b1561760ffb8b4285eca1..c0e4007aeffacb5dfd7debef7836a56e17806ec3 100644
--- a/dumux/python/porousmediumflow/velocityoutput.hh
+++ b/dumux/python/porousmediumflow/velocityoutput.hh
@@ -25,6 +25,7 @@
#define DUMUX_PYTHON_POROUSMEDIUMFLOW_VELOCITYOUTPUT_HH
#include <dune/python/pybind11/pybind11.h>
+#include <dune/python/common/typeregistry.hh>
#include <dumux/porousmediumflow/velocityoutput.hh>
namespace Dumux::Python {
diff --git a/examples/liddrivencavity/properties.hh b/examples/liddrivencavity/properties.hh
index a3468d77a0215f9d352d74636850623566882b29..5afc3d5ff189c0079fe0a1074fe8b6c3b88d3557 100644
--- a/examples/liddrivencavity/properties.hh
+++ b/examples/liddrivencavity/properties.hh
@@ -33,6 +33,8 @@
// The single-phase flow Navier-Stokes equations are solved by coupling a momentum balance model to a mass balance model.
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
+#include <dumux/multidomain/traits.hh>
+#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
// We want to use `YaspGrid`, an implementation of the dune grid interface for structured grids:
#include <dune/grid/yaspgrid.hh>
diff --git a/test/discretization/facecentered/staggered/drawgrid.hh b/test/discretization/facecentered/staggered/drawgrid.hh
index ae3f634bd5ada88a548dcda040472c3168029e66..9f0c8e21ab0880e1495eda02d3cb078507ae35ab 100644
--- a/test/discretization/facecentered/staggered/drawgrid.hh
+++ b/test/discretization/facecentered/staggered/drawgrid.hh
@@ -24,11 +24,16 @@
#ifndef DUMUX_DISCRETIZATION_FACECENTERED_STAGGERED_DRAWGRID_HH
#define DUMUX_DISCRETIZATION_FACECENTERED_STAGGERED_DRAWGRID_HH
+#include <iostream>
#include <fstream>
#include <string>
+#include <array>
+#include <utility>
#include <dune/common/exceptions.hh>
+#include <dumux/discretization/facecentered/staggered/normalaxis.hh>
+
namespace Dumux {
namespace {
diff --git a/test/freeflow/navierstokes/analyticalsolutionvectors.hh b/test/freeflow/navierstokes/analyticalsolutionvectors.hh
index 669ae4cb05a1154b2eedf0dac725c694be2cc1c3..82ec2f311619da1ffb64e39e3fda90483e039f51 100644
--- a/test/freeflow/navierstokes/analyticalsolutionvectors.hh
+++ b/test/freeflow/navierstokes/analyticalsolutionvectors.hh
@@ -24,6 +24,11 @@
#ifndef DUMUX_TEST_FREEFLOW_NAVIERSTOKES_ANALYTICALSOLVECTORS_HH
#define DUMUX_TEST_FREEFLOW_NAVIERSTOKES_ANALYTICALSOLVECTORS_HH
+#include <vector>
+#include <memory>
+#include <type_traits>
+#include <dune/common/fvector.hh>
+
namespace Dumux {
/*!
* \ingroup NavierStokesTests
diff --git a/test/freeflow/navierstokes/angeli/properties.hh b/test/freeflow/navierstokes/angeli/properties.hh
index 976b49397d9776922d8f2dc4ad0b9fb5d9f28b5f..4874fcde23e8d722e87f5b34f7a70b07764350e6 100644
--- a/test/freeflow/navierstokes/angeli/properties.hh
+++ b/test/freeflow/navierstokes/angeli/properties.hh
@@ -29,7 +29,7 @@
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
-
+#include <dumux/multidomain/traits.hh>
#include <dumux/discretization/fcstaggered.hh>
#include <dumux/discretization/cctpfa.hh>
diff --git a/test/freeflow/navierstokes/channel/1d/properties.hh b/test/freeflow/navierstokes/channel/1d/properties.hh
index a1b1c05d70e16b079b5755424a9467c39c203f0f..ce8b3f187d9b72d5a0265c9fceed812f114d8d29 100644
--- a/test/freeflow/navierstokes/channel/1d/properties.hh
+++ b/test/freeflow/navierstokes/channel/1d/properties.hh
@@ -31,6 +31,7 @@
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
+#include <dumux/multidomain/traits.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
index b29ad6ce3f128cbda7361f18ca24b70fbdc2b8f9..a936e67100b9544bbf7364455cd1d1f4b83c0f1b 100644
--- a/test/freeflow/navierstokes/channel/2d/problem.hh
+++ b/test/freeflow/navierstokes/channel/2d/problem.hh
@@ -34,6 +34,7 @@
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
diff --git a/test/freeflow/navierstokes/channel/2d/properties.hh b/test/freeflow/navierstokes/channel/2d/properties.hh
index 44043017a9e995c2242df5a2dcacbfde64b22987..944f2fe302fc1f83ab1cd45cd4b1110f0b40edfc 100644
--- a/test/freeflow/navierstokes/channel/2d/properties.hh
+++ b/test/freeflow/navierstokes/channel/2d/properties.hh
@@ -37,6 +37,7 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
#include "problem.hh"
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index 6de441a3e1e5fdbc26bc860d7b23c04f03460a04..7a4a5c21487700aea3468b13017a9e71268e5a6e 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -36,6 +36,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
diff --git a/test/freeflow/navierstokes/channel/3d/properties.hh b/test/freeflow/navierstokes/channel/3d/properties.hh
index eac8cef3e5066187324519f985ab3bb945deec9f..a9e0182192867546c414b433faaba95ec3cb007c 100644
--- a/test/freeflow/navierstokes/channel/3d/properties.hh
+++ b/test/freeflow/navierstokes/channel/3d/properties.hh
@@ -41,7 +41,7 @@
#include <dumux/discretization/fcstaggered.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
-
+#include <dumux/multidomain/traits.hh>
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
diff --git a/test/freeflow/navierstokes/channel/pipe/problem.hh b/test/freeflow/navierstokes/channel/pipe/problem.hh
index f30c6cc89c180941e7713a06bdd52e6184049a9d..aa4fd0bb7de2e725fd08b68322613cffac80614d 100644
--- a/test/freeflow/navierstokes/channel/pipe/problem.hh
+++ b/test/freeflow/navierstokes/channel/pipe/problem.hh
@@ -26,6 +26,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
/*!
diff --git a/test/freeflow/navierstokes/channel/pipe/properties.hh b/test/freeflow/navierstokes/channel/pipe/properties.hh
index 9069d9303b2b40e3a3de1022f0c30d69fd124201..4f9fd0f915b9df4d71d89c70f456f8768413c25a 100644
--- a/test/freeflow/navierstokes/channel/pipe/properties.hh
+++ b/test/freeflow/navierstokes/channel/pipe/properties.hh
@@ -37,6 +37,7 @@
#include <dumux/material/components/constant.hh>
#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
#include "problem.hh"
diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh
index 59c6b18d61da453e3f3366d19b66f0ce77e14cac..4c580acb0572fb4c4df9450dac1736d06565456a 100644
--- a/test/freeflow/navierstokes/donea/problem.hh
+++ b/test/freeflow/navierstokes/donea/problem.hh
@@ -24,9 +24,12 @@
#ifndef DUMUX_DONEA_TEST_PROBLEM_HH
#define DUMUX_DONEA_TEST_PROBLEM_HH
+#include <dune/common/fmatrix.hh>
+
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
diff --git a/test/freeflow/navierstokes/donea/properties.hh b/test/freeflow/navierstokes/donea/properties.hh
index 9247d3c52fe291dd155a654281f91653bce1b193..7306b8fc84a59eab91795a34c5856e2a3ebac104 100644
--- a/test/freeflow/navierstokes/donea/properties.hh
+++ b/test/freeflow/navierstokes/donea/properties.hh
@@ -39,7 +39,8 @@
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
-
+#include <dumux/multidomain/traits.hh>
+#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
diff --git a/test/freeflow/navierstokes/errors.hh b/test/freeflow/navierstokes/errors.hh
index 93409d55a887bf8d2d80bba0214a7148610a4ba1..b77874e995a07f705f1171f6f7d2de27753313be 100644
--- a/test/freeflow/navierstokes/errors.hh
+++ b/test/freeflow/navierstokes/errors.hh
@@ -26,7 +26,9 @@
#include <vector>
#include <cmath>
+#include <fstream>
#include <dune/common/indices.hh>
+#include <dune/common/fvector.hh>
#include <dumux/discretization/extrusion.hh>
#include <dumux/io/format.hh>
diff --git a/test/freeflow/navierstokes/periodic/properties.hh b/test/freeflow/navierstokes/periodic/properties.hh
index e5b1686496ec493d04c6e9e75fb91a3cdfbdb538..7bb135b868468eef599c81b6cc7e864f58ce0bdc 100644
--- a/test/freeflow/navierstokes/periodic/properties.hh
+++ b/test/freeflow/navierstokes/periodic/properties.hh
@@ -35,6 +35,7 @@
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
#include <dumux/discretization/fcstaggered.hh>
#include <dumux/discretization/cctpfa.hh>
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index 8ebc251abb069b40cb8438b13215b580d7ab14f1..6c15b959924d7578350a1e26753429b509a188d4 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_SINCOS_TEST_PROBLEM_HH
#define DUMUX_SINCOS_TEST_PROBLEM_HH
+#include <dune/common/fmatrix.hh>
+
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
diff --git a/test/freeflow/navierstokes/sincos/properties.hh b/test/freeflow/navierstokes/sincos/properties.hh
index 72e992d08df5e2e4229e8ae86e8e5406b9292679..8810efed5f343da89d56bfdc24d9fc68f0bb0689 100644
--- a/test/freeflow/navierstokes/sincos/properties.hh
+++ b/test/freeflow/navierstokes/sincos/properties.hh
@@ -36,7 +36,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/multidomain/staggeredfreeflow/couplingmanager.hh>
-
+#include <dumux/multidomain/traits.hh>
#include "problem.hh"
namespace Dumux::Properties {
diff --git a/test/multidomain/boundary/freeflowporenetwork/1p_1p/problem_freeflow.hh b/test/multidomain/boundary/freeflowporenetwork/1p_1p/problem_freeflow.hh
index be9236e7cc0e4d0cba9512abfd9edaad0f56faf0..522686b73f519d7c1af9c546ed082f04be254000 100644
--- a/test/multidomain/boundary/freeflowporenetwork/1p_1p/problem_freeflow.hh
+++ b/test/multidomain/boundary/freeflowporenetwork/1p_1p/problem_freeflow.hh
@@ -29,6 +29,7 @@
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
diff --git a/test/multidomain/boundary/freeflowporenetwork/1p_1p/properties.hh b/test/multidomain/boundary/freeflowporenetwork/1p_1p/properties.hh
index 9ae19ef3317e842af647f36e2f128fc12c317fa0..9c220faae51774e02c5d2040a1bbe02185fef40d 100644
--- a/test/multidomain/boundary/freeflowporenetwork/1p_1p/properties.hh
+++ b/test/multidomain/boundary/freeflowporenetwork/1p_1p/properties.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_PNMSTOKES_PROPERTIES_HH
#define DUMUX_PNMSTOKES_PROPERTIES_HH
+#include <dune/foamgrid/foamgrid.hh>
#include <dune/grid/yaspgrid.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
diff --git a/test/multidomain/boundary/freeflowporousmedium/1p_1p/convergence/problem_freeflow.hh b/test/multidomain/boundary/freeflowporousmedium/1p_1p/convergence/problem_freeflow.hh
index 5a90c741dcaa9e4cae7f257d8f3266a3e9e7b5f6..c71c5d1ca06780208cc2e8b2d818750cbeaffa30 100644
--- a/test/multidomain/boundary/freeflowporousmedium/1p_1p/convergence/problem_freeflow.hh
+++ b/test/multidomain/boundary/freeflowporousmedium/1p_1p/convergence/problem_freeflow.hh
@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh>
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
#include <dune/common/fmatrix.hh>
#include "testcase.hh"
diff --git a/test/multidomain/boundary/freeflowporousmedium/1p_1p/problem_freeflow.hh b/test/multidomain/boundary/freeflowporousmedium/1p_1p/problem_freeflow.hh
index cf6b4156d0ae5d7537f14774dce492b5eb78b72b..868d732610eedfec7d71a80decce1b23bf140718 100644
--- a/test/multidomain/boundary/freeflowporousmedium/1p_1p/problem_freeflow.hh
+++ b/test/multidomain/boundary/freeflowporousmedium/1p_1p/problem_freeflow.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/freeflow/navierstokes/momentum/fluxhelper.hh>
#include <dumux/freeflow/navierstokes/scalarfluxhelper.hh>
+#include <dumux/freeflow/navierstokes/mass/1p/advectiveflux.hh>
namespace Dumux {
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index 228b8ae8c1f6c0765cda1b3cfebd5ff0e45ee94f..ffeebaa2629d11d7f2d205929d9e0d4e41691fa6 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -32,7 +32,7 @@
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
-
+#include <dumux/multidomain/embedded/couplingmanager1d3d_projection.hh>
namespace Dumux {
/*!
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index 447b36f2cc52a57ea6f3666a40ba8810bab1dd9d..25f00f7c81a19bc2e09b6ff6ee1d1ee6db3d5ae8 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -35,6 +35,7 @@
#include <dumux/common/properties.hh>
#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/multidomain/embedded/couplingmanager1d3d_projection.hh>
namespace Dumux {
diff --git a/test/porousmediumflow/2p2c/evaporation/properties.hh b/test/porousmediumflow/2p2c/evaporation/properties.hh
index 8ddf580b000274ed05f580d908f817d413711b3d..6e62f6726be0d83e740bbc84031aa4e493affa8e 100644
--- a/test/porousmediumflow/2p2c/evaporation/properties.hh
+++ b/test/porousmediumflow/2p2c/evaporation/properties.hh
@@ -36,6 +36,10 @@
#include "constant2p2cfluidsystem.hh"
#include "problem.hh"
+#ifndef WETTINGCOMPONENT
+#define WETTINGCOMPONENT Components::Constant<2,Scalar>
+#endif
+
namespace Dumux::Properties {
// Create new type tags
diff --git a/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh b/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh
index 4e75499516cf9d5c8574f7df38a6bd2fe40b2fcd..a1d6b1677a2a3b73e6287588d2abc07e75a4d08a 100644
--- a/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh
+++ b/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh
@@ -25,8 +25,9 @@
#define DUMUX_TEST_2P3C_SURFACTANT_FLUIDSYSTEM_HH
#include <cassert>
-
+#include <limits>
#include <dune/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/material/fluidsystems/base.hh>
namespace Dumux::FluidSystems {
diff --git a/test/porousmediumflow/2pnc/surfactant/problem.hh b/test/porousmediumflow/2pnc/surfactant/problem.hh
index 96139feaa196aab64cf3076943536704649dfb84..a1e154c27c98a801aa7ab129acc85ac77ef4adfb 100644
--- a/test/porousmediumflow/2pnc/surfactant/problem.hh
+++ b/test/porousmediumflow/2pnc/surfactant/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/2p/formulation.hh>
namespace Dumux {