diff --git a/core/net/rime/broadcast-announcement.c b/core/net/rime/broadcast-announcement.c
index a728ce145..d430f0cc3 100644
--- a/core/net/rime/broadcast-announcement.c
+++ b/core/net/rime/broadcast-announcement.c
@@ -1,8 +1,3 @@
-/**
- * \addtogroup rimeexamples
- * @{
- */
-
 /*
  * Copyright (c) 2006, Swedish Institute of Computer Science.
  * All rights reserved.
@@ -35,6 +30,11 @@
  *
  */
 
+/**
+ * \addtogroup rimeexamples
+ * @{
+ */
+
 /**
  * \file
  *         An example announcement back-end, based on the broadcast primitive
diff --git a/core/net/rime/broadcast.c b/core/net/rime/broadcast.c
index 463346dce..2e1ed7c49 100644
--- a/core/net/rime/broadcast.c
+++ b/core/net/rime/broadcast.c
@@ -1,8 +1,3 @@
-/**
- * \addtogroup rimebroadcast
- * @{
- */
-
 /*
  * Copyright (c) 2006, Swedish Institute of Computer Science.
  * All rights reserved.
@@ -35,6 +30,11 @@
  *
  */
 
+/**
+ * \addtogroup rimebroadcast
+ * @{
+ */
+
 /**
  * \file
  *         Identified best-effort local area broadcast (broadcast)
diff --git a/core/net/rime/multihop.c b/core/net/rime/multihop.c
index 00773d150..59886bf80 100644
--- a/core/net/rime/multihop.c
+++ b/core/net/rime/multihop.c
@@ -1,5 +1,5 @@
 /**
- * \addtogroup rimemh
+ * \addtogroup rime
  * @{
  */
 
