diff --git a/applications/test/PatchTools/Make/options b/applications/test/PatchTools/Make/options
index 3d00e249a6..89e5059ff9 100644
--- a/applications/test/PatchTools/Make/options
+++ b/applications/test/PatchTools/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude
+    -I$(LIB_SRC)/fileFormats/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lfileFormats
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 7bc071ec45..1cc47f2c86 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,11 +29,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "PatchTools.H"
 #include "argList.H"
 #include "fvMesh.H"
-#include "volFields.H"
-#include "Time.H"
+#include "PatchTools.H"
 #include "OBJstream.H"
 
 using namespace Foam;
diff --git a/applications/test/liquid/Make/options b/applications/test/liquid/Make/options
index 3ed9829402..f40ee9b4cb 100644
--- a/applications/test/liquid/Make/options
+++ b/applications/test/liquid/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
 EXE_LIBS = \
     -lthermophysicalProperties
diff --git a/applications/test/liquid/Test-liquid.C b/applications/test/liquid/Test-liquid.C
index feb2d1e7e0..43f82fb2de 100644
--- a/applications/test/liquid/Test-liquid.C
+++ b/applications/test/liquid/Test-liquid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/test/nonUniformTable/Make/options b/applications/test/nonUniformTable/Make/options
index 3ed9829402..0454575bf6 100644
--- a/applications/test/nonUniformTable/Make/options
+++ b/applications/test/nonUniformTable/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
 EXE_LIBS = \
     -lthermophysicalProperties
diff --git a/applications/test/nonUniformTable/Test-nonUniformTable.C b/applications/test/nonUniformTable/Test-nonUniformTable.C
index 81d277c141..9d8dd0156c 100644
--- a/applications/test/nonUniformTable/Test-nonUniformTable.C
+++ b/applications/test/nonUniformTable/Test-nonUniformTable.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    Test-nonUniformTable
+    Test-nonUniformTable1D
 
 Description
     Tests the lookup of values of a linear function from and non-uniform
@@ -30,7 +30,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "nonUniformTableThermophysicalFunction.H"
+#include "nonUniformTable1DThermophysicalFunction.H"
 #include "IFstream.H"
 
 using namespace Foam;
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 {
     dictionary dict(IFstream("thermoDict")());
 
-    thermophysicalFunctions::nonUniformTable table(dict);
+    thermophysicalFunctions::nonUniformTable1D table(dict);
 
     const label n = 1000;
     const scalar T0 = table.values().first().first();