diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h
index 5c011262f9c35286a9ec429c7e85c6cf80b2cb0c..f5cb41a1ad3bda6595f2ef08f8a8ba99c864efc7 100644
--- a/boards/airfy-beacon/include/board.h
+++ b/boards/airfy-beacon/include/board.h
@@ -18,8 +18,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -67,5 +67,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/airfy-beacon/include/periph_conf.h b/boards/airfy-beacon/include/periph_conf.h
index 8ae3cfaa478d0ba123c4aba05c60b2e1a709885d..ebef807fe37f2073fd798f4cf059f3c309b56387 100644
--- a/boards/airfy-beacon/include/periph_conf.h
+++ b/boards/airfy-beacon/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
  extern "C" {
@@ -180,4 +180,4 @@
 } /* end extern "C" */
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/arduino-due/include/board.h b/boards/arduino-due/include/board.h
index 94aaa58592cef83a01d27cf845c448554d0f92f8..29029e72ba6adbe40ab8001673356559a3104b21 100644
--- a/boards/arduino-due/include/board.h
+++ b/boards/arduino-due/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -80,5 +80,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/arduino-due/include/periph_conf.h b/boards/arduino-due/include/periph_conf.h
index bf80529e77803fc15a7da0d5b8b00243390b3b90..6d29726aa07b271109ad38441aa878b5629c8a6c 100644
--- a/boards/arduino-due/include/periph_conf.h
+++ b/boards/arduino-due/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -346,5 +346,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/arduino-mega2560/include/board.h b/boards/arduino-mega2560/include/board.h
index 2d1969a5a0d6e61c4ccbd1b0e92a6389141eb403..1fe89231bf250018f6c8e4f5d4dda6b79b55e781 100644
--- a/boards/arduino-mega2560/include/board.h
+++ b/boards/arduino-mega2560/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -83,5 +83,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/arduino-mega2560/include/periph_conf.h b/boards/arduino-mega2560/include/periph_conf.h
index 351e59f602aec09814b2b0d3bb2f12de779c8f07..8d9f9dce5b51663792c236f26b87c2dedf8a84b2 100644
--- a/boards/arduino-mega2560/include/periph_conf.h
+++ b/boards/arduino-mega2560/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -286,4 +286,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index 5a721fd413590af47c6987118ce2f919d6809da6..7b8c486f8d5e52be389885f0a3a02165e3621a9c 100644
--- a/boards/avsextrem/include/periph_conf.h
+++ b/boards/avsextrem/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #include "lpc2387.h"
 
@@ -54,5 +54,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h
index 723803fbdd09e0b0639efaa84f4d2b3ba1c3144f..3a5212ce10629674bfbb4f6bc1f03031e142eac3 100644
--- a/boards/avsextrem/include/ssp0-board.h
+++ b/boards/avsextrem/include/ssp0-board.h
@@ -19,8 +19,8 @@
  *
  * @note        $Id:  avsextrem-ssp0.c  3854 2010-01-18 15:27:01Z zkasmi $
  */
-#ifndef __SSP_H__
-#define __SSP_H__
+#ifndef SSP_H__
+#define SSP_H__
 
 #include "stdint.h"
 
@@ -122,4 +122,4 @@ void SSP0Handler(void);
 }
 #endif
 
-#endif  /* __SSP_H__ */
+#endif  /* SSP_H__ */
diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h
index 8f7e19ef6f0094e2408584d2a7ad91f96afe8286..b82526e96fc955902a983a0af2ef659efb209dd9 100644
--- a/boards/cc2538dk/include/board.h
+++ b/boards/cc2538dk/include/board.h
@@ -17,8 +17,8 @@
  * @author      Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -100,5 +100,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/cc2538dk/include/periph_conf.h b/boards/cc2538dk/include/periph_conf.h
index e6d341b5166dc29bc8a92d8badb179f99d2f3569..8d5245183f25865c994cc5463cc3caa30bf40836 100644
--- a/boards/cc2538dk/include/periph_conf.h
+++ b/boards/cc2538dk/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #include "gptimer.h"
 
@@ -192,5 +192,5 @@ extern "C" {
 } /* end extern "C" */
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/chronos/drivers/include/battery.h b/boards/chronos/drivers/include/battery.h
index 5bf58dd9c4b2e8ffdc6590d4b4a69756ff35dfad..34bb37b0b312a78b8ab2d9263badfa266bfca00f 100644
--- a/boards/chronos/drivers/include/battery.h
+++ b/boards/chronos/drivers/include/battery.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BATTERY_H
-#define BATTERY_H
+#ifndef BATTERY_H_
+#define BATTERY_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/chronos/drivers/include/buzzer.h b/boards/chronos/drivers/include/buzzer.h
index 22fe35da0b36086bebf21f3fbc6685728c447690..f964b5a3e35689f1ea7f7e7c85744162783968a8 100644
--- a/boards/chronos/drivers/include/buzzer.h
+++ b/boards/chronos/drivers/include/buzzer.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BUZZER_H
-#define BUZZER_H
+#ifndef BUZZER_H_
+#define BUZZER_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/chronos/drivers/include/display.h b/boards/chronos/drivers/include/display.h
index 7bccf5e0616fd4523e31376a246b5e8711d5c6b0..bd726f63e88cd494aa86897e7772c4cb4e341a69 100644
--- a/boards/chronos/drivers/include/display.h
+++ b/boards/chronos/drivers/include/display.h
@@ -35,8 +35,8 @@
  * Basic display functions.
  * ************************************************************************************************/
 