diff --git a/cpu/avr/dev/lanc111.c b/cpu/avr/dev/lanc111.c
index cfd20abdf..28b793896 100644
--- a/cpu/avr/dev/lanc111.c
+++ b/cpu/avr/dev/lanc111.c
@@ -167,9 +167,12 @@
 #endif
 
 /*!
- * \addtogroup xgSmscRegs
- */
-/*@{*/
+ * \addtogroup avr
+ * @{ */
+/*!
+ * \defgroup xgSmscRegs
+ *
+ * @{ */
 
 /*!
  * \brief Bank select register.
@@ -1361,3 +1364,6 @@ lanc111_init(void)
 }
 
 /** @} */
+/** @} */
+
+/** @} */
diff --git a/cpu/avr/dev/usb/config.h b/cpu/avr/dev/usb/config.h
index aa6d81ba4..5faa49198 100644
--- a/cpu/avr/dev/usb/config.h
+++ b/cpu/avr/dev/usb/config.h
@@ -53,7 +53,7 @@
 #define CONFIG_H_
 
 /**
-   @addtogroup usb
+   @addtogroup usbstick
    @{
 */
 
diff --git a/cpu/avr/dev/usb/pll_drv.h b/cpu/avr/dev/usb/pll_drv.h
index 6a35ca055..e1b63ed64 100644
--- a/cpu/avr/dev/usb/pll_drv.h
+++ b/cpu/avr/dev/usb/pll_drv.h
@@ -55,7 +55,7 @@
 //_____ I N C L U D E S ____________________________________________________
 
 /**
-   @addtogroup usb
+   @addtogroup usbstick
    @{
 */
 //_____ M A C R O S ________________________________________________________
diff --git a/cpu/pic32/pic32.h b/cpu/pic32/pic32.h
index 77a47c92c..8edcacde8 100644
--- a/cpu/pic32/pic32.h
+++ b/cpu/pic32/pic32.h
@@ -34,6 +34,10 @@
  *
  */
 
+/**
+ * \addtogroup cpu
+ * @{ */
+
 /**
  * \defgroup pic32 PIC32 Contiki Port
  *
diff --git a/cpu/stm32w108/hal/error-def.h b/cpu/stm32w108/hal/error-def.h
index 15360085c..fadda390e 100644
--- a/cpu/stm32w108/hal/error-def.h
+++ b/cpu/stm32w108/hal/error-def.h
@@ -7,7 +7,11 @@
 */
 
 /**
- * @addtogroup status_codes
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/**
+ * @defgroup status_codes
  *
  * Many StZNet API functions return an ::StStatus value to indicate
  * the success or failure of the call.
diff --git a/cpu/stm32w108/hal/micro/adc.h b/cpu/stm32w108/hal/micro/adc.h
index 75d2eeeb5..4500c26a8 100644
--- a/cpu/stm32w108/hal/micro/adc.h
+++ b/cpu/stm32w108/hal/micro/adc.h
@@ -3,7 +3,12 @@
  *
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
-/** @addtogroup adc
+
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup adc
  * Sample A/D converter driver.
  *
  * See adc.h for source code.
@@ -318,5 +323,5 @@ boolean halAdcGetRange(void);
 
 /** @} // END addtogroup
  */
-
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h
index 66fee590c..7783c0f96 100644
--- a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h
+++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h
@@ -3,7 +3,11 @@
  *
  */
 
-/** @addtogroup gnu
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup gnu
  * @brief Compiler and Platform specific definitions and typedefs for the
  *  GNU C ARM compiler.
  *
@@ -539,4 +543,5 @@ int abs(int I);
 #endif // GNU_H_
 
 /** @}  END addtogroup */
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h
index f9046cd32..c4492dd61 100644
--- a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h
+++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h
@@ -4,7 +4,11 @@
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
 
-/** @addtogroup iar
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup iar
  * @brief Compiler and Platform specific definitions and typedefs for the
  *  IAR ARM C compiler.
  *
@@ -532,4 +536,5 @@ int abs(int I);
 #endif // IAR_H_
 
 /** @}  END addtogroup */
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/cortexm3/flash.h b/cpu/stm32w108/hal/micro/cortexm3/flash.h
index 3404736f5..0bfa7a0f4 100644
--- a/cpu/stm32w108/hal/micro/cortexm3/flash.h
+++ b/cpu/stm32w108/hal/micro/cortexm3/flash.h
@@ -4,8 +4,13 @@
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
  
-/** @addtogroup flash
- * @brief Definition and description of public flash manipulation routines.
+/**
+ * \addtogroup stm32w-cpu
+ * @{
+ */
+
+/** 
+ * @defgroup flash Definition and description of public flash manipulation routines.
  *
  * @note
  * During an erase or a write the flash is not available,
@@ -123,4 +128,5 @@ StStatus halInternalCibOptionByteWrite(uint8_t byte, uint8_t data);
 #endif //FLASH_H_
 
 /** @} END addtogroup */
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/cortexm3/nvm.h b/cpu/stm32w108/hal/micro/cortexm3/nvm.h
index 8f9bea60d..d8accaed1 100644
--- a/cpu/stm32w108/hal/micro/cortexm3/nvm.h
+++ b/cpu/stm32w108/hal/micro/cortexm3/nvm.h
@@ -9,8 +9,12 @@
  *
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
- 
-/** @addtogroup nvm
+
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup nvm
  * @brief Cortex-M3 Non-Volatile Memory data storage system.
  *
  * This header defines the API for NVM data storage.  This header also
@@ -274,6 +278,7 @@ StStatus halCommonWriteToNvm(const void *data, uint32_t offset, uint16_t length)
 #define NVM_MGMT_SIZE_B  (4)
 
 /** @} END addtogroup */
+/** @} */
 
 #endif // NVM_H_
 
diff --git a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h
index 92f65625c..24bbfceaf 100644
--- a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h
+++ b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h
@@ -1,4 +1,4 @@
-/** \addtogroup platform_common
+/** 
  * \brief Compiler and Platform specific definitions and typedefs common to
  * all platforms.  
  *
@@ -10,6 +10,10 @@
  *@{
  */
 
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
 /** \file hal/micro/generic/compiler/platform-common.h
  * See \ref platform_common for detailed documentation.
  *
@@ -348,4 +352,5 @@
 #endif //PLATFORMCOMMON_H_
 
 /** @}  END addtogroup */
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/led.h b/cpu/stm32w108/hal/micro/led.h
index c34fca1ff..3f7bb021b 100644
--- a/cpu/stm32w108/hal/micro/led.h
+++ b/cpu/stm32w108/hal/micro/led.h
@@ -4,7 +4,11 @@
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
 
-/** @addtogroup led 
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup led 
  *  @brief  Sample API funtions for controlling LEDs.
  *
  * When specifying an LED to use, always use the BOARDLEDx definitions that
@@ -55,4 +59,4 @@ void halClearLed(HalBoardLed led);
 
 /** @} // END addtogroup 
  */
-
+/** @} */
diff --git a/cpu/stm32w108/hal/micro/micro-common.h b/cpu/stm32w108/hal/micro/micro-common.h
index b9092f1fb..db12908bf 100644
--- a/cpu/stm32w108/hal/micro/micro-common.h
+++ b/cpu/stm32w108/hal/micro/micro-common.h
@@ -5,7 +5,11 @@
  * <!--(C) COPYRIGHT 2010 STMicroelectronics. All rights reserved.        -->
  */
 
-/** @addtogroup micro
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup micro
  * Many of the supplied example applications use these microcontroller functions.
  * See hal/micro/micro-common.h for source code.
  *
@@ -144,4 +148,5 @@ StStatus halBootloaderStart(uint8_t mode, uint8_t channel, uint16_t panId);
 #endif //MICRO_COMMON_H_
 
 /** @} END micro group  */
+/** @} */
 
diff --git a/cpu/stm32w108/hal/micro/system-timer.h b/cpu/stm32w108/hal/micro/system-timer.h
index abda36b2e..3a34ab453 100644
--- a/cpu/stm32w108/hal/micro/system-timer.h
+++ b/cpu/stm32w108/hal/micro/system-timer.h
@@ -6,7 +6,11 @@
 
  */
 
-/** @addtogroup system_timer
+/**
+ * @addtogroup stm32w-cpu
+ * @{ */
+
+/** @defgroup system_timer
  * @brief Functions that provide access to the system clock.
  *
  * A single system tick (as returned by ::halCommonGetInt16uMillisecondTick() and
@@ -76,7 +80,7 @@ uint16_t halCommonGetInt16uQuarterSecondTick(void);
 
 /**@} //END addtogroup
  */
-
+/** @} */
 
 
 
diff --git a/platform/mbxxx/platform-conf.h b/platform/mbxxx/platform-conf.h
index cd316da82..d7d9b29fe 100644
--- a/platform/mbxxx/platform-conf.h
+++ b/platform/mbxxx/platform-conf.h
@@ -1,3 +1,6 @@
+/**
+ * \addtogroup platform
+ * @{ */
 /**
  * \defgroup mbxxx-platform The STM32W MBXXX platform.
  *
@@ -102,3 +105,4 @@ typedef unsigned long rtimer_clock_t;
 
 #endif /* PLATFORM_CONF_H_ */
 /** @} */
+/** @} */
diff --git a/platform/seedeye/contiki-seedeye-main.c b/platform/seedeye/contiki-seedeye-main.c
index 04e55a335..dabb8f126 100644
--- a/platform/seedeye/contiki-seedeye-main.c
+++ b/platform/seedeye/contiki-seedeye-main.c
@@ -35,7 +35,11 @@
  */
 
 /**
- * \addtogroup SeedEye Contiki SEEDEYE Platform
+ * \addtogroup platform
+ * @{ */
+
+/**
+ * \defgroup SeedEye Contiki SEEDEYE Platform
  *
  * @{
  */
@@ -178,3 +182,5 @@ main(int argc, char **argv)
 /*---------------------------------------------------------------------------*/
 
 /** @} */
+/** @} */
+
diff --git a/platform/seedeye/dev/mrf24j40/mrf24j40.h b/platform/seedeye/dev/mrf24j40/mrf24j40.h
index 34ea55594..05061357b 100644
--- a/platform/seedeye/dev/mrf24j40/mrf24j40.h
+++ b/platform/seedeye/dev/mrf24j40/mrf24j40.h
@@ -34,6 +34,10 @@
  *
  */
 
+/**
+ * \addtogroup SeedEye 
+ * @{ */
+
 /**
  * \defgroup mrf24j40 MRF24J40 Driver
  *
@@ -226,3 +230,4 @@ typedef union _INT_status {
 #endif /* MRF24J40_H_ */
 
 /** @} */
+/** @} */