diff --git a/cpu/msp430_common/include/cpu.h b/cpu/msp430_common/include/cpu.h
index 88a1aac846..529c2183c2 100644
--- a/cpu/msp430_common/include/cpu.h
+++ b/cpu/msp430_common/include/cpu.h
@@ -7,20 +7,20 @@
  * directory for more details.
  */
 
-#ifndef CPU_H
-#define CPU_H
-
 /**
  * @defgroup    cpu_msp430_common TI MSP430
  * @ingroup     cpu
  * @brief       Texas Instruments MSP430 specific code
-
-<h2>First steps</h2>
-\li See the <a href="../manual/index.html">manual</a> for toolchain and ide setup
-
+ *
  * @{
+ * @file
+ * @brief       Texas Instruments MSP430 specific code
+ *
  */
 
+#ifndef CPU_H
+#define CPU_H
+
 #include <stdio.h>
 
 #include <msp430.h>
@@ -163,5 +163,5 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-/** @} */
 #endif /* CPU_H */
+/** @} */
diff --git a/cpu/msp430_common/include/cpu_conf.h b/cpu/msp430_common/include/cpu_conf.h
index 3bf046d1d2..6dde740662 100644
--- a/cpu/msp430_common/include/cpu_conf.h
+++ b/cpu/msp430_common/include/cpu_conf.h
@@ -6,6 +6,15 @@
  * directory for more details.
  */
 
+/**
+ * @ingroup     cpu_msp430_common
+ * @{
+ *
+ * @file
+ * @brief       Common CPU definitions fpr MSP430
+ *
+ */
+
 #ifndef CPU_CONF_H
 #define CPU_CONF_H
 
@@ -48,3 +57,4 @@ extern "C" {
 #endif
 
 #endif /* CPU_CONF_H */
+/** @} */
diff --git a/cpu/msp430_common/include/msp430_types.h b/cpu/msp430_common/include/msp430_types.h
index 81114dd195..a1acec8c86 100644
--- a/cpu/msp430_common/include/msp430_types.h
+++ b/cpu/msp430_common/include/msp430_types.h
@@ -6,6 +6,14 @@
  * directory for more details.
  */
 
+/**
+ * @ingroup     cpu_msp430_common
+ * @{
+ *
+ * @file
+ * @brief       basic types for MSP430
+ */
+
 #ifndef MSP430_TYPES_H
 #define MSP430_TYPES_H
 
@@ -89,3 +97,4 @@ typedef     uint32_t useconds_t;  /**< Used for time in microseconds */
 #endif
 
 #endif /* MSP430_TYPES_H */
+/** @} */
diff --git a/cpu/msp430_common/include/stdio.h b/cpu/msp430_common/include/stdio.h
index 2a5223ba60..2a67eb2ac1 100644
--- a/cpu/msp430_common/include/stdio.h
+++ b/cpu/msp430_common/include/stdio.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     msp430
+ * @ingroup     cpu_msp430_common
  * @{
  *
  * @file
@@ -42,3 +42,4 @@ int getchar(void);
 #endif
 
 #endif /* STDIO_H */
+/** @} */
diff --git a/cpu/msp430_common/include/stdlib.h b/cpu/msp430_common/include/stdlib.h
index 20bc817c84..30549a61a0 100644
--- a/cpu/msp430_common/include/stdlib.h
+++ b/cpu/msp430_common/include/stdlib.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     msp430
+ * @ingroup     cpu_msp430_common
  * @{
  *
  * @file
@@ -38,3 +38,4 @@ extern "C" {
 #endif
 
 #endif /* STDLIB_H */
+/** @} */
diff --git a/cpu/msp430_common/include/sys/stat.h b/cpu/msp430_common/include/sys/stat.h
index 2b3ec0933d..45843a7be9 100644
--- a/cpu/msp430_common/include/sys/stat.h
+++ b/cpu/msp430_common/include/sys/stat.h
@@ -7,6 +7,9 @@
  */
 
 /**
+ * @ingroup cpu_msp430_common
+ *
+ * @{
  * @file
  * @brief   POSIX compatible sys/stat.h definitions
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
diff --git a/cpu/msp430_common/include/unistd.h b/cpu/msp430_common/include/unistd.h
index 39049c605f..55930fab6b 100644
--- a/cpu/msp430_common/include/unistd.h
+++ b/cpu/msp430_common/include/unistd.h
@@ -7,6 +7,14 @@
  * directory for more details.
  */
 
+/**
+ * @ingroup     cpu_msp430_common
+ * @{
+ *
+ * @file
+ * @brief       unistd.h wrapper for MSP430
+ */
+
 #ifndef UNISTD_H
 #define UNISTD_H
 
@@ -108,3 +116,4 @@ ssize_t      write(int, const void *, size_t);
 #endif
 
 #endif /* UNISTD_H */
+/** @} */