diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 2045c175f..79deedb76 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index 743db2945..e8645bb47 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
index cdb1c64d5..6eb245028 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index 530d66ce5..bd30b60a9 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -63,12 +63,11 @@ int main(int argc, char *argv[])
     #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
-    #include "CourantNo.H"
     #include "createControls.H"
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 5a54c9845..382d041fd 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index 1fc630ca6..8d913919d 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
-    #include "CourantNo.H"
+    #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 99fc9feed..3bfb2be77 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index e314d8b31..b3e758df1 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     if (!LTS)
     {
-        #include "CourantNo.H"
+        #include "compressibleCourantNo.H"
         #include "setInitialDeltaT.H"
     }
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
index b0516d110..52c04603c 100644
--- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
@@ -32,8 +32,6 @@ Description
 
 if (adjustTimeStep)
 {
-    #include "CourantNo.H"
-
     if (CoNum > SMALL)
     {
         scalar maxDeltaTFact =