diff --git a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
index 0a24afc13181e787242f6979247a7ddd4d9c919e..2ac25d8e5d0a460c4eefc9f6c79a56fcccd5ad8c 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalcApp.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
@@ -38,6 +38,8 @@ Description
 #include "timeSelector.H"
 #include "calcType.H"
 
+using namespace Foam;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractValue.C b/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractValue.C
index 8bded094906a546c110cd7935062d8f94ca58f64..b1ec01bdd998a11a697a58ee8ff24ce5fa14e223 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractValue.C
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractValue.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::addSubtract::writeAddSubtractValue
 (
@@ -86,4 +90,4 @@ void Foam::calcTypes::addSubtract::writeAddSubtractValue
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcType.C b/src/postProcessing/foamCalcFunctions/calcType/calcType.C
index 9aceab5da3b4e76f9b767e4c8e8bd6b211579705..b78de6d9932df8ae69716ac73d8071ae0890be49 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcType.C
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcType.C
@@ -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
@@ -27,9 +27,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(calcType, 0);
-
-defineRunTimeSelectionTable(calcType, dictionary);
+namespace Foam
+{
+    defineTypeNameAndDebug(calcType, 0);
+    defineRunTimeSelectionTable(calcType, dictionary);
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -47,9 +49,7 @@ Foam::calcType::~calcType()
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::calcType::init()
-{
-    // Do nothing
-}
+{}
 
 
 void Foam::calcType::preCalc
@@ -58,9 +58,7 @@ void Foam::calcType::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
-    // Do nothing
-}
+{}
 
 
 void Foam::calcType::calc
@@ -69,9 +67,7 @@ void Foam::calcType::calc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
-    // Do nothing
-}
+{}
 
 
 void Foam::calcType::postCalc
@@ -80,9 +76,7 @@ void Foam::calcType::postCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
-    // Do nothing
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcType.H b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
index 4519eb61a107f24773b59af6014487e9191768d0..33ae4da26a8986b90e1706fb13ae4c2510b9e399 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcType.H
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcType.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
@@ -42,11 +42,10 @@ SourceFiles
 #ifndef calcType_H
 #define calcType_H
 
-#include "autoPtr.H"
+#include "argList.H"
+#include "fvMesh.H"
 #include "runTimeSelectionTables.H"
 
-#include "fvCFD.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C b/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
index 866952afa7d05c290a88bf1bfb523dd97d6b0df3..82b234f60ff531eddd1ce859e84bf6407b72c3ac 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
+++ b/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::components::writeComponentFields
 (
@@ -62,4 +66,4 @@ void Foam::calcTypes::components::writeComponentFields
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/div/writeDivField.C b/src/postProcessing/foamCalcFunctions/field/div/writeDivField.C
index 75fa73f5ca6bdc8f4b5a0af90459e4f210473bc7..9cb87d180f5988862f0bb00a3faedc57f6cc2721 100644
--- a/src/postProcessing/foamCalcFunctions/field/div/writeDivField.C
+++ b/src/postProcessing/foamCalcFunctions/field/div/writeDivField.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvcDiv.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::div::writeDivField
 (
@@ -55,4 +59,4 @@ void Foam::calcTypes::div::writeDivField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/interpolate/writeInterpolateField.C b/src/postProcessing/foamCalcFunctions/field/interpolate/writeInterpolateField.C
index 87ae342696adf586f5f90fdd4bb7f58e50cf7d32..31d4f453736aaffcdf958f67cedb481494731dc8 100644
--- a/src/postProcessing/foamCalcFunctions/field/interpolate/writeInterpolateField.C
+++ b/src/postProcessing/foamCalcFunctions/field/interpolate/writeInterpolateField.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "surfaceInterpolate.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::interpolate::writeInterpolateField
 (
@@ -58,4 +62,4 @@ void Foam::calcTypes::interpolate::writeInterpolateField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/mag/writeMagField.C b/src/postProcessing/foamCalcFunctions/field/mag/writeMagField.C
index 9246dd1f547cf3d5ac84ca5c9a1aff3f9b0ee2b3..e33c0a9837ac019f3a53b9c351301b8a5daeaa2c 100644
--- a/src/postProcessing/foamCalcFunctions/field/mag/writeMagField.C
+++ b/src/postProcessing/foamCalcFunctions/field/mag/writeMagField.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::mag::writeMagField
 (
@@ -57,4 +61,4 @@ void Foam::calcTypes::mag::writeMagField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/magGrad/writeMagGradField.C b/src/postProcessing/foamCalcFunctions/field/magGrad/writeMagGradField.C
index 1c47ad1f8e8b51c385e074916f18518e882502f2..cfc9ccc6cb06035db4fe1d51dc55073557f19f4f 100644
--- a/src/postProcessing/foamCalcFunctions/field/magGrad/writeMagGradField.C
+++ b/src/postProcessing/foamCalcFunctions/field/magGrad/writeMagGradField.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::magGrad::writeMagGradField
 (
@@ -57,4 +61,4 @@ void Foam::calcTypes::magGrad::writeMagGradField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/magSqr/writeMagSqrField.C b/src/postProcessing/foamCalcFunctions/field/magSqr/writeMagSqrField.C
index b61be63cb9ad300669c34076cd4181830029314d..22a56292afbfc55b3b7a94518498f344702166e7 100644
--- a/src/postProcessing/foamCalcFunctions/field/magSqr/writeMagSqrField.C
+++ b/src/postProcessing/foamCalcFunctions/field/magSqr/writeMagSqrField.C
@@ -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
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::magSqr::writeMagSqrField
 (
@@ -57,4 +61,4 @@ void Foam::calcTypes::magSqr::writeMagSqrField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C b/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
index 0c024aa136e625cba0580f8e2dc02440e57760b5..df9beed0ef0ef4122f4745e5e6a48ffce80e0d0b 100644
--- a/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
+++ b/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,6 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type>
 void Foam::calcTypes::randomise::writeRandomField
 (
@@ -69,4 +73,4 @@ void Foam::calcTypes::randomise::writeRandomField
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //