57 files changed, 315 insertions, 6 deletions

diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 9130ff57e..9f173a691 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -351,4 +355,6 @@ GNUNET_BANDWIDTH_tracker_update_quota (
 
 /** @} */ /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_bandwidth_lib.h */
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 142f1b088..5eefabff2 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -683,4 +687,6 @@ GNUNET_BIO_write_spec_commit (struct GNUNET_BIO_WriteHandle *h,
 
 /** @} */  /* end of group bio */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_bio_lib.h */
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index af61dcfb0..fe6c99613 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -296,4 +299,6 @@ GNUNET_BLOCK_group_merge (struct GNUNET_BLOCK_Group *bg1,
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_block_lib.h */
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index 6f9e8e9dc..7cd744ac4 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -289,3 +292,5 @@ struct GNUNET_BLOCK_PluginFunctions
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_buffer_lib.h b/src/include/gnunet_buffer_lib.h
index 7239eccfb..174d2d010 100644
--- a/src/include/gnunet_buffer_lib.h
+++ b/src/include/gnunet_buffer_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * Common buffer management functions.
  *
  * @author Florian Dold
@@ -203,3 +207,5 @@ GNUNET_buffer_clear (struct GNUNET_Buffer *buf);
 
 
 #endif
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_child_management_lib.h b/src/include/gnunet_child_management_lib.h
index a35b37865..e7f1271ee 100644
--- a/src/include/gnunet_child_management_lib.h
+++ b/src/include/gnunet_child_management_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @file include/gnunet_child_management_lib.h
  * @brief GNUnet child management api
  * @author Christian Grothoff
@@ -70,3 +74,5 @@ void
 GNUNET_wait_child_cancel (struct GNUNET_ChildWaitHandle *cwh);
 
 #endif
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 2ecd38b04..b239109cd 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -19,6 +19,13 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
+ * @addtogroup networking
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -93,4 +100,8 @@ GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 /** @} */ /* end of group client */
 
+/* @} */ /* end of group addition */
+
+/* @} */ /* end of group addition */
+
 /* end of gnunet_client_lib.h */
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 9bcd99c7b..5035d6baa 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @file include/gnunet_common.h
  * @brief commonly used definitions; globals in this file
  *        are exempt from the rule that the module name ("common")
@@ -1861,3 +1865,5 @@ enum GNUNET_SCHEDULER_Priority
 #endif
 
 #endif /* GNUNET_COMMON_H */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index bc862f54f..ac0013e94 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -795,3 +799,5 @@ GNUNET_CONFIGURATION_config_tool_run (
 #endif
 
 /** @} */ /* end of group configuration */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 93a88f239..53d1a96c8 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  * @author Nils Durner
  *
@@ -2710,4 +2714,7 @@ GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_HeapNode *node,
 
 /* ifndef GNUNET_CONTAINER_LIB_H */
 #endif
+
+/** @} */ /* end of group addition */
+
 /* end of gnunet_container_lib.h */
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index 8570093cf..e201c2cf3 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @addtogroup Conversation
+ * @addtogroup conversation_l2  Conversation service and libraries
  * @{
  *
  * @author Simon Dieterle
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 2737ee0e9..ff14b09ca 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @file include/gnunet_crypto_lib.h
  * @brief cryptographic primitives for GNUnet
  *
@@ -2942,4 +2946,7 @@ GNUNET_CRYPTO_cs_verify (const struct GNUNET_CRYPTO_CsSignature *sig,
 
 /* ifndef GNUNET_CRYPTO_LIB_H */
 #endif
+
+/** @} */ /* end of group addition */
+
 /* end of gnunet_crypto_lib.h */
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index b4ef346e2..5a876af8c 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -208,3 +211,5 @@ GNUNET_DATACACHE_get_closest (struct GNUNET_DATACACHE_Handle *h,
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 7e63d87d9..298623cb1 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -180,3 +183,5 @@ struct GNUNET_DATACACHE_PluginFunctions
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 113f6b2f2..3de08b788 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup fs_l2  File sharing and support services/libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -377,3 +380,5 @@ struct GNUNET_DATASTORE_PluginFunctions
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index c99db67bc..c2ec9ce1f 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup fs_l2  File sharing and support services/libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -361,3 +364,5 @@ GNUNET_DATASTORE_cancel (struct GNUNET_DATASTORE_QueueEntry *qe);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 6604d1ca7..e493929f0 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -21,6 +21,8 @@
 /**
  * @addtogroup Backbone
  * @{
+ * @addtogroup dht_libs  DHT and support libraries
+ * @{
  *
  * @author Christian Grothoff
  *
@@ -585,3 +587,5 @@ GNUNET_DHT_hello_offer (struct GNUNET_DHT_Handle *dht_handle,
 /** @} */  /* end of group dht */
 
 /** @} */ /* end of group addition */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 7dfd9ccf1..71c1f88a5 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -815,4 +819,6 @@ GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h);
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_disk_lib.h */
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index 20f0f13ee..fd1319dd9 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup vpn_suite  VPN services and libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -191,3 +194,5 @@ GNUNET_DNS_disconnect (struct GNUNET_DNS_Handle *dh);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index f77073264..b8b908e84 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * @{
+ *
  * @author Philipp Toelke
  * @author Christian Grothoff
  *
@@ -978,3 +981,5 @@ GNUNET_DNSPARSER_hex_to_bin (const char *hex,
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 4e93105bb..1310ce55a 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -147,3 +150,5 @@ GNUNET_DNSSTUB_resolve_cancel (struct GNUNET_DNSSTUB_RequestSocket *rs);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index c964b5434..bb4a3ee8c 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup Backbone
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -228,3 +231,5 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 96936bad2..6b664169a 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup fs_l2  File sharing and support services/libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -2788,3 +2791,5 @@ GNUNET_FS_share_tree_free (struct GNUNET_FS_ShareTreeItem *toplevel);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 259d648dd..c7c1d57a3 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -507,4 +511,6 @@ GNUNET_GETOPT_run (const char *binaryOptions,
 
 /** @} */ /* end of group getopt */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_getopt_lib.h */
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 74eca999d..b12108a33 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Backbone
+ * @{
+ *
  * @author Christian Grothoff
  * @file
  * Helper library for handling HELLOs
@@ -536,4 +539,6 @@ GNUNET_HELLO_address_to_prefix (const char *address);
 
 /** @} */ /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_hello_lib.h */
diff --git a/src/include/gnunet_hello_uri_lib.h b/src/include/gnunet_hello_uri_lib.h
index c109a151a..89cd42d31 100644
--- a/src/include/gnunet_hello_uri_lib.h
+++ b/src/include/gnunet_hello_uri_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Backbone
+ * @{
+ *
  * @author Christian Grothoff
  * @file
  * Helper library for handling HELLO URIs
@@ -245,4 +248,6 @@ GNUNET_HELLO_dht_msg_to_block (const struct GNUNET_MessageHeader *hello,
 
 /** @} */ /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_hello_uri_lib.h */
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index b54120204..3362d698e 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Philipp Toelke
  * @author Christian Grothoff
  *
@@ -181,3 +185,5 @@ GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh);
 /* end of include guard: GNUNET_HELPER_LIB_H */
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index 227c7f486..c54f6abf8 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup egos  Ego management
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -868,4 +871,6 @@ GNUNET_IDENTITY_ego_lookup_by_suffix_cancel (
 
 /** @} */ /* end of group identity */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_identity_service.h */
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index a2d22698f..479c7a71e 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @addtogroup Conversation
+ * @addtogroup conversation_l2  Conversation service and libraries
  * @{
  *
  * @author Simon Dieterle
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index a1c5c4957..bf2902707 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Florian Dold
  * @author Christian Grothoff
  *
@@ -1120,3 +1124,5 @@ GNUNET_MQ_preference_to_string (enum GNUNET_MQ_PreferenceKind type);
 #endif
 
 /** @} */ /* end of group mq */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 9f3431b98..36b1fd8d5 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -19,6 +19,13 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
+ * @addtogroup networking
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -161,4 +168,6 @@ GNUNET_MST_destroy (struct GNUNET_MessageStreamTokenizer *mst);
 
 /** @} */  /* end of group server */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_mst_lib.h */
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index bd22fd6e2..7eef49900 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -99,3 +103,5 @@ unsigned int
 GNUNET_notification_context_get_size (struct GNUNET_NotificationContext *nc);
 
 #endif
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index b1cf58711..1e8b7e851 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -19,6 +19,13 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
+ * @addtogroup networking
+ * @{
+ *
  * @author Nils Durner
  * @author Tobias Frisch
  *
@@ -588,3 +595,7 @@ GNUNET_NETWORK_test_port_free (int ipproto,
 #endif /* GNUNET_NETWORK_LIB_H */
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_nt_lib.h b/src/include/gnunet_nt_lib.h
index 18419a7b8..5c3ec86af 100644
--- a/src/include/gnunet_nt_lib.h
+++ b/src/include/gnunet_nt_lib.h
@@ -22,7 +22,7 @@
  * @author Christian Grothoff
  * @author Matthias Wachs
  *
- * @defgroup nt  network type characterization
+ * @defgroup nt  Network type characterization
  *
  * @{
  */
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index 77fa7f955..0e09457cc 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @file
  * Asynchronous operations; register callbacks for operations and call them when a response arrives.
  *
@@ -153,3 +157,5 @@ GNUNET_OP_remove (struct GNUNET_OP_Handle *h,
 
 
 #endif // GNUNET_OP_H
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index eddf97dab..fc88e1123 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  * @author Krista Bennett
  * @author Gerd Knorr <kraxel@bytesex.org>
@@ -690,4 +694,6 @@ GNUNET_OS_check_helper_binary (const char *binary,
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_os_lib.h */
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index f94b883f8..e088743e6 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -126,4 +130,6 @@ GNUNET_PEER_resolve2 (GNUNET_PEER_Id id);
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_peer_lib.h */
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index d265eb343..d5f3f893a 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -169,4 +173,6 @@ GNUNET_PLUGIN_unload (const char *library_name,
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_plugin_lib.h */
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 4167060c0..2d4dc626b 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -126,4 +130,6 @@ GNUNET_PROGRAM_run (int argc,
 
 /** @} */  /* end of group program */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_program_lib.h */
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index f2892e125..dc66a0401 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  * @author Tobias Frisch
  *
@@ -3617,4 +3621,6 @@ extern "C" {
 
 /** @} */ /* end of group protocols */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_protocols.h */
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index bbf1c3ad3..0d5ef59b7 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -19,12 +19,15 @@
  */
 
 /**
+ * @addtogroup reclaim_suite  RECLAIM services and libraries
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
  * Identity attribute definitions
  *
- * @defgroup reclaim-attribute reclaim attributes
+ * @defgroup reclaim-attribute Reclaim attributes
  * @{
  */
 #ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H
@@ -858,4 +861,6 @@ GNUNET_RECLAIM_credential_get_presentation (
 
 /** @} */ /* end of group reclaim-attribute */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_reclaim_attribute_lib.h */
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 11d5d76f7..331f36f24 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup reclaim_suite  RECLAIM services and libraries
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
@@ -439,3 +442,5 @@ struct GNUNET_RECLAIM_CredentialPluginFunctions
 #endif
 
 /** @} */ /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 38e1c8735..9f348a1cb 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -19,13 +19,16 @@
  */
 
 /**
+ * @addtogroup reclaim_suite  RECLAIM services and libraries
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
  * reclaim service; implements identity and personal data sharing
  * for GNUnet
  *
- * @defgroup reclaim service
+ * @defgroup reclaim  Reclaim service
  * @{
  */
 #ifndef GNUNET_RECLAIM_SERVICE_H
@@ -509,4 +512,6 @@ GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op);
 
 /** @} */ /* end of group reclaim */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_reclaim_service.h */
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index 7e74bee76..82448697a 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup rest_l2  REST service and libraries
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
@@ -137,3 +140,5 @@ GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle *conn,
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 96454f66b..acfe879b3 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -18,6 +18,9 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
+ * @addtogroup rest_l2  REST service and libraries
+ * @{
+ *
  * @author Martin Schanzenbach
  *
  * @file
@@ -88,3 +91,5 @@ struct GNUNET_REST_Plugin
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index 8cff948e2..b3f6a5090 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -24,6 +24,9 @@
 #include "gnunet_identity_service.h"
 
 /**
+ * @addtogroup egos  Ego management
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -268,3 +271,5 @@ GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow);
 #endif /* GNUNET_REVOCATION_SERVICE_H_ */
 
 /** @} */ /* end of group revocation */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 158f1d83b..6492039dd 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -929,3 +933,5 @@ GNUNET_SCHEDULER_begin_async_scope (struct GNUNET_AsyncScopeId *aid);
 #endif
 
 /** @} */ /* end of group scheduler */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index ad238a0fa..5baa9100e 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -19,6 +19,13 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
+ * @addtogroup networking
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -442,4 +449,6 @@ GNUNET_SERVICE_client_persist (struct GNUNET_SERVICE_Client *c);
 
 /** @} */  /* end of group service */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_service_lib.h */
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index 5a14a2d9e..f70f22403 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -105,4 +109,6 @@ GNUNET_SIGNAL_raise (const int sig);
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_signal_lib.h */
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index 33c520671..cb4d65fb9 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @addtogroup Conversation
+ * @addtogroup conversation_l2  Conversation service and libraries
  * @{
  *
  * @author Simon Dieterle
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index aa4daf8a3..e96888db5 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  * @author Krista Bennett
  * @author Gerd Knorr <kraxel@bytesex.org>
@@ -765,4 +769,6 @@ GNUNET_STRINGS_parse_ipv6_policy (const char *routeListX);
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_util_string.h */
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 72b5ab364..91ede19d8 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Testing
+ * @{
+ *
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  *
  * @file
@@ -130,4 +133,6 @@ GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h);
 
 /** @} */  /* end of group */
 
+/** @} */ /* end of group addition */
+
 /* End of gnunet_testbed_logger_service.h */
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 888c6e391..29515b7af 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Testing
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -1727,3 +1730,5 @@ GNUNET_TESTBED_underlaylinkmodel_free (struct
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 664e20ac3..724382c66 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup Testing
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -472,3 +475,5 @@ GNUNET_TESTING_get_testname_from_underscore (const char *argv0);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index d59eb984d..d753d62f7 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -19,6 +19,10 @@
  */
 
 /**
+ * @addtogroup libgnunetutil
+ * Multi-function utilities library for GNUnet programs
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -910,4 +914,6 @@ GNUNET_TIME_absolute_get_monotonic (
 
 /** @} */ /* end of group time */
 
+/** @} */ /* end of group addition */
+
 /* end of gnunet_time_lib.h */
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 61880cea1..e92d6ae04 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup vpn_suite  VPN services and libraries
+ * @{
+ *
  * @author Philipp Toelke
  * @author Christian Grothoff
  *
@@ -946,3 +949,5 @@ GNUNET_TUN_compute_service_cadet_port (const struct GNUNET_HashCode *desc,
 #endif
 
 /** @} */ /* end of group */
+
+/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index 31476e140..d493dddd0 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -19,6 +19,9 @@
  */
 
 /**
+ * @addtogroup vpn_suite  VPN services and libraries
+ * @{
+ *
  * @author Christian Grothoff
  *
  * @file
@@ -159,3 +162,5 @@ GNUNET_VPN_disconnect (struct GNUNET_VPN_Handle *vh);
 #endif
 
 /** @} */  /* end of group */
+
+/** @} */ /* end of group addition */