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 542b42de8ed..4eb54901e66 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,6 +1,6 @@
 #include <CGAL/Real_timer.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_inexact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 dcea07ea89c..d2be01208de 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,6 +1,6 @@
 #include <CGAL/Real_timer.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_inexact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt
index 2453847f046..c1a21a0fcb4 100644
--- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt
+++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt
@@ -185,7 +185,7 @@ coordinates at all the generated points. The used `Kernel` is inexact.
 Example's point pattern.
 \cgalFigureEnd
 
-\cgalExample{Barycentric_coordinates_2/Wachspress_coordinates.cpp}
+\cgalExample{Barycentric_coordinates_2/wachspress_coordinates.cpp}
 
 
 \subsection dh_example Discrete Harmonic Coordinates
diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/examples.txt b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/examples.txt
index 330f140190c..e4e0873bcd0 100644
--- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/examples.txt
+++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/examples.txt
@@ -1,7 +1,7 @@
 /*!
 \example Barycentric_coordinates_2/segment_coordinates.cpp
 \example Barycentric_coordinates_2/triangle_coordinates.cpp
-\example Barycentric_coordinates_2/Wachspress_coordinates.cpp
+\example Barycentric_coordinates_2/wachspress_coordinates.cpp
 \example Barycentric_coordinates_2/discrete_harmonic_coordinates.cpp
 \example Barycentric_coordinates_2/mean_value_coordinates.cpp
 \example Barycentric_coordinates_2/harmonic_coordinates.cpp
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 aee6eeef029..886c3b33fd9 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,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 f3974ea2c0b..815ca34c2eb 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,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_at_vertices.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_at_vertices.cpp
index dd57f12dd37..827d2854a12 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_at_vertices.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_at_vertices.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/boundary_coordinates_2.h>
 
 template<typename Kernel>
 void test_boundary_coordinates_at_vertices() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_on_edges.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_on_edges.cpp
index 428ca62966d..0c0e9de91b6 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_on_edges.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_boundary_coordinates_on_edges.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/boundary_coordinates_2.h>
 
 template<typename Kernel>
 void test_boundary_coordinates_on_edges() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_almost_degenerate_polygon.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_almost_degenerate_polygon.cpp
index e05dd965f4b..05750dc23c5 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_almost_degenerate_polygon.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_almost_degenerate_polygon.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_const_linear_precision.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_const_linear_precision.cpp
index d748fe62557..6c24871fa23 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_const_linear_precision.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_const_linear_precision.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 d3d51f78468..035e30935ed 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,5 +1,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_weights.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_weights.cpp
index a1210ff80cd..fe15a597b40 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_weights.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_weights.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 1f3db03b02d..5f2ff679f24 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
@@ -5,7 +5,7 @@
 #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>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_inexact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_const_linear_precision.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_const_linear_precision.cpp
index a5c11074d40..ee09e699b88 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_const_linear_precision.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_const_linear_precision.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Mean_value_coordinates_2.h>
 
 template<typename Kernel>
 void test_mv_const_linear_precision() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp
index ba5bc11f287..8d67bba42bf 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Mean_value_coordinates_2.h>
 #include <boost/math/special_functions/fpclassify.hpp>
 
 template<typename Kernel>
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 60cc2394040..0ac8151c814 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,7 +1,8 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Mean_value_coordinates_2.h>
 
 template<typename Kernel>
 void test_mv_triangle() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp
index 91b4d928fa9..088f35f4051 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Mean_value_coordinates_2.h>
 
 template<typename Kernel>
 void test_mv_weakly_convex_polygon() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp
index 184d1d4fb5a..857211fbf22 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Mean_value_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 1d684d1cb9b..9bb9780438b 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,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 ab4b28769db..f0df306e812 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,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/segment_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 6a8a9c8aa1a..f8fa741cb93 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,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
 
 template<typename Kernel>
 void test_triangle_coordinates() {
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_almost_degenerate_polygon.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_almost_degenerate_polygon.cpp
index f249fbbae10..9d473b7b10a 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_almost_degenerate_polygon.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_almost_degenerate_polygon.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_const_linear_precision.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_const_linear_precision.cpp
index 86083549738..3d42466dcf4 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_const_linear_precision.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_const_linear_precision.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_dh_unit_square.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_dh_unit_square.cpp
index 50fb100dbc7..bfe0e586d29 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_dh_unit_square.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_dh_unit_square.cpp
@@ -1,5 +1,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Discrete_harmonic_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
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 6e560f638b0..f0585ddd080 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,5 +1,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/triangle_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_weights.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_weights.cpp
index 59cd8170445..ef2cfadc22c 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_weights.cpp
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_weights.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Barycentric_coordinates_2.h>
+#include <CGAL/Barycentric_coordinates_2/Wachspress_coordinates_2.h>
 
 using Kernel  = CGAL::Exact_predicates_exact_constructions_kernel;
 using FT      = typename Kernel::FT;
diff --git a/Barycentric_coordinates_2/todo.md b/Barycentric_coordinates_2/todo.md
index 6649a8a27f5..221d71a96fd 100644
--- a/Barycentric_coordinates_2/todo.md
+++ b/Barycentric_coordinates_2/todo.md
@@ -14,3 +14,6 @@
 * Improve the solver interface and make it a parameter for the harmonic coordinates class.
 * What about adding a demo with visualization of the coordinate functions?
 * I should move internal weights to the weight interface.
+* Rename examples and tests to keep track of 2D and 3D versions.
+* Merge all necessary PRs.
+* Change CGAL::max() to (CGAL::max)().
\ No newline at end of file