diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options
index 682a236843295b9b23b65b6544d880c60389f13d..f4c92c9d5e7f7e1eac167c4227d370793bdace39 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
     -lmultiphaseSystem
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options
index ff6d9b0ef049b9477ba8071e6eab8cbf7bc491b5..0244b7df757ac4ecc960e4467ee20adf7a08cfdf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options
@@ -10,6 +10,8 @@ EXE_INC = \
     -I../twoPhaseSystem/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
     -lcompressibleTwoPhaseSystem \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
diff --git a/applications/utilities/mesh/generation/blockMesh/Make/options b/applications/utilities/mesh/generation/blockMesh/Make/options
index 3828bbeca13abb14b71d5f956c9694110a8b0cce..b0674ad5f844bc672fce6895be48e126ac08e38a 100644
--- a/applications/utilities/mesh/generation/blockMesh/Make/options
+++ b/applications/utilities/mesh/generation/blockMesh/Make/options
@@ -6,5 +6,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lblockMesh \
+    -lfileFormats \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options b/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options
index eb9d10ceb00b7cb5e2ddd3b92ef7187f44800fac..de37e37a759d89da82cf9c4fc4dfd1279aa2e86a 100644
--- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lfileFormats \
     -lsurfMesh \
diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C
index f64d7d5a870f335cc497d14e56db030ba26d4808..8060153e9b93d40d920de9b9613cdba8bb827c67 100644
--- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C
@@ -38,8 +38,10 @@ License
 #include <cstring>
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam;
diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C
index 6a063f0563d402ec178434aa207569ae4042d246..3b4c27ccd4b1c022b7f1553f803c6cbbf163cd81 100644
--- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C
@@ -46,8 +46,10 @@ License
 #include "OSspecific.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam;
diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C
index 6cadff43e5e8992ced883d008cad3f4ff210c127..5d630740798c462d7eba1040077baf81ff6e5867 100644
--- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C
@@ -31,8 +31,10 @@ License
 #include "mathematicalConstants.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam::constant;
diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C
index 95d0adffcad0f8308dad3a3101f3e81551881172..45651b25317b636eb766e10cad10f9713f376852 100644
--- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C
+++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C
@@ -31,8 +31,10 @@ License
 #include "mathematicalConstants.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam::constant;
diff --git a/src/OSspecific/MSwindows/Allwmake b/src/OSspecific/MSwindows/Allwmake
index c474ed4c239f7588d4a4f0b69279b417cc106efa..b294db892055ece511bc59dedf49cae3e0ae7fe4 100755
--- a/src/OSspecific/MSwindows/Allwmake
+++ b/src/OSspecific/MSwindows/Allwmake
@@ -4,6 +4,18 @@ targetType=libo                                     # Preferred library type
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments $*
 
 #------------------------------------------------------------------------------
+
+if [ -f /usr/include/FlexLexer.h ] && [ ! -f FlexLexer.h ]
+then
+    echo "Adding FlexLexer.h link to ${PWD##*/} for cross-compilation"
+    ln -sf /usr/include/FlexLexer.h FlexLexer.h
+
+    if [ -d lnInclude ]
+    then
+        (cd lnInclude && ln -sf ../FlexLexer.h .)
+    fi
+fi
+
 unset COMP_FLAGS LINK_FLAGS
 
 # Make object (non-shared by default)
diff --git a/src/transportModels/geometricVoF/Make/options b/src/transportModels/geometricVoF/Make/options
index 00fc27d7cff0a5b189328637b475c807b40c8f92..49ee6e6a4e01149e5c41be00f88553f4acff13e2 100644
--- a/src/transportModels/geometricVoF/Make/options
+++ b/src/transportModels/geometricVoF/Make/options
@@ -3,15 +3,17 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
+    -lsampling \
+    -ldynamicMesh \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties