diff --git a/dumux/freeflow/stokes/stokesproblem.hh b/dumux/freeflow/stokes/stokesproblem.hh
index 6bc9d483ca39e00d24384ddcbf288de22bf12619..8dbda9354f0f3450f38322637ded151efd876dc8 100644
--- a/dumux/freeflow/stokes/stokesproblem.hh
+++ b/dumux/freeflow/stokes/stokesproblem.hh
@@ -29,6 +29,7 @@
 
 #include <dumux/boxmodels/common/boxproblem.hh>
 
+#include "stokesproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index f2dac60e7ef38a485c3982bec9e47910f1a62dec..eca320a22d9df52593d54f5a9dbe83440ad51409 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -36,6 +36,10 @@
 #include "stokesproperties.hh"
 #include "stokesindices.hh"
 #include "stokeslocaljacobian.hh"
+#include "stokeslocalresidual.hh"
+#include "stokesmodel.hh"
+#include "stokesvolumevariables.hh"
+#include "stokesfluxvariables.hh"
 #include "stokesnewtoncontroller.hh"
 
 #include <dumux/material/fluidsystems/gasphase.hh>
diff --git a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
index f147944df077a9190d11ae1c4934ecca76f63863..324b203d5826f8d6407ee9e30d822744de6d705d 100644
--- a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
+++ b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
@@ -33,8 +33,11 @@
 #define DUMUX_STOKES2C_PROPERTY_DEFAULTS_HH
 
 #include "stokes2cproperties.hh"
+#include "stokes2cfluxvariables.hh"
 #include "stokes2cindices.hh"
 #include "stokes2clocalresidual.hh"
+#include "stokes2cmodel.hh"
+#include "stokes2cvolumevariables.hh"
 
 #include <dumux/material/fluidstates/compositionalfluidstate.hh>
 
diff --git a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
index 5b8bc8f3a01f0c8a703feee1348ff2e27d7743e1..9afdc2863e90bc861dc65d5b90c8a9bc4fa07972 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
@@ -32,11 +32,12 @@
 #ifndef DUMUX_STOKES2CNI_PROPERTY_DEFAULTS_HH
 #define DUMUX_STOKES2CNI_PROPERTY_DEFAULTS_HH
 
-#include "stokes2cniindices.hh"
-
-#include <dumux/freeflow/stokes2c/stokes2cproperties.hh>
 
+#include "stokes2cnifluxvariables.hh"
+#include "stokes2cniindices.hh"
 #include "stokes2cnilocalresidual.hh"
+#include "stokes2cnimodel.hh"
+#include "stokes2cnivolumevariables.hh"
 
 namespace Dumux
 {