diff --git a/cpu/arm_common/include/arm_common.h b/cpu/arm_common/include/arm_common.h
index e34c5821ca..18c6efc804 100644
--- a/cpu/arm_common/include/arm_common.h
+++ b/cpu/arm_common/include/arm_common.h
@@ -10,7 +10,8 @@
 #define __ARM_COMMON_H
 
 /**
- * @defgroup    arm_common      ARM CPU common
+ * @defgroup    arm_common ARM CPU common
+ * @brief       Common implementations and headers for ARM based micro-controllers
  * @ingroup     cpu
  * @{
  */
diff --git a/cpu/cc430/include/cc430-rtc.h b/cpu/cc430/include/cc430-rtc.h
index ea284850a0..4d9b7b5776 100644
--- a/cpu/cc430/include/cc430-rtc.h
+++ b/cpu/cc430/include/cc430-rtc.h
@@ -16,7 +16,6 @@ See the file LICENSE in the top level directory for more details.
 #include "time.h"
 
 /**
- * @defgroup    cc430_rtc   CC430 Real Time Clock
  * @ingroup     cc430
  */
 
diff --git a/cpu/cortexm_common/doc.txt b/cpu/cortexm_common/doc.txt
index e54053e201..a39fa0a468 100644
--- a/cpu/cortexm_common/doc.txt
+++ b/cpu/cortexm_common/doc.txt
@@ -1,40 +1,40 @@
 /**
- * @defgroup    cortexm Cortex-M
+ * @defgroup    cpu_cortexm Cortex-M
  * @brief       ARM Cortex-M specific code
  * @ingroup     cpu
  */
 
 /**
  * @defgroup    CMSIS_Core_FunctionInterface
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_core_register
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_glob_defs
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_MISRA_Exceptions
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_core_definitions
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_SIMD_intrinsics
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
 
 /**
  * @defgroup    CMSIS_Core_InstructionInterface
- * @ingroup     cortexm
+ * @ingroup     cpu_cortexm
  */
diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index 3e89412580..4bf0abb0c5 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -7,9 +7,7 @@
  */
 
 /**
- * @defgroup    cpu_cortexm_common ARM Cortex-M common files
- * @ingroup     cpu
- * @brief       Common implementations and headers for Cortex-M family based micro-controllers
+ * @addtogroup  cpu_cortexm
  * @{
  *
  * @file        cpu.h
diff --git a/cpu/lpc1768/include/cmsis.h b/cpu/lpc1768/include/cmsis.h
index 97d672ae83..c705982a15 100644
--- a/cpu/lpc1768/include/cmsis.h
+++ b/cpu/lpc1768/include/cmsis.h
@@ -6,6 +6,7 @@
 
 /**
  * @defgroup CMSIS
+ * @brief    Cortex Microcontroller Software Interface Standard
  * @ingroup cpu
  * @{
  *
diff --git a/cpu/lpc1768/include/cpu.h b/cpu/lpc1768/include/cpu.h
index a45fb1b484..5ae45a87f1 100644
--- a/cpu/lpc1768/include/cpu.h
+++ b/cpu/lpc1768/include/cpu.h
@@ -3,6 +3,7 @@
 
 /**
  * @defgroup    lpc1768 NXP LPC1768
+ * @brief       NXP LPC1768 specific code
  * @ingroup		cpu
  * @{
  */
diff --git a/cpu/native/include/cpu.h b/cpu/native/include/cpu.h
index e3300cb19c..72b74bfa70 100644
--- a/cpu/native/include/cpu.h
+++ b/cpu/native/include/cpu.h
@@ -1,8 +1,4 @@
-/**
- * Native CPU interface
- *
- * The native CPU uses system calls to simulate hardware access.
- *
+/*
  * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser General
@@ -12,7 +8,9 @@
 
 /**
  * @ingroup arch
- * @defgroup    native_cpu  Native CPU
+ * @defgroup    native_cpu  Native
+ * @brief       Native CPU specific code
+ * @details     The native CPU uses system calls to simulate hardware access.
  * @ingroup     cpu
  * @brief       CPU abstraction for the native port
  * @{
diff --git a/cpu/sam3x8e/doc.txt b/cpu/sam3x8e/doc.txt
index 30a96ca12c..bc486c5691 100644
--- a/cpu/sam3x8e/doc.txt
+++ b/cpu/sam3x8e/doc.txt
@@ -1,7 +1,7 @@
 /**
  * @defgroup        cpu_sam3x8e Atmel SAM3X8E
  * @ingroup         cpu
- * @brief           Implementation of Atmel's SAM3X8E Cortex-M3 MCU
+ * @brief           Atmel SAM3X8E Cortex-M3 MCU specific code
  */
 
 /**