diff --git a/exercises/exercise-coupling-ff-pm/interface/properties.hh b/exercises/exercise-coupling-ff-pm/interface/properties.hh
index 67a3dc85ceef3585b703fab984b6d690898831ee..c18e541b650e9435c47289cf6f7c87bbb400f183 100644
--- a/exercises/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/properties.hh
@@ -25,6 +25,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// TODO: dumux-course-task 1.C
//****** uncomment for the last exercise *****//
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index fe8b3ce9f20e685e382ac59a98691cbcdc2fd079..08465b8918520e55956705439d39529fa5557199 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 3ac0dd9e68253e277ebc6742726f00bfe475b809..4d3f7ebb264385ed53978394114ab243e880bce5 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -24,8 +24,11 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/io/gnuplotinterface.hh>
+
+#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
diff --git a/exercises/exercise-coupling-ff-pm/models/properties.hh b/exercises/exercise-coupling-ff-pm/models/properties.hh
index 447e5c86a6e1dccf67d480c2398fa1557b0bd34e..fee538b70c515bc6dbbe468d7e3ab702e778096d 100644
--- a/exercises/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/models/properties.hh
@@ -26,6 +26,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 6a42d3002ed6d2f0d254ed7d60a11fe00f988391..6367854e9a940848c2022d9fdf0038ee32e25f92 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -23,13 +23,15 @@
#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
+#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+
// TODO: dumux-course-task 3.A
// Include headers for turbulence problem (rans) here.
#include <dumux/freeflow/navierstokes/problem.hh>
-#include <dumux/common/properties.hh>
namespace Dumux {
-
/*!
* \brief The free-flow sub problem
*/
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 376c31713ced2c3a6849b062010ac3fe5718ae22..f4ecbabf80969ab3f07b1353c64f1dd85f2dfa58 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -26,6 +26,8 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
index d1ea847b09bce58cc613fa8bd9f3ec1f542c7ffa..f7c79ed58ae738042eb26ae89ae1b164e0b68730 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -26,6 +26,8 @@
// Both domain
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index dd740702f3b52020b471d67337a098dfa18a399d..48c8929e3d85e299481ada46ba0ad9569919a03d 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -23,11 +23,12 @@
#ifndef DUMUX_STOKES_SUBPROBLEM_HH
#define DUMUX_STOKES_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \brief The free flow sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
index ebca1dee614ab66ede6b68a9a13fe1c9fca28bf0..3574bd07550e59c472512a6681731810b5596196 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
@@ -26,6 +26,8 @@
// Both domains
#include <dune/grid/yaspgrid.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#if EXNUMBER >= 3
#include <dumux/io/grid/gridmanager_sub.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index c53bb64f8fc939fa86753d5997c87201fab83b69..70ca05e3d21a18bf5616a1d3b6866a782c72a6bb 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
-#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/freeflow/navierstokes/problem.hh>
+namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 896d75c4ee07c69a202c08658829989b496ed81e..537126e07e9044f2d24f46d822eb62eb09f3eea1 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -24,11 +24,13 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/io/gnuplotinterface.hh>
+#include <dumux/porousmediumflow/problem.hh>
+namespace Dumux {
/*!
* \brief The porous medium flow sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
index e54cf22845a00b332a033d9e1f56b1845dc71dce..f33c30055ce27c1edd19a1ee6f8b736eec8ad473 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
@@ -30,6 +30,8 @@
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/discretization/cctpfa.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index fe5694348ddc94396ae576d10b89c70072ceaf68..4a0b9a1162d97e4de48a37efc229f3730c8b15ba 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -29,7 +29,9 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#endif
+#include <dumux/common/timeloop.hh>
#include <dumux/common/properties.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index b6c10c33b8f3709a04ce747986fee671056b2cc2..92c91a982215a62cb43562f5957bd741d694d38d 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -24,11 +24,13 @@
#ifndef DUMUX_DARCY2P2C_SUBPROBLEM_HH
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH
-#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/timeloop.hh>
-namespace Dumux {
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+namespace Dumux {
/*!
* \brief The porous medium sub problem
*/
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
index d4110fb105a126f95f4b6b41e8668d2097a42c69..d025a97412c4dbd95ddad611a45a7872fd27d7c1 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -29,6 +29,8 @@
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/multidomain/staggeredtraits.hh>
+#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/porousmediumflow/2p2c/model.hh>