diff --git a/dumux/discretization/box/elementfluxvariablescache.hh b/dumux/discretization/box/elementfluxvariablescache.hh
index abd6d85679045593cc1296bf0bc88eaee79a4578..dca7bf1a8d9512b493b678ad19ec898f45ecdb0b 100644
--- a/dumux/discretization/box/elementfluxvariablescache.hh
+++ b/dumux/discretization/box/elementfluxvariablescache.hh
@@ -23,6 +23,9 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
 
+#include <cstddef>
+#include <vector>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/discretization/cellcentered/gridvolumevariables.hh b/dumux/discretization/cellcentered/gridvolumevariables.hh
index be85257c751df9a57f4e740f8d6452d25406a8ef..b9b250ffd78686829fa1a33cfd07ec6a5724831d 100644
--- a/dumux/discretization/cellcentered/gridvolumevariables.hh
+++ b/dumux/discretization/cellcentered/gridvolumevariables.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_CC_GRID_VOLUMEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_CC_GRID_VOLUMEVARIABLES_HH
 
+#include <vector>
 #include <type_traits>
 
 //! make the local view function available whenever we use this class
diff --git a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
index 6835c183e13a19ed783da6fd9519c0dad57b593f..6be32c186795abf41e853e0459cc70f26d915db4 100644
--- a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
@@ -25,7 +25,10 @@
 #define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_FLUXVARSCACHE_HH
 
 #include <algorithm>
+#include <cassert>
 #include <type_traits>
+#include <vector>
+
 #include <dune/common/exceptions.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
index 4e8a7e37c036aa19bc9c56b80513c9e537517a55..926db5889c66147d7aa547fd2624361e9634d353 100644
--- a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
@@ -24,8 +24,10 @@
 #ifndef DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
 
-#include <utility>
+#include <algorithm>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #include <dumux/discretization/cellcentered/elementsolution.hh>
 
diff --git a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
index b93bb79ad52f8bd252c339fa0032262aa49c8cac..36a9d53b07ea4398f5c7dd33423522dfa9701e6d 100644
--- a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
@@ -25,6 +25,8 @@
 #define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_FLUXVARSCACHE_HH
 
 #include <algorithm>
+#include <cassert>
+#include <vector>
 #include <dune/common/exceptions.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
index f28036fb4807a7fcbd1dc6c3d6e549e16ce4fa9f..9612e6c1ea50e0020e9f6b669b233a7e9d0d72ea 100644
--- a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
@@ -24,7 +24,9 @@
 #ifndef DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
 
+#include <algorithm>
 #include <type_traits>
+#include <vector>
 
 #include <dumux/discretization/cellcentered/elementsolution.hh>
 
diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/discretization/fluxvariablesbase.hh
index 037e1e80315c07c8b9a2b3a796566e5e835f614b..1d940072e54563c88530814eeb899fdd1993a2bd 100644
--- a/dumux/discretization/fluxvariablesbase.hh
+++ b/dumux/discretization/fluxvariablesbase.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
 #define DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
 
+#include <vector>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/discretization/staggered/elementfacevariables.hh b/dumux/discretization/staggered/elementfacevariables.hh
index 79b26709c8508d72f1f7d822070408f56f8e0a4a..c4aec037e1697d8a8a25ba4e2ea28e169382faa1 100644
--- a/dumux/discretization/staggered/elementfacevariables.hh
+++ b/dumux/discretization/staggered/elementfacevariables.hh
@@ -25,6 +25,8 @@
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
 
 #include <algorithm>
+#include <cassert>
+#include <vector>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index e0a5274ad4a8f12de1f4afbe867a06a2ddb3a689..7be5655c753156695941ddd481d1bcf042a6cc7f 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -25,7 +25,9 @@
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
 
 #include <algorithm>
+#include <cassert>
 #include <iterator>
+#include <vector>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/staggered/elementvolumevariables.hh b/dumux/discretization/staggered/elementvolumevariables.hh
index 885a47a6363adf097c36d31e94e7987844b3a717..20cf881b72358c6a9fbc9da0147f30727afefee3 100644
--- a/dumux/discretization/staggered/elementvolumevariables.hh
+++ b/dumux/discretization/staggered/elementvolumevariables.hh
@@ -25,7 +25,10 @@
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
 
 #include <algorithm>
+#include <cassert>
 #include <iterator>
+#include <vector>
+
 #include <dune/common/exceptions.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh
index 745a81eec373bb76cae64cca8d82be0e5bd97ed9..e497d64629d6c642e696cf07b125054ff3a51a76 100644
--- a/dumux/discretization/staggered/facesolution.hh
+++ b/dumux/discretization/staggered/facesolution.hh
@@ -24,8 +24,10 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
 
-#include <vector>
+#include <algorithm>
+#include <cassert>
 #include <type_traits>
