9 files changed, 10 insertions, 10 deletions
diff --git a/os/lib/include/chbsem.h b/os/lib/include/chbsem.h
index 77ca30c25..192aec86a 100644
--- a/os/lib/include/chbsem.h
+++ b/os/lib/include/chbsem.h
@@ -20,8 +20,6 @@
 /**
  * @file    chbsem.h
  * @brief   Binary semaphores structures and macros.
- *
- * @addtogroup binary_semaphores
  * @details Binary semaphores related APIs and services.
  *          <h2>Operation mode</h2>
  *          Binary semaphores are implemented as a set of inline functions
@@ -43,6 +41,8 @@
  *          implement the priority inheritance protocol.<br>
  *          In order to use the binary semaphores APIs the
  *          @p CH_CFG_USE_SEMAPHORES option must be enabled in @p chconf.h.
+ *
+ * @addtogroup oslib_binary_semaphores
  * @{
  */
 
diff --git a/os/lib/include/chfactory.h b/os/lib/include/chfactory.h
index 75f52e52f..0f66bf906 100644
--- a/os/lib/include/chfactory.h
+++ b/os/lib/include/chfactory.h
@@ -21,7 +21,7 @@
  * @file    chfactory.h
  * @brief   ChibiOS objects factory structures and macros.
  *
- * @addtogroup objects_factory
+ * @addtogroup oslib_objects_factory
  * @{
  */
 
diff --git a/os/lib/include/chlib.h b/os/lib/include/chlib.h
index 674561cb8..02f50e9c2 100644
--- a/os/lib/include/chlib.h
+++ b/os/lib/include/chlib.h
@@ -23,7 +23,7 @@
  * @details This header includes all the required library headers. This file
  *          is meant do be included by @p ch.h not directly by user.
  *
- * @addtogroup library_info
+ * @addtogroup oslib_info
  * @details OS Library related info.
  * @{
  */
diff --git a/os/lib/include/chmboxes.h b/os/lib/include/chmboxes.h
index 899a8ce1e..fd76b995a 100644
--- a/os/lib/include/chmboxes.h
+++ b/os/lib/include/chmboxes.h
@@ -21,7 +21,7 @@
  * @file    chmboxes.h
  * @brief   Mailboxes macros and structures.
  *
- * @addtogroup mailboxes
+ * @addtogroup oslib_mailboxes
  * @{
  */
 
diff --git a/os/lib/include/chmemcore.h b/os/lib/include/chmemcore.h
index 262796d84..b9b728389 100644
--- a/os/lib/include/chmemcore.h
+++ b/os/lib/include/chmemcore.h
@@ -21,7 +21,7 @@
  * @file    chmemcore.h
  * @brief   Core memory manager macros and structures.
  *
- * @addtogroup memcore
+ * @addtogroup oslib_memcore
  * @{
  */
 
diff --git a/os/lib/include/chmemheaps.h b/os/lib/include/chmemheaps.h
index c0ebcbb99..f20969a32 100644
--- a/os/lib/include/chmemheaps.h
+++ b/os/lib/include/chmemheaps.h
@@ -21,7 +21,7 @@
  * @file    chmemheaps.h
  * @brief   Memory heaps macros and structures.
  *
- * @addtogroup heaps
+ * @addtogroup oslib_memheaps
  * @{
  */
 
diff --git a/os/lib/include/chmempools.h b/os/lib/include/chmempools.h
index f8555c137..60d6a8da9 100644
--- a/os/lib/include/chmempools.h
+++ b/os/lib/include/chmempools.h
@@ -21,7 +21,7 @@
  * @file    chmempools.h
  * @brief   Memory Pools macros and structures.
  *
- * @addtogroup pools
+ * @addtogroup oslib_mempools
  * @{
  */
 
diff --git a/os/lib/include/chobjfifos.h b/os/lib/include/chobjfifos.h
index 51e7bf0a8..dfb0692ef 100644
--- a/os/lib/include/chobjfifos.h
+++ b/os/lib/include/chobjfifos.h
@@ -37,7 +37,7 @@
  *            can be blocking.
  *          .
  *
- * @addtogroup objects_fifo
+ * @addtogroup oslib_objects_fifos
  * @{
  */
 
diff --git a/os/lib/include/chpipes.h b/os/lib/include/chpipes.h
index 9e91614c4..c66c48d68 100644
--- a/os/lib/include/chpipes.h
+++ b/os/lib/include/chpipes.h
@@ -21,7 +21,7 @@
  * @file    chpipes.h
  * @brief   Pipes macros and structures.
  *
- * @addtogroup pipes
+ * @addtogroup oslib_pipes
  * @{
  */