diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
index 4499de4ab06abac2f74361c5c576833a464ec96c..319eb4f81773a973fd99748be5e6ff2d0532e069 100644
--- a/boards/chronos/include/board.h
+++ b/boards/chronos/include/board.h
@@ -27,7 +27,9 @@
 extern "C" {
 #endif
 
-/* for correct inclusion of <msp430.h> */
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __CC430F6137__
 #define __CC430F6137__
 #endif
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index af5e8c7a16e1fa2eef654c31de88393cd254acc9..6e6f351e1e1a7402c426a71d0fc365e3d19a4eb3 100644
--- a/boards/msb-430/include/board.h
+++ b/boards/msb-430/include/board.h
@@ -40,17 +40,25 @@
 extern "C" {
 #endif
 
-/*  for correct inclusion of <msp430.h> */
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F1612__
 #define __MSP430F1612__
 #endif
 
-/* MSB430 core */
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    2457600uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             1
 #define MSP430_HAS_EXTERNAL_CRYSTAL 0
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index f506e70a29d77c602b6f722568c8b6e69abc56d1..d2c42c4dd924bc9546e1765274dc81da64a9af2f 100644
--- a/boards/msb-430h/include/board.h
+++ b/boards/msb-430h/include/board.h
@@ -28,17 +28,25 @@
 extern "C" {
 #endif
 
-/* for correct inclusion of <msp430.h> */
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F1612__
 #define __MSP430F1612__
 #endif
 
-//MSB430 core
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    7372800uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             1
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h
index 390535faf77ef7fe6f04a473919806b03e57e860..78764a33acf9c8b953e0c94e211069d230626ba9 100644
--- a/boards/qemu-i386/include/board.h
+++ b/boards/qemu-i386/include/board.h
@@ -25,8 +25,13 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Serial port configuration
+ * @{
+ */
 #define UART_PORT (COM1_PORT) /* IO port to use for UART */
 #define UART_IRQ (COM1_IRQ)   /* IRQ line to use for UART */
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index eb3c4a2afa344a99cde9f913cc6ef67ae5bda9ca..7dc19412dacffc75afc9d91deac3640d55c77d0a 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -31,10 +31,12 @@ extern "C" {
 #endif
 
 /**
- * Assign the hardware timer
+ * @brief   xtimer configuration
+ * @{
  */
 #define XTIMER              TIMER_1
 #define XTIMER_CHAN         (0)
+/** @} */
 
 /**
  * @name AT86RF233 configuration
diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h
index f6101f925ad208c57f08541597db51ae2a6a9be0..a02c6d65056794eb9dcc477f967fe2ea78b29145 100644
--- a/boards/telosb/include/board.h
+++ b/boards/telosb/include/board.h
@@ -34,7 +34,9 @@
 extern "C" {
 #endif
 
-/*  for correct inclusion of <msp430.h> */
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F1611__
 #define __MSP430F1611__
 #endif
@@ -50,12 +52,18 @@ extern "C" {
 #define XTIMER_BACKOFF              (40)
 /** @} */
 
-/* TelosB core */
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    2457600uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             0
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
+/** @} */
 
 /**
  * @brief   LED pin definitions and handlers
@@ -87,7 +95,5 @@ extern "C" {
 }
 #endif
 
-#include <stdint.h>
-
 /** @} */
 #endif /*  TELOSB_BOARD_H_ */
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index e41ea87c0f3b6600282e7c0702871c2a5933ba2c..49478dadd207ff9af7ed9aa7e53d758bf771ce53 100644
--- a/boards/wsn430-v1_3b/include/board.h
+++ b/boards/wsn430-v1_3b/include/board.h
@@ -34,17 +34,25 @@
 extern "C" {
 #endif
 
-// for correct inclusion of <msp430.h>
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F1611__
 #define __MSP430F1611__
 #endif
 
-//MSB430 core
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             0
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
index 162703aadea3a29d540e596669aaad6a08396d45..537c62ea73d97b9004110f7c40ba341dff9210b6 100644
--- a/boards/wsn430-v1_4/include/board.h
+++ b/boards/wsn430-v1_4/include/board.h
@@ -34,17 +34,25 @@
 extern "C" {
 #endif
 
-/*  for correct inclusion of <msp430.h> */
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F1611__
 #define __MSP430F1611__
 #endif
 
-/* MSB430 core */
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             0
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h
index 198f16b78111dc1f1b413227ad241450f896d173..431931cd916544594a4368ab1d7f155e484c8c4f 100644
--- a/boards/z1/include/board.h
+++ b/boards/z1/include/board.h
@@ -37,6 +37,9 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Define the CPU model for the <msp430.h>
+ */
 #ifndef __MSP430F2617__
 #define __MSP430F2617__
 #endif
@@ -61,7 +64,12 @@ extern "C" {
 #define UART_STDIO_RX_BUFSIZE       (64U)
 /** @} */
 
-/*  MSP430 core */
+/**
+ * @brief   CPU core configuration
+ *
+ * @todo    Move this to the periph_conf.h
+ * @{
+ */
 #define MSP430_INITIAL_CPU_SPEED    8000000uL
 #ifndef F_CPU
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
@@ -69,6 +77,7 @@ extern "C" {
 #define F_RC_OSCILLATOR             32768
 #define MSP430_HAS_DCOR             0
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
+/** @} */
 
 /**
  * @brief   LED pin definitions and handlers
@@ -97,12 +106,16 @@ extern "C" {
 /** @} */
 
 
-/*  User-button port */
+/**
+ * @brief   User button configuration
+ * @{
+ */
 #define USER_BTN_PxIN      P2IN
 #define USER_BTN_MASK      0x20
 
 #define USER_BTN_PRESSED   ((USER_BTN_PxIN & USER_BTN_MASK) == 0)
 #define USER_BTN_RELEASED  ((USER_BTN_PxIN & USER_BTN_MASK) != 0)
+/** @} */
 
 #ifdef __cplusplus
 }