diff --git a/dumux/decoupled/2p2c/cellData2p2c.hh b/dumux/decoupled/2p2c/cellData2p2c.hh
index 16b6efb7fd19056791350997189588fd442a68ce..21b66478c86df316aef37433bb19657a709d9ab2 100644
--- a/dumux/decoupled/2p2c/cellData2p2c.hh
+++ b/dumux/decoupled/2p2c/cellData2p2c.hh
@@ -22,8 +22,7 @@
 #ifndef DUMUX_ELEMENTDATA2P2C_HH
 #define DUMUX_ELEMENTDATA2P2C_HH
 
-#include "2p2cproperties.hh"
-#include <dumux/decoupled/2p2c/dec2p2cfluidstate.hh>
+#include "dec2p2cfluidstate.hh"
 #include "fluxData2p2c.hh"
 
 /**
diff --git a/dumux/decoupled/2p2c/fluxData2p2c.hh b/dumux/decoupled/2p2c/fluxData2p2c.hh
index f2b893d4d04484f9c9d4d359145c4a0a8e30a9bf..eb66f5c0014bff335d7b62c4b64547f2b64ab06c 100644
--- a/dumux/decoupled/2p2c/fluxData2p2c.hh
+++ b/dumux/decoupled/2p2c/fluxData2p2c.hh
@@ -22,6 +22,8 @@
 #ifndef DUMUX_FLUXDATA2P2C_HH
 #define DUMUX_FLUXDATA2P2C_HH
 
+#include <dumux/decoupled/common/decoupledproperties.hh>
+
 /**
  * @file
  * @brief  Class including the variables and data of discretized data of the constitutive relations
@@ -39,7 +41,7 @@ namespace Dumux
  * mobilities, fractional flow functions and capillary pressure. Thus, they have to be callculated just once in every time step or every iteration step.
  *
  * @tparam TypeTag The Type Tag
- 1*/
+ */
 template<class TypeTag>
 class FluxData2P2C
 {
diff --git a/dumux/material/fluidstates/nonequilibriumfluidstate.hh b/dumux/material/fluidstates/nonequilibriumfluidstate.hh
index 5e4b6961591d661dfcfab609788809f9c072b8ff..d18173253f1d6e54417d2ee56312e2fcf3048ace 100644
--- a/dumux/material/fluidstates/nonequilibriumfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriumfluidstate.hh
@@ -29,11 +29,13 @@
 #ifndef DUMUX_GENERIC_FLUID_STATE_HH
 #define DUMUX_GENERIC_FLUID_STATE_HH
 
-#include <dumux/common/valgrind.hh>
-
 #include <cmath>
 #include <algorithm>
 
+#include <dune/common/exceptions.hh>
+
+#include <dumux/common/valgrind.hh>
+
 namespace Dumux
 {
 /*!