-#ifndef __DISPLAY_H
-#define __DISPLAY_H
+#ifndef DISPLAY_H_
+#define DISPLAY_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -463,4 +463,4 @@ void display_all_off(void);
 }
 #endif
 
-#endif /* __DISPLAY_ */
+#endif /* DISPLAY_ */
diff --git a/boards/chronos/drivers/include/display_putchar.h b/boards/chronos/drivers/include/display_putchar.h
index 0dcdaae018e62ad40e13f7a95a954ac04cac65c0..b5194d0ab95c7e49e8f6c11996668742bf80eddb 100644
--- a/boards/chronos/drivers/include/display_putchar.h
+++ b/boards/chronos/drivers/include/display_putchar.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef __DISPLAY_PUTCHAR_H
-#define __DISPLAY_PUTCHAR_H
+#ifndef DISPLAY_PUTCHAR_H_
+#define DISPLAY_PUTCHAR_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,4 +19,4 @@ void init_display_putchar(void);
 }
 #endif
 
-#endif /* __DISPLAY_PUTCHAR_H */
+#endif /* DISPLAY_PUTCHAR_H_ */
diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
index ed3659d1d064d495b47971e5955f2494fe2c5908..73ce7735629222d1f38f988d96cf190aeb57c77e 100644
--- a/boards/chronos/include/board.h
+++ b/boards/chronos/include/board.h
@@ -18,8 +18,8 @@
  * @author      unknwon
  */
 
-#ifndef _CHRONOS_BOARD_H
-#define _CHRONOS_BOARD_H
+#ifndef CHRONOS_BOARD_H_
+#define CHRONOS_BOARD_H_
 
 #include <stdint.h>
 
@@ -44,5 +44,5 @@ typedef uint8_t radio_packet_length_t;
 }
 #endif
 
-#endif /* _CHRONOS_BOARD_H */
+#endif /* _CHRONOS_BOARD_H_ */
 /** @} */
diff --git a/boards/chronos/include/buttons.h b/boards/chronos/include/buttons.h
index 592f2ad0bc4351736eb203e49a99f8d21dd06e28..9bd68173bd582db00a4181e7d630f941661ab45f 100644
--- a/boards/chronos/include/buttons.h
+++ b/boards/chronos/include/buttons.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BUTTONS_H
-#define BUTTONS_H
+#ifndef BUTTONS_H_
+#define BUTTONS_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/chronos/include/periph_conf.h b/boards/chronos/include/periph_conf.h
index 7f825ab6fcaf5dddde61928170ceca611c5e3658..d76d953f6af1b74974492b3fb0fb81787f26736c 100644
--- a/boards/chronos/include/periph_conf.h
+++ b/boards/chronos/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,4 +32,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/f4vi1/include/board.h b/boards/f4vi1/include/board.h
index 283ebb10e252b7797a6f5c150f0b72d651408248..f7f7fbb7869096a58b33f052855e23da98971e23 100644
--- a/boards/f4vi1/include/board.h
+++ b/boards/f4vi1/include/board.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -94,5 +94,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/f4vi1/include/periph_conf.h b/boards/f4vi1/include/periph_conf.h
index 7f7826406df2c1835b459b1459d571a9be0613a9..5a00d270efad24a7f61852e355902986deb08923 100644
--- a/boards/f4vi1/include/periph_conf.h
+++ b/boards/f4vi1/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -99,5 +99,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h
index b20edddd4615e2c2da45f7b72b63dc0cf980c7a1..98d399adbfb52cc9cdb27fee075288d0869f022e 100644
--- a/boards/fox/include/periph_conf.h
+++ b/boards/fox/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -304,5 +304,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/iot-lab_M3/include/ng_at86rf2xx_params.h b/boards/iot-lab_M3/include/ng_at86rf2xx_params.h
index 08d721527eb9e01b3ee5494b1f4f5c458aa4ded7..b9f01637ecc935b3a85ccba55696c35c31a4a4c3 100644
--- a/boards/iot-lab_M3/include/ng_at86rf2xx_params.h
+++ b/boards/iot-lab_M3/include/ng_at86rf2xx_params.h
@@ -16,8 +16,8 @@
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NG_AT86RF2XX_PARAMS_H
-#define NG_AT86RF2XX_PARAMS_H
+#ifndef NG_AT86RF2XX_PARAMS_H_
+#define NG_AT86RF2XX_PARAMS_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/iot-lab_M3/include/periph_conf.h b/boards/iot-lab_M3/include/periph_conf.h
index 8bb4912c1c42918f4e1ee7b69b1989f99c992181..e9d5d877433b03f8b04f71b2ea79e6c1caf12658 100644
--- a/boards/iot-lab_M3/include/periph_conf.h
+++ b/boards/iot-lab_M3/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -319,5 +319,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/mbed_lpc1768/include/board.h b/boards/mbed_lpc1768/include/board.h
index cb7006243a6795d25ba5f92b5aefb1e1592b0470..daf7e8907b8b9d7ffdecbe06bfe553ed74eab45d 100644
--- a/boards/mbed_lpc1768/include/board.h
+++ b/boards/mbed_lpc1768/include/board.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include <stdint.h>
 
@@ -102,5 +102,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* __BOARD_H */
+#endif /* BOARD_H_ */
 /** @} */
