diff --git a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
index 58156ed6640..bd9cfec7f7c 100644
--- a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
+++ b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
@@ -17,6 +17,9 @@
 #ifndef CGAL_DRAW_POLYGON_SET_2_H
 #define CGAL_DRAW_POLYGON_SET_2_H
 
+#include <CGAL/license/Boolean_set_operations_2.h>
+
+
 #include <CGAL/Qt/Basic_viewer_qt.h>
 
 #ifdef DOXYGEN_RUNNING
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 434368e3ef1..933212c0c6b 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
@@ -17,6 +17,9 @@
 #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 7873d6f4b1a..a941f4e0b46 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
@@ -17,6 +17,9 @@
 #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 0730222f251..ff1feca70bd 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
@@ -17,6 +17,9 @@
 #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 8896e76c23b..bab7cfadfc1 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
@@ -17,6 +17,9 @@
 #ifndef CGAL_CIRCULAR_KERNEL_2_INTERSECTION_TRAITS_H
 #define CGAL_CIRCULAR_KERNEL_2_INTERSECTION_TRAITS_H
 
+#include <CGAL/license/Circular_kernel_2.h>
+
+
 #include <CGAL/Intersection_traits.h>
 
 #include <variant>
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 b2319846ecb..ed6ac62628f 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
@@ -13,6 +13,9 @@
 #ifndef CGAL_CIRCULAR_KERNEL_3_INTERSECTION_TRAITS_H
 #define CGAL_CIRCULAR_KERNEL_3_INTERSECTION_TRAITS_H
 
+#include <CGAL/license/Circular_kernel_3.h>
+
+
 #include <CGAL/Intersection_traits.h>
 
 #include <variant>
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 432fc6bc635..7e3e82c822d 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
@@ -22,6 +22,9 @@
 #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/Convex_hull_2/include/CGAL/Convex_hull_traits_adapter_2.h b/Convex_hull_2/include/CGAL/Convex_hull_traits_adapter_2.h
index b1a7c83210c..eb7f87c96ea 100644
--- a/Convex_hull_2/include/CGAL/Convex_hull_traits_adapter_2.h
+++ b/Convex_hull_2/include/CGAL/Convex_hull_traits_adapter_2.h
@@ -13,6 +13,9 @@
 #ifndef CGAL_CONVEX_HULL_TRAITS_ADAPTER_2_H
 #define CGAL_CONVEX_HULL_TRAITS_ADAPTER_2_H
 
+#include <CGAL/license/Convex_hull_2.h>
+
+
 #include <boost/call_traits.hpp>
 
 #include <CGAL/property_map.h>
diff --git a/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h b/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
index c5fdd7c3eff..a617735b67e 100644
--- a/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
+++ b/GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_QT_CONFIG_H
 #define CGAL_QT_CONFIG_H
 
+#include <CGAL/license/GraphicsView.h>
+
+
 #include <QtCore/qglobal.h>
 
 #if defined(CGAL_Qt6_DLL)
diff --git a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
index 7099eddc48c..c984b85a5d2 100644
--- a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
+++ b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_QT_CREATE_OPENGL_CONTEXT_H
 #define CGAL_QT_CREATE_OPENGL_CONTEXT_H
 
+#include <CGAL/license/GraphicsView.h>
+
+
 #include <QOpenGLContext>
 
 namespace CGAL{
diff --git a/GraphicsView/include/CGAL/auto_link/Qt.h b/GraphicsView/include/CGAL/auto_link/Qt.h
index f8efb5e983a..a27bb073b2b 100644
--- a/GraphicsView/include/CGAL/auto_link/Qt.h
+++ b/GraphicsView/include/CGAL/auto_link/Qt.h
@@ -12,6 +12,9 @@
 #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 8722c6d344c..14ea46c6380 100644
--- a/GraphicsView/include/CGAL/export/Qt.h
+++ b/GraphicsView/include/CGAL/export/Qt.h
@@ -12,6 +12,9 @@
 #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/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h
index 1f335f6d387..ef494741b98 100644
--- a/Nef_2/include/CGAL/Nef_2/Polynomial.h
+++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h
@@ -14,6 +14,9 @@
 #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/Polynomial_impl.h b/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
index 19d7c064778..0e39b126b4d 100644
--- a/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
+++ b/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
@@ -11,6 +11,11 @@
 // Author(s)     : Michael Seel
 //                 Andreas Fabri
 
+#ifndef CGAL_NEF_2_POLYNOMIAL_IMPL_H
+#define CGAL_NEF_2_POLYNOMIAL_IMPL_H
+
+#include <CGAL/license/Nef_2.h>
+
 
 namespace CGAL{
 
@@ -202,3 +207,5 @@ Polynomial<double> Polynomial<double>::gcd(
 
 } // end namespace Nef
 }//end namespace CGAL
+
+#endif //CGAL_NEF_2_POLYNOMIAL_IMPL_H
diff --git a/Nef_2/include/CGAL/Nef_2/debug.h b/Nef_2/include/CGAL/Nef_2/debug.h
index 2583e37d523..001eaeaa1ef 100644
--- a/Nef_2/include/CGAL/Nef_2/debug.h
+++ b/Nef_2/include/CGAL/Nef_2/debug.h
@@ -13,6 +13,9 @@
 #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 34a534b0d71..17cc9df36f9 100644
--- a/Nef_2/include/CGAL/Nef_polynomial_fwd.h
+++ b/Nef_2/include/CGAL/Nef_polynomial_fwd.h
@@ -13,6 +13,9 @@
 #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 2b129cc7ab2..f813b7dc9f4 100644
--- a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
+++ b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
@@ -13,6 +13,9 @@
 #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/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
index 8a1e06c29ba..748034a41ab 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h
@@ -12,6 +12,9 @@
 #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/Filtered_kernel/internal/Static_filters/Static_filter_error.h>
 #include <CGAL/Filtered_kernel/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 c9b266ebbd6..18db0dc8e34 100644
--- a/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h
+++ b/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h
@@ -13,6 +13,9 @@
 #ifndef CGAL_POLYHEDRON_3_TO_LCC_H
 #define CGAL_POLYHEDRON_3_TO_LCC_H
 
+#include <CGAL/license/Polyhedron.h>
+
+
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/assertions.h>
 #include <iostream>
diff --git a/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h b/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
index 008dae42a64..2bbea002775 100644
--- a/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
+++ b/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
@@ -10,7 +10,10 @@
 // Author(s)     : Andreas Fabri, Fernando Cacciola
 
 #ifndef CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H
-#define CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H 1
+#define CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H
+
+#include <CGAL/license/Polyhedron.h>
+
 
 #include <CGAL/HalfedgeDS_vertex_max_base_with_id.h>
 #include <CGAL/HalfedgeDS_halfedge_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 7df39974c10..f8e6e9a21ca 100644
--- a/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
@@ -12,6 +12,9 @@
 #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 3571d0c3fa2..6d7bf94b3fb 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
@@ -13,6 +13,9 @@
 #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/Installation/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 2b35cb02b4d..b66e213400d 100644
--- a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_BOOST_GRAPH_PROPERTIES_POLYHEDRON_3_H
 #define CGAL_BOOST_GRAPH_PROPERTIES_POLYHEDRON_3_H
 
+#include <CGAL/license/Polyhedron.h>
+
+
 #define CGAL_HDS_TMPLT Gt, class I, CGAL_HDS_PARAM_, class A
 #define CGAL_HDS_CLASS CGAL::Polyhedron_3<Gt,I,HDS,A>
 
diff --git a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_features.h b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_features.h
index 06a8f4a1514..d047937ec83 100644
--- a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_features.h
+++ b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_features.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_PROPERTIES_POLYHEDRON_3_FEATURES_H
 #define CGAL_PROPERTIES_POLYHEDRON_3_FEATURES_H
 
+#include <CGAL/license/Polyhedron.h>
+
+
 #include <CGAL/Polyhedron_3.h>
 #include <set>
 
diff --git a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_time_stamp.h b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_time_stamp.h
index 5a2fdc85417..8d88c8fd895 100644
--- a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_time_stamp.h
+++ b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3_time_stamp.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_PROPERTIES_POLYHEDRON_3_TIME_STAMP_H
 #define CGAL_PROPERTIES_POLYHEDRON_3_TIME_STAMP_H
 
+#include <CGAL/license/Polyhedron.h>
+
+
 #include <CGAL/Polyhedron_3.h>
 
 #define CGAL_HDS_PARAM_ template < class Traits, class Items, class Alloc> class HDS
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 345367b6c11..c051cf033b3 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
@@ -17,6 +17,9 @@
 #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 5f24e083d99..fefc27f69ee 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
@@ -17,6 +17,9 @@
 #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 b115b610c72..1c88c7ee567 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
@@ -17,6 +17,9 @@
 #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/Principal_component_analysis/include/CGAL/Subiterator.h b/Principal_component_analysis/include/CGAL/Subiterator.h
index 0d31b12a8e8..c860be7a361 100644
--- a/Principal_component_analysis/include/CGAL/Subiterator.h
+++ b/Principal_component_analysis/include/CGAL/Subiterator.h
@@ -13,6 +13,9 @@
 #ifndef CGAL_PCA_SUBITERATOR_H
 #define CGAL_PCA_SUBITERATOR_H
 
+#include <CGAL/license/Principal_component_analysis.h>
+
+
 #include <boost/iterator/iterator_facade.hpp>
 
 namespace CGAL
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_stream.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_stream.h
index 5adc8c897c2..61b3eed75b2 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_stream.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_stream.h
@@ -15,6 +15,9 @@
 #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/Straight_skeleton_2/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_writer.h
index e2d3ec5c50a..2251dbe09e2 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_writer.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/Dxf_writer.h
@@ -15,6 +15,9 @@
 #ifndef CGAL_IO_DXF_WRITER_H
 #define CGAL_IO_DXF_WRITER_H
 
+#include <CGAL/license/Straight_skeleton_2.h>
+
+
 #include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/print.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/print.h
index a389b96c138..6c9c493ae87 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/print.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/IO/print.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_SLS_IO_PRINT_H
 #define CGAL_SLS_IO_PRINT_H
 
+#include <CGAL/license/Straight_skeleton_2.h>
+
+
 #include <CGAL/Point_2.h>
 #include <CGAL/Polygon_2.h>
 #include <CGAL/Polygon_with_holes_2.h>
diff --git a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
index 5468e8b9699..f7d82b3c093 100644
--- a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
@@ -11,6 +11,9 @@
 #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 46ba2d948c2..5ecf764b5d8 100644
--- a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
@@ -11,6 +11,9 @@
 #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/properties_Surface_mesh_features.h b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_features.h
index 68fd42eb79e..1484943f078 100644
--- a/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_features.h
+++ b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_features.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_PROPERTIES_SURFACE_MESH_FEATURES_H
 #define CGAL_PROPERTIES_SURFACE_MESH_FEATURES_H
 
+#include <CGAL/license/Surface_mesh.h>
+
+
 #ifndef DOXYGEN_RUNNING
 
 #include <CGAL/Surface_mesh.h>
diff --git a/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_time_stamp.h b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_time_stamp.h
index 06baa03192e..de779d13a28 100644
--- a/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_time_stamp.h
+++ b/Surface_mesh/include/CGAL/boost/graph/properties_Surface_mesh_time_stamp.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_PROPERTIES_SURFACE_MESH_TIME_STAMP_H
 #define CGAL_PROPERTIES_SURFACE_MESH_TIME_STAMP_H
 
+#include <CGAL/license/Surface_mesh.h>
+
+
 #ifndef DOXYGEN_RUNNING
 
 #include <CGAL/Surface_mesh.h>
diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
index 32591b23968..12a0c01cc94 100644
--- a/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
+++ b/Surface_mesher/include/CGAL/Surface_mesher/Profile_counter.h
@@ -16,6 +16,9 @@
 #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/TDS_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h b/TDS_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
index 2ebbf85432b..55ff0388bcf 100644
--- a/TDS_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
+++ b/TDS_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_DATA_STRUCTURE_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_DATA_STRUCTURE_2_H
 
+#include <CGAL/license/TDS_2.h>
+
+
 // include this to avoid a VC15 warning
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h>
diff --git a/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h b/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h
index 483690396b5..1c0b1ae4b40 100644
--- a/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h
+++ b/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h
@@ -19,8 +19,11 @@
 #include <iterator>
 #include <utility>
 
-#ifndef CGAL_GRAPH_TRAITS_2D_TDS_HELPERS
-#define CGAL_GRAPH_TRAITS_2D_TDS_HELPERS
+#ifndef CGAL_GRAPH_TRAITS_2D_TDS_HELPERS_H
+#define CGAL_GRAPH_TRAITS_2D_TDS_HELPERS_H
+
+#include <CGAL/license/TDS_2.h>
+
 
 namespace CGAL {
 namespace internal {
@@ -319,4 +322,4 @@ struct hash<CGAL::internal::TDS2_halfedge_descriptor<TDS> >
 
 } // namespace std
 
-#endif // CGAL_GRAPH_TRAITS_2D_TDS_HELPERS
+#endif // CGAL_GRAPH_TRAITS_2D_TDS_HELPERS_H
diff --git a/TDS_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h b/TDS_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h
index 151af643059..91ba969bd6d 100644
--- a/TDS_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h
+++ b/TDS_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_TRIANGULATION_DATA_STRUCTURE_2_H
 #define CGAL_PROPERTIES_TRIANGULATION_DATA_STRUCTURE_2_H
 
+#include <CGAL/license/TDS_2.h>
+
+
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h>
 #include <CGAL/boost/graph/internal/Has_member_id.h>
diff --git a/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h b/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
index 5dbe2895f10..36fc501daf0 100644
--- a/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
+++ b/Triangulation/include/CGAL/IO/Triangulation_off_ostream.h
@@ -13,6 +13,9 @@
 #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 6d96c38bcb9..6fdcb5b03c4 100644
--- a/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h
+++ b/Triangulation_2/include/CGAL/IO/Triangulation_off_ostream_2.h
@@ -13,6 +13,9 @@
 #ifndef CGAL_TRIANGULATION_OFF_OSTREAM_2_H
 #define CGAL_TRIANGULATION_OFF_OSTREAM_2_H
 
+#include <CGAL/license/Triangulation_2.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 6f24fd8e50e..21607148403 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2_to_lcc.h
@@ -13,6 +13,9 @@
 #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_face_base_with_id_2.h b/Triangulation_2/include/CGAL/Triangulation_face_base_with_id_2.h
index 72fd9fcfba6..eec9abb65c3 100644
--- a/Triangulation_2/include/CGAL/Triangulation_face_base_with_id_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_face_base_with_id_2.h
@@ -12,6 +12,9 @@
 #ifndef CGAL_TRIANGULATION_FACE_BASE_WITH_ID_2_H
 #define CGAL_TRIANGULATION_FACE_BASE_WITH_ID_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Triangulation_face_base_2.h>
 
 namespace CGAL {
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 aca49c503bc..310d3c158e4 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
@@ -12,6 +12,9 @@
 #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 9df2dbd2366..fc235d47a48 100644
--- a/Triangulation_2/include/CGAL/apply_to_range.h
+++ b/Triangulation_2/include/CGAL/apply_to_range.h
@@ -10,8 +10,11 @@
 //
 // Author(s)     : Radu Ursu
 
-#ifndef CGAL_apply_to_range_h
-#define CGAL_apply_to_range_h
+#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>
@@ -151,4 +154,4 @@ void apply_to_range(const Tr &t,
 
 }//end namespace
 
-#endif
+#endif //CGAL_APPLY_TO_RANGE_H
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 c4a6e7f61bd..ae3cdba64d3 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
@@ -12,6 +12,9 @@
 #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 <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/boost/graph/properties_Constrained_Delaunay_triangulation_2.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 3f4fa4e9245..50b31a0d05f 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
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Constrained_triangulation_2.h>
 #include <CGAL/boost/graph/properties_Constrained_triangulation_2.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 85f44168e9a..fb21cff567a 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
@@ -12,6 +12,9 @@
 #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 <CGAL/Constrained_triangulation_plus_2.h>
 #include <CGAL/boost/graph/properties_Constrained_triangulation_plus_2.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 35ac74f22ea..22b95fd4cfd 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
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Delaunay_triangulation_2.h>
 #include <CGAL/boost/graph/properties_Delaunay_triangulation_2.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 4595604b503..127a345a9e2 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
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Regular_triangulation_2.h>
 #include <CGAL/boost/graph/properties_Regular_triangulation_2.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 42bbed130b5..8a50f96e3df 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
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/boost/graph/properties_Triangulation_2.h>
 
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 cd07894b313..eae9f93cefe 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
@@ -12,6 +12,9 @@
 #ifndef CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Triangulation_hierarchy_2.h>
 #include <CGAL/boost/graph/properties_Triangulation_hierarchy_2.h>
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation.h b/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation.h
index e120e7d626f..976c6741e63 100644
--- a/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation.h
+++ b/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation.h
@@ -10,6 +10,8 @@
 //                 Andreas Fabri,
 //                 Fernando Cacciola
 
+#include <CGAL/license/Triangulation_2.h>
+
 #ifndef CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS
   #error CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS is not defined
 #endif
diff --git a/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation_helper.h b/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation_helper.h
index 46a904bc1c3..22a4a4c2f3c 100644
--- a/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation_helper.h
+++ b/Triangulation_2/include/CGAL/boost/graph/internal/graph_traits_2D_triangulation_helper.h
@@ -17,8 +17,11 @@
 
 #include <utility>
 
-#ifndef CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS
-#define CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS
+#ifndef CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS_H
+#define CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS_H
+
+#include <CGAL/license/Triangulation_2.h>
+
 
 namespace CGAL {
 namespace internal {
@@ -181,4 +184,4 @@ private:
 } // namespace internal
 } // namespace CGAL
 
-#endif // CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS
+#endif // CGAL_GRAPH_TRAITS_2D_TRIANGULATION_HELPERS_H
diff --git a/Triangulation_2/include/CGAL/boost/graph/internal/properties_2D_triangulation.h b/Triangulation_2/include/CGAL/boost/graph/internal/properties_2D_triangulation.h
index 65516f9f3b3..2ac267ebcf8 100644
--- a/Triangulation_2/include/CGAL/boost/graph/internal/properties_2D_triangulation.h
+++ b/Triangulation_2/include/CGAL/boost/graph/internal/properties_2D_triangulation.h
@@ -26,6 +26,9 @@
 #ifndef CGAL_BOOST_GRAPH_PROPERTIES_2D_TRIANGULATION_H
 #define CGAL_BOOST_GRAPH_PROPERTIES_2D_TRIANGULATION_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 namespace CGAL {
 namespace internal {
 
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_Delaunay_triangulation_2.h
index b070a293df1..e3ee3e3bb67 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_Delaunay_triangulation_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_PROPERTIES_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename GT, typename TDS, typename Itag
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_2.h
index e56fc487b47..0fdc55290c2 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_CONSTRAINED_TRIANGULATION_2_H
 #define CGAL_PROPERTIES_CONSTRAINED_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Constrained_triangulation_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename GT, typename TDS, typename Itag
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_plus_2.h
index 6e0f16ea086..8d2df8776c9 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_plus_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Constrained_triangulation_plus_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_CONSTRAINED_TRIANGULATION_PLUS_2_H
 #define CGAL_PROPERTIES_CONSTRAINED_TRIANGULATION_PLUS_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Constrained_triangulation_plus_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename Tr
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Delaunay_triangulation_2.h
index 6367bc5a58b..a040184b4b8 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Delaunay_triangulation_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_PROPERTIES_DELAUNAY_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Delaunay_triangulation_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename GT, typename TDS
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Regular_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Regular_triangulation_2.h
index 7d91b01ae96..a4d0f9a4acc 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Regular_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Regular_triangulation_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_REGULAR_TRIANGULATION_2_H
 #define CGAL_PROPERTIES_REGULAR_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Regular_triangulation_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename GT, typename TDS
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_2.h
index 25c60a34d80..6c111297bfa 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_TRIANGULATION_2_H
 #define CGAL_PROPERTIES_TRIANGULATION_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Triangulation_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename GT, typename TDS
diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_hierarchy_2.h
index 9ed8bbdb193..830c4f8f6b5 100644
--- a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_hierarchy_2.h
@@ -11,6 +11,9 @@
 #ifndef CGAL_PROPERTIES_TRIANGULATION_HIERARCHY_2_H
 #define CGAL_PROPERTIES_TRIANGULATION_HIERARCHY_2_H
 
+#include <CGAL/license/Triangulation_2.h>
+
+
 #include <CGAL/Triangulation_hierarchy_2.h>
 
 #define CGAL_2D_TRIANGULATION_TEMPLATE_PARAMETERS typename Tr
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 4708dc1b7e1..55f1b953a5d 100644
--- a/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h
+++ b/Triangulation_3/include/CGAL/IO/Triangulation_off_ostream_3.h
@@ -13,6 +13,9 @@
 #ifndef CGAL_TRIANGULATION_OFF_OSTREAM_3_H
 #define CGAL_TRIANGULATION_OFF_OSTREAM_3_H
 
+#include <CGAL/license/Triangulation_3.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 43079354d0a..19f495dbfbe 100644
--- a/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h
+++ b/Triangulation_3/include/CGAL/Triangulation_3_to_lcc.h
@@ -13,6 +13,9 @@
 #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>
 #include <CGAL/Weighted_point_3.h>