diff --git a/dumux/common/deprecated.hh b/dumux/common/deprecated.hh
index 410fea9106e4024a2b9505ea2bbb84e23e74ba6e..c8e75e6c2ccbd721468cabed15603d5c3ca1eb92 100644
--- a/dumux/common/deprecated.hh
+++ b/dumux/common/deprecated.hh
@@ -25,6 +25,10 @@
 #ifndef DUMUX_COMMON_DEPRECATED_HH
 #define DUMUX_COMMON_DEPRECATED_HH
 
+#include <utility>
+
+#include <dune/common/std/type_traits.hh>
+
 namespace Dumux {
 
 #ifndef DOXYGEN // hide from doxygen
diff --git a/dumux/discretization/box/gridvolumevariables.hh b/dumux/discretization/box/gridvolumevariables.hh
index e58a1218d9533c2505bb73f8497b921a0352e45e..2444bf22d4c18f0897ddd2841d5a6f5908b0e917 100644
--- a/dumux/discretization/box/gridvolumevariables.hh
+++ b/dumux/discretization/box/gridvolumevariables.hh
@@ -36,7 +36,7 @@ namespace Dumux {
 template<class Problem,
          class VolumeVariables,
          bool enableGridVolVarsCache = false,
-         class Traits = BoxDefaultGridVolumeVariablesTraits<Problem, VolumeVariables> >
+         class Traits = CVFEDefaultGridVolumeVariablesTraits<Problem, VolumeVariables> >
 using BoxGridVolumeVariables [[deprecated("Will be removed after 3.6")]] = CVFEGridVolumeVariables<Traits, enableGridVolVarsCache>;
 
 } // end namespace Dumux
diff --git a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
index 03eed2cb39da551dc6e538bceaacf6ed91d0c477..22a7430b9fe45b034b355311c0c73deab9eca9d1 100644
--- a/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
+++ b/dumux/discretization/facecentered/diamond/fvelementgeometry.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DISCRETIZATION_FACECENTERED_DIAMOND_FV_ELEMENT_GEOMETRY_HH
 
 #include <type_traits>
+#include <optional>
 
 #include <dune/common/reservedvector.hh>
 #include <dune/common/iteratorrange.hh>
diff --git a/dumux/discretization/facecentered/diamond/subcontrolvolumeface.hh b/dumux/discretization/facecentered/diamond/subcontrolvolumeface.hh
index b9011a256deaaba1d4b526f9d4f75a5564fe813d..3e76f5f91d561b54b90207d82d1276a6c037f08e 100644
--- a/dumux/discretization/facecentered/diamond/subcontrolvolumeface.hh
+++ b/dumux/discretization/facecentered/diamond/subcontrolvolumeface.hh
@@ -28,11 +28,13 @@
 #include <utility>
 #include <dune/common/fvector.hh>
 #include <dune/geometry/type.hh>
+#include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/common/boundaryflag.hh>
 #include <dumux/common/indextraits.hh>
 #include <dumux/common/typetraits/isvalid.hh>
 #include <dumux/discretization/subcontrolvolumefacebase.hh>
+#include <dumux/discretization/facecentered/diamond/geometryhelper.hh>
 
 
 #include <typeinfo>
diff --git a/dumux/discretization/pq1bubble/geometryhelper.hh b/dumux/discretization/pq1bubble/geometryhelper.hh
index 5ac64610b1418ac3dc8d70ced0117db076a5b59a..de380c6845b426c4e0a8a21f0c9e26ee6dae017b 100644
--- a/dumux/discretization/pq1bubble/geometryhelper.hh
+++ b/dumux/discretization/pq1bubble/geometryhelper.hh
@@ -32,6 +32,7 @@
 #include <dune/geometry/type.hh>
 #include <dune/geometry/referenceelements.hh>
 #include <dune/geometry/multilineargeometry.hh>
+#include <dune/common/reservedvector.hh>
 
 #include <dumux/common/math.hh>
 #include <dumux/geometry/volume.hh>
diff --git a/dumux/discretization/pq1bubble/subcontrolvolume.hh b/dumux/discretization/pq1bubble/subcontrolvolume.hh
index 4c3de3cd1c6e8aa64c8cebac725dc0e5434143f8..ea96c43160627b9f1fefd6f1f099b4aff3d75a27 100644
--- a/dumux/discretization/pq1bubble/subcontrolvolume.hh
+++ b/dumux/discretization/pq1bubble/subcontrolvolume.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/indextraits.hh>
 #include <dumux/discretization/subcontrolvolumebase.hh>
+#include <dumux/discretization/pq1bubble/geometryhelper.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/pq1bubble/subcontrolvolumeface.hh b/dumux/discretization/pq1bubble/subcontrolvolumeface.hh
index 1ed16cf146cbd93a4299d5ff49178ed037bc55ce..8397a8dd2019e7a33fad13255aa209d666e55cc7 100644
--- a/dumux/discretization/pq1bubble/subcontrolvolumeface.hh
+++ b/dumux/discretization/pq1bubble/subcontrolvolumeface.hh
@@ -32,6 +32,7 @@
 #include <dumux/common/boundaryflag.hh>
 #include <dumux/common/indextraits.hh>
 #include <dumux/discretization/subcontrolvolumefacebase.hh>
+#include <dumux/discretization/pq1bubble/geometryhelper.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh
index b691cbac07db165588d79ad93c4039d46eb875f2..3f49df0331be6d907cf5757ccc957f25c1002fde 100644
--- a/dumux/multidomain/embedded/couplingmanagerbase.hh
+++ b/dumux/multidomain/embedded/couplingmanagerbase.hh
@@ -36,6 +36,7 @@
 #include <dune/geometry/quadraturerules.hh>
 
 #include <dumux/io/format.hh>
+#include <dumux/parallel/parallel_for.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/numeqvector.hh>
 #include <dumux/assembly/coloring.hh>
@@ -46,6 +47,7 @@
 #include <dumux/multidomain/glue.hh>
 #include <dumux/multidomain/embedded/pointsourcedata.hh>
 #include <dumux/multidomain/embedded/integrationpointsource.hh>
+#include <dumux/multidomain/fvassembler.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/freeflow/couplingmanager_diamond.hh b/dumux/multidomain/freeflow/couplingmanager_diamond.hh
index 673ab4a92099c5c9d9aa92a9a9495c5bd9814a23..c0393f5a48ed4552a0d11570fb3e12773b396377 100644
--- a/dumux/multidomain/freeflow/couplingmanager_diamond.hh
+++ b/dumux/multidomain/freeflow/couplingmanager_diamond.hh
@@ -42,6 +42,7 @@
 #include <dumux/discretization/elementsolution.hh>
 
 #include <dumux/multidomain/couplingmanager.hh>
+#include <dumux/multidomain/fvassembler.hh>
 
 #include <dumux/parallel/parallel_for.hh>
 #include <dumux/assembly/coloring.hh>
diff --git a/dumux/multidomain/freeflow/couplingmanager_pq1bubble.hh b/dumux/multidomain/freeflow/couplingmanager_pq1bubble.hh
index 0591734a81545c25ad6efe0d849333a498caf48e..ca0931aaa96105fe3e1a630fe43c6d0bccbfa7d6 100644
--- a/dumux/multidomain/freeflow/couplingmanager_pq1bubble.hh
+++ b/dumux/multidomain/freeflow/couplingmanager_pq1bubble.hh
@@ -42,6 +42,7 @@
 #include <dumux/discretization/elementsolution.hh>
 
 #include <dumux/multidomain/couplingmanager.hh>
+#include <dumux/multidomain/fvassembler.hh>
 
 #include <dumux/parallel/parallel_for.hh>
 #include <dumux/assembly/coloring.hh>
diff --git a/dumux/multidomain/freeflow/couplingmanager_staggered.hh b/dumux/multidomain/freeflow/couplingmanager_staggered.hh
index 82c6e878aaf07bc800f8c7440cf8d139887d69a9..61a33786cc35608ecf869f247e2b1805b13da521 100644
--- a/dumux/multidomain/freeflow/couplingmanager_staggered.hh
+++ b/dumux/multidomain/freeflow/couplingmanager_staggered.hh
@@ -41,6 +41,7 @@
 #include <dumux/discretization/elementsolution.hh>
 
 #include <dumux/multidomain/couplingmanager.hh>
+#include <dumux/multidomain/fvassembler.hh>
 #include <dumux/discretization/facecentered/staggered/consistentlyorientedgrid.hh>
 
 #include <dumux/parallel/parallel_for.hh>
diff --git a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
index 00d0b8d8cd22d2bdd822eee38d5982b546a393f7..987b3480ca6ca25927f2e8318425bba054ef69dc 100644
--- a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh
@@ -26,6 +26,8 @@
 #ifndef DUMUX_POROUSMEDIUM_BOXDFM_FLUXVARIABLESCACHE_HH
 #define DUMUX_POROUSMEDIUM_BOXDFM_FLUXVARIABLESCACHE_HH
 
+#include <dune/common/fvector.hh>
+
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/flux/fluxvariablescaching.hh>
diff --git a/dumux/porousmediumflow/mpnc/initialconditionhelper.hh b/dumux/porousmediumflow/mpnc/initialconditionhelper.hh
index 69c00dbfa4e9ed08f96647ca820b8b1da95d07c2..ef93bea2cb961ff83a0071005fd98627f28aef9a 100644
--- a/dumux/porousmediumflow/mpnc/initialconditionhelper.hh
+++ b/dumux/porousmediumflow/mpnc/initialconditionhelper.hh
@@ -27,6 +27,8 @@
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 
+#include "pressureformulation.hh"
+
 namespace Dumux {
 
 namespace MPNCInitialConditions {
diff --git a/dumux/python/common/fvspatialparams.hh b/dumux/python/common/fvspatialparams.hh
index de7ef9888628144a750d968b814b9265c42ca617..b932bb039d07cc1a36ffc4a9d5468a035b4aebd7 100644
--- a/dumux/python/common/fvspatialparams.hh
+++ b/dumux/python/common/fvspatialparams.hh
@@ -29,9 +29,11 @@
 
 #include <dune/common/fvector.hh>
 #include <dune/common/exceptions.hh>
-#include <dumux/common/parameters.hh>
 #include <dune/python/pybind11/pybind11.h>
 
+#include <dumux/common/parameters.hh>
+#include <dumux/discretization/method.hh>
+
 namespace Dumux::Python {
 
 /*!
diff --git a/examples/porenetwork_upscaling/upscalinghelper.hh b/examples/porenetwork_upscaling/upscalinghelper.hh
index b5beebae82366c1c4cb52fa4da409b03377bac5e..f6bfea6dc694b3acca438013e8a3c02105b1d99b 100644
--- a/examples/porenetwork_upscaling/upscalinghelper.hh
+++ b/examples/porenetwork_upscaling/upscalinghelper.hh
@@ -30,8 +30,12 @@
 #include <iomanip>
 #include <numeric>
 #include <functional>
+
+#include <dune/common/float_cmp.hh>
+
 #include <dumux/io/gnuplotinterface.hh>
 #include <dumux/io/format.hh>
+#include <dumux/common/parameters.hh>
 
 namespace Dumux {
 
diff --git a/test/freeflow/navierstokes/analyticalsolutionvectors.hh b/test/freeflow/navierstokes/analyticalsolutionvectors.hh
index 15a7c766da83fe0aa0b7e630fc8f29018a157354..9c1756ae9edfbf3a08ae3c19d2e556dc5777dbf1 100644
--- a/test/freeflow/navierstokes/analyticalsolutionvectors.hh
+++ b/test/freeflow/navierstokes/analyticalsolutionvectors.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_TEST_FREEFLOW_NAVIERSTOKES_ANALYTICALSOLVECTORS_HH
 #define DUMUX_TEST_FREEFLOW_NAVIERSTOKES_ANALYTICALSOLVECTORS_HH
 
+#include <dune/common/fvector.hh>
+
 #include <dumux/discretization/method.hh>
 
 namespace Dumux {
diff --git a/test/freeflow/navierstokes/channel/3d_nonuniform/problem.hh b/test/freeflow/navierstokes/channel/3d_nonuniform/problem.hh
index 77a5678bb9e0dbcc1ee95eadd8d9f55c7438036b..e6cef22e6ddfc523e592795b8141bfdb09aadaac 100644
--- a/test/freeflow/navierstokes/channel/3d_nonuniform/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d_nonuniform/problem.hh
@@ -28,10 +28,13 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/vtk/function.hh>
 #include <dumux/io/grid/griddata.hh>
 
 #include <dumux/geometry/diameter.hh>
+#include <dumux/geometry/geometricentityset.hh>
+#include <dumux/geometry/boundingboxtree.hh>
 #include <dumux/multidomain/embedded/circlepoints.hh>
 
 namespace Dumux {
diff --git a/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh b/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
index 69662b6cbe5be4d33ca3129133b78bd0f4dd38a8..fa4d709499196ff9f82fa63ddf6908779668514a 100644
--- a/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
+++ b/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
@@ -57,6 +57,7 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/multidomain/freeflow/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "problem.hh"
 
diff --git a/test/freeflow/navierstokes/errors.hh b/test/freeflow/navierstokes/errors.hh
index 90c15ef13e496172e707fc3a329fc09a499a799e..ac49f58b9c5b494fb4fcf6e46600f81a1a0fcfe9 100644
--- a/test/freeflow/navierstokes/errors.hh
+++ b/test/freeflow/navierstokes/errors.hh
@@ -26,7 +26,12 @@
 
 #include <vector>
 #include <cmath>
+#include <fstream>
+
+#include <dune/common/fvector.hh>
 #include <dune/common/indices.hh>
+
+#include <dumux/discretization/method.hh>
 #include <dumux/discretization/extrusion.hh>
 #include <dumux/io/format.hh>
 #include <dumux/geometry/diameter.hh>
diff --git a/test/freeflow/navierstokes/unstructured/problem.hh b/test/freeflow/navierstokes/unstructured/problem.hh
index f056e31fe7986903567aec13086760aca9e9006a..d769b9e55ab762d29d791c9f13d6e85692b873a9 100644
--- a/test/freeflow/navierstokes/unstructured/problem.hh
+++ b/test/freeflow/navierstokes/unstructured/problem.hh
@@ -24,6 +24,7 @@
 
 #include <dune/common/float_cmp.hh>
 #include <dune/common/fmatrix.hh>
+#include <dune/geometry/quadraturerules.hh>
 
 #include <dumux/common/math.hh>
 #include <dumux/common/properties.hh>
diff --git a/test/freeflow/navierstokes/unstructured/properties.hh b/test/freeflow/navierstokes/unstructured/properties.hh
index 76e5ecf5c921d3455c9ecc5992d2a1c1f0eb0f51..43b3c66f0729d1b9181346ef9355b52aed8ed566 100644
--- a/test/freeflow/navierstokes/unstructured/properties.hh
+++ b/test/freeflow/navierstokes/unstructured/properties.hh
@@ -24,6 +24,14 @@
 #ifndef DUMUX_TEST_FREEFLOW_NAVIERSTOKES_DFG_CHANNEL_PROPERTIES_HH
 #define DUMUX_TEST_FREEFLOW_NAVIERSTOKES_DFG_CHANNEL_PROPERTIES_HH
 
+#ifndef TYPETAG_MOMENTUM
+#define TYPETAG_MOMENTUM DFGChannelTestMomentumDiamond
+#endif
+
+#ifndef TYPETAG_MASS
+#define TYPETAG_MASS DFGChannelTestMassTpfa
+#endif
+
 #include <dune/grid/uggrid.hh>
 
 #include <dumux/discretization/fcdiamond.hh>
@@ -40,6 +48,7 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/multidomain/freeflow/couplingmanager.hh>
+#include <dumux/multidomain/traits.hh>
 
 #include "problem.hh"