diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_optimization_return_code.h b/Mesh_2/doc/Mesh_2/CGAL/Mesh_optimization_return_code.h
similarity index 83%
rename from Mesh_3/doc/Mesh_3/CGAL/Mesh_optimization_return_code.h
rename to Mesh_2/doc/Mesh_2/CGAL/Mesh_optimization_return_code.h
index 6e04370ee12..ebba6c2a0ce 100644
--- a/Mesh_3/doc/Mesh_3/CGAL/Mesh_optimization_return_code.h
+++ b/Mesh_2/doc/Mesh_2/CGAL/Mesh_optimization_return_code.h
@@ -1,6 +1,6 @@
 namespace CGAL { 
 /*!
-\ingroup PkgMesh_3Enum
+\ingroup PkgMesh2Enum
 
 The enum `Mesh_optimization_return_code` is the output of the global
 mesh optimization functions. This output corresponds to mesh
@@ -8,10 +8,7 @@ optimization process termination reasons.  Note that depending on what
 parameters have been set to the optimizer, each return value may
 represent a failure or a success.
 
-\sa `CGAL::exude_mesh_3()` 
-\sa `CGAL::perturb_mesh_3()` 
-\sa `CGAL::lloyd_optimize_mesh_3()` 
-\sa `CGAL::odt_optimize_mesh_3()` 
+\sa `CGAL::lloyd_optimize_mesh_2`
 
 */
 enum Mesh_optimization_return_code {
diff --git a/Mesh_2/doc/Mesh_2/dependencies b/Mesh_2/doc/Mesh_2/dependencies
index 1b234b1e39a..696bf34e1fb 100644
--- a/Mesh_2/doc/Mesh_2/dependencies
+++ b/Mesh_2/doc/Mesh_2/dependencies
@@ -5,4 +5,3 @@ Algebraic_foundations
 Circulator
 Stream_support
 Triangulation_2
-Mesh_3
diff --git a/Mesh_3/include/CGAL/Mesh_optimization_return_code.h b/Mesh_2/include/CGAL/Mesh_optimization_return_code.h
similarity index 100%
rename from Mesh_3/include/CGAL/Mesh_optimization_return_code.h
rename to Mesh_2/include/CGAL/Mesh_optimization_return_code.h
diff --git a/Mesh_2/test/Mesh_2/test_lloyd.cpp b/Mesh_2/test/Mesh_2/test_lloyd.cpp
index 9251561b5c1..27dbc887ddc 100644
--- a/Mesh_2/test/Mesh_2/test_lloyd.cpp
+++ b/Mesh_2/test/Mesh_2/test_lloyd.cpp
@@ -7,6 +7,7 @@
 #include <CGAL/Delaunay_mesh_size_criteria_2.h>
 #include <CGAL/Delaunay_mesher_2.h>
 #include <CGAL/lloyd_optimize_mesh_2.h>
+#include <CGAL/Mesh_optimization_return_code.h>
 
 #include "test_utilities.h"
 
@@ -58,14 +59,16 @@ struct Lloyd_tester
 
     const size_type number_of_constraints = number_of_constrained_edges(cdt);
     const size_type number_of_vertices1 = cdt.number_of_vertices();
-    CGAL::lloyd_optimize_mesh_2(cdt,
-      max_iteration_number = 10,
-      convergence = 0.001,
-      freeze_bound = 0.001,
-      seeds_begin = seeds.begin(),
-      seeds_end = seeds.end());
+    CGAL::Mesh_optimization_return_code rc
+      = CGAL::lloyd_optimize_mesh_2(cdt,
+              max_iteration_number = 10,
+              convergence = 0.001,
+              freeze_bound = 0.001,
+              seeds_begin = seeds.begin(),
+              seeds_end = seeds.end());
     const size_type number_of_vertices2 = cdt.number_of_vertices();
-    std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n";
+    std::cerr << " done (return code = "<< rc <<").\n";
+    std::cerr << "Number of vertices: " << cdt.number_of_vertices() << "\n\n";
 
     assert( cdt.is_valid() );
     assert( number_of_vertices1 == cdt.number_of_vertices());
diff --git a/Mesh_3/doc/Mesh_3/dependencies b/Mesh_3/doc/Mesh_3/dependencies
index a94e77bf75e..24c894587cc 100644
--- a/Mesh_3/doc/Mesh_3/dependencies
+++ b/Mesh_3/doc/Mesh_3/dependencies
@@ -9,3 +9,4 @@ Triangulation_3
 TDS_3
 Polyhedron
 Miscellany
+Mesh_2