diff --git a/applications/test/Function1/Make/options b/applications/test/Function1/Make/options
index 15bfa4c12c..54c035b8f5 100644
--- a/applications/test/Function1/Make/options
+++ b/applications/test/Function1/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/test/IjkField/Make/options b/applications/test/IjkField/Make/options
index 2c375bcb61..18e6fe47af 100644
--- a/applications/test/IjkField/Make/options
+++ b/applications/test/IjkField/Make/options
@@ -1,4 +1,2 @@
-EXE_INC = -DFULLDEBUG
-
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/PDRblockMesh/Make/options b/applications/test/PDRblockMesh/Make/options
index 447e8d18fe..b4f99e5295 100644
--- a/applications/test/PDRblockMesh/Make/options
+++ b/applications/test/PDRblockMesh/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/test/PatchFunction1/Make/options b/applications/test/PatchFunction1/Make/options
index f7182cb4c5..72211b15db 100644
--- a/applications/test/PatchFunction1/Make/options
+++ b/applications/test/PatchFunction1/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/test/fieldMapping/Make/options b/applications/test/fieldMapping/Make/options
index 8c55d77648..d840aaca0b 100644
--- a/applications/test/fieldMapping/Make/options
+++ b/applications/test/fieldMapping/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/test/hexRef8/Make/options b/applications/test/hexRef8/Make/options
index 8c55d77648..d840aaca0b 100644
--- a/applications/test/hexRef8/Make/options
+++ b/applications/test/hexRef8/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/test/parallelOverset/Make/options b/applications/test/parallelOverset/Make/options
index 0dd7b75e80..b0aa2ef220 100644
--- a/applications/test/parallelOverset/Make/options
+++ b/applications/test/parallelOverset/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
diff --git a/applications/test/plotFunction1/Make/options b/applications/test/plotFunction1/Make/options
index f7182cb4c5..72211b15db 100644
--- a/applications/test/plotFunction1/Make/options
+++ b/applications/test/plotFunction1/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -DFULLDEBUG -g -O0 \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 1ada957a53..7c18fdde5c 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,7 +1,3 @@
-/* Add to EXE_INC as required:
-   -g -DFULLDEBUG -O0
- */
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
@@ -19,6 +15,7 @@ EXE_LIBS = \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \
+    -lfvMotionSolvers \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy \
     -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index 2faf0b8ed1..004f82049f 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -1,7 +1,3 @@
-/* Add to EXE_INC as required:
-   -DFULLDEBUG -g -O0
- */
-
 EXE_INC = \
     $(COMP_FLAGS) \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/src/optimisation/adjointOptimisation/adjoint/Make/options b/src/optimisation/adjointOptimisation/adjoint/Make/options
index 0853278b17..6952adb3f5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/Make/options
+++ b/src/optimisation/adjointOptimisation/adjoint/Make/options
@@ -18,13 +18,14 @@ EXE_INC = \
 LIB_LIBS = \
     -lfiniteVolume \
     -lfiniteArea \
-    -lmeshTools \
+    -lfileFormats \
     -lsurfMesh \
+    -lmeshTools \
     -lsampling \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lfvMotionSolvers \
     -ldynamicMesh \
+    -lfvMotionSolvers \
     -lgeometricVoF \
     -lfvOptions