diff --git a/applications/utilities/mesh/generation/CV2DMesher/Make/options b/applications/utilities/mesh/generation/CV2DMesher/Make/options
index d58ae360fd..ff54c4ad91 100755
--- a/applications/utilities/mesh/generation/CV2DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV2DMesher/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
@@ -16,10 +16,10 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/lib \
+    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
     -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
     -lmeshTools \
     -ltriSurface \
     -ldynamicMesh \
-    -lboost_thread-gcc43-mt-1_38 \
+    -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \
     -lmpfr
diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options
index d58ae360fd..ff54c4ad91 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
@@ -16,10 +16,10 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/lib \
+    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
     -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
     -lmeshTools \
     -ltriSurface \
     -ldynamicMesh \
-    -lboost_thread-gcc43-mt-1_38 \
+    -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \
     -lmpfr
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index fca28f4337..4b22e2542a 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -18,7 +18,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-    -L$(BOOST_ROOT)/lib \
+    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ledgeMesh \
diff --git a/src/conformalVoronoiMesh/Make/options b/src/conformalVoronoiMesh/Make/options
index 9168d12c6e..6da893c424 100644
--- a/src/conformalVoronoiMesh/Make/options
+++ b/src/conformalVoronoiMesh/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 1429a75525..b31cd53a7f 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,7 +1,4 @@
-CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
-
 CGAL_INC = \
     -Wno-old-style-cast \
     -I${CGAL_SRC}/include \
-    -I${CGAL_PATH} \
     -I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}