--- a/include/stxxl/bits/containers/queue.h
+++ b/include/stxxl/bits/containers/queue.h
@@ -79,6 +79,9 @@
     unsigned_type blocks2prefetch;
 
 public:
+    //! \name Constructors/Destructors
+    //! \{
+
     //! Constructs empty queue with own write and prefetch block pool.
     //!
     //! \param D  number of parallel disks, defaulting to the configured number of scratch disks,
@@ -152,6 +155,11 @@
         init(blocks2prefetch_);
     }
 
+    //! \}
+
+    //! \name Modifiers
+    //! \{
+
     void swap(queue& obj)
     {
         std::swap(m_size, obj.m_size);
@@ -168,6 +176,8 @@
         std::swap(blocks2prefetch, obj.blocks2prefetch);
     }
 
+    //! \}
+
 private:
     void init(int blocks2prefetch_ = -1)
     {
@@ -192,6 +202,9 @@
     }
 
 public:
+    //! \name Miscellaneous
+    //! \{
+
     //! Defines the number of blocks to prefetch (\c front side).
     //! This method should be called whenever the prefetch pool is resized
     //! \param blocks2prefetch_  defines the number of blocks to prefetch (\c front side),
@@ -209,6 +222,10 @@
     {
         return blocks2prefetch;
     }
+    //! \}
+
+    //! \name Modifiers
+    //! \{
 
     //! Adds an element in the queue.
     void push(const value_type& val)
@@ -324,18 +341,10 @@
         ++front_element;
         --m_size;
     }
-
-    //! Returns the size of the queue.
-    size_type size() const
-    {
-        return m_size;
-    }
-
-    //! Returns \c true if queue is empty.
-    bool empty() const
-    {
-        return (m_size == 0);
-    }
+    //! \}
+
+    //! \name Operators
+    //! \{
 
     //! Returns a mutable reference at the back of the queue.
     value_type & back()
@@ -364,6 +373,11 @@
         assert(!empty());
         return *front_element;
     }
+
+    //! \}
+
+    //! \name Constructors/Destructors
+    //! \{
 
     ~queue()
     {
@@ -379,6 +393,25 @@
         if (!bids.empty())
             bm->delete_blocks(bids.begin(), bids.end());
     }
+
+    //! \}
+
+    //! \name Capacity
+    //! \{
+
+    //! Returns the size of the queue.
+    size_type size() const
+    {
+        return m_size;
+    }
+
+    //! Returns \c true if queue is empty.
+    bool empty() const
+    {
+        return (m_size == 0);
+    }
+
+    //! \}
 };
 
 //! \}