diff --git a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
index 4beef30e5a5..ac894c38477 100644
--- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in
@@ -2173,11 +2173,11 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_RUNNING \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \
                          "CGAL_BGL_NP_CLASS=NamedParameters" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_1=NamedParameters1" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_2=NamedParameters2" \
                          CGAL_DEPRECATED
 
diff --git a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in
index 231bd26238f..8c5e85797fc 100644
--- a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in
@@ -2161,11 +2161,11 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_RUNNING \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \
                          "CGAL_BGL_NP_CLASS=NamedParameters" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_1=NamedParameters1" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_2=NamedParameters2" \
                          CGAL_DEPRECATED
 
diff --git a/Documentation/doc/resources/1.8.20/BaseDoxyfile.in b/Documentation/doc/resources/1.8.20/BaseDoxyfile.in
index 44d829bb0ff..d450a6a5aab 100644
--- a/Documentation/doc/resources/1.8.20/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.20/BaseDoxyfile.in
@@ -2244,11 +2244,11 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_RUNNING \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \
                          "CGAL_BGL_NP_CLASS=NamedParameters" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_1=NamedParameters1" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_2=NamedParameters2" \
                          CGAL_DEPRECATED
 
diff --git a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
index 2dd83eddb59..477b2e17d15 100644
--- a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
@@ -1761,11 +1761,11 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = DOXYGEN_RUNNING \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \
                          "CGAL_BGL_NP_CLASS=NamedParameters" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_1=NamedParameters1" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_2=NamedParameters2" \
                          CGAL_DEPRECATED
 
diff --git a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
index 6936ae60211..bd4350aae78 100644
--- a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
+++ b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in
@@ -2244,11 +2244,11 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_RUNNING \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \
                          "CGAL_BGL_NP_CLASS=NamedParameters" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_1=NamedParameters1" \
-                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2" \
+                         "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \
                          "CGAL_BGL_NP_CLASS_2=NamedParameters2" \
                          CGAL_DEPRECATED
                         
diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
index f258d1ae921..c3d9ae64f6b 100644
--- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h
+++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
@@ -226,8 +226,6 @@ compute_average_spacing(
   return sum_spacings / (FT)(nb);
 }
 
-/// \cond SKIP_IN_MANUAL
-
 } //namespace CGAL
 
 #include <CGAL/enable_warnings.h>
diff --git a/Stream_support/include/CGAL/IO/GOCAD.h b/Stream_support/include/CGAL/IO/GOCAD.h
index 48da5d08428..6cc06a9d9ba 100644
--- a/Stream_support/include/CGAL/IO/GOCAD.h
+++ b/Stream_support/include/CGAL/IO/GOCAD.h
@@ -157,6 +157,8 @@ bool read_GOCAD(std::istream& is,
   return end_read && nb_gocad == nb_end && !is.bad();
 }
 
+/// \endcond
+
 /*!
  * \ingroup PkgStreamSupportIoFuncsGOCAD
  *