diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index c062af036458a51fcfbe486ebbf12efb6dcc876d..9b839241a18887f8619e254bc49e927885ff8f92 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -69,13 +69,12 @@ void zeroCells
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    simpleControl simple(mesh);
-
+    #include "createControl.H"
     #include "createFields.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..36ebed126c001d3de228d53d59d32fec338a5071
--- /dev/null
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
@@ -0,0 +1 @@
+simpleControl simple(mesh);
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
index a4fd56d67021c9569c0961db67ddd0bfa396fee4..f0d6d667b4dc2b254353e07bfc506df919d9ab57 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,9 +29,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createPhia_H
-#define createPhia_H
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Info<< "Reading/calculating face flux field phia\n" << endl;
@@ -49,8 +46,5 @@ surfaceScalarField phia
     linearInterpolate(Ua) & mesh.Sf()
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H b/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..a721b7405299b9aedf7c6b7b16ed39b907543c9f
--- /dev/null
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
@@ -0,0 +1 @@
+pisoControl piso(mesh);
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index bdac3f83361b2c353ffd668c3b2681c9bbf60f5f..82179a9686d05fce11c59cd64d0733dfc5552d96 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -37,12 +37,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMeshNoClear.H"
-
-    pisoControl piso(mesh);
-
+    #include "createControl.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
index 9af500124c942b27a375386bad981c907b491648..4c2a78fa5a16bd1979b4aa2f553b45a32e4cf026 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
@@ -1,4 +1,6 @@
 EXE_INC = \
+    -I. \
+    -I.. \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index 94d7657b255278d4b91eb873692702e89f53412b..d1b8bc197623077bbc6bcd5ff971e6e6e9defe4a 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,12 +43,11 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFvOptions.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/createControl.H b/applications/solvers/incompressible/pimpleFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..cf82a59b358b7aaa3981f923a5610f2c0985b9b0
--- /dev/null
+++ b/applications/solvers/incompressible/pimpleFoam/createControl.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
index 41aeca934cdfb188dbfc6292b1bd5c8f284d55a6..b22f52355004dfca99980835b90daa896c818b6b 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 9db684476118dc49a4eae959e6a12b1b70d89ecd..23bc0e0618c94dea1d2f5bd99e159a3ba128c8a3 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -44,13 +44,13 @@ 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 "createControl.H"
     #include "createFields.H"
     #include "createUf.H"
     #include "createMRF.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index a065bcbd3cca42e8bc1dc1214d598baa0f4ebd92..86c9ed0bd6206172a94bf1a0e181ae6f34443c29 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -44,12 +44,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createMRF.H"
diff --git a/applications/solvers/incompressible/pisoFoam/createControl.H b/applications/solvers/incompressible/pisoFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..a721b7405299b9aedf7c6b7b16ed39b907543c9f
--- /dev/null
+++ b/applications/solvers/incompressible/pisoFoam/createControl.H
@@ -0,0 +1 @@
+pisoControl piso(mesh);
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 7d18261528ee1bf6c373a961c48ea7a9d53cbd6b..5529e234925521ba7ee465159407cc829e872cfc 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,12 +43,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pisoControl piso(mesh);
-
+    #include "createControl.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createControl.H b/applications/solvers/incompressible/shallowWaterFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..cf82a59b358b7aaa3981f923a5610f2c0985b9b0
--- /dev/null
+++ b/applications/solvers/incompressible/shallowWaterFoam/createControl.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
index 2716b87132ea8d0237185c423b973ba49ab102aa..2e987664ece3eec363f83fa3238fb10f4ec30a36 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "readGravitationalAcceleration.H"
+
 Info<< "Reading field h\n" << endl;
 volScalarField h
 (
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
index dca0c91a6286fb3c74be5408b1328f7c5cfb83b7..5a1b4c803f4a264a8d89f608cb5e3d223794189a 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,9 +29,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createPhi_H
-#define createPhi_H
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Info<< "Reading/calculating face flux field phi\n" << endl;
@@ -49,8 +46,5 @@ surfaceScalarField phi
     linearInterpolate(hU) & mesh.Sf()
 );
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 6575a09f05ed851eefccfabca88fdbb04cbb7209..a29f31a761237e3d8ff31ba752b92ffc2f25749c 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -39,13 +39,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
-    #include "readGravitationalAcceleration.H"
+    #include "createControl.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //