diff --git a/applications/test/dynamicIndexedOctree/Make/options b/applications/test/dynamicIndexedOctree/Make/options
index e2c7c2d103123d59c83cf6ff1c645eb86664be60..a1d2c044e1735e01ef01663f42be893ea661dcce 100644
--- a/applications/test/dynamicIndexedOctree/Make/options
+++ b/applications/test/dynamicIndexedOctree/Make/options
@@ -1,3 +1,3 @@
-EXE_INC = -I$(FOAM_SRC)/meshTools/lnInclude
+EXE_INC = -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
index e627adf83915ec81ff3e3cada82acf6f416babbd..96a1f1e23afc34da35cb2c7d6657f1c0bf2cce07 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
+++ b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// For complete details on what this dictionary file should provide, see
-// $FOAM_SRC/src/dynamicMesh/slidingInterface/slidingInterface.C
+// src/dynamicMesh/slidingInterface/slidingInterface.C
// method: Foam::slidingInterface::setTolerances
//- Point merge tolerance
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
index 4ff7ef80147e9842bd3ae73de7d9348abdd99efe..f88af1c00adfae7163d3492010e8b088dab5cb55 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
@@ -15,8 +15,8 @@ EXE_INC = \
${CGAL_INC} \
${c++CGALWARN} \
$(COMP_FLAGS) \
- -I$(FOAM_SRC)/surfMesh/lnInclude \
- -I$(FOAM_SRC)/triSurface/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
index 367e9e2e3cfd19e541ae01dd4f6845665ffd157e..bea50bf0febd441105771a3e4252fa2dae03f9f5 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
@@ -13,8 +13,8 @@ EXE_INC = \
${CGAL_INC} \
${c++CGALWARN} \
-I.. \
- -I$(FOAM_SRC)/surfMesh/lnInclude \
- -I$(FOAM_SRC)/triSurface/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I/usr/include/Qt
diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options
index 6c6cd122873520ca7edceea5bf8b5be49d77f4ef..dd995740b3776afc860cfd784c0625fad0a86d86 100644
--- a/applications/utilities/surface/surfaceInflate/Make/options
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@@ -1,8 +1,7 @@
EXE_INC = \
- -I$(FOAM_SRC)/triSurface/lnInclude \
- -I$(FOAM_SRC)/surfMesh/lnInclude \
- -I$(FOAM_SRC)/meshTools/lnInclude
-
+ -I$(LIB_SRC)/triSurface/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-ltriSurface \
diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options
index 1dc3af297c2a883f9588dfdcde3ae833b8291167..4acabef1b388229f92d4f5fcf7bc80ac8dce4f66 100644
--- a/src/dummyThirdParty/metisDecomp/Make/options
+++ b/src/dummyThirdParty/metisDecomp/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(FOAM_SRC)/parallel/decompose/metisDecomp/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/metisDecomp/lnInclude
LIB_LIBS =
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index ffe80489d7ab0dea672e5de09cbfd9d4cf3d9e21..ea3ee98863f90952819a2c734ccab49105a2c6ac 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -34,7 +34,7 @@ static const char* notImplementedMessage =
"Please install metis and make sure that libmetis.so is in your "
"LD_LIBRARY_PATH.\n"
"The metisDecomp library can then be built from "
-"$FOAM_SRC/parallel/decompose/metisDecomp and dynamically loading or linking"
+"src/parallel/decompose/metisDecomp and dynamically loading or linking"
" this library will add metis as a decomposition method.\n"
"Please be aware that there are license restrictions on using Metis.";
diff --git a/src/dummyThirdParty/ptscotchDecomp/Make/options b/src/dummyThirdParty/ptscotchDecomp/Make/options
index 3cb176ccf98bc8e9bd2616f289154efac4f54a49..481166164b7f72242102e4f730ce7db1729a703b 100644
--- a/src/dummyThirdParty/ptscotchDecomp/Make/options
+++ b/src/dummyThirdParty/ptscotchDecomp/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(FOAM_SRC)/parallel/decompose/ptscotchDecomp/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/ptscotchDecomp/lnInclude
LIB_LIBS =
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index 719e6b6d1189298996d8917df302901dac2185a7..25287d72befdacd028480e72acc1a147ff8b3a89 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -35,7 +35,7 @@ static const char* notImplementedMessage =
"Please install ptscotch and make sure that libptscotch.so is in your "
"LD_LIBRARY_PATH.\n"
"The ptscotchDecomp library can then be built in "
-"$FOAM_SRC/parallel/decompose/ptscotchDecomp\n";
+"src/parallel/decompose/ptscotchDecomp\n";
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options
index da7a7df7b69be19fb43ae20ee80b042f9d509f61..f3429e59e593402f69649cc073a39bc2adc23320 100644
--- a/src/dummyThirdParty/scotchDecomp/Make/options
+++ b/src/dummyThirdParty/scotchDecomp/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(FOAM_SRC)/parallel/decompose/scotchDecomp/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/scotchDecomp/lnInclude
LIB_LIBS =
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index 737196be16441e81888fe599644f111a7a9cc142..f1088d487bce61935a622fc3350db8fdab6ffeb7 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -34,7 +34,7 @@ static const char* notImplementedMessage =
"Please install scotch and make sure that libscotch.so is in your "
"LD_LIBRARY_PATH.\n"
"The scotchDecomp library can then be built in "
-"$FOAM_SRC/parallel/decompose/decompositionMethods/scotchDecomp\n";
+"src/parallel/decompose/decompositionMethods/scotchDecomp\n";
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options
index ed93f8b2b87c6b2d75c449c0edcc8b057d803b0b..e92e24e0962594c631ec0a7fa1533d0ee676a155 100644
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@@ -5,9 +5,9 @@ EXE_INC = \
/* -DFULLDEBUG -g -O0 */ \
$(PFLAGS) $(PINC) \
${c++LESSWARN} \
- -I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \
- -I$(ZOLTAN_ARCH_PATH)/include/ \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(ZOLTAN_ARCH_PATH)/include
LIB_LIBS = \
-L$(ZOLTAN_ARCH_PATH)/lib \