diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index aa8843562aa313ad0c4bd2dcaa2716d473bf2b34..c455b7113ea1a5a6b790f374b31f3ad1b34c1fd1 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -26,19 +26,13 @@
 #ifndef DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH
 #define DUMUX_STOKES_LOCAL_RESIDUAL_BASE_HH
 
-#include <dumux/implicit/common/implicitmodel.hh>
-//#include <dumux/implicit/box/boxcouplinglocalresidual.hh>
+#include <dune/grid/common/grid.hh>
 
+#include <dumux/implicit/common/implicitmodel.hh>
 #include "stokesproperties.hh"
 #include "stokesvolumevariables.hh"
 #include "stokesfluxvariables.hh"
 
-#include <dune/common/collectivecommunication.hh>
-#include <vector>
-#include <iostream>
-
-#include<dune/grid/common/grid.hh>
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh
index df6f2bc8560a7dd7cb3997571c236a78970193e2..b44fca921aaefae4febdbef88494380d82685e77 100644
--- a/dumux/implicit/2p2c/2p2cvolumevariables.hh
+++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh
@@ -26,18 +26,11 @@
 #define DUMUX_2P2C_VOLUME_VARIABLES_HH
 
 #include <dumux/implicit/common/implicitmodel.hh>
-#include <dumux/common/math.hh>
-
-#include <dune/common/collectivecommunication.hh>
-#include <vector>
-#include <iostream>
-
-#include "2p2cproperties.hh"
-#include "2p2cindices.hh"
-
 #include <dumux/material/fluidstates/compositionalfluidstate.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
+#include "2p2cproperties.hh"
+#include "2p2cindices.hh"
 
 namespace Dumux
 {
diff --git a/dumux/implicit/3p/3pvolumevariables.hh b/dumux/implicit/3p/3pvolumevariables.hh
index 32a30c80532dca9e5851c25690f4c7f72ac2aaa8..d7d1626223e10e02de8769adeee35de508d3a97a 100644
--- a/dumux/implicit/3p/3pvolumevariables.hh
+++ b/dumux/implicit/3p/3pvolumevariables.hh
@@ -26,16 +26,9 @@
 #define DUMUX_3P_VOLUME_VARIABLES_HH
 
 #include <dumux/implicit/common/implicitmodel.hh>
-#include <dumux/common/math.hh>
-
-#include <dune/common/collectivecommunication.hh>
-#include <vector>
-#include <iostream>
-
-#include "3pproperties.hh"
-
 #include <dumux/material/constants.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
+#include "3pproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/implicit/3p3c/3p3cvolumevariables.hh b/dumux/implicit/3p3c/3p3cvolumevariables.hh
index 985e3bf544c5cbb4cbf139b74d2d85b5b1d87986..863ccd254bcc003033b9650bd4c8e16803e811a3 100644
--- a/dumux/implicit/3p3c/3p3cvolumevariables.hh
+++ b/dumux/implicit/3p3c/3p3cvolumevariables.hh
@@ -26,18 +26,11 @@
 #define DUMUX_3P3C_VOLUME_VARIABLES_HH
 
 #include <dumux/implicit/common/implicitmodel.hh>
-#include <dumux/common/math.hh>
-
-#include <dune/common/collectivecommunication.hh>
-#include <vector>
-#include <iostream>
-
-#include "3p3cproperties.hh"
-
 #include <dumux/material/constants.hh>
 #include <dumux/material/fluidstates/compositionalfluidstate.hh>
 #include <dumux/material/constraintsolvers/computefromreferencephase.hh>
 #include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
+#include "3p3cproperties.hh"
 
 namespace Dumux
 {