diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 80a88270b..982d725ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -119,9 +119,8 @@ public:
         ) const;
 
 
-    // Destructor
-
-        virtual ~slicedFvPatchField();
+    //- Destructor
+    virtual ~slicedFvPatchField();
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index 4b92cb6da..4d5165f62 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -65,7 +65,9 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
     const dictionary& dict
 )
 :
-    fvPatchField<Type>(p, iF, dict)
+    // Do not read value from the dictionary even if it is there
+    // HJ, 30/Nov/2017
+    fvPatchField<Type>(p, iF)
 {
     fvPatchField<Type>::operator=(this->patchInternalField());
 }
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFields.C
index 1a344acb3..a649dc58c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "calculatedFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFields.C
index 2b6190ab1..07d1be11a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFields.C
@@ -24,7 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fixedValueFvsPatchFields.H"
-#include "surfaceFields.H"
+#include "fvPatchFields.H"
+#include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFields.C
index 2f4f50118..9560f1969 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "slicedFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFields.C
index 149067a7b..c5ae34e94 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cyclicFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicGgi/cyclicGgiFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicGgi/cyclicGgiFvsPatchFields.C
index 65e4897f4..4c63ddd5d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicGgi/cyclicGgiFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicGgi/cyclicGgiFvsPatchFields.C
@@ -34,6 +34,7 @@ Contributor:
 \*---------------------------------------------------------------------------*/
 
 #include "cyclicGgiFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFields.C
index 08477e3a4..9a743b182 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "emptyFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/ggi/ggiFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/ggi/ggiFvsPatchFields.C
index 9e1a9c605..a82b6f671 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/ggi/ggiFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/ggi/ggiFvsPatchFields.C
@@ -31,6 +31,7 @@ Author
 \*---------------------------------------------------------------------------*/
 
 #include "ggiFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/mixingPlane/mixingPlaneFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/mixingPlane/mixingPlaneFvsPatchFields.C
index 75547c16c..2cd5b34d6 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/mixingPlane/mixingPlaneFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/mixingPlane/mixingPlaneFvsPatchFields.C
@@ -34,6 +34,7 @@ Contributor
 \*---------------------------------------------------------------------------*/
 
 #include "mixingPlaneFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/overlapGgi/overlapGgiFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/overlapGgi/overlapGgiFvsPatchFields.C
index 988f191e7..9c794b56a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/overlapGgi/overlapGgiFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/overlapGgi/overlapGgiFvsPatchFields.C
@@ -27,6 +27,7 @@ Author
 \*---------------------------------------------------------------------------*/
 
 #include "overlapGgiFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFields.C
index a10df8d07..1794f01b1 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "processorFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/regionCoupling/regionCouplingFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/regionCoupling/regionCouplingFvsPatchFields.C
index 20acc83ff..aafd98a1f 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/regionCoupling/regionCouplingFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/regionCoupling/regionCouplingFvsPatchFields.C
@@ -30,6 +30,7 @@ Author
 \*---------------------------------------------------------------------------*/
 
 #include "regionCouplingFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFields.C
index 3e48c4cff..bf5aae14f 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "symmetryFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFields.C
index 02fe018e9..f335235fa 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "wedgeFvsPatchFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/calculatedFvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/calculatedFvsPatchVectorNFields.C
index 0fee9a2fa..3eba31c25 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/calculatedFvsPatchVectorNFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/calculatedFvsPatchVectorNFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "calculatedFvsPatchVectorNFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/coupledFvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/coupledFvsPatchVectorNFields.C
index 413ad3757..241236d73 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/coupledFvsPatchVectorNFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/coupledFvsPatchVectorNFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coupledFvsPatchVectorNFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/emptyFvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/emptyFvsPatchVectorNFields.C
index 622e6aaac..8db0fdcd8 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/emptyFvsPatchVectorNFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/emptyFvsPatchVectorNFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "emptyFvsPatchVectorNFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/processorFvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/processorFvsPatchVectorNFields.C
index 9affb3161..b3a32f7e4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/processorFvsPatchVectorNFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/processorFvsPatchVectorNFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "processorFvsPatchVectorNFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/wedgeFvsPatchVectorNFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/wedgeFvsPatchVectorNFields.C
index 7d00e9880..55302e04c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/wedgeFvsPatchVectorNFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchVectorNFields/wedgeFvsPatchVectorNFields.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "wedgeFvsPatchVectorNFields.H"
+#include "fvPatchFields.H"
 #include "fvsPatchFields.H"
 #include "addToRunTimeSelectionTable.H"