diff --git a/applications/solvers/multiphase/interFoam/createControls.H b/applications/solvers/multiphase/interFoam/createControls.H
new file mode 100644
index 0000000000000000000000000000000000000000..cf82a59b358b7aaa3981f923a5610f2c0985b9b0
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/createControls.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index e4891edba5555c9ed7b3a1667fd90985b6d65bb8..77cabdc4c15ed98bd9a9dacad8f93e96fe431078 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -135,3 +135,5 @@ surfaceScalarField alphaPhi
 
 // MULES Correction
 tmp<surfaceScalarField> talphaPhiCorr0;
+
+#include "createMRF.H"
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index 33aac0ab4ab9758b2b751aaa5733a58e47a9fb75..bceea20c8147c9bf4b7ff720f6d00f6ba21b65bd 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H b/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
similarity index 89%
rename from applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H
rename to applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
index f1930cdfc08077e975d9c6e790fa098b3e5ddde7..5055ac090a9353ca383e15d0f1bfcfac8a2c812a 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
@@ -1,5 +1,3 @@
-#include "createTimeControls.H"
-
 bool correctPhi
 (
     pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index efebaff8b1030274d77617b7f71d7c1d8ea3864d..15707219a44a5105b6d4d0448d070dad7934380a 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -51,17 +51,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-
-    pimpleControl pimple(mesh);
-
     #include "createControls.H"
+    #include "createTimeControls.H"
+    #include "createDyMControls.H"
     #include "createRDeltaT.H"
     #include "createFields.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
 
     volScalarField rAU
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index a341b64e12073b7f02ed7886cbe724de0398bf87..8e8c78fff48410b601065c76aeb864de11086dc3 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -55,17 +55,16 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
+    #include "createControls.H"
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "correctPhi.H"
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index 53234dcaeeb7c7731dcbc3ac3d3229cef736b2fc..ce7222ff1bcf43af0ef9ab7a62e7d43b469072b3 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -IimmiscibleIncompressibleThreePhaseMixture \
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 4d9f0e7f0159c7c61d766db4f60da09ab2c52101..07e174717b3c2120b82d40ed532d2e27a03e902f 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -121,3 +121,5 @@ if (p_rgh.needReference())
 
 mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha2.name());
+
+#include "createMRF.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 24c292b870987d35a1ac780b76d713f2937b68ac..8b59f1ad4ff1cf5c0ebf976a6d7aaa289d95314c 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -45,17 +45,16 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
+    #include "createControls.H"
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "correctPhi.H"