diff --git a/Installation/include/CGAL/license/Isosurfacing_3.h b/Installation/include/CGAL/license/Isosurfacing_3.h
new file mode 100644
index 00000000000..345fae13a82
--- /dev/null
+++ b/Installation/include/CGAL/license/Isosurfacing_3.h
@@ -0,0 +1,54 @@
+// Copyright (c) 2016  GeometryFactory SARL (France).
+// All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org)
+//
+// $URL$
+// $Id$
+// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
+//
+// Author(s) : Andreas Fabri
+//
+// Warning: this file is generated, see include/CGAL/licence/README.md
+
+#ifndef CGAL_LICENSE_ISOSURFACING_3_H
+#define CGAL_LICENSE_ISOSURFACING_3_H
+
+#include <CGAL/config.h>
+#include <CGAL/license.h>
+
+#ifdef CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE
+
+#  if CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
+
+#    if defined(CGAL_LICENSE_WARNING)
+
+       CGAL_pragma_warning("Your commercial license for CGAL does not cover "
+                           "this release of the 3D Isosurfacing package.")
+#    endif
+
+#    ifdef CGAL_LICENSE_ERROR
+#      error "Your commercial license for CGAL does not cover this release \
+              of the 3D Isosurfacing package. \
+              You get this error, as you defined CGAL_LICENSE_ERROR."
+#    endif // CGAL_LICENSE_ERROR
+
+#  endif // CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
+
+#else // no CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE
+
+#  if defined(CGAL_LICENSE_WARNING)
+     CGAL_pragma_warning("\nThe macro CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE is not defined."
+                          "\nYou use the CGAL 3D Isosurfacing package under "
+                          "the terms of the GPLv3+.")
+#  endif // CGAL_LICENSE_WARNING
+
+#  ifdef CGAL_LICENSE_ERROR
+#    error "The macro CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE is not defined.\
+            You use the CGAL 3D Isosurfacing package under the terms of \
+            the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR."
+#  endif // CGAL_LICENSE_ERROR
+
+#endif // no CGAL_ISOSURFACING_3_COMMERCIAL_LICENSE
+
+#endif // CGAL_LICENSE_ISOSURFACING_3_H
diff --git a/Installation/include/CGAL/license/SMDS_3.h b/Installation/include/CGAL/license/SMDS_3.h
index 6191918e010..80dae3f8747 100644
--- a/Installation/include/CGAL/license/SMDS_3.h
+++ b/Installation/include/CGAL/license/SMDS_3.h
@@ -24,12 +24,12 @@
 #    if defined(CGAL_LICENSE_WARNING)
 
        CGAL_pragma_warning("Your commercial license for CGAL does not cover "
-                           "this release of the 3D Mesh Data Structure package.")
+                           "this release of the 3D Simplicial Mesh Data Structure package.")
 #    endif
 
 #    ifdef CGAL_LICENSE_ERROR
 #      error "Your commercial license for CGAL does not cover this release \
-              of the 3D Mesh Data Structure package. \
+              of the 3D Simplicial Mesh Data Structure package. \
               You get this error, as you defined CGAL_LICENSE_ERROR."
 #    endif // CGAL_LICENSE_ERROR
 
diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt
index f023d48f375..8047fa608d2 100644
--- a/Installation/include/CGAL/license/gpl_package_list.txt
+++ b/Installation/include/CGAL/license/gpl_package_list.txt
@@ -24,6 +24,7 @@ Hyperbolic_triangulation_2 2D Hyperbolic Delaunay Triangulations
 Inscribed_areas Inscribed Areas
 Interpolation 2D and Surface Function Interpolation
 Interval_skip_list Interval Skip List
+Isosurfacing_3 3D Isosurfacing
 Jet_fitting_3 Estimation of Local Differential Properties of Point-Sampled Surfaces
 Matrix_search Monotone and Sorted Matrix Search
 Mesh_2 2D Conforming Triangulations and Meshes
diff --git a/Isosurfacing_3/include/CGAL/Cartesian_grid_3.h b/Isosurfacing_3/include/CGAL/Cartesian_grid_3.h
index 558442b9667..7a110e5fd63 100644
--- a/Isosurfacing_3/include/CGAL/Cartesian_grid_3.h
+++ b/Isosurfacing_3/include/CGAL/Cartesian_grid_3.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_CARTESIAN_GRID_3_H
 #define CGAL_CARTESIAN_GRID_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Image_3.h>
 
diff --git a/Isosurfacing_3/include/CGAL/Cartesian_grid_domain.h b/Isosurfacing_3/include/CGAL/Cartesian_grid_domain.h
index a01b366f285..ef776147282 100644
--- a/Isosurfacing_3/include/CGAL/Cartesian_grid_domain.h
+++ b/Isosurfacing_3/include/CGAL/Cartesian_grid_domain.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_CARTESIAN_GRID_DOMAIN_H
 #define CGAL_CARTESIAN_GRID_DOMAIN_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cartesian_grid_3.h>
 #include <CGAL/Cartesian_topology_base.h>
 #include <CGAL/Default_gradients.h>
diff --git a/Isosurfacing_3/include/CGAL/Cartesian_topology_base.h b/Isosurfacing_3/include/CGAL/Cartesian_topology_base.h
index e118d5cb118..a244a7c8f17 100644
--- a/Isosurfacing_3/include/CGAL/Cartesian_topology_base.h
+++ b/Isosurfacing_3/include/CGAL/Cartesian_topology_base.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_CARTESIAN_TOPOLOGY_BASE_H
 #define CGAL_CARTESIAN_TOPOLOGY_BASE_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cell_type.h>
 #include <CGAL/Isosurfacing_3/internal/Tables.h>
 #include <CGAL/tags.h>
