diff --git a/dumux/common/typetraits/matrix.hh b/dumux/common/typetraits/matrix.hh
index b9e8361461a404ad6e438b0e3668e9a42ab17bc3..d5a57be29e126d802579289c34347641e7588f65 100644
--- a/dumux/common/typetraits/matrix.hh
+++ b/dumux/common/typetraits/matrix.hh
@@ -26,6 +26,8 @@
 
 #include <type_traits>
 
+#include <dune/istl/bcrsmatrix.hh>
+
 namespace Dumux {
 
 //! Helper type to determine whether a given type is a Dune::BCRSMatrix
diff --git a/dumux/discretization/cellcentered/connectivitymap.hh b/dumux/discretization/cellcentered/connectivitymap.hh
index 07a0ea6df0010931f727d76997858b6230b459dc..66fdce5483f64c5af75489a185032dfd9b23d1eb 100644
--- a/dumux/discretization/cellcentered/connectivitymap.hh
+++ b/dumux/discretization/cellcentered/connectivitymap.hh
@@ -30,6 +30,7 @@
 #include <utility>
 #include <algorithm>
 
+#include <dune/common/exceptions.hh>
 #include <dune/common/reservedvector.hh>
 #include <dumux/discretization/fluxstencil.hh>
 
diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
index 95bee55df5e2d5f922aee9ddd15164bb7d4fd4c1..81783f744575c012309b49d3ad7fc1ab55cd5277 100644
--- a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEBASE_HH
 #define DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEBASE_HH
 
+#include <vector>
+
 #include <dune/common/exceptions.hh>
 
 namespace Dumux
diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
index a4f64384f131fa99ab93de24ae737af83f599237..fb1cf2a7fdee4c221e59a3c50231809ce5e25106 100644
--- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
@@ -28,6 +28,7 @@
 
 #include <algorithm>
 #include <array>
+#include <vector>
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/iteratorrange.hh>
diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh
index b249dbe5a8afce8670470f82d633433a44024dc5..e19f6b77f91e6c1b49a812e7bf911b0be9e80c62 100644
--- a/dumux/discretization/fluxstencil.hh
+++ b/dumux/discretization/fluxstencil.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_DISCRETIZATION_FLUXSTENCIL_HH
 #define DUMUX_DISCRETIZATION_FLUXSTENCIL_HH
 
+#include <vector>
+
 #include <dune/common/reservedvector.hh>
 #include <dumux/discretization/methods.hh>
 
diff --git a/dumux/discretization/staggered/fvelementgeometry.hh b/dumux/discretization/staggered/fvelementgeometry.hh
index eb9773e07506c524607ed7986b6f7b17b6fedf40..76e228d4c01d6beae7edb0004bcd63559e3f8086 100644
--- a/dumux/discretization/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/staggered/fvelementgeometry.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_FV_ELEMENT_GEOMETRY_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_FV_ELEMENT_GEOMETRY_HH
 
+#include <vector>
+
 #include <dune/common/iteratorrange.hh>
 
 #include <dumux/discretization/scvandscvfiterators.hh>
diff --git a/dumux/material/constraintsolvers/fluidsystemcomputefromreferencephase.hh b/dumux/material/constraintsolvers/fluidsystemcomputefromreferencephase.hh
index b643a0d1656b9b3a9adaca92d1c548dedc410efc..01bb9086e3e826ea5151e8b124fce786f7f72717 100644
--- a/dumux/material/constraintsolvers/fluidsystemcomputefromreferencephase.hh
+++ b/dumux/material/constraintsolvers/fluidsystemcomputefromreferencephase.hh
@@ -33,6 +33,8 @@
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/valgrind.hh>
 
+#include "misciblemultiphasecomposition.hh"
+
 namespace Dumux {
 /*!
  * \ingroup ConstraintSolver