diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
index 9f996fadc70..34d7fb0b5a8 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
+++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
@@ -477,10 +477,12 @@ via a sparse linear system.
 The main author of the first version of this package was Laurent Saboret,
 who worked as an engineer at Inria Sophia-Antipolis.
 
-For CGAL 4.10 the package has undergone a major rewrite by Andreas Fabri.
-The algorithms are the same, but they are now based on the `FaceGraph` API.
-Additionally, the class `Seam_mesh` was introduced, which is also a model of
-a `FaceGraph`, and replaces a wrapper which had a more complicated API.
+For CGAL 4.11 the package has undergone a major rewrite by Andreas Fabri and
+Mael Rouxel-Labbé and the Orbifold Tutte Embedding and As-Rigid-As-Possible
+parameterization techniques were added. All algorithms are now based on
+the`FaceGraph` API. Additionally, the class `Seam_mesh` was introduced to handle
+virtual borders. It is also a model of a `FaceGraph`, and replaces a wrapper
+which had a more complicated API.
 
 */
 } /* namespace CGAL */
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
index 9de5a4ac557..cc26847fe09 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_ARAP_PARAMETERIZER_3_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_ARAP_PARAMETERIZER_3_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Surface_mesh_parameterization/internal/Bool_property_map.h>
 #include <CGAL/Surface_mesh_parameterization/internal/Containers_filler.h>
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Error_code.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Error_code.h
index e3f52cfa19d..a8efab6f422 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Error_code.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Error_code.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_ERROR_CODE_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_ERROR_CODE_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 /// \file Error_code.h
 
 namespace CGAL {
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h
index 714eef0618e..676ef1a49f8 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h
@@ -16,13 +16,17 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
+
+#ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_IO_FILE_OFF_H
+#define CGAL_SURFACE_MESH_PARAMETERIZATION_IO_FILE_OFF_H
+
+#include <CGAL/license/Surface_mesh_parameterization.h>
 
 #include <CGAL/Surface_mesh_parameterization/internal/Containers_filler.h>
 
 #include <CGAL/boost/graph/iterator.h>
 #include <CGAL/Polygon_mesh_processing/connected_components.h>
-
 #include <CGAL/circulator.h>
 
 #include <boost/foreach.hpp>
@@ -36,9 +40,6 @@
 #include <sstream>
 #include <vector>
 
-#ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_IO_FILE_OFF_H
-#define CGAL_SURFACE_MESH_PARAMETERIZATION_IO_FILE_OFF_H
-
 namespace CGAL {
 
 namespace Surface_mesh_parameterization {
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h
index 66b1ace8aec..92548153f60 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/MVC_post_processor_3.h
@@ -16,11 +16,12 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_MVC_POST_PROCESSOR_3_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_MVC_POST_PROCESSOR_3_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
 
 #include <CGAL/Surface_mesh_parameterization/internal/Containers_filler.h>
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h
index f50224ea4b7..df8c6b182b6 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_parameterizer_3.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_ORBIFOLD_TUTTE_PARAMETERIZER_3_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_ORBIFOLD_TUTTE_PARAMETERIZER_3_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Surface_mesh_parameterization/internal/angles.h>
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
 #include <CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h>
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_sphere_mapping.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_sphere_mapping.h
index 384c9d0cbea..f7d09310798 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_sphere_mapping.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Orbifold_Tutte_sphere_mapping.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_ORBIFOLD_TUTTE_SPHERE_MAPPING_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_ORBIFOLD_TUTTE_SPHERE_MAPPING_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h>
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Bool_property_map.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Bool_property_map.h
index 7979f27eb26..d6c50cc2d65 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Bool_property_map.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Bool_property_map.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_BOOL_PROPERTY_MAP_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_BOOL_PROPERTY_MAP_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/Kernel_traits.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h
index d62264fa69a..1de384d769d 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_CONTAINERS_FILLER_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_CONTAINERS_FILLER_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <boost/foreach.hpp>
 #include "boost/tuple/tuple.hpp"
 #include <boost/unordered_set.hpp>
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/angles.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/angles.h
index 2b8f39dbc56..5d2415cc08f 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/angles.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/angles.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_ANGLES_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_ANGLES_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Kernel/global_functions.h>
 #include <CGAL/number_type_config.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/kernel_traits.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/kernel_traits.h
index 272e49a3187..4687e7ab95b 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/kernel_traits.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/kernel_traits.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_KERNEL_TRAITS_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_KERNEL_TRAITS_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/Kernel_traits.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h
index 94c1138bb99..d900e1d1ad5 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/orbifold_cone_helper.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_CONE_HELPER_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_CONE_HELPER_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
 #include <CGAL/Surface_mesh_parameterization/Error_code.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/shortest_path.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/shortest_path.h
index f786f1aae59..e0bfe3ac8ca 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/shortest_path.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/shortest_path.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_SHORTEST_PATH_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_SHORTEST_PATH_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/assertions.h>
 
 #include <boost/graph/dijkstra_shortest_paths.hpp>
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h
index da5a3622c8e..fb58d1045ad 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h
@@ -16,11 +16,13 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 #ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_VALIDITY_H
 #define CGAL_SURFACE_MESH_PARAMETERIZATION_INTERNAL_VALIDITY_H
 
+#include <CGAL/license/Surface_mesh_parameterization.h>
+
 #include <CGAL/Surface_mesh_parameterization/internal/Containers_filler.h>
 #include <CGAL/Surface_mesh_parameterization/internal/kernel_traits.h>
 
diff --git a/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h b/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
index 1ec0d034cb7..d56e89f7d06 100644
--- a/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
+++ b/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
@@ -16,7 +16,7 @@
 // $Id$
 //
 //
-// Author(s)     :
+// Author(s)     : Mael Rouxel-Labbé
 
 /**
 * \ingroup PkgSurfaceMeshParameterization
@@ -25,9 +25,6 @@
 * the free functions of this package.
 */
 
-#ifndef CGAL_SURFACE_MESH_PARAMETERIZATION_H
-#define CGAL_SURFACE_MESH_PARAMETERIZATION_H
-
 #include <CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h>
 #include <CGAL/Surface_mesh_parameterization/Barycentric_mapping_parameterizer_3.h>
 #include <CGAL/Surface_mesh_parameterization/Discrete_authalic_parameterizer_3.h>
@@ -44,4 +41,3 @@
 #include <CGAL/Surface_mesh_parameterization/Square_border_parameterizer_3.h>
 #include <CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h>
 
-#endif // CGAL_SURFACE_MESH_PARAMETERIZATION_H