+#include <vector>
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index b2c646b2b8d71f6578f8909b18d799e8fe24e704..a264e7d2ed275e5dffcc492a7544782ad6acb3a0 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -25,6 +25,7 @@
 #define DUMUX_NAVIERSTOKES_STAGGERED_FLUXVARIABLES_HH
 
 #include <dumux/common/math.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
 
 #include <dumux/discretization/fluxvariablesbase.hh>
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index 9a66695f16595f3134f8bd88d0bfbc2a602915f1..dda3c6ba50f84ae8cd206ccd065d5f4131608596 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -24,8 +24,9 @@
 #ifndef DUMUX_3P_IMMISCIBLE_FLUID_SYSTEM_HH
 #define DUMUX_3P_IMMISCIBLE_FLUID_SYSTEM_HH
 
-#include <limits>
 #include <cassert>
+#include <limits>
+#include <iostream>
 
 #include <dune/common/exceptions.hh>
 
diff --git a/dumux/porousmediumflow/1pnc/volumevariables.hh b/dumux/porousmediumflow/1pnc/volumevariables.hh
index c0312d5fea9809e154be2059276ad345b6eb926d..5a1f33dbb8dc35d98efc73928f4884357dd5a838 100644
--- a/dumux/porousmediumflow/1pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/1pnc/volumevariables.hh
@@ -25,6 +25,8 @@
 #ifndef DUMUX_1PNC_VOLUME_VARIABLES_HH
 #define DUMUX_1PNC_VOLUME_VARIABLES_HH
 
+#include <dune/common/fvector.hh>
+
 #include <dumux/porousmediumflow/volumevariables.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
index 94d4d092142e4e0325b8391d750dbb1a4256f11c..aca6f54dd19ef1fc844a2dbe07bba8b27fdfef81 100644
--- a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
 
+#include <string>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
index 04034051326c225dba40439307f620531c4131a3..95b529e98a8403b475683e77f7ac60ed21f2724f 100644
--- a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_2P1C_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_2P1C_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/2p1c/volumevariables.hh b/dumux/porousmediumflow/2p1c/volumevariables.hh
index 13583f6b3fbd0fac2b802a164fddca72b6529391..c75c929a3db3f5711c39b86125d43dcda0507945 100644
--- a/dumux/porousmediumflow/2p1c/volumevariables.hh
+++ b/dumux/porousmediumflow/2p1c/volumevariables.hh
@@ -24,6 +24,9 @@
 #ifndef DUMUX_2P1C_VOLUME_VARIABLES_HH
 #define DUMUX_2P1C_VOLUME_VARIABLES_HH
 
+#include <dune/common/exceptions.hh>
+
+#include <dumux/common/valgrind.hh>
 #include <dumux/porousmediumflow/volumevariables.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh b/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
index 339d15a74fe3868f6eef70be2dd2d14532274d86..7bc46bb83e86f48fe3ae57724abe2ae9495d111b 100644
--- a/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_2P2C_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_2P2C_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/2p/formulation.hh>
 
diff --git a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
index db9ccb342548a21d21c5010ef9a5e73f4dabd39e..56d9a72a04dd37fd6f124bcded04fbbafe4e3d66 100644
--- a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_2PNC_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_2PNC_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/2p/formulation.hh>
 
diff --git a/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
index d2ce4ffc37b1c5c9b5dc6352e73a335fd21e4e22..d68ba0da9665034d13299a7d07277bf17f775aa1 100644
--- a/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 
 namespace Dumux {
diff --git a/dumux/porousmediumflow/co2/primaryvariableswitch.hh b/dumux/porousmediumflow/co2/primaryvariableswitch.hh
index 30307aea246227596220e506a145ea06f7412f14..32bc3211b8807b0eb340d787be8976a58ba34e62 100644
--- a/dumux/porousmediumflow/co2/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/co2/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_2P2C_CO2_PRIMARY_VARIABLE_SWITCH_HH
 #define DUMUX_2P2C_CO2_PRIMARY_VARIABLE_SWITCH_HH
 
+#include <iostream>
+
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/2p/formulation.hh>
 
diff --git a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index 8d760dfa8ec7e71f2e70f767f5afb56c495ccff3..dbf43f0a00fa051be21924ced6a905231b45d7b3 100644
--- a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
 
+#include <dumux/common/parameters.hh>
+
 namespace Dumux {
 
 /*!
diff --git a/dumux/porousmediumflow/tracer/vtkoutputfields.hh b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
index 7fd8bc6b0d59fc4811caf5f8741a7b5183d12574..f8b3aa6c0d589cedb2226d26d5327a37a8474121 100644
--- a/dumux/porousmediumflow/tracer/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
 #define DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
 
+#include <string>
+
 namespace Dumux {
 
 /*!
diff --git a/test/freeflow/navierstokes/l2error.hh b/test/freeflow/navierstokes/l2error.hh
index 353a028af70ca82a70abfb7649a80446c569dbee..a71434116682641bcd402524345dd184d64e57e5 100644
--- a/test/freeflow/navierstokes/l2error.hh
+++ b/test/freeflow/navierstokes/l2error.hh
@@ -24,6 +24,9 @@
 #ifndef DUMUX_TEST_L2_ERROR_HH
 #define DUMUX_TEST_L2_ERROR_HH
 
+#include <vector>
+#include <cmath>
+
 namespace Dumux
 {