diff --git a/Generalized_map/examples/Generalized_map/gmap_3_with_colored_facets.cpp b/Generalized_map/examples/Generalized_map/gmap_3_with_colored_facets.cpp
index 40d75093331..5c0f0a35dce 100644
--- a/Generalized_map/examples/Generalized_map/gmap_3_with_colored_facets.cpp
+++ b/Generalized_map/examples/Generalized_map/gmap_3_with_colored_facets.cpp
@@ -1,21 +1,3 @@
-// Copyright (c) 2010 CNRS, LIRIS, http://liris.cnrs.fr/, All rights reserved.
-//
-// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation; version 2.1 of the License.
-// See the file LICENSE.LGPL distributed with CGAL.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// $URL$
-// $Id$
-//
-// Author(s)     : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
-//
 #include <CGAL/Generalized_map.h>
 #include <CGAL/Cell_attribute.h>
 #include <iostream>
diff --git a/Generalized_map/examples/Generalized_map/gmap_4_simple_example.cpp b/Generalized_map/examples/Generalized_map/gmap_4_simple_example.cpp
index bed13d6cc0a..e447da890e0 100644
--- a/Generalized_map/examples/Generalized_map/gmap_4_simple_example.cpp
+++ b/Generalized_map/examples/Generalized_map/gmap_4_simple_example.cpp
@@ -1,21 +1,3 @@
-// Copyright (c) 2010 CNRS, LIRIS, http://liris.cnrs.fr/, All rights reserved.
-//
-// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation; version 2.1 of the License.
-// See the file LICENSE.LGPL distributed with CGAL.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// $URL$
-// $Id$
-//
-// Author(s)     : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
-//
 #include <CGAL/Generalized_map.h>
 #include <iostream>
 #include <cstdlib>
diff --git a/Generalized_map/include/CGAL/GMap_cell_const_iterators.h b/Generalized_map/include/CGAL/GMap_cell_const_iterators.h
index 3482079f843..45383ec3be1 100644
--- a/Generalized_map/include/CGAL/GMap_cell_const_iterators.h
+++ b/Generalized_map/include/CGAL/GMap_cell_const_iterators.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/GMap_cell_iterators.h b/Generalized_map/include/CGAL/GMap_cell_iterators.h
index 2ec2f682122..69c32133c92 100644
--- a/Generalized_map/include/CGAL/GMap_cell_iterators.h
+++ b/Generalized_map/include/CGAL/GMap_cell_iterators.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/GMap_dart.h b/Generalized_map/include/CGAL/GMap_dart.h
index d431ea6b3aa..3fa08fc2ca1 100644
--- a/Generalized_map/include/CGAL/GMap_dart.h
+++ b/Generalized_map/include/CGAL/GMap_dart.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/GMap_dart_const_iterators.h b/Generalized_map/include/CGAL/GMap_dart_const_iterators.h
index d55fe1f59ff..b29a239af90 100644
--- a/Generalized_map/include/CGAL/GMap_dart_const_iterators.h
+++ b/Generalized_map/include/CGAL/GMap_dart_const_iterators.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/GMap_dart_iterators.h b/Generalized_map/include/CGAL/GMap_dart_iterators.h
index 2440c6200c1..ce43d27f92e 100644
--- a/Generalized_map/include/CGAL/GMap_dart_iterators.h
+++ b/Generalized_map/include/CGAL/GMap_dart_iterators.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h
index 424b370398b..3cf981e5c86 100644
--- a/Generalized_map/include/CGAL/Generalized_map.h
+++ b/Generalized_map/include/CGAL/Generalized_map.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map_iterators_base.h b/Generalized_map/include/CGAL/Generalized_map_iterators_base.h
index 9be808f1e7d..6cdbd3705dd 100644
--- a/Generalized_map/include/CGAL/Generalized_map_iterators_base.h
+++ b/Generalized_map/include/CGAL/Generalized_map_iterators_base.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map_min_items.h b/Generalized_map/include/CGAL/Generalized_map_min_items.h
index 9602b53314a..37eb3da4b33 100644
--- a/Generalized_map/include/CGAL/Generalized_map_min_items.h
+++ b/Generalized_map/include/CGAL/Generalized_map_min_items.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map_operations.h b/Generalized_map/include/CGAL/Generalized_map_operations.h
index a9426b5aeb6..c513b0a3f4e 100644
--- a/Generalized_map/include/CGAL/Generalized_map_operations.h
+++ b/Generalized_map/include/CGAL/Generalized_map_operations.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map_save_load.h b/Generalized_map/include/CGAL/Generalized_map_save_load.h
index d515b2fbc69..37e8999ad8e 100644
--- a/Generalized_map/include/CGAL/Generalized_map_save_load.h
+++ b/Generalized_map/include/CGAL/Generalized_map_save_load.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
+!// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/Generalized_map_storages.h b/Generalized_map/include/CGAL/Generalized_map_storages.h
index c9110792739..be30c6f0977 100644
--- a/Generalized_map/include/CGAL/Generalized_map_storages.h
+++ b/Generalized_map/include/CGAL/Generalized_map_storages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/internal/Generalized_map_group_functors.h b/Generalized_map/include/CGAL/internal/Generalized_map_group_functors.h
index 466ba5f6b2b..e7cfa3fd3df 100644
--- a/Generalized_map/include/CGAL/internal/Generalized_map_group_functors.h
+++ b/Generalized_map/include/CGAL/internal/Generalized_map_group_functors.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/internal/Generalized_map_internal_functors.h b/Generalized_map/include/CGAL/internal/Generalized_map_internal_functors.h
index ee403720885..0f3ebe63cf0 100644
--- a/Generalized_map/include/CGAL/internal/Generalized_map_internal_functors.h
+++ b/Generalized_map/include/CGAL/internal/Generalized_map_internal_functors.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Generalized_map/include/CGAL/internal/Generalized_map_sewable.h b/Generalized_map/include/CGAL/internal/Generalized_map_sewable.h
index 003bb926523..ec84aa710dc 100644
--- a/Generalized_map/include/CGAL/internal/Generalized_map_sewable.h
+++ b/Generalized_map/include/CGAL/internal/Generalized_map_sewable.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
diff --git a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
index 5bb50958979..7bdf192649b 100644
--- a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
+++ b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 CNRS and LIRIS' Establishments (France).
+// Copyright (c) 2016 CNRS and LIRIS' Establishments (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or