diff --git a/boards/chronos/board_init.c b/boards/chronos/board_init.c
index 0a24e48e16c76160e96bc1e15c78e75d49926c50..da2ad5ef6c0de94503e7e804a42a6f9885edc1be 100644
--- a/boards/chronos/board_init.c
+++ b/boards/chronos/board_init.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/chronos/drivers/battery.c b/boards/chronos/drivers/battery.c
index 2e954d075c03f9cab7f50586bd286ca3ea0db957..6c4ec88b5b8fccb821431f02610f7feb5ced0180 100644
--- a/boards/chronos/drivers/battery.c
+++ b/boards/chronos/drivers/battery.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/chronos/drivers/buzzer.c b/boards/chronos/drivers/buzzer.c
index 86d139039d34931380a01ddb9a1450a1dfcf5fa1..120e07a3b531e3e9d5049dcfe93ccc998174a404 100644
--- a/boards/chronos/drivers/buzzer.c
+++ b/boards/chronos/drivers/buzzer.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/chronos/drivers/display.c b/boards/chronos/drivers/display.c
index 88f1d977adfe8c458ba1c7b6b405d9484d193a7c..a0071ddc4c8e71d0a33c90f4c490d611b6b6aaae 100644
--- a/boards/chronos/drivers/display.c
+++ b/boards/chronos/drivers/display.c
@@ -34,7 +34,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/chronos/drivers/display_putchar.c b/boards/chronos/drivers/display_putchar.c
index 25a1cd58e0e8a684a466c6a997bb2bf65c836e60..f3f904551b24d9f3f643e3910b5fcc3fe57b3a4b 100644
--- a/boards/chronos/drivers/display_putchar.c
+++ b/boards/chronos/drivers/display_putchar.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/chronos/stdio.c b/boards/chronos/stdio.c
index 0de7f23a288aebb34dad4795a0e583551f577e32..f94b9875aaf6071b7216f8ee74344e418cf7e8e0 100644
--- a/boards/chronos/stdio.c
+++ b/boards/chronos/stdio.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup chronos
+ * @ingroup boards_chronos
  * @{
  */
 
diff --git a/boards/common/arduino-mkr/board.c b/boards/common/arduino-mkr/board.c
index c78e8836814c93b1b2e3e077b74bcb40442304f5..35ec380a96ccbdc2153e69727d863bcb2c9adc06 100644
--- a/boards/common/arduino-mkr/board.c
+++ b/boards/common/arduino-mkr/board.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     boards_arduino-mkr-common
+ * @ingroup     boards_common_arduino-mkr
  * @{
  * @file
  * @brief       Board common implementations for the Arduino MKR boards
diff --git a/boards/common/atmega/board.c b/boards/common/atmega/board.c
index 01c58b31ddc336933e02d52924e420c180ae144e..40605c4c2e090ab08c1ecbd0db343b058da44bf4 100644
--- a/boards/common/atmega/board.c
+++ b/boards/common/atmega/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_common_atmega
+ * @ingroup     boards_common
  * @{
  *
  * @file
diff --git a/boards/common/msba2/drivers/include/sht11-board.h b/boards/common/msba2/drivers/include/sht11-board.h
index 4ab9808a469e1b978bec436255bb729ca25570fd..7ee0009965815089280778938f45db381b052104 100644
--- a/boards/common/msba2/drivers/include/sht11-board.h
+++ b/boards/common/msba2/drivers/include/sht11-board.h
@@ -10,7 +10,7 @@
 #define SHT11_BOARD_H
 
 /**
- * @ingroup     lpc2387
+ * @ingroup     boards_common_msba2
  * @{
  */
 
diff --git a/boards/common/nrf52xxxdk/board.c b/boards/common/nrf52xxxdk/board.c
index 05dc074ddd56d07efcc179b705a7232fef956060..ceccba5c1a39fff2c429108be52def91f19a2b02 100644
--- a/boards/common/nrf52xxxdk/board.c
+++ b/boards/common/nrf52xxxdk/board.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_common_nrf52xxxdk
+ * @ingroup     boards_common_nrf52
  * @{
  *
  * @file
diff --git a/boards/common/stm32f103c8/include/periph_conf.h b/boards/common/stm32f103c8/include/periph_conf.h
index a151cee375ffea9108f5a45836d6bd18cbb7bbac..08bfaedaba69438ea294f90f2cebf428df10ba0c 100644
--- a/boards/common/stm32f103c8/include/periph_conf.h
+++ b/boards/common/stm32f103c8/include/periph_conf.h
@@ -8,7 +8,9 @@
  */
 
 /**
- * @ingroup     boards_common_stm32f103c8
+ * @defgroup    boards_common_stm32f103c8 STM32F103C8 based boards common
+ * @ingroup     boards_common
+ * @brief       Shared files and configuration for STM32F103C8 based boards
  * @{
  *
  * @file
@@ -260,3 +262,4 @@ static const spi_conf_t spi_config[] = {
 #endif
 
 #endif /* PERIPH_CONF_H */
+/** @} */
diff --git a/boards/frdm-k22f/include/gpio_params.h b/boards/frdm-k22f/include/gpio_params.h
index 65481c1f47741081cd53e8b2ea77ffd827ae3779..8a8f5d6dabc9afc3942b14bbd1d4e9afa5fc2da9 100644
--- a/boards/frdm-k22f/include/gpio_params.h
+++ b/boards/frdm-k22f/include/gpio_params.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup   boards_frdm_k22f
+ * @ingroup   boards_frdm-k22f
  * @{
  *
  * @file
diff --git a/boards/frdm-kw41z/include/adc_params.h b/boards/frdm-kw41z/include/adc_params.h
index 0c4a109e2eb846215d07d84f749b883ee108eb22..3fe2783a3d62789c72a3a9980ebe3d2f1ca235bf 100644
--- a/boards/frdm-kw41z/include/adc_params.h
+++ b/boards/frdm-kw41z/include/adc_params.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup   boards_frdm_kw41z
+ * @ingroup   boards_frdm-kw41z
  * @{
  *
  * @file
diff --git a/boards/frdm-kw41z/include/gpio_params.h b/boards/frdm-kw41z/include/gpio_params.h
index b5c717cd6c506726611fc7e92a9ccb432bfd6206..d02434ac331cf00a6c39763e88b03c6306a16278 100644
--- a/boards/frdm-kw41z/include/gpio_params.h
+++ b/boards/frdm-kw41z/include/gpio_params.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup   boards_frdm_kw41z
+ * @ingroup   boards_frdm-kw41z
  * @{
  *
  * @file
diff --git a/boards/msba2/board_init.c b/boards/msba2/board_init.c
index 4075240712e31d1ea48cb6bbd7d4afe136311a6a..a386a9984c7cca48ea436ce4637f899c161feaca 100644
--- a/boards/msba2/board_init.c
+++ b/boards/msba2/board_init.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup msba2
+ * @ingroup     boards_msba2
  * @{
  */
 
diff --git a/boards/native/board_init.c b/boards/native/board_init.c
index 52cb9aef98e5cd7baabff2c87e2476c91274d715..7b331f08c07ac76f11a08ddb9ee91c148cb9c162 100644
--- a/boards/native/board_init.c
+++ b/boards/native/board_init.c
@@ -7,7 +7,7 @@
  * General Public License v2.1. See the file LICENSE in the top level
  * directory for more details.
  *
- * @ingroup native_board
+ * @ingroup boards_native
  * @{
  * @file
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
diff --git a/boards/native/drivers/native-led.c b/boards/native/drivers/native-led.c
index 1b6e5c09c6e5113e1a3cfcafddce1e9a04979657..2bc0e1d6865d1fc600014515aa3273d3f4ad1af8 100644
--- a/boards/native/drivers/native-led.c
+++ b/boards/native/drivers/native-led.c
@@ -9,7 +9,7 @@
  * General Public License v2.1. See the file LICENSE in the top level
  * directory for more details.
  *
- * @ingroup native_board
+ * @ingroup boards_native
  * @{
  * @file
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
diff --git a/boards/pba-d-01-kw2x/board.c b/boards/pba-d-01-kw2x/board.c
index 923e6658330077accbeed1c736c518458ed91413..3baf0eb36d8dfba29eff07c38b4a843cbca1250f 100644
--- a/boards/pba-d-01-kw2x/board.c
+++ b/boards/pba-d-01-kw2x/board.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_pba-d-01
+ * @ingroup     boards_pba-d-01-kw2x
  * @{
  *
  * @file
diff --git a/boards/remote-pa/board.c b/boards/remote-pa/board.c
index 3f2807d1710aaca79441f66364c961d377cdc39b..879e0816271577279c1ef54303395e1282a1f4ef 100644
--- a/boards/remote-pa/board.c
+++ b/boards/remote-pa/board.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_remote-pa
+ * @ingroup     boards_remote-pa
  * @{
  *
  * @file