diff --git a/boards/mbed_lpc1768/include/periph_conf.h b/boards/mbed_lpc1768/include/periph_conf.h
index d05cee233cadebaa343cbce385e1532bd1382b6e..33de1b9bf5d021d57dc05864cd2a63357e5d7bb5 100644
--- a/boards/mbed_lpc1768/include/periph_conf.h
+++ b/boards/mbed_lpc1768/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,5 +89,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/mbed_lpc1768/system.c b/boards/mbed_lpc1768/system.c
index c2dbc0ae1bf99dc573100d9cab11554836bbb42f..1866d97bf77624b3e51b4a9aceda448553de3b85 100644
--- a/boards/mbed_lpc1768/system.c
+++ b/boards/mbed_lpc1768/system.c
@@ -382,34 +382,34 @@
 
 
 /* F_cco0 = (2 * M * F_in) / N  */
-#define __M               (((PLL0CFG_Val      ) & 0x7FFF) + 1)
-#define __N               (((PLL0CFG_Val >> 16) & 0x00FF) + 1)
-#define __FCCO(__F_IN)    ((2ULL * __M * __F_IN) / __N)
-#define __CCLK_DIV        (((CCLKCFG_Val      ) & 0x00FF) + 1)
+#define M               (((PLL0CFG_Val      ) & 0x7FFF) + 1)
+#define N               (((PLL0CFG_Val >> 16) & 0x00FF) + 1)
+#define FCCO(F_IN)      ((2ULL * M * F_IN) / N)
+#define CCLK_DIV        (((CCLKCFG_Val      ) & 0x00FF) + 1)
 
 /* Determine core clock frequency according to settings */
 #if (PLL0_SETUP)
 #if   ((CLKSRCSEL_Val & 0x03) == 1)
-#define __CORE_CLK (__FCCO(OSC_CLK) / __CCLK_DIV)
+#define CORE_CLK (FCCO(OSC_CLK) / CCLK_DIV)
 #elif ((CLKSRCSEL_Val & 0x03) == 2)
-#define __CORE_CLK (__FCCO(RTC_CLK) / __CCLK_DIV)
+#define CORE_CLK (FCCO(RTC_CLK) / CCLK_DIV)
 #else
-#define __CORE_CLK (__FCCO(IRC_OSC) / __CCLK_DIV)
+#define CORE_CLK (FCCO(IRC_OSC) / CCLK_DIV)
 #endif
 #else
 #if   ((CLKSRCSEL_Val & 0x03) == 1)
-#define __CORE_CLK (OSC_CLK         / __CCLK_DIV)
+#define CORE_CLK (OSC_CLK         / CCLK_DIV)
 #elif ((CLKSRCSEL_Val & 0x03) == 2)
-#define __CORE_CLK (RTC_CLK         / __CCLK_DIV)
+#define CORE_CLK (RTC_CLK         / CCLK_DIV)
 #else
-#define __CORE_CLK (IRC_OSC         / __CCLK_DIV)
+#define CORE_CLK (IRC_OSC         / CCLK_DIV)
 #endif
 #endif
 
 /*----------------------------------------------------------------------------
   Clock Variable definitions
  *----------------------------------------------------------------------------*/
-uint32_t system_clock = __CORE_CLK;/*!< System Clock Frequency (Core Clock)*/
+uint32_t system_clock = CORE_CLK;/*!< System Clock Frequency (Core Clock)*/
 
 
 /*----------------------------------------------------------------------------
diff --git a/boards/msb-430-common/include/board-conf.h b/boards/msb-430-common/include/board-conf.h
index c22e6b99e85973765bde969c7de41ddc30d293c5..9a632989493f4bbc77920e72237b6e1e1fad3a50 100644
--- a/boards/msb-430-common/include/board-conf.h
+++ b/boards/msb-430-common/include/board-conf.h
@@ -18,8 +18,8 @@
  * @author      unknown
  */
 
-#ifndef BOARD_CONF_H
-#define BOARD_CONF_H
+#ifndef BOARD_CONF_H_
+#define BOARD_CONF_H_
 
 #include <stdint.h>
 
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index 2706c914fa4d82a4efb53836448a712f0572fbe2..2bad4640e9c8f9327bab89aa1f3b8b00bc64d927 100644
--- a/boards/msb-430/include/board.h
+++ b/boards/msb-430/include/board.h
@@ -23,8 +23,8 @@
  * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  */
 
-#ifndef _MSB_BOARD_H
-#define _MSB_BOARD_H
+#ifndef MSB_BOARD_H_
+#define MSB_BOARD_H_
 
 #include "board-conf.h"
 
