diff --git a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_segment_coordinates.cpp b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_segment_coordinates.cpp
index 4eb54901e66..ffec19e4065 100644
--- a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_segment_coordinates.cpp
+++ b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_segment_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Real_timer.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_triangle_coordinates.cpp b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_triangle_coordinates.cpp
index d2be01208de..ebaf9d770d2 100644
--- a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_triangle_coordinates.cpp
+++ b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/benchmark_triangle_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Real_timer.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/segment_coordinates.cpp b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/segment_coordinates.cpp
index e6b8510d735..56f999724bc 100644
--- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/segment_coordinates.cpp
+++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/segment_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/triangle_coordinates.cpp b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/triangle_coordinates.cpp
index 6a747f0cab4..56159ca16ab 100644
--- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/triangle_coordinates.cpp
+++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/triangle_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_segment.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_segment.cpp
index 886c3b33fd9..c337208c5ab 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_segment.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_segment.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_triangle.cpp
index 815ca34c2eb..c660918d325 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_triangle.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_almost_degenerate_triangle.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp
index 221f55a02b6..c19f597f43f 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp
@@ -1,5 +1,3 @@
-#include <cmath>
-#include <cassert>
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_triangle.cpp
index 035e30935ed..b3ce1786962 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_triangle.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_triangle.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 #include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_const_linear_precision.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_const_linear_precision.cpp
index ed349c1a5c4..e39d545d569 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_const_linear_precision.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_const_linear_precision.cpp
@@ -1,7 +1,3 @@
-// #define HMC_SparseLU
-// #define HMC_SimplicialLLT
-// #define HMC_SimplicialLDLT // default
-
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h>
 #include <CGAL/Barycentric_coordinates_2/Harmonic_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_triangle.cpp
index 5f2ff679f24..fdf2fbfacdb 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_triangle.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_triangle.cpp
@@ -1,7 +1,4 @@
-// #define HMC_SparseLU
-// #define HMC_SimplicialLLT
-// #define HMC_SimplicialLDLT // default
-
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h>
 #include <CGAL/Barycentric_coordinates_2/Harmonic_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_unit_square.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_unit_square.cpp
index 8fa5a2a5e32..4dc8f6853ee 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_unit_square.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_hm_unit_square.cpp
@@ -1,7 +1,3 @@
-// #define HMC_SparseLU
-// #define HMC_SimplicialLLT
-// #define HMC_SimplicialLDLT // default
-
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/Delaunay_domain_2.h>
 #include <CGAL/Barycentric_coordinates_2/Harmonic_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp
index b41a9720a30..25436a0bd6e 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp
@@ -1,5 +1,3 @@
-#include <cmath>
-#include <cassert>
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp
index 024071b2c83..16333d5a2ac 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp
index 152257cd72d..d0b363c7a7e 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp
@@ -1,5 +1,3 @@
-#include <cmath>
-#include <cassert>
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates.cpp
index 9bb9780438b..dbacf558cc6 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates_with_offset.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates_with_offset.cpp
index f0df306e812..642e27cb99f 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates_with_offset.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_segment_coordinates_with_offset.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp
index 68db234168a..e37784a8adb 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp
@@ -1,5 +1,3 @@
-#include <cmath>
-#include <cassert>
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_triangle_coordinates.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_triangle_coordinates.cpp
index f8fa741cb93..aac95229bae 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_triangle_coordinates.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_triangle_coordinates.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp
index 5dc2f114399..a44bdb5391d 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp
@@ -1,5 +1,3 @@
-#include <cmath>
-#include <cassert>
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/Wachspress_2.h>
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_triangle.cpp
index f0585ddd080..14b58bdcae3 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_triangle.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_triangle.cpp
@@ -1,3 +1,4 @@
+#include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 #include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>