diff --git a/applications/test/callback/Test-callback.C b/applications/test/callback/Test-callback.C
index 2f30843d16..2599ada23e 100644
--- a/applications/test/callback/Test-callback.C
+++ b/applications/test/callback/Test-callback.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,10 @@ public:
     ~callback()
     {}
 
-    virtual const word& name() const = 0;
+    virtual const word& name() const
+    {
+        return word::null;
+    }
 
     void testCallbackFunction() const
     {
diff --git a/applications/test/cyclic/Make/options b/applications/test/cyclic/Make/options
index fa15f12452..d27c95d033 100644
--- a/applications/test/cyclic/Make/options
+++ b/applications/test/cyclic/Make/options
@@ -1,5 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options
index a004547599..af5541db76 100644
--- a/applications/test/dataEntry/Make/options
+++ b/applications/test/dataEntry/Make/options
@@ -1,14 +1,16 @@
 EXE_INC = \
     -DFULLDEBUG -g -O0 \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -llagrangianIntermediate \
     -lradiationModels \
     -lthermophysicalFunctions \
     -lregionModels \
+    -lfiniteVolume \
+    -lmeshTools \
     -lsampling
diff --git a/applications/test/fvc/Make/options b/applications/test/fvc/Make/options
index fa15f12452..d27c95d033 100644
--- a/applications/test/fvc/Make/options
+++ b/applications/test/fvc/Make/options
@@ -1,5 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/pointField/Make/options b/applications/test/pointField/Make/options
index fa15f12452..d27c95d033 100644
--- a/applications/test/pointField/Make/options
+++ b/applications/test/pointField/Make/options
@@ -1,5 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/reconstruct/Make/options b/applications/test/reconstruct/Make/options
index 1a8bb54992..d27c95d033 100644
--- a/applications/test/reconstruct/Make/options
+++ b/applications/test/reconstruct/Make/options
@@ -1,4 +1,7 @@
-EXE_INC = -g \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/slicedField/Make/options b/applications/test/slicedField/Make/options
index 725122ea1d..d27c95d033 100644
--- a/applications/test/slicedField/Make/options
+++ b/applications/test/slicedField/Make/options
@@ -1,4 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/volField/Make/options b/applications/test/volField/Make/options
index 725122ea1d..d27c95d033 100644
--- a/applications/test/volField/Make/options
+++ b/applications/test/volField/Make/options
@@ -1,4 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/volPointInterpolation/Make/options b/applications/test/volPointInterpolation/Make/options
index 725122ea1d..d27c95d033 100644
--- a/applications/test/volPointInterpolation/Make/options
+++ b/applications/test/volPointInterpolation/Make/options
@@ -1,4 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools