diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
index 770c49a98a3..95f52e13f2d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
@@ -24,9 +24,6 @@
 #ifndef CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
 #define CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <CGAL/config.h>
 
 #include <CGAL/Algebraic_kernel_d/flags.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
index ae965963989..92f0f8dfa64 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_ARC_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_ARC_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
  *\brief Defines class \c Arc_2 that represents an arc on a curve that
  * can be analyzed.
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h
index b20ffd259c7..843d68d2147 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_CURVE_INTERVAL_ARCNO_CACHE_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_CURVE_INTERVAL_ARCNO_CACHE_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h
  * \brief defines \c Curve_interval_arcno_cache functor
  */
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h
index 9df2cb853a2..8b3170e6671 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_renderer_facade.h
@@ -30,9 +30,6 @@
 #ifndef CGAL_CKVA_CURVE_RENDERER_FACADE_H
 #define CGAL_CKVA_CURVE_RENDERER_FACADE_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 // do not compile curve renderer code (for fast debugging)
 //#define CGAL_CKVA_DUMMY_RENDERER
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h
index f046627fecb..bac3b6d6af7 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_FUNCTORS_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_FUNCTORS_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_functors.h
  * \brief defines Curved_kernel_via_analysis_2 function objects + class
  */
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h
index 85f6689a36c..90bfb3715af 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curved_kernel_via_analysis_2_impl.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_IMPL_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_IMPL_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2.h
  * \brief defines class \c Curved_kernel_via_analysis_2
  *  
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h
index 43f9a6afa8c..899f0903976 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h
@@ -24,9 +24,6 @@
 #ifndef CGAL_FILTERED_CURVED_KERNEL_VIA_ANALYSIS_2_IMPL_H
 #define CGAL_FILTERED_CURVED_KERNEL_VIA_ANALYSIS_2_IMPL_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Filtered_curved_kernel_via_analysis_2.h
  * \brief defines class \c Filtered_curved_kernel_via_analysis_2
  *  
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h
index 8570a01f21f..4f034795e13 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_GENERIC_ARC_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_GENERIC_ARC_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Generic_arc_2.h
  * \brief defines class \c Generic_arc_2
  *  
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h
index 31098427bfd..26173e4aa7f 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_GENERIC_POINT_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_GENERIC_POINT_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Generic_point_2.h
  * \brief defines class \c Generic_point_2
  *  
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
index e48d402178a..d9f928ed06e 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_MAKE_X_MONOTONE_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_MAKE_X_MONOTONE_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Make_x_monotone_2.h
  * \brief Defines \c Make_x_monotone_2 functor
  */
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h
index 35a9679871d..299c91dad41 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_NON_X_MONOTONE_ARC_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_NON_X_MONOTONE_ARC_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Non_x_monotone_arc_2.h
  * \brief defines class \c Non_x_monotone_arc_2
  *  
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
index b03c29979f6..2260f6b92bc 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_POINT_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_POINT_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
  * \brief Defines class \c Point_2 that represents a point on a curve that can
  * be analyzed.
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h
index 323f1eb7562..5cba5bd713d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_SWEEP_CURVES_ADAPTER_2_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_SWEEP_CURVES_ADAPTER_2_H 1
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/Sweep_curves_adapter_2.h
  * \brief defines class \c Sweep_curves_adapter_2
  *
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h
index db2920e6e79..da01afea544 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h
@@ -28,9 +28,6 @@
 #ifndef CGAL_CKVA_CURVE_RENDERER_2_H
 #define CGAL_CKVA_CURVE_RENDERER_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #ifndef CGAL_AK_ENABLE_DEPRECATED_INTERFACE
 #define CGAL_AK_ENABLE_DEPRECATED_INTERFACE 1
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h
index dcc022d1f21..d2ac06551ed 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_internals.h
@@ -33,9 +33,6 @@
 #ifndef CGAL_CKVA_CURVE_RENDERER_INTERNALS_H
 #define CGAL_CKVA_CURVE_RENDERER_INTERNALS_H 1
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <vector>
 #include <stack>
 // #include <boost/multi_index_container.hpp>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h
index 9fd0f7d257a..74f77e57d7d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_traits.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_CKVA_CURVE_RENDERER_TRAITS_H
 #define CGAL_CKVA_CURVE_RENDERER_TRAITS_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <CGAL/basic.h>
 #include <CGAL/function_objects.h>
 #include <boost/functional.hpp>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h
index aa631565368..09c03fa73fe 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_1.h
@@ -28,9 +28,6 @@
 #ifndef CGAL_CKVA_SUBDIVISION_1_H
 #define CGAL_CKVA_SUBDIVISION_1_H 1
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <vector>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h
index 1173027f6e0..6f743a2ba77 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h
@@ -28,8 +28,6 @@
 #ifndef CGAL_CKVA_SUBDIVISION_2_H
 #define CGAL_CKVA_SUBDIVISION_2_H 1
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
 #warning this file is considered obsolete
 
 #include <vector>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
index b01462956c3..18be69ec131 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_TEST_SIMPLE_MODELS_H
 #define CGAL_CURVED_KERNEL_VIA_ANALYSIS_2_TEST_SIMPLE_MODELS_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 /*!\file include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
  * \brief defines dummy implementations satisfying Curve_kernel_2
  * concept requirenments 
diff --git a/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
index fe6a49395fe..5c4bcd10227 100644
--- a/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
 #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <CGAL/graph_traits_Arrangement_2.h>
 
 #endif //CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
diff --git a/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Dual_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Dual_Arrangement_2.h
index 7ecdec33af8..be5fafe3060 100644
--- a/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Dual_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/boost/graph/graph_traits_Dual_Arrangement_2.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_BOOST_GRAPH_GRAPH_TRAITS_DUAL_ARRANGEMENT_2_H
 #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
 
-#include <CGAL/license/Arrangement_on_surface_2.h>
-
-
 #include <CGAL/graph_traits_Dual_Arrangement_2.h>
 
 #endif //CGAL_BOOST_GRAPH_GRAPH_TRAITS_DUAL_ARRANGEMENT_2_H
diff --git a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_2.h b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_2.h
index 26a64e2ca5f..7f2bcc46f56 100644
--- a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_2.h
+++ b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_2.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_2_H
 #define CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_2_H
 
-#include <CGAL/license/Bounding_volumes.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_2.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_2.h>
diff --git a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_3.h b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_3.h
index 3278b3d5b77..eed7c3e4b3f 100644
--- a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_3.h
+++ b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_3.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_3_H
 #define CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_3_H
 
-#include <CGAL/license/Bounding_volumes.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_3.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_3.h>
diff --git a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_d.h b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_d.h
index cf219fe70c6..1b9195d7aa4 100644
--- a/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_d.h
+++ b/Bounding_volumes/include/CGAL/Min_sphere_annulus_d_traits_d.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_MIN_SPHERE_ANULUS_D_TRAITS_D_H
 #define CGAL_MIN_SPHERE_ANULUS_D_TRAITS_D_H
 
-#include <CGAL/license/Bounding_volumes.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_d.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_d.h>
diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Intersection_traits.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Intersection_traits.h
index beaaab22637..537332f2a04 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Intersection_traits.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Intersection_traits.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_CIRCULAR_KERNEL_2_INTERSECTION_TRAITS_H
 #define CGAL_CIRCULAR_KERNEL_2_INTERSECTION_TRAITS_H
 
-#include <CGAL/license/Circular_kernel_2.h>
-
-
 //this include is needed to know the value of CGAL_INTERSECTION_VERSION
 #include <CGAL/Intersection_traits.h>
 
diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Intersection_traits.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Intersection_traits.h
index 79fe00e52cc..4a690b64562 100644
--- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Intersection_traits.h
+++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Intersection_traits.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_CIRCULAR_KERNEL_3_INTERSECTION_TRAITS_H
 #define CGAL_CIRCULAR_KERNEL_3_INTERSECTION_TRAITS_H
 
-#include <CGAL/license/Circular_kernel_3.h>
-
-
 //this include is needed to know the value of CGAL_INTERSECTION_VERSION
 #include <CGAL/Intersection_traits.h>
 
diff --git a/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h b/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h
index 198aa310f81..6031d1c037a 100644
--- a/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h
+++ b/Circular_kernel_3/include/CGAL/Spherical_kernel_type_equality_wrapper.h
@@ -31,9 +31,6 @@
 #ifndef CGAL_SPHERICAL_KERNEL_TYPE_EQUALITY_WRAPPER_H
 #define CGAL_SPHERICAL_KERNEL_TYPE_EQUALITY_WRAPPER_H
 
-#include <CGAL/license/Circular_kernel_3.h>
-
-
 #include <CGAL/user_classes.h>
 #include <CGAL/Circular_arc_point_3.h>
 #include <CGAL/Circular_arc_3.h>
diff --git a/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h b/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
index 92b6b7cd2cd..7ae76e3bb3a 100644
--- a/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
+++ b/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_QT_CONFIG_H
 #define CGAL_QT_CONFIG_H
 
-#include <CGAL/license/GraphicsView.h>
-
-
 #include <QtCore/qglobal.h>
 
 #if defined(CGAL_Qt5_DLL)
diff --git a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
index 2ec07231abb..f70d416e7a9 100644
--- a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
+++ b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
@@ -21,8 +21,6 @@
 #ifndef CGAL_QT_CREATE_OPENGL_CONTEXT_H
 #define CGAL_QT_CREATE_OPENGL_CONTEXT_H
 
-#include <CGAL/license/GraphicsView.h>
-
 #include <QOpenGLContext>
 #include <QGLContext>
 namespace CGAL{
diff --git a/GraphicsView/include/CGAL/auto_link/Qt.h b/GraphicsView/include/CGAL/auto_link/Qt.h
index 7e38ff7ce90..3fdf1110d47 100644
--- a/GraphicsView/include/CGAL/auto_link/Qt.h
+++ b/GraphicsView/include/CGAL/auto_link/Qt.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_AUTO_LINK_QT_H
 #define CGAL_AUTO_LINK_QT_H
 
-#include <CGAL/license/GraphicsView.h>
-
-
 #include <CGAL/config.h>
 #include <QtCore/qglobal.h>
 
diff --git a/GraphicsView/include/CGAL/export/Qt.h b/GraphicsView/include/CGAL/export/Qt.h
index 71eb2bc8d43..360e6c85e34 100644
--- a/GraphicsView/include/CGAL/export/Qt.h
+++ b/GraphicsView/include/CGAL/export/Qt.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_QT_EXPORT_H
 #define CGAL_QT_EXPORT_H
 
-#include <CGAL/license/GraphicsView.h>
-
-
 #include <CGAL/config.h>
 #include <CGAL/export/helpers.h>
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/properties_Polyhedron_3.h b/Mesh_3/include/CGAL/Mesh_3/properties_Polyhedron_3.h
index 9ef5041b610..3e06305df49 100644
--- a/Mesh_3/include/CGAL/Mesh_3/properties_Polyhedron_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/properties_Polyhedron_3.h
@@ -21,7 +21,6 @@
 #ifndef CGAL_MESH_3_PROPERTIES_POLYHEDRON_3_H
 #define CGAL_MESH_3_PROPERTIES_POLYHEDRON_3_H
 
-#include <CGAL/license/Mesh_3.h>
 #include <CGAL/Mesh_3/properties.h>
 #include <CGAL/boost/graph/properties_Polyhedron_3.h>
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h b/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h
index 1abf8559505..8c9ac16080d 100644
--- a/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h
+++ b/Mesh_3/include/CGAL/Mesh_3/properties_Surface_mesh.h
@@ -21,7 +21,6 @@
 #ifndef CGAL_MESH_3_PROPERTIES_SURFACE_MESH_H
 #define CGAL_MESH_3_PROPERTIES_SURFACE_MESH_H
 
-#include <CGAL/license/Mesh_3.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Mesh_3/properties.h>
 #include <set>
diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h
index 236504261ed..7e43da0e116 100644
--- a/Nef_2/include/CGAL/Nef_2/Polynomial.h
+++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h
@@ -23,9 +23,6 @@
 #ifndef CGAL_NEF_2_POLYNOMIAL_H
 #define CGAL_NEF_2_POLYNOMIAL_H
 
-#include <CGAL/license/Nef_2.h>
-
-
 #include <CGAL/basic.h>
 #include <CGAL/kernel_assertions.h>
 #include <CGAL/Handle_for.h>
diff --git a/Nef_2/include/CGAL/Nef_2/debug.h b/Nef_2/include/CGAL/Nef_2/debug.h
index 558b7c9f324..55a16c8bfc8 100644
--- a/Nef_2/include/CGAL/Nef_2/debug.h
+++ b/Nef_2/include/CGAL/Nef_2/debug.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_NEF_2_DEBUG_H
 #define CGAL_NEF_2_DEBUG_H
 
-#include <CGAL/license/Nef_2.h>
-
-
 #include <iostream>
 
 #ifdef NDEBUG
diff --git a/Nef_2/include/CGAL/Nef_polynomial_fwd.h b/Nef_2/include/CGAL/Nef_polynomial_fwd.h
index ffa9581ba96..168ddde7250 100644
--- a/Nef_2/include/CGAL/Nef_polynomial_fwd.h
+++ b/Nef_2/include/CGAL/Nef_polynomial_fwd.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_NEF_POLYNOMIAL_FWD_H
 #define CGAL_NEF_POLYNOMIAL_FWD_H
 
-#include <CGAL/license/Nef_2.h>
-
-
 #include <CGAL/enum.h>
 
 // Forward declarations of functions over Polynomial and Nef_polynomial
diff --git a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
index 285f4b1cb4d..c78b97eb00b 100644
--- a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
+++ b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_OGL_BASE_OBJECT_H
 #define CGAL_OGL_BASE_OBJECT_H
 
-#include <CGAL/license/Nef_S2.h>
-
-
 #include <CGAL/Simple_cartesian.h>
 
 namespace CGAL {
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
index a2562aeb0c4..c13f9b8cbf5 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
@@ -18,8 +18,6 @@
 #ifndef CGAL_INTERNAL_STATIC_FILTERS_PERIODIC_3_POWER_TEST_3_H
 #define CGAL_INTERNAL_STATIC_FILTERS_PERIODIC_3_POWER_TEST_3_H
 
-#include <CGAL/license/Periodic_3_triangulation_3.h>
-
 #include <CGAL/Profile_counter.h>
 #include <CGAL/internal/Static_filters/Static_filter_error.h>
 #include <CGAL/internal/Static_filters/tools.h>
diff --git a/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h b/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h
index 19c9521053e..779ceb05814 100644
--- a/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h
+++ b/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_POLYHEDRON_3_TO_LCC_H
 #define CGAL_POLYHEDRON_3_TO_LCC_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/assertions.h>
 #include <iostream>
 #include <map>
diff --git a/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h b/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
index 0060921c726..e66d63e30f9 100644
--- a/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
+++ b/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H
 #define CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H 1
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/HalfedgeDS_vertex_max_base_with_id.h>
 #include <CGAL/HalfedgeDS_halfedge_max_base_with_id.h>
 #include <CGAL/HalfedgeDS_face_max_base_with_id.h>
diff --git a/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
index f476567d3bf..3d1c005e3bc 100644
--- a/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYHEDRON_3_H
 #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYHEDRON_3_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/boost/graph/graph_traits_HalfedgeDS.h>
 
 #include <CGAL/Polyhedron_3.h>
diff --git a/Polyhedron/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h
index fd48bae25f1..9330761843a 100644
--- a/Polyhedron/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_BOOST_GRAPH_HALFEDGE_GRAPH_TRAITS_POLYHEDRON_3_H
 #define CGAL_BOOST_GRAPH_HALFEDGE_GRAPH_TRAITS_POLYHEDRON_3_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #define CGAL_DEPRECATED_HEADER "<CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/boost/graph/graph_traits_Polyhedron_3.h>"
 #include <CGAL/internal/deprecation_warning.h>
diff --git a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
index 4d7ec950ed4..db6f3b795f5 100644
--- a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
@@ -21,8 +21,6 @@
 #ifndef CGAL_BOOST_GRAPH_PROPERTIES_POLYHEDRON_3_H
 #define CGAL_BOOST_GRAPH_PROPERTIES_POLYHEDRON_3_H
 
-#include <CGAL/license/Polyhedron.h>
-
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Unique_hash_map.h>
diff --git a/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h b/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h
index 7036a4b321a..33c686dd471 100644
--- a/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h
+++ b/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h
@@ -20,8 +20,6 @@
 #ifndef CGAL_IO_OBJ_READER_H
 #define CGAL_IO_OBJ_READER_H
 
-#include <CGAL/license/Polyhedron.h>
-
 #include <istream>
 #include <vector>
 
diff --git a/Polyhedron_IO/include/CGAL/IO/OFF_reader.h b/Polyhedron_IO/include/CGAL/IO/OFF_reader.h
index a759b210530..17741fe1933 100644
--- a/Polyhedron_IO/include/CGAL/IO/OFF_reader.h
+++ b/Polyhedron_IO/include/CGAL/IO/OFF_reader.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_IO_OFF_READER_H
 #define CGAL_IO_OFF_READER_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/IO/File_scanner_OFF.h>
 
 #include <vector>
diff --git a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h b/Polyhedron_IO/include/CGAL/IO/PLY_reader.h
index 7ddd5164bc0..371114bd353 100644
--- a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h
+++ b/Polyhedron_IO/include/CGAL/IO/PLY_reader.h
@@ -20,8 +20,6 @@
 #ifndef CGAL_IO_PLY_READER_H
 #define CGAL_IO_PLY_READER_H
 
-#include <CGAL/license/Polyhedron.h>
-
 #include <CGAL/IO/read_ply_points.h>
 
 namespace CGAL{
diff --git a/Polyhedron_IO/include/CGAL/IO/PLY_writer.h b/Polyhedron_IO/include/CGAL/IO/PLY_writer.h
index 6962c698037..b177d071fcd 100644
--- a/Polyhedron_IO/include/CGAL/IO/PLY_writer.h
+++ b/Polyhedron_IO/include/CGAL/IO/PLY_writer.h
@@ -20,8 +20,6 @@
 #ifndef CGAL_IO_PLY_WRITER_H
 #define CGAL_IO_PLY_WRITER_H
 
-#include <CGAL/license/Polyhedron.h>
-
 #include <CGAL/IO/write_ply_points.h>
 
 namespace CGAL{
diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h
index 8bee638d123..256f16e08be 100644
--- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h
+++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_IO_POLYHEDRON_STL_BUILDER_H
 #define CGAL_IO_POLYHEDRON_STL_BUILDER_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/Modifier_base.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
 #include <CGAL/IO/STL_reader.h>
diff --git a/Polyhedron_IO/include/CGAL/IO/STL_reader.h b/Polyhedron_IO/include/CGAL/IO/STL_reader.h
index e8e5f0dea03..50bc2691f76 100644
--- a/Polyhedron_IO/include/CGAL/IO/STL_reader.h
+++ b/Polyhedron_IO/include/CGAL/IO/STL_reader.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_IO_STL_READER_H
 #define CGAL_IO_STL_READER_H
 
-#include <CGAL/license/Polyhedron.h>
-
-
 #include <CGAL/array.h>
 #include <boost/cstdint.hpp> 
 #include <vector>
diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h
index ba2f2a754dc..272ceabbfef 100644
--- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h
+++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_POLYTOPE_DISTANCE_D_TRAITS_2_H
 #define CGAL_POLYTOPE_DISTANCE_D_TRAITS_2_H
 
-#include <CGAL/license/Polytope_distance_d.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_2.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_2.h>
diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h
index a795bcbe3a6..accabbb97a9 100644
--- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h
+++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_POLYTOPE_DISTANCE_D_TRAITS_3_H
 #define CGAL_POLYTOPE_DISTANCE_D_TRAITS_3_H
 
-#include <CGAL/license/Polytope_distance_d.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_3.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_3.h>
diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h
index 8fe3302cb4a..eb073fc1811 100644
--- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h
+++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h
@@ -26,9 +26,6 @@
 #ifndef CGAL_POLYTOPE_DISTANCE_D_TRAITS_D_H
 #define CGAL_POLYTOPE_DISTANCE_D_TRAITS_D_H
 
-#include <CGAL/license/Polytope_distance_d.h>
-
-
 // includes
 #  include <CGAL/Optimisation/Access_dimension_d.h>
 #  include <CGAL/Optimisation/Access_coordinates_begin_d.h>
diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
index 1d43001745d..abc61e587a6 100644
--- a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
+++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
@@ -24,9 +24,6 @@
 #ifndef CGAL_DXF_STREAM_H
 #define CGAL_DXF_STREAM_H
 
-#include <CGAL/license/Straight_skeleton_2.h>
-
-
 #include <CGAL/basic.h>
 #include <CGAL/Polygon_2.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
index e84d7dc05e9..4abdc85e2fa 100644
--- a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
+++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
@@ -25,9 +25,6 @@
 #ifndef CGAL_IO_DXF_WRITER_H
 #define CGAL_IO_DXF_WRITER_H
 
-#include <CGAL/license/Straight_skeleton_2.h>
-
-
 #include <CGAL/basic.h>
 #include <CGAL/algorithm.h>
 #include <iostream>
diff --git a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
index 15d7d591c09..ca5e8734d44 100644
--- a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_CERTIFIED_NUMERIC_PREDICATES_H
 #define CGAL_CERTIFIED_NUMERIC_PREDICATES_H
 
-#include <CGAL/license/Straight_skeleton_2.h>
-
-
 #include <CGAL/number_utils.h>
 #include <CGAL/Interval_arithmetic.h>
 #include <CGAL/Uncertain.h>
diff --git a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
index fa884230abb..2de11d217d4 100644
--- a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
@@ -20,9 +20,6 @@
 #ifndef CGAL_CERTIFIED_QUOTIENT_PREDICATES_H 
 #define CGAL_CERTIFIED_QUOTIENT_PREDICATES_H
 
-#include <CGAL/license/Straight_skeleton_2.h>
-
- 
 #include <CGAL/certified_numeric_predicates.h>
 #include <CGAL/Quotient.h>
 
diff --git a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
index 5fec86ebd6f..4c306423720 100644
--- a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_BOOST_GRAPH_TRAITS_SURFACE_MESH_H
 #define CGAL_BOOST_GRAPH_TRAITS_SURFACE_MESH_H
 
-#include <CGAL/license/Surface_mesh.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh.h b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh.h
index 07e9965ee49..8b094c3ce50 100644
--- a/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_PROPERTIES_SURFACE_MESH_H
 #define CGAL_PROPERTIES_SURFACE_MESH_H
 
-#include <CGAL/license/Surface_mesh.h>
-
-
 #include <CGAL/assertions.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Surface_mesh/Properties.h>
diff --git a/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_closest_rotation_traits_3.h b/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_closest_rotation_traits_3.h
index 91c47452533..1350947abdf 100644
--- a/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_closest_rotation_traits_3.h
+++ b/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_closest_rotation_traits_3.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_DEFORMATION_EIGEN_CLOSEST_ROTATION_TRAITS_3_H
 #define CGAL_DEFORMATION_EIGEN_CLOSEST_ROTATION_TRAITS_3_H
 
-#include <CGAL/license/Surface_mesh_deformation.h>
-
-
 #include <Eigen/Eigen>
 #include <Eigen/SVD>
 
diff --git a/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_polar_closest_rotation_traits_3.h b/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_polar_closest_rotation_traits_3.h
index e80432ab26c..24e12cb0de2 100644
--- a/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_polar_closest_rotation_traits_3.h
+++ b/Surface_mesh_deformation/include/CGAL/Deformation_Eigen_polar_closest_rotation_traits_3.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_DEFORMATION_EIGEN_POLAR_CLOSEST_ROTATION_TRAITS_3_H
 #define CGAL_DEFORMATION_EIGEN_POLAR_CLOSEST_ROTATION_TRAITS_3_H
 
-#include <CGAL/license/Surface_mesh_deformation.h>
-
-
 #include <CGAL/Deformation_Eigen_closest_rotation_traits_3.h>
 #include <CGAL/FPU_extension.h>
 #include <CGAL/Profile_counter.h>
diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
index 27a9f3ee76b..bf05c60ba43 100644
--- a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
+++ b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
@@ -25,9 +25,6 @@
 #ifndef CGAL_SURFACE_MESHER_PROFILE_COUNTER_H
 #define CGAL_SURFACE_MESHER_PROFILE_COUNTER_H
 
-#include <CGAL/license/Surface_mesher.h>
-
-
 #include <CGAL/Profile_counter.h>
 
 #ifdef CGAL_SURFACE_MESHER_PROFILE
diff --git a/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h b/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
index bef90982d39..249a8f61286 100644
--- a/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
+++ b/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
@@ -22,8 +22,6 @@
 #ifndef CGAL_TRIANGULATION_IO_H
 #define CGAL_TRIANGULATION_IO_H
 
-#include <CGAL/license/Triangulation.h>
-
 #include <CGAL/Epick_d.h>
 #include <CGAL/Triangulation.h>
 #include <sstream>
diff --git a/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h b/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h
index ba234e901e0..a370eb714e0 100644
--- a/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h
+++ b/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h
@@ -22,8 +22,6 @@
 #ifndef CGAL_TRIANGULATION_OFF_OSTREAM_2_H
 #define CGAL_TRIANGULATION_OFF_OSTREAM_2_H
 
-#include <CGAL/license/Triangulation.h>
-
 #include <CGAL/Triangulation_2.h>
 #include <sstream>
 #include <iostream>
diff --git a/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h b/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h
index a79dd367472..43283e84403 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_TRIANGULATION_2_TO_LCC_H
 #define CGAL_TRIANGULATION_2_TO_LCC_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 #include <CGAL/assertions.h>
 #include <map>
 
diff --git a/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h b/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h
index d6763426e2f..3d57f0f4181 100644
--- a/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_TRIANGULATION_VERTEX_BASE_WITH_ID_2_H
 #define CGAL_TRIANGULATION_VERTEX_BASE_WITH_ID_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 #include <CGAL/Triangulation_vertex_base_2.h>
 
 namespace CGAL {
diff --git a/Triangulation_2/include/CGAL/apply_to_range.h b/Triangulation_2/include/CGAL/apply_to_range.h
index 2e66f9fa491..a8dd424509c 100644
--- a/Triangulation_2/include/CGAL/apply_to_range.h
+++ b/Triangulation_2/include/CGAL/apply_to_range.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_apply_to_range_h
 #define CGAL_apply_to_range_h
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 #include <CGAL/Point_2.h>
 #include <CGAL/Unique_hash_map.h>
 #include <stack>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
index 65a57208b53..83dd6e274da 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
index 936eefe17b4..5496562ea4e 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
index df9adae2d13..78d724d5cc6 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_PLUS_2_H
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_PLUS_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
index e20db1b4a6e..6b6db25a84f 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
index 15c3d7cdc94..4a5936dc3a0 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
index d2d12bf7348..1d107b21b68 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 #include <functional>
 
 // include this to avoid a VC15 warning
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
index d6036b283e7..839a824d638 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_DATA_STRUCTURE_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_DATA_STRUCTURE_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 #include <functional>
 
 // include this to avoid a VC15 warning
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
index 580490ab5af..2b97ccf0efb 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
 
-#include <CGAL/license/Triangulation_2.h>
-
-
 // include this to avoid a VC15 warning
 #include <CGAL/boost/graph/named_function_params.h>
 
diff --git a/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h b/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h
index cd79380b440..6861f303402 100644
--- a/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h
+++ b/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h
@@ -22,8 +22,6 @@
 #ifndef CGAL_TRIANGULATION_OFF_OSTREAM_3_H
 #define CGAL_TRIANGULATION_OFF_OSTREAM_3_H
 
-#include <CGAL/license/Triangulation.h>
-
 #include <CGAL/Triangulation_3.h>
 #include <sstream>
 #include <iostream>
diff --git a/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h b/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h
index ce5cfe13e9e..f0933531702 100644
--- a/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h
+++ b/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h
@@ -22,9 +22,6 @@
 #ifndef CGAL_TRIANGULATION_3_TO_LCC_H
 #define CGAL_TRIANGULATION_3_TO_LCC_H
 
-#include <CGAL/license/Triangulation_3.h>
-
-
 #include <CGAL/assertions.h>
 #include <map>