diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h
index 970dd04c74707ca28dfd685ff64eef3f4811a183..95603988d85d1746800c8f6333855fc6f2ca20ac 100644
--- a/boards/airfy-beacon/include/board.h
+++ b/boards/airfy-beacon/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @brief Xtimer configuration
* @{
diff --git a/boards/arduino-due/include/board.h b/boards/arduino-due/include/board.h
index 09d5c94872d50d0eda73fd34eb481329ee32b099..8a2c825ad8da6aebcfa74368c158905e3c649bb8 100644
--- a/boards/arduino-due/include/board.h
+++ b/boards/arduino-due/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (84000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/arduino-mega2560/include/board.h b/boards/arduino-mega2560/include/board.h
index 3f00a6a0860166b6e19640eb16fc7158a50f8bd6..cae587c17de06d8fe272b8f8d5d992a841379be0 100644
--- a/boards/arduino-mega2560/include/board.h
+++ b/boards/arduino-mega2560/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000L)
-
/**
* @brief As the CPU is too slow to handle 115200 baud, we set the default
* baudrate to 9600 for this board
diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h
index acd0f86ae491e569d40f9d670cd96ba7de6eb8aa..caa9319109efbc0a1e3ea9e7b1b35f3db7de45e7 100644
--- a/boards/cc2538dk/include/board.h
+++ b/boards/cc2538dk/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU XOSC32M_FREQ
-
/**
* @name Macros for controlling the on-board LEDs.
* @{
diff --git a/boards/f4vi1/include/board.h b/boards/f4vi1/include/board.h
index 8848fe5e9efc542af023d390f0f6c19390ced2c2..56c0932e901560b115153d66cbf7a41273b1ae07 100644
--- a/boards/f4vi1/include/board.h
+++ b/boards/f4vi1/include/board.h
@@ -29,11 +29,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/fox/include/board.h b/boards/fox/include/board.h
index 3dd0220c836c80675df1218e74b40bd528c0f104..6717f2c77caf897a04ae4c7c2b7d386a6d8bc65e 100644
--- a/boards/fox/include/board.h
+++ b/boards/fox/include/board.h
@@ -33,11 +33,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name Define the interface to the AT86RF231 radio
*
diff --git a/boards/frdm-k64f/include/board.h b/boards/frdm-k64f/include/board.h
index ee1d8a71b23b8fd5abba512b2c4d45e5290b58e5..dc4b528e2d10dc97e007fcf9ab45998d6e0aad1b 100644
--- a/boards/frdm-k64f/include/board.h
+++ b/boards/frdm-k64f/include/board.h
@@ -30,11 +30,6 @@ extern "C"
{
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/iotlab-m3/include/board.h b/boards/iotlab-m3/include/board.h
index 1bdf833f0acd9b81e4656e494ee80a9704c5f8e3..9b5aaa139ee20508dbf5372c8ed14dd6f4bcd0ee 100644
--- a/boards/iotlab-m3/include/board.h
+++ b/boards/iotlab-m3/include/board.h
@@ -33,11 +33,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name Set the default baudrate to 500K for this board
* @{
diff --git a/boards/limifrog-v1/include/board.h b/boards/limifrog-v1/include/board.h
index 883fa2550a06837a042cea8eabc72dcd3ebabbf4..5be17551d126e54404064821d8a6ae35f43740a8 100644
--- a/boards/limifrog-v1/include/board.h
+++ b/boards/limifrog-v1/include/board.h
@@ -30,12 +30,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-/** @} */
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/mbed_lpc1768/include/board.h b/boards/mbed_lpc1768/include/board.h
index d333c76039f5d94be12ae10d30f23d41c0150b84..30ca5fd0f35f53790c84e9ff758a93a5bfd1c28a 100644
--- a/boards/mbed_lpc1768/include/board.h
+++ b/boards/mbed_lpc1768/include/board.h
@@ -32,11 +32,6 @@
extern "C" {
#endif
-/**
- * @brief The nominal CPU core clock in this board
- */
-#define F_CPU (96000000)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h
index f278382d4599e7bedb2edd19c2296ea3210fd68e..cd9e44894a26a293594fb8ce7b231def6794973f 100644
--- a/boards/msbiot/include/board.h
+++ b/boards/msbiot/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name Configure connected CC1101 (radio) device
* @{
diff --git a/boards/native/include/board.h b/boards/native/include/board.h
index 0ec6dd8763f7057a7eaaa237682f5c4b1654560f..758a8f68df8f24fc9afda1e194c591c2f46cec3e 100644
--- a/boards/native/include/board.h
+++ b/boards/native/include/board.h
@@ -30,8 +30,6 @@
extern "C" {
#endif
-#define F_CPU 1000000
-
void _native_LED_GREEN_OFF(void);
#define LED_GREEN_OFF (_native_LED_GREEN_OFF())
void _native_LED_GREEN_ON(void);
diff --git a/boards/nrf51dongle/include/board.h b/boards/nrf51dongle/include/board.h
index b2b072772079de4ac3d09b77941af4743e6fd789..9f1ce05921cc6009aa884f181b2629b86ef1bdbb 100644
--- a/boards/nrf51dongle/include/board.h
+++ b/boards/nrf51dongle/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * @brief Define the nominal CPU core clock in this board
- */
-#define F_CPU (CLOCK_CORECLOCK)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/nrf6310/include/board.h b/boards/nrf6310/include/board.h
index 2c164e11a06e433c1148da8fcfe8d1208ff05193..d642762818bc5099a6e6fbcf49416f0b24892fc4 100644
--- a/boards/nrf6310/include/board.h
+++ b/boards/nrf6310/include/board.h
@@ -29,11 +29,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/nucleo-f091/include/board.h b/boards/nucleo-f091/include/board.h
index 49eb198c9451350879be28630f6df711465deede..3d13993d5f43803841a73633f88b4088be479bb9 100644
--- a/boards/nucleo-f091/include/board.h
+++ b/boards/nucleo-f091/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/nucleo-f103/include/board.h b/boards/nucleo-f103/include/board.h
index 0f10daad01ae3814feea493ee62bdd8ad05fa6c7..749016656e5ff4a57352c7c699e95a78a83e4b74 100755
--- a/boards/nucleo-f103/include/board.h
+++ b/boards/nucleo-f103/include/board.h
@@ -30,15 +30,10 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @brief Use the 2nd UART for STDIO on this board
*/
-#define STDIO UART_1
+#define STDIO UART_DEV(1)
/**
* @name LED pin definitions
diff --git a/boards/nucleo-f303/include/board.h b/boards/nucleo-f303/include/board.h
index 136ab5f7dde923604c638e729d83aeeb6aa03878..5c47e914c4547da589f2d1f048efc2f8d4359fd2 100755
--- a/boards/nucleo-f303/include/board.h
+++ b/boards/nucleo-f303/include/board.h
@@ -32,11 +32,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/nucleo-f334/include/board.h b/boards/nucleo-f334/include/board.h
index c3eb3cba3816ed8976d943fa7b25152e58cfe55a..be2fe0460b383f84f610d5c89fd5c684a943e546 100644
--- a/boards/nucleo-f334/include/board.h
+++ b/boards/nucleo-f334/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h
index 22b62da265a71135ce5fb34b816e0011949325b5..5d87b5c9d31d450a699190989f1970cc21020096 100644
--- a/boards/nucleo-f401/include/board.h
+++ b/boards/nucleo-f401/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name xtimer configuration
* @{
diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h
index e33e4a969b203ceb8200f14ba34f5531e5db53b7..0d016c2f02f25814156f5bd51c505fc94aec8628 100644
--- a/boards/nucleo-l1/include/board.h
+++ b/boards/nucleo-l1/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name xtimer configuration
* @{
diff --git a/boards/openmote-cc2538/include/board.h b/boards/openmote-cc2538/include/board.h
index 99c6b0f5b52bfe444a8b0992f681450f1946124c..4e441bae8c2c927bbb4b3246aecccad3ee1ba890 100644
--- a/boards/openmote-cc2538/include/board.h
+++ b/boards/openmote-cc2538/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * @name The nominal CPU core clock in this board
- */
-#define F_CPU (32000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index 524f8566e723d49f6667b68d9d37cbbf5ae13d41..c6ecd57ffda19131a199a93acc8e705eec0549b4 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -30,11 +30,6 @@ extern "C"
{
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h
index d2350866ba53391e24c1326cfcc19cb09df3af16..d0be5893b282091bd2d6e0c0a810fbca371b4618 100644
--- a/boards/pca10000/include/board.h
+++ b/boards/pca10000/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * @brief Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @brief Xtimer configuration
* @{
diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h
index 0283db40ce29682bfb47a722f0c626c6699d0b97..9fc73f3cae5b194addd46ab0a11c30476af5b944 100644
--- a/boards/pca10005/include/board.h
+++ b/boards/pca10005/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @brief Xtimer configuration
* @{
diff --git a/boards/remote/include/board.h b/boards/remote/include/board.h
index 4ecd7b5881069af1b4409ed6dd51ed6da6f94815..0db379e49dd2e6619180e0e227676466b1862e91 100644
--- a/boards/remote/include/board.h
+++ b/boards/remote/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @name The nominal CPU core clock in this board
- */
-#define F_CPU (32000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/saml21-xpro/include/board.h b/boards/saml21-xpro/include/board.h
index 9bace515b6868805a642eb464550c53575c5552b..608f8d7545187bff29a98543ce6bd1fe85db545c 100644
--- a/boards/saml21-xpro/include/board.h
+++ b/boards/saml21-xpro/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index 3e1dcec962f1cfc3c6d7987337497b1abf91b505..05e4a65168a175848c095bafed456bab42db564b 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (CLOCK_CORECLOCK)
-
/**
* Assign the hardware timer
*/
diff --git a/boards/slwstk6220a/include/board.h b/boards/slwstk6220a/include/board.h
index 804d3df56bd1bef0e6c71f254424e733d8ceb163..bb6578173c64b410188a4006c9b16fbaceb8e46a 100644
--- a/boards/slwstk6220a/include/board.h
+++ b/boards/slwstk6220a/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @brief Define the nominal CPU core clock in this board
- */
-#define F_CPU (CLOCK_CORECLOCK)
-
/**
* @brief Assign the hardware timer
*/
diff --git a/boards/spark-core/include/board.h b/boards/spark-core/include/board.h
index 43eb055b84d379abe01b1c69e57a13da30763eb8..14f9627b201cbf1214e5403ab4e61cf37d45d251 100644
--- a/boards/spark-core/include/board.h
+++ b/boards/spark-core/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name Define the location of the RIOT image in flash
*/
diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h
index 56e07d50755b322fee781d18dac424f4c7ce1425..4795b52c148bfb35059c4754cd414154ddc91e58 100644
--- a/boards/stm32f0discovery/include/board.h
+++ b/boards/stm32f0discovery/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * @name The nominal CPU core clock in this board
- */
-#define F_CPU (48000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h
index cd7bee4cfadd66b5b44373ee5efac5d9b3b40b99..a6412d9b6f9c77846c463046a6ebe51c5b5c947d 100644
--- a/boards/stm32f3discovery/include/board.h
+++ b/boards/stm32f3discovery/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (72000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h
index 06923e6179ca02cdcc03c3856c6ef6eced12a900..6db7a5e23950101dabfa431e1e9e347899eb74ee 100644
--- a/boards/stm32f4discovery/include/board.h
+++ b/boards/stm32f4discovery/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU CLOCK_CORECLOCK
-
/**
* @name xtimer configuration
* @{
diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h
index 5403d0440978029e18cd8d31a7dc812fe03fb0d5..e33cf8297fb4a879adea4272b2f0b363317fb651 100644
--- a/boards/udoo/include/board.h
+++ b/boards/udoo/include/board.h
@@ -28,11 +28,6 @@
extern "C" {
#endif
-/**
- * Define the nominal CPU core clock in this board
- */
-#define F_CPU (84000000UL)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/weio/include/board.h b/boards/weio/include/board.h
index 7395026302e6b37d5e79540254c9d9d43075d01e..2fac0052785b175b8bd77b874cf5809027c0899e 100644
--- a/boards/weio/include/board.h
+++ b/boards/weio/include/board.h
@@ -30,11 +30,6 @@
extern "C" {
#endif
-/**
- * @brief The nominal CPU core clock in this board
- */
-#define F_CPU (48000000)
-
/**
* @name LED pin definitions
* @{
diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h
index c0a0dcbb45763c2b81087ac080c9f0e6e330b42a..11463377d64774b03f10cac7db767f14c4d2ecfc 100644
--- a/boards/yunjia-nrf51822/include/board.h
+++ b/boards/yunjia-nrf51822/include/board.h
@@ -27,11 +27,6 @@
extern "C" {
#endif
-/**
- * @name Define the nominal CPU core clock in this board
- */
-#define F_CPU (16000000UL)
-
/**
* @brief Xtimer configuration
* @{