@@ -64,4 +64,4 @@ extern "C" {
 typedef uint8_t radio_packet_length_t;
 
 /** @} */
-#endif // _MSB_BOARD_H
+#endif // MSB_BOARD_H_
diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h
index cf7bb6155998e483f09ee009ed089fcd175105a5..2bdcff4f1cd4ce4b3790c9afcb76096accab25f2 100644
--- a/boards/msb-430/include/periph_conf.h
+++ b/boards/msb-430/include/periph_conf.h
@@ -16,9 +16,9 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index 7f8366980ebf5727fc0a65a261f89e47ca807e3e..b2780a68c26a7f3ed26e1f23a2cc9f5dd15bdb3f 100644
--- a/boards/msb-430h/include/board.h
+++ b/boards/msb-430h/include/board.h
@@ -18,8 +18,8 @@
  * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  */
 
-#ifndef _MSB_BOARD_H
-#define _MSB_BOARD_H
+#ifndef MSB_BOARD_H_
+#define MSB_BOARD_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,4 +57,4 @@ extern "C" {
 typedef uint8_t radio_packet_length_t;
 
 /** @} */
-#endif // _MSB_BOARD_H
+#endif // MSB_BOARD_H_
diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h
index 8f5b8b8fc409fac200e7b47662341f483b657d3f..b742d02f1b3b1accd92fd871bbe0882ac0cae9fb 100644
--- a/boards/msb-430h/include/periph_conf.h
+++ b/boards/msb-430h/include/periph_conf.h
@@ -16,9 +16,10 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
+#endif /* PERIPH_CONF_H_ */
 #endif /* PERIPH_CONF_H */
diff --git a/boards/msba2-common/drivers/include/uart0.h b/boards/msba2-common/drivers/include/uart0.h
index c78c8f9f075fe49e15d6342dfc4f37bb6a42ce82..24a22b99c756f69a40f40bdef174a50092d3696d 100644
--- a/boards/msba2-common/drivers/include/uart0.h
+++ b/boards/msba2-common/drivers/include/uart0.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef __UART0_H
-#define __UART0_H
+#ifndef UART0_H_
+#define UART0_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,4 +19,4 @@ extern kernel_pid_t uart0_handler_pid;
 }
 #endif
 
-#endif /* __UART0_H */
+#endif /* UART0_H */
diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h
index 6d9a763fcfc74b3fa06f1923b82e8e39d5bd92f0..0a0fd71714622dc5b162e83a6d7863a29712d57a 100644
--- a/boards/msba2-common/include/msba2_common.h
+++ b/boards/msba2-common/include/msba2_common.h
@@ -17,8 +17,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef __MSBA2_COMMON_H
-#define __MSBA2_COMMON_H
+#ifndef MSBA2_COMMON_H_
+#define MSBA2_COMMON_H_
 
 
 #include <stdint.h>
@@ -41,4 +41,4 @@ static inline void pllfeed(void)
 #endif
 
 /** @} */
-#endif // __MSBA2_COMMON_H
+#endif // MSBA2_COMMON_H_
diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h
index d43dd60cba4f7a594651dd9b7af39d283740e165..9b0598a6fd9b487493c1b82331c878d76d5d856b 100644
--- a/boards/msba2-common/tools/src/control_2xxx.h
+++ b/boards/msba2-common/tools/src/control_2xxx.h
@@ -16,10 +16,10 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef CONTROL_2XXXX_H
-#define CONTROL_2XXXX_H
+#ifndef CONTROL_2XXXX_H_
+#define CONTROL_2XXXX_H_
 
 void hard_reset_to_bootloader(void);
 void hard_reset_to_user_code(void);
 
-#endif // ..._H
+#endif // ..._H_
diff --git a/boards/msba2-common/tools/src/serial.h b/boards/msba2-common/tools/src/serial.h
index 9607361086a06ee4ab8049dc6ff244fdf2e20309..27f0ac3b9b9c4801a258f590ef93b8634c867be6 100644
--- a/boards/msba2-common/tools/src/serial.h
+++ b/boards/msba2-common/tools/src/serial.h
@@ -16,8 +16,8 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef SERIAL_H
-#define SERIAL_H
+#ifndef SERIAL_H_
+#define SERIAL_H_
 
 extern char *baud_rate;
 
@@ -34,4 +34,4 @@ void set_rts(int val);
 void set_dtr(int val);
 void change_baud(const char *baud_name);
 
-#endif // SERIAL_H
+#endif // SERIAL_H_
diff --git a/boards/msba2/include/board.h b/boards/msba2/include/board.h
index bbc878989590ef678809f81a58f5eb12e1b1ac0d..599e2ab411bf009641e4d387dd303872ef839e9d 100644
--- a/boards/msba2/include/board.h
+++ b/boards/msba2/include/board.h
@@ -18,8 +18,8 @@
  * @author      unknown
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "msba2_common.h"
 #include "bitarithm.h"
@@ -47,5 +47,5 @@ typedef uint8_t radio_packet_length_t;
 }
 #endif
 
-#endif /* __BOARD_H */
+#endif /* BOARD_H_ */
 /** @} */
diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h
index a9a7bdf3bee92ad9b72e9d99922b8f605e7e788e..7ae12d6b545ad690daf685e8544906ecace3c2d1 100644
--- a/boards/msba2/include/periph_conf.h
+++ b/boards/msba2/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #include "lpc2387.h"
 
@@ -55,5 +55,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h
index 843aa751646ff96e1bc72bdba8dbf6e7dfa4efa5..4ca982d43c42bc84216ad46ef7fddf5ef521aeca 100644
--- a/boards/msbiot/include/board.h
+++ b/boards/msbiot/include/board.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -105,5 +105,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h
index 6135a7f3b8b36daf3b209d16f4c19116a9767673..b1d86dc92f7e1f9d1e8ae8ffe1d376f22160eb2b 100644
--- a/boards/msbiot/include/periph_conf.h
+++ b/boards/msbiot/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -395,5 +395,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index 8b54f4588285dac0663fbe1f37e0946510476bef..d467d6e69d2620c1bbda31443d454be13bec47f5 100644
--- a/boards/mulle/include/periph_conf.h
+++ b/boards/mulle/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Joakim Gebart <joakim.gebart@eistec.se>
  */
 
