boards: removed leading underscores from macros

* also added a trailing underscore to header guards for consistency Commit for PR 2623, repairing header file include guards. This PR is intended to fix the include guards in files under RIOT/boards SQUASH ME: fix underscore removal overdos SQUASH ME: consistent macro naming SQUASH ME: missed that one SQUASH ME: fixed overdo SQUASH ME: consistency
2024-12-29 04:50:03 +01:00 · 2015-04-22 23:00:54 -04:00 · 2015-04-22 23:00:54 -04:00 · b6bd067863
commit b6bd067863
parent a10beb25f4
86 changed files with 248 additions and 247 deletions
--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
 /** @} */
--- 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__ */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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" {
--- 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" {
--- 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_ */
--- 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_ */
--- 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_ */
 /** @} */
--- 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" {
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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" {
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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)*/


 /*----------------------------------------------------------------------------
--- 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>

--- 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_
--- 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_ */
--- 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_
--- 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 */
--- 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 */
--- 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_
--- 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_
--- 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_
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
--- 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" {
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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"
--- 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
--- 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"

--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
--- 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_ */
 /** @} */
--- 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" {
--- 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" {
--- 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_
--- 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>

--- 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>

--- 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_ */
--- 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_ */
 /** @} */
--- 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" {
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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" {
--- 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_
--- 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_ */
--- 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_ */
 /** @} */
--- 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_ */
 /** @} */
--- 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>

--- 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_ */
--- 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_
--- 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_
--- 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" {
--- 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_ */
 /** @} */
--- 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_ */
--- 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
--- 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_
--- 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_ */