diff --git a/Isosurfacing_3/include/CGAL/Cell_type.h b/Isosurfacing_3/include/CGAL/Cell_type.h
index 65a8cf12e3d..246118afbc6 100644
--- a/Isosurfacing_3/include/CGAL/Cell_type.h
+++ b/Isosurfacing_3/include/CGAL/Cell_type.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_DOMAIN_CELL_TYPE
 #define CGAL_DOMAIN_CELL_TYPE
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <limits>
 
 namespace CGAL {
diff --git a/Isosurfacing_3/include/CGAL/Default_gradients.h b/Isosurfacing_3/include/CGAL/Default_gradients.h
index f241c780a07..d513627ed5c 100644
--- a/Isosurfacing_3/include/CGAL/Default_gradients.h
+++ b/Isosurfacing_3/include/CGAL/Default_gradients.h
@@ -12,6 +12,8 @@
 #ifndef CGAL_DEFAULT_GRADIENT_H
 #define CGAL_DEFAULT_GRADIENT_H
 
+#include <CGAL/license/Isosurfacing_3.h>
+
 namespace CGAL {
 namespace Isosurfacing {
 
diff --git a/Isosurfacing_3/include/CGAL/Dual_contouring_3.h b/Isosurfacing_3/include/CGAL/Dual_contouring_3.h
index 33dc3516cb1..b3fd0be4fa5 100644
--- a/Isosurfacing_3/include/CGAL/Dual_contouring_3.h
+++ b/Isosurfacing_3/include/CGAL/Dual_contouring_3.h
@@ -13,6 +13,7 @@
 #ifndef CGAL_DUAL_CONTOURING_3_H
 #define CGAL_DUAL_CONTOURING_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cell_type.h>
 #include <CGAL/Isosurfacing_3/internal/Dual_contouring_internal.h>
 #include <CGAL/tags.h>
diff --git a/Isosurfacing_3/include/CGAL/Implicit_domain.h b/Isosurfacing_3/include/CGAL/Implicit_domain.h
index 35c0834bb2d..87da797cb69 100644
--- a/Isosurfacing_3/include/CGAL/Implicit_domain.h
+++ b/Isosurfacing_3/include/CGAL/Implicit_domain.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_IMPLICIT_DOMAIN_H
 #define CGAL_IMPLICIT_DOMAIN_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Cartesian_topology_base.h>
 #include <CGAL/Default_gradients.h>
diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Dual_contouring_internal.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Dual_contouring_internal.h
index b73aab1cd9e..dcafddcef5a 100644
--- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Dual_contouring_internal.h
+++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Dual_contouring_internal.h
@@ -13,6 +13,7 @@
 #ifndef CGAL_DUAL_CONTOURING_3_INTERNAL_DUAL_CONTOURING_3_H
 #define CGAL_DUAL_CONTOURING_3_INTERNAL_DUAL_CONTOURING_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Isosurfacing_3/internal/Tables.h>
 #include <CGAL/Origin.h>
diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h
index 50fe93bc789..e57bf09ca79 100644
--- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h
+++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h
@@ -41,6 +41,7 @@
 #ifndef CGAL_MARCHING_CUBES_3_INTERNAL_MARCHING_CUBES_3_H
 #define CGAL_MARCHING_CUBES_3_INTERNAL_MARCHING_CUBES_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Isosurfacing_3/internal/Tables.h>
 #include <tbb/concurrent_vector.h>
 
diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tables.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tables.h
index 969c874e1f3..089a1bcb117 100644
--- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tables.h
+++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tables.h
@@ -41,6 +41,8 @@
 #ifndef CGAL_MARCHING_CUBES_3_INTERNAL_TABLES_H
 #define CGAL_MARCHING_CUBES_3_INTERNAL_TABLES_H
 
+#include <CGAL/license/Isosurfacing_3.h>
+
 namespace CGAL {
 namespace Isosurfacing {
 namespace internal {
diff --git a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tmc_internal.h b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tmc_internal.h
index 89bac91a287..aa80a8b2b58 100644
--- a/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tmc_internal.h
+++ b/Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Tmc_internal.h
@@ -41,6 +41,7 @@
 #ifndef CGAL_TMC_INTERNAL_TMC_H
 #define CGAL_TMC_INTERNAL_TMC_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h>
 #include <CGAL/Isosurfacing_3/internal/Tables.h>
 
diff --git a/Isosurfacing_3/include/CGAL/Marching_cubes_3.h b/Isosurfacing_3/include/CGAL/Marching_cubes_3.h
index 36d945024ab..aed0dd6036c 100644
--- a/Isosurfacing_3/include/CGAL/Marching_cubes_3.h
+++ b/Isosurfacing_3/include/CGAL/Marching_cubes_3.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_MARCHING_CUBES_3_H
 #define CGAL_MARCHING_CUBES_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cell_type.h>
 #include <CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h>
 #include <CGAL/tags.h>
diff --git a/Isosurfacing_3/include/CGAL/Octree_domain.h b/Isosurfacing_3/include/CGAL/Octree_domain.h
index 9640ac5ce10..623d691deaf 100644
--- a/Isosurfacing_3/include/CGAL/Octree_domain.h
+++ b/Isosurfacing_3/include/CGAL/Octree_domain.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_OCTREE_DOMAIN_H
 #define CGAL_OCTREE_DOMAIN_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cell_type.h>
 #include <CGAL/Default_gradients.h>
 #include <CGAL/Octree_wrapper.h>
diff --git a/Isosurfacing_3/include/CGAL/Octree_wrapper.h b/Isosurfacing_3/include/CGAL/Octree_wrapper.h
index 1c56f84a0f9..cab8dde6a5a 100644
--- a/Isosurfacing_3/include/CGAL/Octree_wrapper.h
+++ b/Isosurfacing_3/include/CGAL/Octree_wrapper.h
@@ -10,8 +10,10 @@
 // Author(s)     : Daniel Zint
 //                 Julian Stahl
 
-#pragma once
+#ifndef CGAL_OCTREE_WRAPPER_H
+#define CGAL_OCTREE_WRAPPER_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Isosurfacing_3/internal/Tables.h>
 #include <CGAL/Octree.h>
 #include <CGAL/Orthtree/Traversals.h>
@@ -522,3 +524,5 @@ public:
 
 }  // namespace Isosurfacing
 }  // namespace CGAL
+
+#endif // CGAL_OCTREE_WRAPPER_H
diff --git a/Isosurfacing_3/include/CGAL/TC_marching_cubes_3.h b/Isosurfacing_3/include/CGAL/TC_marching_cubes_3.h
index 940ecb0d25d..dd2195c0134 100644
--- a/Isosurfacing_3/include/CGAL/TC_marching_cubes_3.h
+++ b/Isosurfacing_3/include/CGAL/TC_marching_cubes_3.h
@@ -12,6 +12,7 @@
 #ifndef CGAL_TMC_3_H
 #define CGAL_TMC_3_H
 
+#include <CGAL/license/Isosurfacing_3.h>
 #include <CGAL/Cell_type.h>
 #include <CGAL/Isosurfacing_3/internal/Tmc_internal.h>
 #include <CGAL/tags.h>