-#ifndef MULLE_PERIPH_CONF_H
-#define MULLE_PERIPH_CONF_H
+#ifndef MULLE_PERIPH_CONF_H_
+#define MULLE_PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C"
@@ -812,5 +812,5 @@ extern "C"
 }
 #endif
 
-#endif /* MULLE_PERIPH_CONF_H */
+#endif /* MULLE_PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/native/include/board.h b/boards/native/include/board.h
index c3a20664f27168c2fd41023a86b4bcec2014d991..a3354034f1c61fa12ca6494906c56930d4221355 100644
--- a/boards/native/include/board.h
+++ b/boards/native/include/board.h
@@ -21,8 +21,8 @@
  * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
  */
 
-#ifndef BOARD_H
-#define BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include <stdint.h>
 
@@ -52,4 +52,4 @@ typedef uint16_t radio_packet_length_t;
 #endif
 
 /** @} */
-#endif /* BOARD_H */
+#endif /* BOARD_H_ */
diff --git a/boards/native/include/board_internal.h b/boards/native/include/board_internal.h
index d8af212015a53077e30553fe358e17475e02538a..9556d4118a980736fb92b4931bf574765bfaee38 100644
--- a/boards/native/include/board_internal.h
+++ b/boards/native/include/board_internal.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_INTERNAL_H
-#define BOARD_INTERNAL_H
+#ifndef BOARD_INTERNAL_H_
+#define BOARD_INTERNAL_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/nucleo-f091/include/periph_conf.h b/boards/nucleo-f091/include/periph_conf.h
index f0594249077e44e3aaf967506aef0dcbf4edf16f..30fc77cf52ab093e78a50f240b54fc61b527e5c1 100644
--- a/boards/nucleo-f091/include/periph_conf.h
+++ b/boards/nucleo-f091/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -161,5 +161,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/nucleo-f334/include/periph_conf.h b/boards/nucleo-f334/include/periph_conf.h
index 9168aaf099117d16256e9b769ba56e874ffcd386..827906a9f226a6b289ac71a6746feb687ec1fcc2 100644
--- a/boards/nucleo-f334/include/periph_conf.h
+++ b/boards/nucleo-f334/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -166,5 +166,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/nucleo-l1/include/periph_conf.h b/boards/nucleo-l1/include/periph_conf.h
index 3b25c8f8d553b4831d2af7b6e750714847961ee2..e6cef65b5bcc04dbeb6dd2eb1640e2c33fe33bce 100644
--- a/boards/nucleo-l1/include/periph_conf.h
+++ b/boards/nucleo-l1/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -288,5 +288,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/openmote/include/board.h b/boards/openmote/include/board.h
index d4c37b0a6e9b1bcaf3128d224dc779d65e6940e8..e1db0aaa2a406ddb795a9037d7b826d61c2e5ecc 100644
--- a/boards/openmote/include/board.h
+++ b/boards/openmote/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -88,5 +88,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/openmote/include/periph_conf.h b/boards/openmote/include/periph_conf.h
index 6dc5ab8344cec789d5ea0f4993cea2674802e397..c530705d6a2681d08ca9ddcb2fd688267ba64d9c 100644
--- a/boards/openmote/include/periph_conf.h
+++ b/boards/openmote/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
  extern "C" {
@@ -175,5 +175,5 @@
 } /* end extern "C" */
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index 2ac7a07cc1d4f7be56d4de7e03fd77302f58fd6f..9cf3d5023182a97d3058b006960e5c0fe37c86fa 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -19,8 +19,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph_conf.h"
diff --git a/boards/pba-d-01-kw2x/include/kw2xrf_params.h b/boards/pba-d-01-kw2x/include/kw2xrf_params.h
index d0b9bd8813bc18f2711083ba8c47aa413f3beacd..ca9c318519a5bce49ad4249ee9389ed9295a4915 100644
--- a/boards/pba-d-01-kw2x/include/kw2xrf_params.h
+++ b/boards/pba-d-01-kw2x/include/kw2xrf_params.h
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#ifndef KW2XRF_PARAMS_H
-#define KW2XRF_PARAMS_H
+#ifndef KW2XRF_PARAMS_H_
+#define KW2XRF_PARAMS_H_
 
 /**
  * @name KW2XRF configuration
diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h
index 11ca5db40f07cac9e79286f4f4ed891441687e3a..9dc75d80e0142a2996d3c0c5b2db28f85132ca25 100644
--- a/boards/pba-d-01-kw2x/include/periph_conf.h
+++ b/boards/pba-d-01-kw2x/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Jonas Remmert <j.remmert@phytec.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #include "cpu_conf.h"
 
diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h
index 701eb31a2f0fdab0700200acff73fc1bbc935e60..2ce721e2301a5f65509580b284ec8fec27ff562f 100644
--- a/boards/pca10000/include/board.h
+++ b/boards/pca10000/include/board.h
@@ -19,8 +19,8 @@
  * @author      Timo Ziegler <timo.ziegler@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h
index 9b1fee932d0b232e03ef6f6ed1ad05d8e36fe023..b3fdb0fbec553e54e6694af42d68161b0721e61b 100644
--- a/boards/pca10000/include/periph_conf.h
+++ b/boards/pca10000/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -167,4 +167,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h
index 9ce840b3c024de691fafba9673a30928d87052be..1a358c7dae5ecb1846f60d219d2c787531157829 100644
--- a/boards/pca10005/include/board.h
+++ b/boards/pca10005/include/board.h
@@ -19,8 +19,8 @@
  * @author      Timo Ziegler <timo.ziegler@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -73,5 +73,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/pca10005/include/periph_conf.h b/boards/pca10005/include/periph_conf.h
index d935a6069c49785350b3b46facf199eaca7f571f..8b70ece07b6ede33c8b61b9c844bd27c7d4916ae 100644
--- a/boards/pca10005/include/periph_conf.h
+++ b/boards/pca10005/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -186,4 +186,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/pttu/include/board.h b/boards/pttu/include/board.h
index 16a071c15a68c4e808bb9e5809c0f7a391454c97..95fedb449f9ed6daac673a0091612a85d0ac673d 100644
--- a/boards/pttu/include/board.h
+++ b/boards/pttu/include/board.h
@@ -18,8 +18,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include <stdint.h>
 
@@ -59,5 +59,5 @@ typedef uint8_t radio_packet_length_t;
 }
 #endif
 
-#endif /* __BOARD_H */
 /** @} */
