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 8d8cc6785d4..a68feead26c 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
@@ -440,13 +440,14 @@ public:
     Bbox_2 operator()(const X_monotone_curve_2& xcv) const { return bbox(xcv); }
   };
 
-  /*! \name Auxiliary Functor definitions, used gor, e.g., the landmarks
+  /*! \name Auxiliary Functor definitions, used gor, e.g., the landmarks \
    * point-location strategy and the drawing function.
    */
   //@{
   typedef double                                        Approximate_number_type;
   typedef CGAL::Cartesian<Approximate_number_type>      Approximate_kernel;
   typedef Approximate_kernel::Point_2                   Approximate_point_2;
+  //@}
 
   /*! \class Approximate_2
    * A functor that approximates a point and an \f$x\f$-monotone curve.
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 37a7a6c29bd..1db9da8bc82 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
@@ -121,6 +121,7 @@ public:
     X_monotone_curve_2(const X_monotone_curve_2& xcv,
                        const Point_2& src, const Point_2& tgt) const;
 
+    //! @}
   } /* end Arr_segment_traits_2::Trim_2 */
 
 }; /* end Arr_segment_traits_2 */
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBottomSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBottomSideTraits_2.h
index a29b1d33531..8d2682583b8 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBottomSideTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementBottomSideTraits_2.h
@@ -29,6 +29,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedBottomTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedBottomTraits_2.h
index 09de38a67c5..48563de6d81 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedBottomTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedBottomTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedLeftTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedLeftTraits_2.h
index 9a06f1e409c..de1940c372b 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedLeftTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedLeftTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedRightTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedRightTraits_2.h
index 3f93d80deb2..a36bca2691e 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedRightTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedRightTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedTopTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedTopTraits_2.h
index be39ea2b6b1..d4a2d352af4 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedTopTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementContractedTopTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLeftSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLeftSideTraits_2.h
index 3b01d80db4f..6f2d1343a85 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLeftSideTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementLeftSideTraits_2.h
@@ -29,6 +29,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBottomTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBottomTraits_2.h
index c53f51ef056..2298e679738 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBottomTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBottomTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenLeftTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenLeftTraits_2.h
index f1b7d62ca68..b4f1b8d2ee3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenLeftTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenLeftTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenRightTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenRightTraits_2.h
index fa8468d49dc..a5683bc1aff 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenRightTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenRightTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenTopTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenTopTraits_2.h
index 455bef4d160..ad852c41ed3 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenTopTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenTopTraits_2.h
@@ -33,6 +33,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementRightSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementRightSideTraits_2.h
index 689d2b7af2d..ed6d2be0c4d 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementRightSideTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementRightSideTraits_2.h
@@ -29,6 +29,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopSideTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopSideTraits_2.h
index 94614dfc81a..e579a7df9ef 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopSideTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementTopSideTraits_2.h
@@ -29,6 +29,7 @@ public:
 
   /// \name Functor Types
   /// @{
+  /// @}
 
   /// \name Accessing Functor Objects
   /// @{
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
index cff7c59d379..0f63b3c41fa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
@@ -1515,7 +1515,7 @@ public:
 
   //@}
 
-  /*! \name Auxiliary Functor definitions, used gor, e.g., the landmarks
+  /*! \name Auxiliary Functor definitions, used gor, e.g., the landmarks \
    * point-location strategy and the drawing function.
    */
   //@{
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
index c3f09ef16e9..ffd352badaa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
@@ -212,6 +212,7 @@ public:
   using X_monotone_curve_2 = typename Base::X_monotone_curve_2;
   using Curve_2 = typename Base::Curve_2;
   using Multiplicity = typename Base::Multiplicity;
+  //@}
 
   /*! A functor that compares the \f$x\f$-coordinates of two points. */
   class Compare_x_2 {
diff --git a/CGAL_Core/include/CGAL/CORE/BigFloat.h b/CGAL_Core/include/CGAL/CORE/BigFloat.h
index 5b1bd138bca..671e58d644a 100644
--- a/CGAL_Core/include/CGAL/CORE/BigFloat.h
+++ b/CGAL_Core/include/CGAL/CORE/BigFloat.h
@@ -600,6 +600,7 @@ inline long longValue(const BigFloat& bf)
 {
   return bf.longValue();
 }
+//@}
 
 } //namespace CORE
 
diff --git a/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h b/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h
index b20bbdcb36f..eef6a4cf86b 100644
--- a/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h
+++ b/Solver_interface/doc/Solver_interface/Concepts/MixedIntegerProgramTraits.h
@@ -39,6 +39,8 @@ public:
         */
         MixedIntegerProgramVariable(MixedIntegerProgramTraits* solver, Variable_type type, FT lb =, FT ub, const std::string& name, int idx);
 
+        /// @}
+
         /// \name Operations
         /// @{
 
@@ -131,6 +133,8 @@ public:
         */
         MixedIntegerProgramLinearConstraint(MixedIntegerProgramTraits* solver, FT lb, FT ub, const std::string& name, int idx);
 
+        /// @}
+
         /// \name Operations
         /// @{
 
@@ -238,6 +242,8 @@ public:
         */
         MixedIntegerProgramLinearObjective(MixedIntegerProgramTraits* solver, Sense sense);
 
+        /// @}
+
         /// \name Operations
         /// @{
 
diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeCollapseSimplificationVisitor.h b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeCollapseSimplificationVisitor.h
index 0bbb8e88078..7a8476e10f5 100644
--- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeCollapseSimplificationVisitor.h
+++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/Concepts/EdgeCollapseSimplificationVisitor.h
@@ -21,6 +21,8 @@ The type of the surface mesh to simplify. Must be a model of the `MutableFaceGra
 */
 typedef Edge_profile::Triangle_mesh TriangleMesh;
 
+/// @}
+
 /// \name Operations
 /// @{
 
diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h
index 6ab5522df50..7649be08913 100644
--- a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h
+++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h
@@ -870,6 +870,7 @@ a vertex of the `c`.
 */
 int index(Vertex_handle v) const;
 
+/// @}
 
 /// \name Internal
 /// \cgalAdvancedBegin
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_2.h
index 570114a5b99..14dff71d41f 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_2.h
@@ -785,6 +785,7 @@ is returned.
 */
 Vertex_handle move(Vertex_handle v, const Point & p);
 
+/// @}
 
 /// \name Specialized Modifiers
 /// The following member functions offer more specialized versions of