diff --git a/include/libopencm3/stm32/common/usart_common_f124.h b/include/libopencm3/stm32/common/usart_common_f124.h
index 41ce2999..cd5c7122 100644
--- a/include/libopencm3/stm32/common/usart_common_f124.h
+++ b/include/libopencm3/stm32/common/usart_common_f124.h
@@ -39,7 +39,6 @@ specific memorymap.h header before including this header file.*/
 
 
 /** @defgroup usart_reg_base USART register base addresses
- * @ingroup STM32F_usart_defines
  * Holds all the U(S)ART peripherals supported.
  * @{
  */
diff --git a/include/libopencm3/stm32/common/usart_common_f24.h b/include/libopencm3/stm32/common/usart_common_f24.h
index e8d9f7f0..9edb640b 100644
--- a/include/libopencm3/stm32/common/usart_common_f24.h
+++ b/include/libopencm3/stm32/common/usart_common_f24.h
@@ -38,9 +38,14 @@ specific memorymap.h header before including this header file.*/
 
 /* --- Convenience macros -------------------------------------------------- */
 
+/** @addtogroup usart_reg_base USART register base addresses
+ * Holds all the U(S)ART peripherals supported.
+ * @{
+ */
 #define USART6				USART6_BASE
 #define UART7				UART7_BASE
 #define UART8				UART8_BASE
+/**@}*/
 
 /* --- USART registers ----------------------------------------------------- */
 
diff --git a/include/libopencm3/stm32/f0/usart.h b/include/libopencm3/stm32/f0/usart.h
index 5a51a46b..869f4843 100644
--- a/include/libopencm3/stm32/f0/usart.h
+++ b/include/libopencm3/stm32/f0/usart.h
@@ -34,10 +34,16 @@
 #include <libopencm3/stm32/common/usart_common_all.h>
 #include <libopencm3/stm32/common/usart_common_v2.h>
 
+/**@{*/
+
 /*****************************************************************************/
 /* Module definitions                                                        */
 /*****************************************************************************/
 
+/** @defgroup usart_reg_base USART register base addresses
+ * Holds all the U(S)ART peripherals supported.
+ * @{
+ */
 #define USART1				USART1_BASE
 #define USART2				USART2_BASE
 #define USART3				USART3_BASE
@@ -46,6 +52,7 @@
 #define USART6				USART6_BASE
 #define USART7				USART7_BASE
 #define USART8				USART8_BASE
+/**@}*/
 
 /*****************************************************************************/
 /* Register values                                                           */
@@ -59,5 +66,7 @@ BEGIN_DECLS
 
 END_DECLS
 
+/**@}*/
+
 #endif
 
diff --git a/include/libopencm3/stm32/f3/usart.h b/include/libopencm3/stm32/f3/usart.h
index dc180950..860eba09 100644
--- a/include/libopencm3/stm32/f3/usart.h
+++ b/include/libopencm3/stm32/f3/usart.h
@@ -34,9 +34,9 @@
 #include <libopencm3/stm32/common/usart_common_all.h>
 #include <libopencm3/stm32/common/usart_common_v2.h>
 
+/**@{*/
 
 /** @defgroup usart_reg_base USART register base addresses
- * @ingroup STM32F_usart_defines
  * Holds all the U(S)ART peripherals supported.
  * @{
  */
@@ -51,5 +51,7 @@ BEGIN_DECLS
 
 END_DECLS
 
+/**@}*/
+
 #endif
 
diff --git a/include/libopencm3/stm32/f7/usart.h b/include/libopencm3/stm32/f7/usart.h
index 9f7fed51..df496a0b 100644
--- a/include/libopencm3/stm32/f7/usart.h
+++ b/include/libopencm3/stm32/f7/usart.h
@@ -34,9 +34,9 @@
 #include <libopencm3/stm32/common/usart_common_all.h>
 #include <libopencm3/stm32/common/usart_common_v2.h>
 
+/**@{*/
 
 /** @defgroup usart_reg_base USART register base addresses
- * @ingroup STM32F_usart_defines
  * Holds all the U(S)ART peripherals supported.
  * @{
  */
@@ -54,5 +54,7 @@ BEGIN_DECLS
 
 END_DECLS
 
+/**@}*/
+
 #endif
 
diff --git a/include/libopencm3/stm32/l0/usart.h b/include/libopencm3/stm32/l0/usart.h
index d3777707..6ab49067 100644
--- a/include/libopencm3/stm32/l0/usart.h
+++ b/include/libopencm3/stm32/l0/usart.h
@@ -30,8 +30,9 @@
 #include <libopencm3/stm32/common/usart_common_all.h>
 #include <libopencm3/stm32/common/usart_common_v2.h>
 
+/**@{*/
+
 /** @defgroup usart_reg_base USART register base addresses
- * @ingroup STM32F_usart_defines
  * Holds all the U(S)ART peripherals supported.
  * @{
  */
@@ -46,4 +47,5 @@ BEGIN_DECLS
 
 END_DECLS
 
+/**@}*/
 #endif
diff --git a/include/libopencm3/stm32/l4/usart.h b/include/libopencm3/stm32/l4/usart.h
index ab7efd63..08d8a86b 100644
--- a/include/libopencm3/stm32/l4/usart.h
+++ b/include/libopencm3/stm32/l4/usart.h
@@ -31,7 +31,6 @@
 #include <libopencm3/stm32/common/usart_common_v2.h>
 
 /** @defgroup usart_reg_base USART register base addresses
- * @ingroup STM32F_usart_defines
  * Holds all the U(S)ART peripherals supported.
  * @{
  */