+#endif /* BOARD_H_ */
diff --git a/boards/pttu/include/periph_conf.h b/boards/pttu/include/periph_conf.h
index ed13a5c78e2b906fefac5dcac38be3450c926394..f644040acad9227a07eb4b29eb2bc1fce2c6b704 100644
--- a/boards/pttu/include/periph_conf.h
+++ b/boards/pttu/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #include "lpc2387.h"
 
@@ -54,5 +54,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h
index e06cd8ed327127826c2c566474feebec19eeec84..bee456c9d1b1d33a8f4300680edee578dc40d7a7 100644
--- a/boards/qemu-i386/include/board.h
+++ b/boards/qemu-i386/include/board.h
@@ -18,8 +18,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef __RIOT__BOARDS__QEMU_I386__BOARD__H
-#define __RIOT__BOARDS__QEMU_I386__BOARD__H
+#ifndef RIOT__BOARDS__QEMU_I386__BOARD__H_
+#define RIOT__BOARDS__QEMU_I386__BOARD__H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h
index a273115f1189e1483ebda950925b63b376b08896..3dbe9a46531d6b22776456ec9e0bdc6ac7b35c87 100644
--- a/boards/qemu-i386/include/cpu_conf.h
+++ b/boards/qemu-i386/include/cpu_conf.h
@@ -16,8 +16,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef __RIOT__BOARDS__QEMU_I386__CPU_CONF__H
-#define __RIOT__BOARDS__QEMU_I386__CPU_CONF__H
+#ifndef RIOT__BOARDS__QEMU_I386__CPU_CONF__H_
+#define RIOT__BOARDS__QEMU_I386__CPU_CONF__H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/redbee-econotag/drivers/include/nvm.h b/boards/redbee-econotag/drivers/include/nvm.h
index f0887beee18f0c4a1412a62f9e02aed22c477abe..f08c9fb93ce639d1378ebd9c37e1d217eb92b61a 100644
--- a/boards/redbee-econotag/drivers/include/nvm.h
+++ b/boards/redbee-econotag/drivers/include/nvm.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef NVM_H
-#define NVM_H
+#ifndef NVM_H_
+#define NVM_H_
 
 #include <stdint.h>
 
@@ -62,4 +62,4 @@ extern void(*nvm_setsvar)(uint32_t zero_for_awesome);
 }
 #endif
 
-#endif //NVM_H
+#endif //NVM_H_
diff --git a/boards/redbee-econotag/drivers/include/uart.h b/boards/redbee-econotag/drivers/include/uart.h
index 546c3fe7e5502e1315581a57ff617a553f14a99d..7cc4ab620b569dd5c998933568519c205bdbd944 100644
--- a/boards/redbee-econotag/drivers/include/uart.h
+++ b/boards/redbee-econotag/drivers/include/uart.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef UART_H
-#define UART_H
+#ifndef UART_H_
+#define UART_H_
 
 #include <stdint.h>
 
diff --git a/boards/redbee-econotag/include/board.h b/boards/redbee-econotag/include/board.h
index 5dcd027b61424fd857f5e53e0c446739b6b912af..cd02b150137c203eb413f8ebb3df868647174c69 100644
--- a/boards/redbee-econotag/include/board.h
+++ b/boards/redbee-econotag/include/board.h
@@ -18,8 +18,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef REDBEE_ECONOTAG_BOARD_H
-#define REDBEE_ECONOTAG_BOARD_H
+#ifndef REDBEE_ECONOTAG_BOARD_H_
+#define REDBEE_ECONOTAG_BOARD_H_
 
 #include <stdint.h>
 
