diff --git a/Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake b/Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
index e22308e0025..66e7007f3d1 100644
--- a/Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
+++ b/Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
@@ -56,7 +56,7 @@ endif()
 # See the release notes of CGAL-4.10: CGAL_Core now requires
 # Boost.Thread, with all compilers but MSVC.
 if (NOT MSVC)
-  find_package( Boost 1.48 REQUIRED thread system )
+  find_package( Boost 1.48 REQUIRED COMPONENTS thread system )
 endif()
 
 function(CGAL_setup_CGAL_Core_dependencies target)
diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp
index 7118aa379a8..d0b210e0b63 100644
--- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp
+++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && not defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+#if defined(__GNUC__) && ! defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
 
 #include <iostream>
 int main()
diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp
index 602893f7ec4..a06ab7ab23d 100644
--- a/Triangulation/examples/Triangulation/triangulation.cpp
+++ b/Triangulation/examples/Triangulation/triangulation.cpp
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && not defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+#if defined(__GNUC__) && ! defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
 #include <iostream>
 int main()
 {
diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp
index 58deb6ae64f..476d44807ee 100644
--- a/Triangulation/test/Triangulation/test_delaunay.cpp
+++ b/Triangulation/test/Triangulation/test_delaunay.cpp
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && not defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+#if defined(__GNUC__) && ! defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
 
 #include <iostream>
 int main()
diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp
index bfc1f86b809..6a9877026a3 100644
--- a/Triangulation/test/Triangulation/test_torture.cpp
+++ b/Triangulation/test/Triangulation/test_torture.cpp
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && not defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+#if defined(__GNUC__) && ! defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
 
 #include <iostream>
 int main()
diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp
index 34a6dcfa5c3..ec29fce1d3d 100644
--- a/Triangulation/test/Triangulation/test_triangulation.cpp
+++ b/Triangulation/test/Triangulation/test_triangulation.cpp
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && not defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+#if defined(__GNUC__) && ! defined (__clang__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
 #include <iostream>
 int main()
 {