diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 96372d88f4d850cc6112ed103f7bcb712c7f7c4f..6199971dbb70dfb561ca12cf17712306ba3d67f4 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -38,6 +38,7 @@
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/io/file/dgfparser.hh>
 
+#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
 #include <dumux/multidomain/common/multidomainproblem.hh>
 #include <dumux/multidomain/2cstokes2p2c/2cstokes2p2cnewtoncontroller.hh>
 #include <dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh>
@@ -48,8 +49,6 @@
 #endif // HAVE_PARDISO
 
 #include "2cnistokes2p2cnispatialparams.hh"
-#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
-
 #include "stokes2cnisubproblem.hh"
 #include "2p2cnisubproblem.hh"
 
diff --git a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
index 39fae90660dfd3ec0805e859d90b7755f9e7fd4e..48fc3afa82eda406f34c546e1fd8bf066e5f57e4 100644
--- a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
@@ -29,15 +29,17 @@
 #include "config.h"
 #endif
 
+#include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
 #include <dumux/implicit/common/implicitporousmediaproblem.hh>
 #include <dumux/implicit/2p2cni/2p2cnimodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 #include <dumux/multidomain/common/multidomainlocaloperator.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-#include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
 
-#include "2cnistokes2p2cniproblem.hh"
+#include "2cnistokes2p2cnispatialparams.hh"
 
 namespace Dumux
 {
diff --git a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
index eefdf7ba7712da1f6109398df4302159205465e3..e53eebf7a8b1f1b38ff21586344235922b0fa30b 100644
--- a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
@@ -26,11 +26,14 @@
 #define DUMUX_STOKES2CNI_SUBPROBLEM_HH
 
 #include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
+#include <dune/pdelab/gridoperator/gridoperator.hh>
 
 #include <dumux/freeflow/stokesncni/stokesncnimodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 
+#include "2cnistokes2p2cnispatialparams.hh"
+
 namespace Dumux
 {
 
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
index d74f846eb4e5b4bfdcbec56f466cc233f54bd9d9..9371fb7b017c60d9f9f68e46b4a95a705b4905cd 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
@@ -91,11 +91,6 @@ class TwoCStokesTwoPTwoCSpatialParams : public ImplicitSpatialParams<TypeTag>
         dim=GridView::dimension,
         dimWorld=GridView::dimensionworld
     };
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-    enum {
-        wPhaseIdx = FluidSystem::wPhaseIdx,
-        nPhaseIdx = FluidSystem::nPhaseIdx
-    };
 
     typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
     typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
index dc245c6e951e7e60b05548d68f8769b2f45d92f6..04ff3176e5f8e0bc0f38549f0754b7c4f9b354ce 100644
--- a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
@@ -25,12 +25,15 @@
 #ifndef DUMUX_2P2C_SUBPROBLEM_HH
 #define DUMUX_2P2C_SUBPROBLEM_HH
 
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
+#include <dumux/implicit/2p2c/2p2cindices.hh>
 #include <dumux/implicit/common/implicitporousmediaproblem.hh>
 #include <dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 #include <dumux/multidomain/common/multidomainlocaloperator.hh>
 
-#include "2cstokes2p2cproblem.hh"
+#include "2cstokes2p2cspatialparams.hh"
 
 namespace Dumux
 {
diff --git a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
index c1c50f4442dc476a0282672db9616fe447e1a31c..cf2f0b581e1f53ba30edcd6e3bdbb3be76e4e098 100644
--- a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
@@ -25,10 +25,14 @@
 #ifndef DUMUX_STOKES2C_SUBPROBLEM_HH
 #define DUMUX_STOKES2C_SUBPROBLEM_HH
 
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
 #include <dumux/freeflow/stokesnc/stokesncmodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 
+#include "2cstokes2p2cspatialparams.hh"
+
 namespace Dumux
 {