diff --git a/boards/redbee-econotag/include/periph_conf.h b/boards/redbee-econotag/include/periph_conf.h
index 1fa2059b55bd68761c72385e0c15e036f687d747..ee839d71de819610667cab2b1d9c581ee96e6586 100644
--- a/boards/redbee-econotag/include/periph_conf.h
+++ b/boards/redbee-econotag/include/periph_conf.h
@@ -16,9 +16,9 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index 7143c6452ae4a5e4e1da0ad176a6a51a02b02116..1c7beceac9575f3b56fc2409eb4287276e2a146f 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -18,8 +18,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -113,5 +113,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/samr21-xpro/include/ng_at86rf2xx_params.h b/boards/samr21-xpro/include/ng_at86rf2xx_params.h
index 9a75c29ac24ad0aad5718a9550bce78ef81ba8a9..b4ae732e18682fcdd834c7744a0c5c2bd59c2ce4 100644
--- a/boards/samr21-xpro/include/ng_at86rf2xx_params.h
+++ b/boards/samr21-xpro/include/ng_at86rf2xx_params.h
@@ -16,8 +16,8 @@
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NG_AT86RF2XX_PARAMS_H
-#define NG_AT86RF2XX_PARAMS_H
+#ifndef NG_AT86RF2XX_PARAMS_H_
+#define NG_AT86RF2XX_PARAMS_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index 1830c68ab38b197f008ece191c49b198a8cea330..23a24f441abf4e2b00bd5e5b90b2e0bea8d9cef4 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -264,5 +264,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/spark-core/include/periph_conf.h b/boards/spark-core/include/periph_conf.h
index a77a1abe80a9ba624532153c22c7f39aa6035470..bbc0f611a0b8273d23b508dac2049a2e7086bc27 100644
--- a/boards/spark-core/include/periph_conf.h
+++ b/boards/spark-core/include/periph_conf.h
@@ -15,8 +15,8 @@
  *
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
  extern "C" {
@@ -253,5 +253,5 @@
 } /* end extern "C" */
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h
index 69be3abf7d2767aec26a33302830fcaa37a9e204..fc1dac305431cea232a64ae85bc40befca710369 100644
--- a/boards/stm32f0discovery/include/board.h
+++ b/boards/stm32f0discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/stm32f0discovery/include/periph_conf.h b/boards/stm32f0discovery/include/periph_conf.h
index b9fdc988eca5a147d65e6a24907a9664bba4a2bb..b8e76c52fbc8c185cbaa4364427c730205411e35 100644
--- a/boards/stm32f0discovery/include/periph_conf.h
+++ b/boards/stm32f0discovery/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -276,4 +276,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h
index 999ad532124a1e495bb4067c485f08b48f54df7d..5c5d04753491c08c549afb41d27c8664e38ff5fb 100644
--- a/boards/stm32f3discovery/include/board.h
+++ b/boards/stm32f3discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -107,5 +107,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/stm32f3discovery/include/periph_conf.h b/boards/stm32f3discovery/include/periph_conf.h
index 8120902dfa5e9fdf778bfae7fdc1a7907c76ba2b..3e9f4d2f5da14eef4fc1a0c7b00d198d9d6a7913 100644
--- a/boards/stm32f3discovery/include/periph_conf.h
+++ b/boards/stm32f3discovery/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -372,4 +372,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h
index f29617a9609222d6646be3427442d13a6a64653f..b33960044e11eec8af88097f79f98eb60bc982c7 100644
--- a/boards/stm32f4discovery/include/board.h
+++ b/boards/stm32f4discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -93,5 +93,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h
index 7e29a0686447d532fe5db36de74a7eb07aa23f42..515d0a8dcb81cda71543995c8f6e71b9a128254e 100644
--- a/boards/stm32f4discovery/include/periph_conf.h
+++ b/boards/stm32f4discovery/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -409,5 +409,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/telosb/include/board-conf.h b/boards/telosb/include/board-conf.h
index bdf1dc61988d76b4b69bf5d4a2bc93c53e94266f..aa24dffec7032521afb23f0c589dc2d12e840ef6 100644
--- a/boards/telosb/include/board-conf.h
+++ b/boards/telosb/include/board-conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_CONF_H
-#define BOARD_CONF_H
+#ifndef BOARD_CONF_H_
+#define BOARD_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h
index c5ff8ac940b6788230cf66169c9cd684e1300226..37f148ce378ab95f817c8f62af0bb927b5e810c3 100644
--- a/boards/telosb/include/board.h
+++ b/boards/telosb/include/board.h
@@ -23,8 +23,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef _TELOSB_BOARD_H
-#define _TELOSB_BOARD_H
+#ifndef TELOSB_BOARD_H_
+#define TELOSB_BOARD_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ extern "C" {
 typedef uint8_t radio_packet_length_t;
 
 /** @} */
-#endif // _TELOSB_BOARD_H
+#endif // TELOSB_BOARD_H_
diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h
index ff1db5a34f544c574d9e24c206946f23a059cba8..e5626ec493e960e6ed7bace9703665219e5fd395 100644
--- a/boards/telosb/include/periph_conf.h
+++ b/boards/telosb/include/periph_conf.h
@@ -16,9 +16,9 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h
index 224c468b43de1b4801b7290fe0b5aa9b708d5fb6..fff203b0644f70546c13f808df8151ae89935ebd 100644
--- a/boards/udoo/include/board.h
+++ b/boards/udoo/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 #include "cpu_conf.h"
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/udoo/include/periph_conf.h b/boards/udoo/include/periph_conf.h
index 5c49bf3adc887cadc00ac41316e2475a6d32862c..52b31e739fcd64c5cde905e3d077e3510e5ba514 100644
--- a/boards/udoo/include/periph_conf.h
+++ b/boards/udoo/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -347,5 +347,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
 /** @} */
diff --git a/boards/wsn430-common/include/board-conf.h b/boards/wsn430-common/include/board-conf.h
index c6985226dbf86ee4b99d08a2342fe3b6e5305a8f..cff1c02246862cde80cbbc6714e7e46f15d75749 100644
--- a/boards/wsn430-common/include/board-conf.h
+++ b/boards/wsn430-common/include/board-conf.h
@@ -18,8 +18,8 @@
  * @author      unknown
  */
 
-#ifndef BOARD_CONF_H
-#define BOARD_CONF_H
+#ifndef BOARD_CONF_H_
+#define BOARD_CONF_H_
 
 #include <stdint.h>
 
diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/wsn430-common/include/periph_conf.h
index 16a2f385f2e0b0b0b4369a3ff933b4e6b9120489..39305bbb3d81d86778b28e6184f9d3e75c29219c 100644
--- a/boards/wsn430-common/include/periph_conf.h
+++ b/boards/wsn430-common/include/periph_conf.h
@@ -16,9 +16,9 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index 685a0f58d83c16b2ea059c2290392a20067177f2..d5fe423860d22f2b189b18aa8a16a91860a54628 100644
--- a/boards/wsn430-v1_3b/include/board.h
+++ b/boards/wsn430-v1_3b/include/board.h
@@ -23,8 +23,8 @@
  * @author      Milan Babel <babel@inf.fu-berlin.de>
  */
 
-#ifndef _WSN_BOARD_H
-#define _WSN_BOARD_H
+#ifndef WSN_BOARD_H_
+#define WSN_BOARD_H_
 
 #include "board-conf.h"
 
@@ -72,4 +72,4 @@ extern "C" {
 typedef uint8_t radio_packet_length_t;
 
 /** @} */
-#endif // _WSN_BOARD_H
+#endif // WSN_BOARD_H_
diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
index 409d5d3dc44da4b504605ff085927cc0204c0122..f72f7bfee27b55dc7cc0384eac990ca2695b24be 100644
--- a/boards/wsn430-v1_4/include/board.h
+++ b/boards/wsn430-v1_4/include/board.h
@@ -23,8 +23,8 @@
  * @author      Milan Babel <babel@inf.fu-berlin.de>
  */
 
-#ifndef _WSN_BOARD_H
-#define _WSN_BOARD_H
+#ifndef WSN_BOARD_H_
+#define WSN_BOARD_H_
 
 #include "board-conf.h"
 
@@ -72,4 +72,4 @@ extern "C" {
 typedef uint8_t radio_packet_length_t;
 
 /** @} */
-#endif // _WSN_BOARD_H
+#endif // WSN_BOARD_H_
diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h
index c7802af734c9fe2fcc4285e07021ba3d606e91ee..44e629d69ac85b608d23c27d1e9db1e82050a76e 100644
--- a/boards/x86-multiboot-common/include/multiboot.h
+++ b/boards/x86-multiboot-common/include/multiboot.h
@@ -25,8 +25,8 @@
  * @brief       Architecture specific definitions for multiboot enabled kernels
  */
 
-#ifndef MULTIBOOT_H
-#define MULTIBOOT_H
+#ifndef MULTIBOOT_H_
+#define MULTIBOOT_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h
index 1fd47cbe70eb200393a95d445889f977681857c7..6cbf25ab20663338e60c4c43be052fe284f1c77b 100644
--- a/boards/yunjia-nrf51822/include/board.h
+++ b/boards/yunjia-nrf51822/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H_
+#define BOARD_H_
 
 #include "cpu.h"
 
@@ -72,5 +72,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H_ */
 /** @} */
diff --git a/boards/yunjia-nrf51822/include/periph_conf.h b/boards/yunjia-nrf51822/include/periph_conf.h
index d4144a17b81afb71f2f1b1cc9a62721767830a4d..a69d8cc3fb1540bc2fa51c669d4a39ec715a9c89 100644
--- a/boards/yunjia-nrf51822/include/periph_conf.h
+++ b/boards/yunjia-nrf51822/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -168,4 +168,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */
diff --git a/boards/z1/include/board-conf.h b/boards/z1/include/board-conf.h
index 3031846d7a969a9c7f48dc0419610478ba2f9d37..0a97ea221539785efe77b3e9e6c03b2051e7a6ef 100644
--- a/boards/z1/include/board-conf.h
+++ b/boards/z1/include/board-conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_CONF_H
-#define BOARD_CONF_H
+#ifndef BOARD_CONF_H_
+#define BOARD_CONF_H_
 
 /**
  * @ingroup     boards_z1
diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h
index 3dcf3d02b088a290e1fe76108d499ce153c421a9..6f3c3207364c302e972ad138c0e42eec67109545 100644
--- a/boards/z1/include/board.h
+++ b/boards/z1/include/board.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef _Z1_BOARD_H
-#define _Z1_BOARD_H
+#ifndef Z1_BOARD_H_
+#define Z1_BOARD_H_
 
 /**
  * @defgroup    boards_z1 Zolertia Z1
@@ -83,4 +83,4 @@ typedef uint8_t radio_packet_length_t;
 #endif
 
 /** @} */
-#endif // _Z1_BOARD_H
+#endif // Z1_BOARD_H_
diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h
index 3f77da85c198ab16a2211eed998e4dc0377ec20d..a7b79948013b8ef08674eebf7a82a41580576971 100644
--- a/boards/z1/include/periph_conf.h
+++ b/boards/z1/include/periph_conf.h
@@ -16,9 +16,9 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H
-#define PERIPH_CONF_H
+#ifndef PERIPH_CONF_H_
+#define PERIPH_CONF_H_
 
 /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */
 
-#endif /* PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H_ */