diff --git a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
index 0e9f78afc1..f614a0cd34 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
@@ -58,6 +58,10 @@ SourceFiles
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
+// Headers reqd for back-porting wall function boundary conditions
+#include "wallFvPatch.H"
+#include "kQRWallFunctionFvPatchField.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/turbulenceModels/RAS/compressible/RASModel/RASModelTemplates.C b/src/turbulenceModels/RAS/compressible/RASModel/RASModelTemplates.C
index 28af37ed9e..6b0d4eb9d8 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/RASModelTemplates.C
+++ b/src/turbulenceModels/RAS/compressible/RASModel/RASModelTemplates.C
@@ -26,9 +26,6 @@ License
 
 #include "RASModel.H"
 
-#include "wallFvPatch.H"
-#include "kQRWallFunctionFvPatchField.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
index 6928cbf771..e06a310643 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
@@ -56,6 +56,11 @@ SourceFiles
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
+// Headers reqd for back-porting wall function boundary conditions
+#include "wallFvPatch.H"
+#include "kQRWallFunctionFvPatchField.H"
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/RASModelTemplates.C b/src/turbulenceModels/RAS/incompressible/RASModel/RASModelTemplates.C
index d300add6fb..e01d965434 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/RASModelTemplates.C
+++ b/src/turbulenceModels/RAS/incompressible/RASModel/RASModelTemplates.C
@@ -26,9 +26,6 @@ License
 
 #include "RASModel.H"
 
-#include "wallFvPatch.H"
-#include "kQRWallFunctionFvPatchField.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam