diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 453c34604009d132457f6ca4feafe6b78a52319a..24fc2d966e4684ecaccff7f3c61d379183144dca 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -11,6 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index fd02717d86f5d10dc75cdfed97397728f3e21310..29b8a6faa45cad648d6daca80f3172eb0c91dcda 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -13,6 +13,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
index 21a47f8893ccbe5538c6559778bd85066978806a..aed69697244a2b8eb9550f6e6de1dacfd07c75d2 100644
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
@@ -20,6 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-llagrangian \
-llagrangianIntermediate \
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 75f2b0a88cf9257737cfb91c0ceef4254361935f..8ab44318e61198d5cfa66cc4fdf1aac57d60814f 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -32,4 +32,5 @@ EXE_LIBS = \
-lsurfaceFilmModels \
-lsampling \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 1f2e7a32db319e43e485f77474cadf0f6d779217..0004a128e41c191308b8f6d96fd51baa3c8853cd 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -28,6 +28,7 @@ EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lregionModels \
-lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index a6a35147e9657ab177bf2de2421e589c6c7adccf..4f94e7f64f82dc68f02b3647fcda7bc82ec031a7 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -32,6 +32,7 @@ EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lregionModels \
-lsurfaceFilmModels \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 0726b90a3fe74d9ac759281b7031372a221f98f5..f9056dd7905e30d5770d168ad74929177cade096 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -25,6 +25,7 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lregionModels \
-lsurfaceFilmModels
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
index c4628e349848a1d5b505b34fc5628ee3e432ddef..02d5a1cc3eeb62c1e84aa01c5d3f071d5ccb92ad 100644
--- a/applications/solvers/multiphase/cavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -14,4 +14,5 @@ EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lbarotropicCompressibilityModel \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
index 5ec5c9a72c261d7aa8a08ef1d096d3e774212bcf..b5d7b2cdfac8e3fde3afd685e547095f71409d4f 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -17,6 +17,7 @@ EXE_LIBS = \
-lincompressibleTurbulenceModels \
-lbarotropicCompressibilityModel \
-lfiniteVolume \
+ -lfvOptions \
-ldynamicMesh \
-ldynamicFvMesh \
-lmeshTools
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index af8f0442e191380adaf0adaa5879266525d36b8c..e24e6697f95b2af22dd2a99d6dda9df0b07157e9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -20,4 +20,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index 01b2a8d5a16df9c0105c8e2241e8446e7e2a9ec1..cc7d5a283294e82c4e707ff25cdeb88c5b72f492 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -25,4 +25,5 @@ EXE_LIBS = \
-ldynamicMesh \
-lmeshTools \
-ldynamicFvMesh \
- -lfiniteVolume
+ -lfiniteVolume \
+ -lfvOptions
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index 59a9ba5a26657bfd3cdad9b4209d2edd8eb5e3c2..b23735398536b0a2cb86b7f49be8cd329791d0b7 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
index a18d189f7c10456a09fa93e0bd221b5b62bf6a9c..2cb9a28a022ead3262e4e5f7e94beb696cece7b9 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
@@ -22,4 +22,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index 256d7391873fdcd362d0c46c39ea65d597578ce0..04e5d53a91b89547358f7bb34f4d9f79d68521d9 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -14,4 +14,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options
index acd5a23a15a3a4cc6f55b93a26852d392a5421a8..4e7c20058c0cf479a6cb6cc8c5da6a96b667268d 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@@ -10,4 +10,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lmeshTools \
-ldynamicMesh \
- -lfiniteVolume
+ -lfiniteVolume \
+ -lfvOptions
diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options
index b5098371d22ac8e12356979a574837f19aee9c0b..f7125e1e957db945457346e0f51d37c0e38fefe0 100644
--- a/applications/utilities/miscellaneous/foamHelp/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/Make/options
@@ -11,4 +11,5 @@ EXE_LIBS = \
-lradiationModels \
-lfluidThermophysicalModels \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lfvOptions
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index f9c82ba46ff1fc139238b4951f8b5b21489e9901..accfb3afd5b996ede87d401a1fa18b42874a1a7e 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -17,6 +17,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume \
+ -lfvOptions \
-lgenericPatchFields \
-lmeshTools \
-lsampling
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 9778b15c09da197c25fef02b86cd13e6b2dcecde..9443f06071aba65fde8a458b40d725081965cb55 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -12,4 +12,5 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lgenericPatchFields \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 628f2fab13edc0631c18c628e787afe88628c0ac..94361e96877f56d0ce4d4065db9bd4f171a170b5 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume \
+ -lfvOptions \
-lgenericPatchFields \
-lmeshTools \
-lsampling
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index fdcd3d7b8da92ac0b80120623b34ea31b92cb486..1d4a46267acd6c94dfd07b6fe7f0a91bcd03c132 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lsolidThermo \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 24f457bb65c459c15072e3673e9d49f6c345a429..0128cf8401e0a7d89ab6f423f7f4de507d581cb7 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
-lspecie \
-lgenericPatchFields \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools
diff --git a/applications/utilities/postProcessing/wall/yPlus/Make/options b/applications/utilities/postProcessing/wall/yPlus/Make/options
index d46a9cbb90b07107a219cebcf378c94b177ac0de..bca86c931d496d86522921950373b3474b3765d6 100644
--- a/applications/utilities/postProcessing/wall/yPlus/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlus/Make/options
@@ -18,6 +18,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lfiniteVolume \
+ -lfvOptions \
-lgenericPatchFields \
-lmeshTools \
-lsampling
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index 9778b15c09da197c25fef02b86cd13e6b2dcecde..c0efa0936371b2888c80771a86319bb76e7c0623 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -12,4 +12,5 @@ EXE_LIBS = \
-lincompressibleTransportModels \
-lgenericPatchFields \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lfvOptions
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
index 518432cbd9ef33a2e7edcffd1e7ea19f429406a6..7672e4c94e73d86f5bd3f0cb347fdcd9da43d324 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
@@ -6,4 +6,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools