diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
index 5888f705f3f..1e168ca3e0f 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
@@ -13,7 +13,5 @@ template< typename T >
 class Fraction_traits {
 public:
 
-/// @}
-
 }; /* end Fraction_traits */
 } /* end namespace CGAL */
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
index d970d13809d..764d96fb35d 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
@@ -42,7 +42,5 @@ the smallest positive remainder \f$ r\f$.
 class EuclideanRing {
 public:
 
-/// @}
-
 }; /* end EuclideanRing */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
index d38989655ee..40f4e1b9c2a 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
@@ -26,7 +26,5 @@ This is also the case for the respective global functions.
 class ExplicitInteroperable {
 public:
 
-/// @}
-
 }; /* end ExplicitInteroperable */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
index 0d30abac98e..ded7cd06000 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
@@ -28,7 +28,5 @@ Moreover, `CGAL::Algebraic_structure_traits< FieldWithRootOf >` is a model of `A
 class FieldWithRootOf {
 public:
 
-/// @}
-
 }; /* end FieldWithRootOf */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
index e0ce583e476..9dd745ff474 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
@@ -27,7 +27,5 @@ Moreover, `CGAL::Algebraic_structure_traits< FieldWithSqrt >` is a model of `Alg
 class FieldWithSqrt {
 public:
 
-/// @}
-
 }; /* end FieldWithSqrt */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
index 98e489c04fa..10f3a5c6951 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
@@ -16,7 +16,5 @@ denominator type are provided by `CGAL::Fraction_traits`.
 class Fraction {
 public:
 
-/// @}
-
 }; /* end Fraction */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
index 92d4e0eac10..4e4854347ec 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
@@ -28,7 +28,5 @@ is `CGAL::Tag_true`.
 class ImplicitInteroperable {
 public:
 
-/// @}
-
 }; /* end ImplicitInteroperable */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
index 1e3b98c1cbe..fc6c643605d 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
@@ -33,7 +33,5 @@ Moreover, `CGAL::Algebraic_structure_traits< IntegralDomain >` is a model of
 class IntegralDomain {
 public:
 
-/// @}
-
 }; /* end IntegralDomain */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
index e04320687ba..492eaa557df 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
@@ -32,7 +32,5 @@ for Homogeneous kernels.
 class RingNumberType {
 public:
 
-/// @}
-
 }; /* end RingNumberType */
 
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
index c44baddea56..25a0d157228 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
@@ -40,7 +40,5 @@ derived from `CGAL::Unique_factorization_domain_tag`
 class UniqueFactorizationDomain {
 public:
 
-/// @}
-
 }; /* end UniqueFactorizationDomain */
 
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
index 7b94e488aeb..4252ec8dd4e 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_face_base_2.h
@@ -26,7 +26,5 @@ template< typename Traits, typename Fb, typename ExactAlphaComparisonTag >
 class Alpha_shape_face_base_2 : public Fb {
 public:
 
-/// @}
-
 }; /* end Alpha_shape_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
index 755c8af5fb4..33543e47270 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_vertex_base_2.h
@@ -27,7 +27,5 @@ template< typename Traits, typename Vb, typename ExactAlphaComparisonTag >
 class Alpha_shape_vertex_base_2 : public Vb {
 public:
 
-/// @}
-
 }; /* end Alpha_shape_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
index 146a941e218..0eda3621996 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h
@@ -29,7 +29,6 @@ template< typename Traits, typename Vb, typename ExactAlphaComparisonTag, typena
 class Alpha_shape_vertex_base_3 : public Vb {
 public:
 
-/// @}
 
 }; /* end Alpha_shape_vertex_base_3 */
 } /* end namespace CGAL */
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
index ab50625bfd5..78364d4cbed 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_cell_base_3.h
@@ -24,7 +24,5 @@ template< typename Traits, typename Cb >
 class Fixed_alpha_shape_cell_base_3 : public Cb {
 public:
 
-/// @}
-
 }; /* end Fixed_alpha_shape_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
index 5c132505980..a069afa0978 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Fixed_alpha_shape_vertex_base_3.h
@@ -24,7 +24,5 @@ template< typename Traits, typename Vb >
 class Fixed_alpha_shape_vertex_base_3 : public Vb {
 public:
 
-/// @}
-
 }; /* end Fixed_alpha_shape_vertex_base_3 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
index c8c2d12a0bd..ccb6bc91e06 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_Bezier_curve_traits_2.h
@@ -110,7 +110,7 @@ points. The value-type of `InputIterator` is `RatKernel::Point_2`.
 template <class InputIterator> 
 Curve_2 (InputIterator pts_begin, InputIterator pts_end); 
 
-/// @} 
+/// @}
 
 /// \name Access Functions 
 /// @{
@@ -282,7 +282,7 @@ std::pair<double, double> parameter_range () const;
 
 }; /* end Arr_Bezier_curve_traits_2::X_monotone_curve_2 */
 
-Class Trim_2{
+class Trim_2{
 public:
 /// \name Creation 
 /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
index 73ff7279566..8801d750237 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circle_segment_traits_2.h
@@ -354,7 +354,7 @@ Bbox_2 bbox() const;
 
 }; /* end Arr_circle_segment_traits_2::X_monotone_curve_2 */
 
-Class Trim_2{
+class Trim_2{
 public:
 /// \name Creation 
 /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
index d09dacf22b0..f8b00a1cc10 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_arc_traits_2.h
@@ -15,7 +15,5 @@ template< typename CircularKernel >
 class Arr_circular_arc_traits_2 {
 public:
 
-/// @}
-
 }; /* end Arr_circular_arc_traits_2 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
index 08c5e3efae8..586da53ba08 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_circular_line_arc_traits_2.h
@@ -19,7 +19,5 @@ template< typename CircularKernel >
 class Arr_circular_line_arc_traits_2 {
 public:
 
-/// @}
-
 }; /* end Arr_circular_line_arc_traits_2 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
index 363da0bab1e..edc4262b5ca 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_conic_traits_2.h
@@ -385,7 +385,7 @@ const Point_2& right() const;
 
 }; /* end Arr_conic_traits_2::X_monotone_curve_2 */
 
-Class Trim_2{
+class Trim_2{
 public:
 /// \name Creation 
 /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
index e18a545236c..1c07e6b2b79 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_default_overlay_traits.h
@@ -19,8 +19,6 @@ template< typename Arrangement >
 class Arr_default_overlay_traits {
 public:
 
-/// @}
-
 }; /* end Arr_default_overlay_traits */
 } /* end namespace CGAL */
 
@@ -55,7 +53,5 @@ template< typename Arr_A, typename Arr_B, typename Arr_R, typename OvlFaceData >
 class Arr_face_overlay_traits {
 public:
 
-/// @}
-
 }; /* end Arr_face_overlay_traits */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
index 95c33d975ab..a6d9e3ddbfb 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_landmarks_point_location.h
@@ -60,7 +60,5 @@ template< typename Arrangement, typename Generator >
 class Arr_landmarks_point_location {
 public:
 
-/// @}
-
 }; /* end Arr_landmarks_point_location */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
index 8dbf2b4fac5..67e4f64bcc5 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_line_arc_traits_2.h
@@ -15,7 +15,5 @@ template< typename CircularKernel >
 class Arr_line_arc_traits_2 {
 public:
 
-/// @}
-
 }; /* end Arr_line_arc_traits_2 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
index 2847d6b5ae2..7be714de572 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
@@ -145,7 +145,7 @@ public:
 
   }; /* end Arr_linear_traits_2::Curve_2 */
 
-Class Trim_2{
+class Trim_2{
 public:
 /// \name Creation 
 /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
index 4cb06ddf4a6..831a82d1317 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_naive_point_location.h
@@ -26,7 +26,5 @@ template< typename Arrangement >
 class Arr_naive_point_location {
 public:
 
-/// @}
-
 }; /* end Arr_naive_point_location */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
index 64dc43330f2..5b4ab3d833a 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_basic_traits_2.h
@@ -28,7 +28,5 @@ template< typename Kernel >
 class Arr_non_caching_segment_basic_traits_2 {
 public:
 
-/// @}
-
 }; /* end Arr_non_caching_segment_basic_traits_2 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
index 2262120d70c..75866897f85 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_non_caching_segment_traits_2.h
@@ -45,7 +45,5 @@ class Arr_non_caching_segment_traits_2
  {
 public:
 
-/// @}
-
 }; /* end Arr_non_caching_segment_traits_2 */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
index f085e4da39c..fcdb042077b 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_segment_traits_2.h
@@ -64,8 +64,6 @@ template< typename Kernel >
 class Arr_segment_traits_2 {
 public:
 
-/// @}
-
 Class Trim_2{
 public:
 /// \name Creation 
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tags.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tags.h
index 302a0fc6109..194ef8db56d 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tags.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_tags.h
@@ -18,8 +18,6 @@ arrangement.
 
 struct Arr_oblivious_side_tag {
 
-/// @}
-
 }; /* end Arr_oblivious_side_tag */
 } /* end namespace CGAL */
 
@@ -45,7 +43,5 @@ functions based on type of curves that induce the arrangement.
 
 struct Arr_open_side_tag {
 
-/// @}
-
 }; /* end Arr_open_side_tag */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
index 7add7e4718f..80f6e022fef 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_walk_along_line_point_location.h
@@ -36,7 +36,5 @@ template< typename Arrangement >
 class Arr_walk_along_line_point_location {
 public:
 
-/// @}
-
 }; /* end Arr_walk_along_line_point_location */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
index 28dd3ecb888..1ac867b5ce2 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_text_formatter.h
@@ -30,8 +30,6 @@ template< typename Arrangement >
 class Arr_extended_dcel_text_formatter {
 public:
 
-/// @}
-
 }; /* end Arr_extended_dcel_text_formatter */
 } /* end namespace CGAL */
 
@@ -64,8 +62,6 @@ template< typename Arrangement >
 class Arr_face_extended_text_formatter {
 public:
 
-/// @}
-
 }; /* end Arr_face_extended_text_formatter */
 } /* end namespace CGAL */
 
@@ -96,7 +92,5 @@ template< typename Arrangement >
 class Arr_text_formatter {
 public:
 
-/// @}
-
 }; /* end Arr_text_formatter */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
index 8d6bef1eb55..2e004387049 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/IO/Arr_with_history_text_formatter.h
@@ -26,7 +26,5 @@ template< typename ArrFormatter >
 class Arr_with_history_text_formatter {
 public:
 
-/// @}
-
 }; /* end Arr_with_history_text_formatter */
 } /* end namespace CGAL */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h
index 5677896e1d9..f1688c89744 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Curve_2.h
@@ -15,8 +15,6 @@ represents a general planar curve.
 class Curve_2 {
 public:
 
-/// @}
-
 }; /* end ArrTraits::Curve_2 */
 
 }
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h
index 1da395e23fa..883e692b716 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--Point_2.h
@@ -16,8 +16,6 @@ Represents a point in the plane.
 class Point_2 {
 public:
 
-/// @}
-
 }; /* end ArrTraits::Point_2 */
 
 }
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h
index c2d1919c061..f7ebd458941 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrTraits--XMonotoneCurve_2.h
@@ -16,8 +16,6 @@ Represents a planar (weakly) \f$ x\f$-monotone curve.
 class XMonotoneCurve_2 {
 public:
 
-/// @}
-
 }; /* end ArrTraits::XMonotoneCurve_2 */
 
 }
diff --git a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
index d340982eec0..0c9ab30a613 100644
--- a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
+++ b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h
@@ -33,8 +33,6 @@ struct Linear_cell_complex_bgl_min_items
 */
 struct Linear_cell_complex_bgl_min_items {
 
-/// @}
-
 }; /* end Linear_cell_complex_bgl_min_items */
 
 } /* end namespace CGAL */
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
index 663c1d11a4c..e22be2b363f 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_circle_segment_traits_2.h
@@ -18,7 +18,5 @@ template< typename Kernel >
 class Gps_circle_segment_traits_2 {
 public:
 
-/// @}
-
 }; /* end Gps_circle_segment_traits_2 */
 } /* end namespace CGAL */
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
index d5155423f8e..cebe22ad9ba 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Gps_traits_2.h
@@ -20,7 +20,5 @@ template< typename ArrTraits, typename GeneralPolygon_t >
 class Gps_traits_2 {
 public:
 
-/// @}
-
 }; /* end Gps_traits_2 */
 } /* end namespace CGAL */
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_set_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_set_2.h
index 3ed0e9cc728..ab96d0f3466 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_set_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_set_2.h
@@ -26,7 +26,5 @@ template< typename Kernel, typename Container, typename Dcel >
 class Polygon_set_2 : public General_polygon_set_2<Gps_segment_traits_2<Kernel,Container> > {
 public:
 
-/// @}
-
 }; /* end Polygon_set_2 */
 } /* end namespace CGAL */
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h
index 15dc321e736..9a96a1d366c 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygonWithHoles_2.h
@@ -20,7 +20,5 @@ A model of this concept represents a general polygon with holes.
 class GpsTraitsGeneralPolygonWithHoles_2 {
 public:
 
-/// @}
-
 }; /* end GpsTraitsGeneralPolygonWithHoles_2 */
 
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h
index 02082c9bbcf..98bf1ab16b2 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GpsTraitsGeneralPolygon_2.h
@@ -21,7 +21,5 @@ A model of this concept represents a simple general polygon.
 class GpsTraitsGeneralPolygon_2 {
 public:
 
-/// @}
-
 }; /* end GpsTraitsGeneralPolygon_2 */
 
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
index 7ec35c6d4ac..86598adf69d 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Algebraic_kernel_for_circles_2_2.h
@@ -10,7 +10,5 @@ namespace CGAL {
 template< typename RT >
 struct Algebraic_kernel_for_circles_2_2 {
 
-/// @}
-
 }; /* end Algebraic_kernel_for_circles_2_2 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
index a17416845cd..d36cb524b37 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Exact_circular_kernel_2.h
@@ -17,7 +17,5 @@ geometric filtering (based on bounding boxes) to gain efficiency.
 class Exact_circular_kernel_2 {
 public:
 
-/// @}
-
 }; /* end Exact_circular_kernel_2 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
index 681d45533c3..c7a3fb71072 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_1_2.h
@@ -11,7 +11,5 @@ template< typename RT >
 class Polynomial_1_2 {
 public:
 
-/// @}
-
 }; /* end Polynomial_1_2 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
index bc2ed3fa3d9..80ff654207e 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Polynomials_2_2.h
@@ -14,7 +14,5 @@ template< typename FT >
 class Polynomial_for_circles_2_2 {
 public:
 
-/// @}
-
 }; /* end Polynomial_for_circles_2_2 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
index ed4d3280a6d..db7c4ed3a6a 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/CGAL/Root_for_circles_2_2.h
@@ -11,7 +11,5 @@ template< typename FT >
 class Root_for_circles_2_2 {
 public:
 
-/// @}
-
 }; /* end Root_for_circles_2_2 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h
index 2ecaa07f26e..8bee9e5b141 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/AlgebraicKernelForCircles--Polynomial_1_2.h
@@ -20,7 +20,5 @@ coefficients are of a type that is a model of the concept
 class AlgebraicKernelForCircles::Polynomial_1_2 {
 public:
 
-/// @}
-
 }; /* end AlgebraicKernelForCircles::Polynomial_1_2 */
 
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h
index db495ad382f..ecbf433f6f6 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h
+++ b/Circular_kernel_2/doc/Circular_kernel_2/Concepts/CircularKernel--CircularArcPoint_2.h
@@ -14,7 +14,5 @@ Concept for points on circles, circular arcs or line arcs.
 class CircularKernel::CircularArcPoint_2 {
 public:
 
-/// @}
-
 }; /* end CircularKernel::CircularArcPoint_2 */
 
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
index 55a6093a78e..db2aec890a4 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Algebraic_kernel_for_spheres_2_3.h
@@ -10,7 +10,5 @@ namespace CGAL {
 template< typename RT >
 struct Algebraic_kernel_for_spheres_2_3 {
 
-/// @}
-
 }; /* end Algebraic_kernel_for_spheres_2_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
index 00159f6b404..b222ec928dc 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Exact_spherical_kernel_3.h
@@ -16,7 +16,5 @@ It defines the same types as `CGAL::Spherical_kernel_3`.
 class Exact_spherical_kernel_3 {
 public:
 
-/// @}
-
 }; /* end Exact_spherical_kernel_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
index 025200ba4c1..df3532cedfc 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_1_3.h
@@ -11,7 +11,5 @@ template< typename RT >
 class Polynomial_1_3 {
 public:
 
-/// @}
-
 }; /* end Polynomial_1_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
index 5adf730a43a..6084f63779d 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_2_3.h
@@ -13,7 +13,5 @@ template< typename FT >
 class Polynomial_for_spheres_2_3 {
 public:
 
-/// @}
-
 }; /* end Polynomial_for_spheres_2_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
index 3a8ad778710..9c51a9e834a 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Polynomials_for_line_3.h
@@ -13,7 +13,5 @@ template< typename FT >
 class Polynomials_for_lines_3 {
 public:
 
-/// @}
-
 }; /* end Polynomials_for_lines_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
index b73f031e5d1..0590e3e0c3d 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/Root_for_spheres_2_3.h
@@ -11,7 +11,5 @@ template< typename RT >
 class Root_for_spheres_2_3 {
 public:
 
-/// @}
-
 }; /* end Root_for_spheres_2_3 */
 } /* end namespace CGAL */
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h
index 9401c645852..db07ac0f5a0 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--Polynomial_1_3.h
@@ -20,7 +20,5 @@ coefficients are of a type that is a model of the concept
 class AlgebraicKernelForSpheres::Polynomial_1_3 {
 public:
 
-/// @}
-
 }; /* end AlgebraicKernelForSpheres::Polynomial_1_3 */
 
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForCircles_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForCircles_3.h
index a06bca51ecc..8ba50646a24 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForCircles_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForCircles_3.h
@@ -17,7 +17,5 @@ capable of storing equations of circles.
 class AlgebraicKernelForSpheres::PolynomialsForCircles_3 {
 public:
 
-/// @}
-
 }; /* end AlgebraicKernelForSpheres::PolynomialsForCircles_3 */
 
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h
index 7f2a474f25e..37f16088bd8 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/AlgebraicKernelForSpheres--PolynomialsForLines_3.h
@@ -19,7 +19,5 @@ capable of storing equations of lines.
 class AlgebraicKernelForSpheres::PolynomialsForLines_3 {
 public:
 
-/// @}
-
 }; /* end AlgebraicKernelForSpheres::PolynomialsForLines_3 */
 
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h
index 238d4b30d76..faf589fc65b 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/Concepts/SphericalKernel--LineArc_3.h
@@ -18,7 +18,5 @@ Concept for line segments supported by a line that is a model of
 class SphericalKernel::LineArc_3 {
 public:
 
-/// @}
-
 }; /* end SphericalKernel::LineArc_3 */
 
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h
index 57251b9b555..067f94c3bec 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h
@@ -33,7 +33,5 @@ struct Combinatorial_map_min_items
 template< unsigned int d >
 struct Combinatorial_map_min_items {
 
-/// @}
-
 }; /* end Combinatorial_map_min_items */
 } /* end namespace CGAL */
diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
index d9a2a20e953..8cbfbf1be14 100644
--- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
+++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Generic_map_min_items.h
@@ -27,7 +27,5 @@ struct Generic_map_min_items
 */
 struct Generic_map_min_items {
 
-/// @}
-
 }; /* end Generic_map_min_items */
 } /* end namespace CGAL */
diff --git a/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_to_polyhedron_3.h b/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_to_polyhedron_3.h
index 9f7775b2157..4aa89938c03 100644
--- a/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_to_polyhedron_3.h
+++ b/Convex_hull_d/doc/Convex_hull_d/CGAL/Convex_hull_d_to_polyhedron_3.h
@@ -24,6 +24,4 @@ bidirected LEDA graph `G`.
 template <class R> 
 void d3_surface_map(const Convex_hull_d<R>& C, GRAPH< typename Convex_hull_d<R>::Point_d ,int>& G); 
 
-/// @}
-
 } /* end namespace CGAL */
diff --git a/Envelope_2/doc/Envelope_2/CGAL/Envelope_diagram_1.h b/Envelope_2/doc/Envelope_2/CGAL/Envelope_diagram_1.h
index 8bc3b12b7e4..bcc30a63f14 100644
--- a/Envelope_2/doc/Envelope_2/CGAL/Envelope_diagram_1.h
+++ b/Envelope_2/doc/Envelope_2/CGAL/Envelope_diagram_1.h
@@ -22,7 +22,5 @@ template< typename Traits >
 class Envelope_diagram_1 {
 public:
 
-/// @}
-
 }; /* end Envelope_diagram_1 */
 } /* end namespace CGAL */
diff --git a/Envelope_3/doc/Envelope_3/CGAL/Env_plane_traits_3.h b/Envelope_3/doc/Envelope_3/CGAL/Env_plane_traits_3.h
index c1a839a38be..d71454efbc7 100644
--- a/Envelope_3/doc/Envelope_3/CGAL/Env_plane_traits_3.h
+++ b/Envelope_3/doc/Envelope_3/CGAL/Env_plane_traits_3.h
@@ -35,7 +35,5 @@ template< typename Kernel >
 class Env_plane_traits_3 : public Arr_linear_traits_2<Kernel> {
 public:
 
-/// @}
-
 }; /* end Env_plane_traits_3 */
 } /* end namespace CGAL */
diff --git a/Envelope_3/doc/Envelope_3/CGAL/Env_triangle_traits_3.h b/Envelope_3/doc/Envelope_3/CGAL/Env_triangle_traits_3.h
index 87ade2cb2ff..dfc8b474b46 100644
--- a/Envelope_3/doc/Envelope_3/CGAL/Env_triangle_traits_3.h
+++ b/Envelope_3/doc/Envelope_3/CGAL/Env_triangle_traits_3.h
@@ -38,7 +38,5 @@ template< typename Kernel >
 class Env_triangle_traits_3 : public Arr_segment_traits_2<Kernel> {
 public:
 
-/// @}
-
 }; /* end Env_triangle_traits_3 */
 } /* end namespace CGAL */
diff --git a/Generator/doc/Generator/CGAL/Combination_enumerator.h b/Generator/doc/Generator/CGAL/Combination_enumerator.h
index 5e1873882c0..bc53cb9628f 100644
--- a/Generator/doc/Generator/CGAL/Combination_enumerator.h
+++ b/Generator/doc/Generator/CGAL/Combination_enumerator.h
@@ -1,7 +1,6 @@
 namespace CGAL {
 
-/// \addtogroup PkgGeneratorsRef
-/// @{
+/// \ingroup PkgGeneratorsRef
 
 /*!
   The class `Combination_enumerator` is used to enumerate all fixed-size combinations
@@ -53,7 +52,7 @@ const CombinationElement & operator[](int i);
 
 
 /// \name Access to the Enumeration
-///@{
+/// @{
 
 /*!
 Returns the size of the enumerated combinations (the parameter `k` from the class' constructor).
@@ -104,5 +103,3 @@ Combination_enumerator operator++(int);
 
 }; /*end of class Combination_enumerator*/
 } /* end namespace CGAL */
-
-/// @}
diff --git a/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_items_2.h b/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_items_2.h
index d65e338e313..17f99cfd04b 100644
--- a/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_items_2.h
+++ b/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_items_2.h
@@ -76,7 +76,5 @@ typedef My_face<Refs> Face;
 class HalfedgeDS_items_2 {
 public:
 
-/// @}
-
 }; /* end HalfedgeDS_items_2 */
 } /* end namespace CGAL */
diff --git a/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_min_items.h b/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_min_items.h
index e77630c9bb3..10bc2600b98 100644
--- a/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_min_items.h
+++ b/HalfedgeDS/doc/HalfedgeDS/CGAL/HalfedgeDS_min_items.h
@@ -49,7 +49,5 @@ typedef CGAL::HalfedgeDS_face_min_base< Refs> Face;
 class HalfedgeDS_min_items {
 public:
 
-/// @}
-
 }; /* end HalfedgeDS_min_items */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
index b66b49fd325..ba42676966d 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel.h
@@ -27,7 +27,5 @@ constructions.
 class Exact_predicates_exact_constructions_kernel {
 public:
 
-/// @}
-
 }; /* end Exact_predicates_exact_constructions_kernel */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_kth_root.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_kth_root.h
index 884d7cac0ce..b8ced442fb8 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_kth_root.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_kth_root.h
@@ -30,7 +30,5 @@ Note that it requires CORE or LEDA installed.
 class Exact_predicates_exact_constructions_kernel_with_kth_root {
 public:
 
-/// @}
-
 }; /* end Exact_predicates_exact_constructions_kernel_with_kth_root */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_root_of.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_root_of.h
index e3c98c350b8..6a6d946097e 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_root_of.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_root_of.h
@@ -30,7 +30,5 @@ Note that it requires CORE or LEDA installed.
 class Exact_predicates_exact_constructions_kernel_with_root_of {
 public:
 
-/// @}
-
 }; /* end Exact_predicates_exact_constructions_kernel_with_root_of */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
index 3e7609c8db6..7149fedd443 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h
@@ -30,7 +30,5 @@ Note that it requires CORE or LEDA installed.
 class Exact_predicates_exact_constructions_kernel_with_sqrt {
 public:
 
-/// @}
-
 }; /* end Exact_predicates_exact_constructions_kernel_with_sqrt */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
index 74b887d407f..5a840e94a0f 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Exact_predicates_inexact_constructions_kernel.h
@@ -27,7 +27,5 @@ constructions.
 class Exact_predicates_inexact_constructions_kernel {
 public:
 
-/// @}
-
 }; /* end Exact_predicates_inexact_constructions_kernel */
 } /* end namespace CGAL */
diff --git a/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h b/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
index d36cf34bf01..424b857dfcd 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
@@ -18,8 +18,6 @@ Tag class for affine transformations.
 class Identity_transformation {
 public:
 
-/// @}
-
 }; /* end Identity_transformation */
 } /* end namespace CGAL */
 
@@ -42,8 +40,6 @@ Tag class for affine transformations.
 class Reflection {
 public:
 
-/// @}
-
 }; /* end Reflection */
 } /* end namespace CGAL */
 
@@ -66,8 +62,6 @@ Tag class for affine transformations.
 class Rotation {
 public:
 
-/// @}
-
 }; /* end Rotation */
 } /* end namespace CGAL */
 
@@ -90,8 +84,6 @@ Tag class for affine transformations.
 class Scaling {
 public:
 
-/// @}
-
 }; /* end Scaling */
 } /* end namespace CGAL */
 
@@ -114,7 +106,5 @@ Tag class for affine transformations.
 class Translation {
 public:
 
-/// @}
-
 }; /* end Translation */
 } /* end namespace CGAL */
diff --git a/Kernel_d/doc/Kernel_d/CGAL/Cartesian_d.h b/Kernel_d/doc/Kernel_d/CGAL/Cartesian_d.h
index 405686a8427..4fda74b5768 100644
--- a/Kernel_d/doc/Kernel_d/CGAL/Cartesian_d.h
+++ b/Kernel_d/doc/Kernel_d/CGAL/Cartesian_d.h
@@ -23,7 +23,5 @@ template< typename FieldNumberType >
 class Cartesian_d {
 public:
 
-/// @}
-
 }; /* end Cartesian_d */
 } /* end namespace CGAL */
diff --git a/Kernel_d/doc/Kernel_d/CGAL/Homogeneous_d.h b/Kernel_d/doc/Kernel_d/CGAL/Homogeneous_d.h
index 93983846534..068c96c6ed7 100644
--- a/Kernel_d/doc/Kernel_d/CGAL/Homogeneous_d.h
+++ b/Kernel_d/doc/Kernel_d/CGAL/Homogeneous_d.h
@@ -23,7 +23,5 @@ template< typename RingNumberType >
 class Homogeneous_d {
 public:
 
-/// @}
-
 }; /* end Homogeneous */
 } /* end namespace CGAL */
diff --git a/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraCd.h b/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraCd.h
index c1bb4ba12d4..1173d867118 100644
--- a/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraCd.h
+++ b/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraCd.h
@@ -21,7 +21,5 @@ template< typename FT >
 class Linear_algebraCd {
 public:
 
-/// @}
-
 }; /* end Linear_algebraCd */
 } /* end namespace CGAL */
diff --git a/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraHd.h b/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraHd.h
index 14958e6c03d..0f140dcf9ec 100644
--- a/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraHd.h
+++ b/Kernel_d/doc/Kernel_d/CGAL/Linear_algebraHd.h
@@ -22,7 +22,5 @@ template< typename RT >
 class Linear_algebraHd {
 public:
 
-/// @}
-
 }; /* end Linear_algebraHd */
 } /* end namespace CGAL */
diff --git a/Kernel_d/doc/Kernel_d/Concepts/Kernel--CartesianConstIterator_d.h b/Kernel_d/doc/Kernel_d/Concepts/Kernel--CartesianConstIterator_d.h
index 9e46edf2b06..e3090f0d0d9 100644
--- a/Kernel_d/doc/Kernel_d/Concepts/Kernel--CartesianConstIterator_d.h
+++ b/Kernel_d/doc/Kernel_d/Concepts/Kernel--CartesianConstIterator_d.h
@@ -19,7 +19,5 @@ in `d` dimensions.
 class Kernel_d::CartesianConstIterator_d {
 public:
 
-/// @}
-
 }; /* end Kernel_d::CartesianConstIterator_d */
 
diff --git a/Linear_cell_complex/doc/Linear_cell_complex/CGAL/Linear_cell_complex_min_items.h b/Linear_cell_complex/doc/Linear_cell_complex/CGAL/Linear_cell_complex_min_items.h
index c8f8f976361..16123f214f4 100644
--- a/Linear_cell_complex/doc/Linear_cell_complex/CGAL/Linear_cell_complex_min_items.h
+++ b/Linear_cell_complex/doc/Linear_cell_complex/CGAL/Linear_cell_complex_min_items.h
@@ -34,8 +34,6 @@ struct Linear_cell_complex_min_items
 */
 struct Linear_cell_complex_min_items {
 
-/// @}
-
 }; /* end Linear_cell_complex_min_items */
 
 } /* end namespace CGAL */
diff --git a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h
index 20935a785b7..909ce593c9f 100644
--- a/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h
+++ b/Linear_cell_complex/doc/Linear_cell_complex/Concepts/LinearCellComplexItems.h
@@ -19,7 +19,5 @@ The first type in `Attributes` tuple must be a model of the `CellAttributeWithPo
 class LinearCellComplexItems {
 public:
 
-/// @}
-
 }; /* end LinearCellComplexItems */
 
diff --git a/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_face_base_2.h b/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_face_base_2.h
index 909c91012c5..d3088b7e757 100644
--- a/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_face_base_2.h
+++ b/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_face_base_2.h
@@ -29,7 +29,5 @@ template< typename Traits, typename Fb >
 class Delaunay_mesh_face_base_2 : Fb {
 public:
 
-/// @}
-
 }; /* end Delaunay_mesh_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_vertex_base_2.h b/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_vertex_base_2.h
index 0eb0c2f8028..f78df3d914f 100644
--- a/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_vertex_base_2.h
+++ b/Mesh_2/doc/Mesh_2/CGAL/Delaunay_mesh_vertex_base_2.h
@@ -24,7 +24,5 @@ template< typename Traits, typename Vb >
 class Delaunay_mesh_vertex_base_2 : Vb {
 public:
 
-/// @}
-
 }; /* end Delaunay_mesh_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Mesh_3/doc/Mesh_3/CGAL/Compact_mesh_cell_base_3.h b/Mesh_3/doc/Mesh_3/CGAL/Compact_mesh_cell_base_3.h
index 9de1c57ecc6..8e91b271375 100644
--- a/Mesh_3/doc/Mesh_3/CGAL/Compact_mesh_cell_base_3.h
+++ b/Mesh_3/doc/Mesh_3/CGAL/Compact_mesh_cell_base_3.h
@@ -30,7 +30,5 @@ template< typename Gt,  typename MD, typename Tds = void >
 class Compact_mesh_cell_base_3 {
 public:
 
-/// @}
-
 }; /* end Compact_mesh_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h b/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h
index f2166607f7d..b20e0426d83 100644
--- a/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h
+++ b/Mesh_3/doc/Mesh_3/CGAL/Mesh_cell_base_3.h
@@ -36,7 +36,5 @@ template< typename Gt,  typename MD, typename Cb >
 class Mesh_cell_base_3 : public Cb {
 public:
 
-/// @}
-
 }; /* end Mesh_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_vertex_base_3.h b/Mesh_3/doc/Mesh_3/CGAL/Mesh_vertex_base_3.h
index 3637f83df52..b0112fcc53a 100644
--- a/Mesh_3/doc/Mesh_3/CGAL/Mesh_vertex_base_3.h
+++ b/Mesh_3/doc/Mesh_3/CGAL/Mesh_vertex_base_3.h
@@ -28,7 +28,5 @@ template< typename Gt, typename MD, typename Vb >
 class Mesh_vertex_base_3 : public Vb {
 public:
 
-/// @}
-
 }; /* end Mesh_vertex_base_3 */
 } /* end namespace CGAL */
diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h b/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
index 2100ae0d516..eb8a49f4354 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
@@ -25,8 +25,6 @@ public:
 
   typedef CGAL::Polygon_2<Kernel,Container> Polygon_2;
 
-/// @}
-
 }; /* end Greene_convex_decomposition_2 */
 } /* end namespace CGAL */
 
@@ -60,8 +58,6 @@ public:
 
   typedef CGAL::Polygon_2<Kernel,Container> Polygon_2;
 
-/// @}
-
 }; /* end Hertel_Mehlhorn_convex_decomposition_2 */
 } /* end namespace CGAL */
 
@@ -92,7 +88,5 @@ public:
 
   typedef CGAL::Polygon_2<Kernel,Container> Polygon_2;
 
-/// @}
-
 }; /* end Optimal_convex_decomposition_2 */
 } /* end namespace CGAL */
diff --git a/Modular_arithmetic/doc/Modular_arithmetic/CGAL/Modular_traits.h b/Modular_arithmetic/doc/Modular_arithmetic/CGAL/Modular_traits.h
index 4375c9ea9e1..0ae771f8df0 100644
--- a/Modular_arithmetic/doc/Modular_arithmetic/CGAL/Modular_traits.h
+++ b/Modular_arithmetic/doc/Modular_arithmetic/CGAL/Modular_traits.h
@@ -14,7 +14,5 @@ template< typename T >
 class Modular_traits {
 public:
 
-/// @}
-
 }; /* end Modular_traits */
 } /* end namespace CGAL */
diff --git a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h
index dacca3fda83..c834edd5cb2 100644
--- a/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h
+++ b/Modular_arithmetic/doc/Modular_arithmetic/Concepts/Modularizable.h
@@ -39,7 +39,5 @@ The following types are `Modularizable` iff their template arguments are.
 class Modularizable {
 public:
 
-/// @}
-
 }; /* end Modularizable */
 
diff --git a/Number_types/doc/Number_types/CGAL/FPU.h b/Number_types/doc/Number_types/CGAL/FPU.h
index 51c8d9f4211..f269dccf64b 100644
--- a/Number_types/doc/Number_types/CGAL/FPU.h
+++ b/Number_types/doc/Number_types/CGAL/FPU.h
@@ -169,6 +169,8 @@ constructor was called.
 */ 
 ~Set_ieee_double_precision(); 
 
+/// @}
+
 }; /* end Set_ieee_double_precision */
 
 
@@ -184,7 +186,5 @@ except that it does not perform the save and restore of the previous state.
 */ 
 void force_ieee_double_precision(); 
 
-/// @}
-
 
 } /* end namespace CGAL */
diff --git a/Number_types/doc/Number_types/CGAL/leda_bigfloat.h b/Number_types/doc/Number_types/CGAL/leda_bigfloat.h
index 97400390851..1934b840f66 100644
--- a/Number_types/doc/Number_types/CGAL/leda_bigfloat.h
+++ b/Number_types/doc/Number_types/CGAL/leda_bigfloat.h
@@ -21,7 +21,5 @@ For more details on the number types of \leda we refer to the \leda manual \cgal
 class leda_bigfloat {
 public:
 
-/// @}
-
 }; /* end leda_bigfloat */
 
diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_face_base_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_face_base_2.h
index 6bb72ea1d75..2f2cc601cf1 100644
--- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_face_base_2.h
+++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_face_base_2.h
@@ -40,7 +40,5 @@ class Periodic_2_triangulation_face_base_2
 {
 public:
 
-/// @}
-
 }; /* end Periodic_2_triangulation_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_vertex_base_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_vertex_base_2.h
index b7e844b6aec..6ead6620b64 100644
--- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_vertex_base_2.h
+++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_vertex_base_2.h
@@ -31,7 +31,5 @@ class Periodic_2_triangulation_vertex_base_2
 {
 public:
 
-/// @}
-
 }; /* end Periodic_2_triangulation_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h
index ff1d013160a..c437d8a3e1e 100644
--- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h
+++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomainWithFeatures_3.h
@@ -44,6 +44,4 @@ public:
   IndicesOutputIterator
   get_corner_incident_curves(Corner_index id, IndicesOutputIterator out);
 
-/// @}
-
 }; /* end Periodic_3MeshDomainWithFeatures_3 */
diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h
index ec9ee6390df..bd86a2a74ae 100644
--- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h
+++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Concepts/Periodic_3MeshDomain_3.h
@@ -41,6 +41,4 @@ public:
   */
   const Iso_cuboid_3& bounding_box();
 
-/// @}
-
 }; /* end Periodic_3MeshDomain_3 */
diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_offset_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_offset_3.h
index ae808a24cf3..7a4b4cfde4d 100644
--- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_offset_3.h
+++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_offset_3.h
@@ -14,7 +14,5 @@ The class `Periodic_3_offset_3` is a model of the concept
 class Periodic_3_offset_3 {
 public:
 
-/// @}
-
 }; /* end Periodic_3_offset_3 */
 } /* end namespace CGAL */
diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_cell_base_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_cell_base_3.h
index b816a001094..af5032d5581 100644
--- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_cell_base_3.h
+++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_cell_base_3.h
@@ -20,7 +20,5 @@ template< >
 class Periodic_3_triangulation_ds_cell_base_3 {
 public:
 
-/// @}
-
 }; /* end Periodic_3_triangulation_ds_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h
index d818dff85e9..0f0c2cd9b5d 100644
--- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h
+++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h
@@ -20,7 +20,5 @@ template< >
 class Periodic_3_triangulation_ds_vertex_base_3 {
 public:
 
-/// @}
-
 }; /* end Periodic_3_triangulation_ds_vertex_base_3 */
 } /* end namespace CGAL */
diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_hierarchy_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_hierarchy_3.h
index 1af91f472cd..ade24596949 100644
--- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_hierarchy_3.h
+++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/CGAL/Periodic_3_triangulation_hierarchy_3.h
@@ -56,7 +56,5 @@ template< typename PTr >
 class Periodic_3_triangulation_hierarchy_3 : public PTr {
 public:
 
-/// @}
-
 }; /* end Periodic_3_triangulation_hierarchy_3 */
 } /* end namespace CGAL */
diff --git a/Polynomial/doc/Polynomial/CGAL/Polynomial_traits_d.h b/Polynomial/doc/Polynomial/CGAL/Polynomial_traits_d.h
index fdf91cf016b..3af76da798c 100644
--- a/Polynomial/doc/Polynomial/CGAL/Polynomial_traits_d.h
+++ b/Polynomial/doc/Polynomial/CGAL/Polynomial_traits_d.h
@@ -13,7 +13,5 @@ template< typename Polynomial_d >
 class Polynomial_traits_d {
 public:
 
-/// @}
-
 }; /* end Polynomial_traits_d */
 } /* end namespace CGAL */
diff --git a/QP_solver/doc/QP_solver/Concepts/MPSFormat.h b/QP_solver/doc/QP_solver/Concepts/MPSFormat.h
index cc6515197bf..b0046b82df8 100644
--- a/QP_solver/doc/QP_solver/Concepts/MPSFormat.h
+++ b/QP_solver/doc/QP_solver/Concepts/MPSFormat.h
@@ -168,7 +168,5 @@ but we don't explain this here.
 class MPSFormat {
 public:
 
-/// @}
-
 }; /* end MPSFormat */
 
diff --git a/SearchStructures/doc/SearchStructures/Concepts/Sublayer.h b/SearchStructures/doc/SearchStructures/Concepts/Sublayer.h
index c3425e09c3b..f1d33eefa59 100644
--- a/SearchStructures/doc/SearchStructures/Concepts/Sublayer.h
+++ b/SearchStructures/doc/SearchStructures/Concepts/Sublayer.h
@@ -29,7 +29,5 @@ Such a recursion anchor class is provided by the class class.
 class Sublayer {
 public:
 
-/// @}
-
 }; /* end Sublayer */
 
diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h
index 91b29a16620..429ad821b04 100644
--- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h
+++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h
@@ -25,7 +25,5 @@ template< typename Vbb >
 class Segment_Delaunay_graph_hierarchy_vertex_base_2 : public Vbb {
 public:
 
-/// @}
-
 }; /* end Segment_Delaunay_graph_hierarchy_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_vertex_base_2.h b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_vertex_base_2.h
index 8b35879a460..a461f9ded1e 100644
--- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_vertex_base_2.h
+++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/CGAL/Segment_Delaunay_graph_vertex_base_2.h
@@ -34,7 +34,5 @@ template< typename Gt, typename SSTag >
 class Segment_Delaunay_graph_vertex_base_2 {
 public:
 
-/// @}
-
 }; /* end Segment_Delaunay_graph_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_3.h b/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_3.h
index 2ff4d1a05ca..b5d588d8fc4 100644
--- a/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_3.h
+++ b/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_3.h
@@ -19,7 +19,5 @@ template< typename SkinSurfaceTraits_3 >
 class Skin_surface_3 {
 public:
 
-/// @}
-
 }; /* end Skin_surface_3 */
 } /* end namespace CGAL */
diff --git a/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_traits_3.h b/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_traits_3.h
index eb1d74ac693..31eda5437bd 100644
--- a/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_traits_3.h
+++ b/Skin_surface_3/doc/Skin_surface_3/CGAL/Skin_surface_traits_3.h
@@ -17,7 +17,5 @@ template< typename K >
 class Skin_surface_traits_3 {
 public:
 
-/// @}
-
 }; /* end Skin_surface_traits_3 */
 } /* end namespace CGAL */
diff --git a/Skin_surface_3/doc/Skin_surface_3/CGAL/Union_of_balls_3.h b/Skin_surface_3/doc/Skin_surface_3/CGAL/Union_of_balls_3.h
index 821e5910268..c348e8306be 100644
--- a/Skin_surface_3/doc/Skin_surface_3/CGAL/Union_of_balls_3.h
+++ b/Skin_surface_3/doc/Skin_surface_3/CGAL/Union_of_balls_3.h
@@ -21,7 +21,5 @@ template< typename SkinSurfaceTraits_3 >
 class Union_of_balls_3 {
 public:
 
-/// @}
-
 }; /* end Union_of_balls_3 */
 } /* end namespace CGAL */
diff --git a/Snap_rounding_2/doc/Snap_rounding_2/CGAL/Snap_rounding_traits_2.h b/Snap_rounding_2/doc/Snap_rounding_2/CGAL/Snap_rounding_traits_2.h
index 8e0c352ef33..15a479820e3 100644
--- a/Snap_rounding_2/doc/Snap_rounding_2/CGAL/Snap_rounding_traits_2.h
+++ b/Snap_rounding_2/doc/Snap_rounding_2/CGAL/Snap_rounding_traits_2.h
@@ -34,7 +34,5 @@ template< typename Kernel >
 class Snap_rounding_traits_2 {
 public:
 
-/// @}
-
 }; /* end Snap_rounding_traits_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Polygon_offset_builder_traits_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Polygon_offset_builder_traits_2.h
index 7691a8a0af5..6b7672ca2dd 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Polygon_offset_builder_traits_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Polygon_offset_builder_traits_2.h
@@ -21,7 +21,5 @@ template< typename Kernel >
 class Polygon_offset_builder_traits_2 {
 public:
 
-/// @}
-
 }; /* end Polygon_offset_builder_traits_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_2.h
index a393afd24a2..ee18785dd18 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_2.h
@@ -28,7 +28,5 @@ template< typename Traits, typename Items, typename Alloc >
 class Straight_skeleton_2 : public HalfedgeDS_vector<Traits,Items,Alloc> {
 public:
 
-/// @}
-
 }; /* end Straight_skeleton_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_builder_traits_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_builder_traits_2.h
index 5666ec40cba..4df1ba5a0a0 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_builder_traits_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_builder_traits_2.h
@@ -23,7 +23,5 @@ template< typename Kernel >
 class Straight_skeleton_builder_traits_2 {
 public:
 
-/// @}
-
 }; /* end Straight_skeleton_builder_traits_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_face_base_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_face_base_2.h
index 6cc5b662764..c569c9c92a2 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_face_base_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_face_base_2.h
@@ -28,7 +28,5 @@ template< typename Refs >
 class Straight_skeleton_face_base_2 {
 public:
 
-/// @}
-
 }; /* end Straight_skeleton_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_halfedge_base_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_halfedge_base_2.h
index d441a215041..be704526919 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_halfedge_base_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_halfedge_base_2.h
@@ -26,7 +26,5 @@ template< typename Refs >
 class Straight_skeleton_halfedge_base_2 {
 public:
 
-/// @}
-
 }; /* end Straight_skeleton_halfedge_base_2 */
 } /* end namespace CGAL */
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_vertex_base_2.h b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_vertex_base_2.h
index f548d1815ed..0fbfa4b013a 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_vertex_base_2.h
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/CGAL/Straight_skeleton_vertex_base_2.h
@@ -28,7 +28,5 @@ template< typename Refs, typename Point, typename FT >
 class Straight_skeleton_vertex_base_2 {
 public:
 
-/// @}
-
 }; /* end Straight_skeleton_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO.h b/Surface_mesh/include/CGAL/Surface_mesh/IO.h
index 7ffc0bed21f..a6e6d7a24bb 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO.h
@@ -404,7 +404,6 @@ bool write_mesh(const Surface_mesh<K>& mesh, const std::string& filename)
 }
 
 /// group io
-/// @}
 template <class P, class Writer>
 void
 generic_print_surface_mesh( std::ostream&   out,
diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h
index 6f3f8b45fcc..8428f17c0ce 100644
--- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h
+++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h
@@ -21,8 +21,6 @@ and hide a non-virtual method in the context of the static polymorphism used in
 template< typename TriangleMesh >
 struct Edge_collapse_visitor_base {
 
-/// @}
-
 }; /* end Surface_mesh_simplification::Edge_collapse_visitor_base */
 
   } /* end namespace Surface_mesh_simplification */
diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h
index 77fd121f6f7..1ed57e0119b 100644
--- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h
+++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h
@@ -19,8 +19,6 @@ template< typename TriangleMesh >
 class Edge_profile {
 public:
 
-/// @}
-
 }; /* end Surface_mesh_simplification::Edge_profile */
 } /* namespace Surface_mesh_simplification */
 } /* end namespace CGAL */
diff --git a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_cell_base_3.h b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_cell_base_3.h
index ec2e8868eea..d69c05405a5 100644
--- a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_cell_base_3.h
+++ b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_cell_base_3.h
@@ -27,7 +27,5 @@ template< typename Gt, typename Cb >
 class Surface_mesh_cell_base_3 : public Cb {
 public:
 
-/// @}
-
 }; /* end Surface_mesh_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_complex_2_in_triangulation_3.h b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_complex_2_in_triangulation_3.h
index 52d3258574e..7e9e841c0f4 100644
--- a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_complex_2_in_triangulation_3.h
+++ b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_complex_2_in_triangulation_3.h
@@ -34,7 +34,5 @@ template< typename Tr, typename Edge_info = void >
 class Surface_mesh_complex_2_in_triangulation_3 {
 public:
 
-/// @}
-
 }; /* end Surface_mesh_complex_2_in_triangulation_3 */
 } /* end namespace CGAL */
diff --git a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_default_triangulation_3.h b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_default_triangulation_3.h
index c04f6d34c57..a3f1a3fde8c 100644
--- a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_default_triangulation_3.h
+++ b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_default_triangulation_3.h
@@ -27,7 +27,5 @@ public:
   /// the cell type which is model of `::SurfaceMeshCellBase_3`.
   typedef unspecified_type Cell;  
 
-/// @}
-
 }; /* end Surface_mesh_default_triangulation_3 */
 } /* end namespace CGAL */
diff --git a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_vertex_base_3.h b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_vertex_base_3.h
index 9fc860e4903..8646bbaf650 100644
--- a/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_vertex_base_3.h
+++ b/Surface_mesher/doc/Surface_mesher/CGAL/Surface_mesh_vertex_base_3.h
@@ -29,7 +29,5 @@ template< typename Gt, typename Vb >
 class Surface_mesh_vertex_base_3 : public Vb {
 public:
 
-/// @}
-
 }; /* end Surface_mesh_vertex_base_3 */
 } /* end namespace CGAL */
diff --git a/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h
index f9b9784fde9..e4154ace5f7 100644
--- a/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h
+++ b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h
@@ -18,7 +18,5 @@ template< typename Tds >
 class Triangulation_ds_face_base_2 {
 public:
 
-/// @}
-
 }; /* end Triangulation_ds_face_base_2 */
 } /* end namespace CGAL */
diff --git a/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h
index 822a61e891d..f93dd03270a 100644
--- a/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h
+++ b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h
@@ -28,7 +28,5 @@ template< typename Tds >
 class Triangulation_ds_vertex_base_2 {
 public:
 
-/// @}
-
 }; /* end Triangulation_ds_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h b/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h
index 94c2b3d1aba..51c3048d577 100644
--- a/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h
+++ b/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h
@@ -19,7 +19,5 @@ template< typename TDS = void >
 class Triangulation_ds_cell_base_3 {
 public:
 
-/// @}
-
 }; /* end Triangulation_ds_cell_base_3 */
 } /* end namespace CGAL */
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_face_base_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_face_base_2.h
index 45a7c90b7be..a1f3aa75bcf 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_face_base_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_face_base_2.h
@@ -34,7 +34,5 @@ template< typename Traits, typename Fb >
 class Constrained_triangulation_face_base_2 : public Fb {
 public:
 
-/// @}
-
 }; /* end Constrained_triangulation_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Regular_triangulation_face_base_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Regular_triangulation_face_base_2.h
index f0124a937ed..fc9dedf4ba1 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/Regular_triangulation_face_base_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/Regular_triangulation_face_base_2.h
@@ -28,7 +28,5 @@ template< typename Traits, typename Fb >
 class Regular_triangulation_face_base_2 : public Fb {
 public:
 
-/// @}
-
 }; /* end Regular_triangulation_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_face_base_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_face_base_2.h
index be789216fed..c31670b1b02 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_face_base_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_face_base_2.h
@@ -31,7 +31,5 @@ template< typename Traits, typename Fb >
 class Triangulation_face_base_2 : public Fb {
 public:
 
-/// @}
-
 }; /* end Triangulation_face_base_2 */
 } /* end namespace CGAL */
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_hierarchy_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_hierarchy_2.h
index 74deac2f6ee..816b53d0b40 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_hierarchy_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_hierarchy_2.h
@@ -61,8 +61,6 @@ template< typename Tr >
 class Triangulation_hierarchy_2 : public Tr {
 public:
 
-/// @}
-
 }; /* end Triangulation_hierarchy_2 */
 } /* end namespace CGAL */
 
@@ -101,7 +99,5 @@ template< typename Vb >
 class Triangulation_hierarchy_vertex_base_2 : public Vb {
 public:
 
-/// @}
-
 }; /* end Triangulation_hierarchy_vertex_base_2 */
 } /* end namespace CGAL */
diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_3.h
index ddc54b1e14e..f1adbe7af67 100644
--- a/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_3.h
+++ b/Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_cell_base_3.h
@@ -31,7 +31,5 @@ template< typename Traits, typename TDSCb >
 class Triangulation_cell_base_3 : public TDSCb {
 public:
 
-/// @}
-
 }; /* end Triangulation_cell_base_3 */
 } /* end namespace CGAL */