diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h
index 0f6aa8c577f7c8ba0a2404d757375ce0f2675d81..1e0687742a37a050a716de5c424dabce5c28dec2 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"
 
@@ -46,5 +46,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 f2d2f651cbfa1bbcc1027ece634b63e03274ebd3..bc7d1a009053d3c334621dcd0c74f6e444244ca0 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
 
 #include "periph_cpu.h"
 
@@ -140,4 +140,4 @@ static const i2c_conf_t i2c_config[] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/arduino-common/include/board.h b/boards/arduino-common/include/board.h
index c908082c76b8e3e0b311ffaad2628d2e650ad1d5..72f7fa933a89dacbe2bc115cab73ae912e8ff2ce 100644
--- a/boards/arduino-common/include/board.h
+++ b/boards/arduino-common/include/board.h
@@ -22,8 +22,8 @@
  * @author      Laurent Navet <laurent.navet@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "arduino_pinmap.h"
@@ -86,5 +86,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-common/include/periph_conf.h b/boards/arduino-common/include/periph_conf.h
index 750fb69cdf42178dd5daf7ec226af914f7389385..a0331f42a43ffc0d286370682901176728fa54f0 100644
--- a/boards/arduino-common/include/periph_conf.h
+++ b/boards/arduino-common/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Laurent Navet <laurent.navet@gmail.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,4 +87,4 @@ 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 20d1c9708dddd4ea38f1a259110080252314c9fd..05f306e7499ee2c25713cc25e771d768de1d556e 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"
 #include "arduino_pinmap.h"
@@ -48,5 +48,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 bfdfa13945a8ec08f4a632d681f783155871f5d1..d6e603c75d812ac07b822cfe2afd6ed2a8cafaec 100644
--- a/boards/arduino-due/include/periph_conf.h
+++ b/boards/arduino-due/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Andreas "Paul" Pauli <andreas.pauli@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -130,5 +130,5 @@ static const pwm_chan_conf_t pwm_chan[] = {
 }
 #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 da03bcac1f7153929459e4f1aa5dbf327f57b1e1..1aee0c2cc8a9b9ab1740e6cd48699df765efc17a 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"
 #include "arduino_pinmap.h"
@@ -82,5 +82,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 a835e09c38a716d264bdf050c5be26aa47ee44f9..c67c0d88e95e7bc825b467201e46ca640c7875cf 100644
--- a/boards/arduino-mega2560/include/periph_conf.h
+++ b/boards/arduino-mega2560/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" {
@@ -104,4 +104,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/arduino-zero/include/board.h b/boards/arduino-zero/include/board.h
index 047d8cef864fdd01f9e9e2df10cfa4be313250e1..753ca5c1be54c7d45f02015ec3f4b10ca3a4c87a 100644
--- a/boards/arduino-zero/include/board.h
+++ b/boards/arduino-zero/include/board.h
@@ -19,8 +19,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -62,5 +62,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-zero/include/periph_conf.h b/boards/arduino-zero/include/periph_conf.h
index f2dc12093369aa5e3f49aef2661b171e24252033..177882619bf62bd43da423e3b11ef84aaf442715 100644
--- a/boards/arduino-zero/include/periph_conf.h
+++ b/boards/arduino-zero/include/periph_conf.h
@@ -20,8 +20,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include <stdint.h>
 
@@ -250,5 +250,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
index 802d3fb4e561976ff8e4cd241bbef8167b4a77cf..3fe0fe6bfd4728d6d7d84b3dccb9cc4fc2a4072d 100644
--- a/boards/avsextrem/include/board.h
+++ b/boards/avsextrem/include/board.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef BOARDCONF_H_
-#define BOARDCONF_H_
+#ifndef BOARDCONF_H
+#define BOARDCONF_H
 #include "bitarithm.h"
 #include "msba2_common.h"
 
@@ -60,4 +60,4 @@ void init_clks1(void);
 #endif
 
 /** @} */
-#endif /* BOARDCONF_H_ */
+#endif /* BOARDCONF_H */
diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index ae50a27529f614b164a3a6c25f516e8b02e0de90..d0806d24b36cc913ce30c62c2167142cd03ced5a 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"
 
@@ -62,5 +62,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h
index 6e5a9f1249bf9feb0867a7752e9a3a4ee562c8d1..95924735f93382af809697236e4ecb6a0a0fe75f 100644
--- a/boards/avsextrem/include/smb380-board.h
+++ b/boards/avsextrem/include/smb380-board.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef SMB380_H_
-#define SMB380_H_
+#ifndef SMB380_H
+#define SMB380_H
 #include <stdint.h>
 #include "bitarithm.h"
 
@@ -255,4 +255,4 @@ void SMB380_Selftest_1(void);
 }
 #endif
 
-#endif   /* SMB380_H_ */
+#endif   /* SMB380_H */
diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h
index d48c1b5b51773f58ca6b9961795c6fe48caef8cf..debe157fcfb3e5521440f5c85f2b4d7ed32bb3fc 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/calliope-mini/include/mini.h b/boards/calliope-mini/include/mini.h
index 1333bcaf10aa062b7b07d066b2115740e299ca44..33a5570265394540c8851721f3ab5fe1d246bce8 100644
--- a/boards/calliope-mini/include/mini.h
+++ b/boards/calliope-mini/include/mini.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MINI_H_
-#define MINI_H_
+#ifndef MINI_H
+#define MINI_H
 
 #include <stdint.h>
 
@@ -86,5 +86,5 @@ void mini_matrix_shift_str(const char *str, uint32_t delay);
 }
 #endif
 
-#endif /* MINI_H_ */
+#endif /* MINI_H */
 /** @} */
diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h
index 6bd13ac5d00eab908026d89b0e7e012c793bfbdc..1c534d36229c2e54f491e9688f067d55e24deca4 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"
@@ -95,5 +95,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 881ec9a15862ca3f78a622832b1b184de565812f..55222f9dfa733aed15db7866d26112d6e183503e 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 "cpu.h"
 #include "periph_cpu.h"
@@ -141,5 +141,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/cc2650stk/include/board.h b/boards/cc2650stk/include/board.h
index 84d4d8980bfc930689173cdd597161bc284298e3..92be45b5002ba91208229dbae7d57e558472839c 100644
--- a/boards/cc2650stk/include/board.h
+++ b/boards/cc2650stk/include/board.h
@@ -18,8 +18,8 @@
  * @author      Leon M. George <leon@georgemail.eu>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "periph/gpio.h"
 
@@ -67,5 +67,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/cc2650stk/include/periph_conf.h b/boards/cc2650stk/include/periph_conf.h
index 89a18186e518a22b6b1e5c0e606b444e135e420a..9c9b5d729af18ba25ee474edaa0c69594f49ca2d 100644
--- a/boards/cc2650stk/include/periph_conf.h
+++ b/boards/cc2650stk/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Leon M. George <leon@georgemail.eu>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -73,5 +73,5 @@ static const timer_conf_t timer_config[] = {
 }
 #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 34bb37b0b312a78b8ab2d9263badfa266bfca00f..5bf58dd9c4b2e8ffdc6590d4b4a69756ff35dfad 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 5d7f09ab6277aeb3cb1d0cfc6b619130a239a1c7..5a323d5853f9f2317fc39ec76efb4021531ba2e9 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
 
 #include <stdint.h>
 
diff --git a/boards/chronos/drivers/include/display.h b/boards/chronos/drivers/include/display.h
index bd726f63e88cd494aa86897e7772c4cb4e341a69..5c1c73c65d154ae0766fecb355db9a1d856b0916 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" {
diff --git a/boards/chronos/drivers/include/display_putchar.h b/boards/chronos/drivers/include/display_putchar.h
index b5194d0ab95c7e49e8f6c11996668742bf80eddb..e4e347c0a2f4b230800ccd8e80595ccb4fcff97f 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 25a5ee2ced0c8c113304d9c8f6c7e2cb8a229645..01cb494de6fae436449490b56222ebe14b87316e 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>
 
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* _CHRONOS_BOARD_H_ */
+#endif /* _CHRONOS_BOARD_H */
 /** @} */
diff --git a/boards/chronos/include/buttons.h b/boards/chronos/include/buttons.h
index 9bd68173bd582db00a4181e7d630f941661ab45f..592f2ad0bc4351736eb203e49a99f8d21dd06e28 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/f4vi1/include/board.h b/boards/f4vi1/include/board.h
index 0588a27bcf1c86c2599701e205567bfc6e43d473..2382124229f2261a19eee93ea83c9e144e88d033 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"
@@ -64,5 +64,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 1cc77da0cb8db6dc217eec0bf2d2f560d9d9e338..3c3fb739ee8ca816843ce613745ac470fed19fe2 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
 
 #include "periph_cpu.h"
 
@@ -122,5 +122,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/fox/include/board.h b/boards/fox/include/board.h
index 51540e1ab5a260b28ca1a4ffa42ece339ffbbea9..24316d18efba52294198035929d93245dcad396b 100644
--- a/boards/fox/include/board.h
+++ b/boards/fox/include/board.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -108,5 +108,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h
index b1218e3354b9f504b8311f36bd91706ba6a064b0..13565ad619398ecbc2ab5759071a1b9928a546ed 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
 
 #include "periph_cpu.h"
 
@@ -173,5 +173,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/iotlab-a8-m3/include/board.h b/boards/iotlab-a8-m3/include/board.h
index 6f93d3c70c033f78e3472e320c89ad6d8112f717..c6493f8985497be57c65fcdbf1b14bffbc6dadb6 100644
--- a/boards/iotlab-a8-m3/include/board.h
+++ b/boards/iotlab-a8-m3/include/board.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -56,5 +56,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/iotlab-a8-m3/include/periph_conf.h b/boards/iotlab-a8-m3/include/periph_conf.h
index 938525b486641e776f375fd0146b30819168e8a1..8b4db8ecbc552c3c28ad23c3bf253e319a992f37 100644
--- a/boards/iotlab-a8-m3/include/periph_conf.h
+++ b/boards/iotlab-a8-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
 
 #include "periph_cpu.h"
 #include "periph_conf_common.h"
@@ -49,5 +49,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/iotlab-common/include/board_common.h b/boards/iotlab-common/include/board_common.h
index 1ecbf337066f7db78e9b4540e5b0c0afe07fda8d..ed9b9883788414aa500a9faddcbae1696c53bfcb 100644
--- a/boards/iotlab-common/include/board_common.h
+++ b/boards/iotlab-common/include/board_common.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #include <stdint.h>
 
@@ -102,5 +102,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_COMMON_H_ */
+#endif /* BOARD_COMMON_H */
 /** @} */
diff --git a/boards/iotlab-common/include/periph_conf_common.h b/boards/iotlab-common/include/periph_conf_common.h
index a8131ddb5418a13e1ac2cbd087f0c4900fbaccfa..3e1aa028ba433eb12b7b72e6e6c8129921e951d9 100644
--- a/boards/iotlab-common/include/periph_conf_common.h
+++ b/boards/iotlab-common/include/periph_conf_common.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_COMMON_H_
-#define PERIPH_CONF_COMMON_H_
+#ifndef PERIPH_CONF_COMMON_H
+#define PERIPH_CONF_COMMON_H
 
 #include "periph_cpu.h"
 
@@ -163,5 +163,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_COMMON_H_ */
+#endif /* PERIPH_CONF_COMMON_H */
 /** @} */
diff --git a/boards/iotlab-m3/include/board.h b/boards/iotlab-m3/include/board.h
index 8669222805aeadbf30d8d846a85c2d726ef91fba..a88fca79a67e3b53b8ddf9c58a91a1a81d49c581 100644
--- a/boards/iotlab-m3/include/board.h
+++ b/boards/iotlab-m3/include/board.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -86,5 +86,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/iotlab-m3/include/periph_conf.h b/boards/iotlab-m3/include/periph_conf.h
index fd3dc46518f8cf20c2076b5845b2e6833e5fae50..ae7d37b4b0cd6fb2027b05f1a4b1de1af68785f7 100644
--- a/boards/iotlab-m3/include/periph_conf.h
+++ b/boards/iotlab-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
 
 #include "periph_cpu.h"
 #include "periph_conf_common.h"
@@ -49,5 +49,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/limifrog-v1/include/board.h b/boards/limifrog-v1/include/board.h
index 597e5a48bfbe2899e4000d8824bfb6d8edf94fef..ae0c3810b11802ed7c9f159c136b095fdedd3414 100644
--- a/boards/limifrog-v1/include/board.h
+++ b/boards/limifrog-v1/include/board.h
@@ -18,8 +18,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -53,5 +53,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/limifrog-v1/include/periph_conf.h b/boards/limifrog-v1/include/periph_conf.h
index e41a01c7d89da01eda8cb9e9c8ade76a81d35c7b..457ec3580fd6777929a1584e441cab76e3801fb3 100644
--- a/boards/limifrog-v1/include/periph_conf.h
+++ b/boards/limifrog-v1/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -177,5 +177,5 @@ static const i2c_conf_t i2c_config[] = {
 }
 #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 e4941816266e6cd0e657473f14f0d9d0b06fdce4..3cd14468c75ace23ae78cb8db60fd6d3b8d74b0c 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>
 
@@ -70,5 +70,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 217ae8b5377a9610640c161ec6e938d8c520cfb2..90dd621fdc379f8bf9e2357481ec16bf49b846ba 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/msb-430-common/drivers/include/sht11-board.h b/boards/msb-430-common/drivers/include/sht11-board.h
index b1ddd0fa5821cbc1bdb24f9c91112894c5e79cad..4e464165694dd7510b1132b0f3dba6901ec3db53 100644
--- a/boards/msb-430-common/drivers/include/sht11-board.h
+++ b/boards/msb-430-common/drivers/include/sht11-board.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11BOARD_H_
-#define SHT11BOARD_H_
+#ifndef SHT11BOARD_H
+#define SHT11BOARD_H
 
 /**
  * @ingroup     msb_430h
@@ -46,4 +46,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H_ */
+#endif /* SHT11BOARD_H */
diff --git a/boards/msb-430-common/include/board_common.h b/boards/msb-430-common/include/board_common.h
index 0ad4a05ae175c4994eaff70499644c0417c280a6..9bf576ee2ee798aceb5f1a29805eac0c95b69afb 100644
--- a/boards/msb-430-common/include/board_common.h
+++ b/boards/msb-430-common/include/board_common.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #include "cpu.h"
 
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index 6e6f351e1e1a7402c426a71d0fc365e3d19a4eb3..a2e6a9b3cc000e3073952444dffa292975ac5515 100644
--- a/boards/msb-430/include/board.h
+++ b/boards/msb-430/include/board.h
@@ -31,8 +31,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_common.h"
 
@@ -65,4 +65,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  MSB_BOARD_H_ */
+#endif /*  MSB_BOARD_H */
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index d2c42c4dd924bc9546e1765274dc81da64a9af2f..72ea980dc605fad7dfd9003d9034a22043aa60df 100644
--- a/boards/msb-430h/include/board.h
+++ b/boards/msb-430h/include/board.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MSB_BOARD_H_
-#define MSB_BOARD_H_
+#ifndef MSB_BOARD_H
+#define MSB_BOARD_H
 
 #include "board_common.h"
 
@@ -53,4 +53,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* MSB_BOARD_H_ */
+#endif /* MSB_BOARD_H */
diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h
index 58451de622f2ef8aeedd52dd8ac5f1e60a79d79e..efa726a4291cf6f33950bfd31afe5d73fd0645a5 100644
--- a/boards/msba2-common/drivers/include/sht11-board.h
+++ b/boards/msba2-common/drivers/include/sht11-board.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11BOARD_H_
-#define SHT11BOARD_H_
+#ifndef SHT11BOARD_H
+#define SHT11BOARD_H
 
 /**
  * @ingroup     lpc2387
@@ -53,4 +53,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H_ */
+#endif /* SHT11BOARD_H */
diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h
index 9b8d3fada2cbb0f93c6c6071397953d8554451c7..84ef700dff0623b1f280da9adf6e6c4f4499b83e 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 d27d319748cb09b4678b1d82a9bc706ffd9b3167..8ccd9a72db57c840a600053fae67efb08b9b4604 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_2XXX_H_
-#define CONTROL_2XXX_H_
+#ifndef CONTROL_2XXX_H
+#define CONTROL_2XXX_H
 
 void hard_reset_to_bootloader(void);
 void hard_reset_to_user_code(void);
 
-#endif /*  CONTROL_2XXX_H_ */
+#endif /*  CONTROL_2XXX_H */
diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.h b/boards/msba2-common/tools/src/lpc2k_pgm.h
index 68b574489e1d03a9b350b1060b4494a411275bfb..dd6d26ba4e12b69857aabe33da6cdc228d6120b0 100644
--- a/boards/msba2-common/tools/src/lpc2k_pgm.h
+++ b/boards/msba2-common/tools/src/lpc2k_pgm.h
@@ -16,7 +16,7 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef LPC2K_PGM_H_
+#ifndef LPC2K_PGM_H
 #define LPC2K_PGM_H
 
 /* gets a name like "115200", sets baudrate accordingly. */
@@ -27,4 +27,4 @@ void change_baud(const char *baud_name);
 */
 void signal_terminal(void);
 
-#endif /*  LPC2K_PGM_H_ */
+#endif /*  LPC2K_PGM_H */
diff --git a/boards/msba2-common/tools/src/serial.h b/boards/msba2-common/tools/src/serial.h
index dc50afad6d4e15753bd8ce442eb0b147676066a1..e5f1a3b67ab2b6f04dde78459ec69879e603f8ad 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 09b968936b91259d6641eb5e025f124f07f3b13e..5f3840ba41acfaeddce46e5c8b98da7b74a546b9 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"
@@ -64,5 +64,5 @@ void init_clks1(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h
index a1abbf21e57d4ff9b92b446cb234d7f8cb9ae606..062da79bac0f7dc8c126ed8c4be2dcea7e0fc82c 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"
 
@@ -92,5 +92,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 812a5bfdabd2e16f216d44db7697b267e90525c3..5199702afb8be3295cc10d3d8779f049796eb00f 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"
@@ -83,5 +83,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 c7d23ebf081d44e62174de4ebcafe5c31e2c9365..acfb0caf49d5fc5a9779a365a5f364862844f8e4 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
 
 #include "periph_cpu.h"
 
@@ -248,5 +248,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/mulle/include/board.h b/boards/mulle/include/board.h
index f9374e7090bc114776596db9dab106ba0c742728..80b24c885614941dfc344ba241f0d4285ebe6709 100644
--- a/boards/mulle/include/board.h
+++ b/boards/mulle/include/board.h
@@ -18,8 +18,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -182,5 +182,5 @@ void board_init(void);
 
 /** @} */
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/mulle/include/mulle-nvram.h b/boards/mulle/include/mulle-nvram.h
index 36efba21d51a4c039d093c26d5a0f28ca5ba17f8..ea63d8586df41edb5e27325d28161513d8634a92 100644
--- a/boards/mulle/include/mulle-nvram.h
+++ b/boards/mulle/include/mulle-nvram.h
@@ -6,8 +6,8 @@
  * details.
  */
 
-#ifndef MULLE_NVRAM_H_
-#define MULLE_NVRAM_H_
+#ifndef MULLE_NVRAM_H
+#define MULLE_NVRAM_H
 
 #include "nvram.h"
 
@@ -42,4 +42,4 @@ extern nvram_t *mulle_nvram;
 }
 #endif
 
-#endif /* MULLE_NVRAM_H_ */
+#endif /* MULLE_NVRAM_H */
diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index dcb1c2652e21ddb196f365ebfa0170ecbaaeac33..f51b9f13b7ae33233a32a50b513c5223e4c812d1 100644
--- a/boards/mulle/include/periph_conf.h
+++ b/boards/mulle/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MULLE_PERIPH_CONF_H_
-#define MULLE_PERIPH_CONF_H_
+#ifndef MULLE_PERIPH_CONF_H
+#define MULLE_PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -456,5 +456,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #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 1062e642cee691cbf07e6069b74cbbac718c2189..a40493370e19e356d90a99459c4cc55b9bdad999 100644
--- a/boards/native/include/board.h
+++ b/boards/native/include/board.h
@@ -21,8 +21,8 @@
  * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -54,4 +54,4 @@ void _native_LED_RED_TOGGLE(void);
 #endif
 
 /** @} */
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
diff --git a/boards/native/include/board_internal.h b/boards/native/include/board_internal.h
index 2baf7f9acb21cf774c54d99db135a6f5ce197acc..28e26320ceb0f1b22cf8337aabf51098253c49a5 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-f030/include/board.h b/boards/nucleo-f030/include/board.h
index 23b2628cebd3bd57e839aa39278b4e24d5229f10..6b4e81864dc02a2d7d2dbd60398c32cf4bd0ef20 100644
--- a/boards/nucleo-f030/include/board.h
+++ b/boards/nucleo-f030/include/board.h
@@ -21,8 +21,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -52,5 +52,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f030/include/periph_conf.h b/boards/nucleo-f030/include/periph_conf.h
index 256fd73e5d76d8a42504c4d3c6ab47d59a1c9e65..909acbf55475189c1451c8132986a41e9ea015d9 100644
--- a/boards/nucleo-f030/include/periph_conf.h
+++ b/boards/nucleo-f030/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -180,5 +180,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f070/include/board.h b/boards/nucleo-f070/include/board.h
index ac10535576fb156f3f3c75d88ddc28c3752d6eb5..7d4b9154999bee0100fc9c9b11b4bc29c2106eb1 100644
--- a/boards/nucleo-f070/include/board.h
+++ b/boards/nucleo-f070/include/board.h
@@ -22,8 +22,8 @@
  * @author      Alexandre Aabdie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -45,5 +45,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f070/include/periph_conf.h b/boards/nucleo-f070/include/periph_conf.h
index 8b68825eb0f5e1ef20f19685b84ed37911863ae1..659a19e38de161e3b3d949a475ddc655084fd303 100644
--- a/boards/nucleo-f070/include/periph_conf.h
+++ b/boards/nucleo-f070/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Aabdie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -192,5 +192,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f072/include/board.h b/boards/nucleo-f072/include/board.h
index 5caf4ded02365040140049b991f88cd0eecbe32b..ad2158289b19c597dabbb14117fe1f95eb15371c 100644
--- a/boards/nucleo-f072/include/board.h
+++ b/boards/nucleo-f072/include/board.h
@@ -20,8 +20,8 @@
  * @author      José Alamos <jialamos@uc.cl>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -43,5 +43,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f072/include/periph_conf.h b/boards/nucleo-f072/include/periph_conf.h
index 8b704dc51f798ca0041d70bd4eed65bbdaf4b121..033c9f3cca3c81ef443623a66320055aa9dadea4 100644
--- a/boards/nucleo-f072/include/periph_conf.h
+++ b/boards/nucleo-f072/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      José Ignacio Alamos <jialamos@uc.cl>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -135,5 +135,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f091/include/board.h b/boards/nucleo-f091/include/board.h
index 470af2dee2931e4c65771ac7798a5793e4a01fbc..c59c61d3a5313a2ffd61ca8e25c8269a006f852b 100644
--- a/boards/nucleo-f091/include/board.h
+++ b/boards/nucleo-f091/include/board.h
@@ -19,8 +19,8 @@
  * @author      Mohmmad Ayman <mohmmad.khzrag@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -32,5 +32,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f091/include/periph_conf.h b/boards/nucleo-f091/include/periph_conf.h
index d0c3545d3d529491ef9a2fdf6bdfbf0d2724e9ec..f3332c4a13c7f0e08d72501f7b38e9626c9c4fce 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
 
 #include "periph_cpu.h"
 
@@ -123,5 +123,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f103/include/board.h b/boards/nucleo-f103/include/board.h
index c0c3cf2ebbe807ee4eb3e9c669ba1d1fb4fc085c..753596069e6985bf0712c7e55603e86bbfdaf074 100755
--- a/boards/nucleo-f103/include/board.h
+++ b/boards/nucleo-f103/include/board.h
@@ -18,8 +18,8 @@
  * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -38,5 +38,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f103/include/periph_conf.h b/boards/nucleo-f103/include/periph_conf.h
index 95073c0b7ce0d25cb27461018132f147b36faaf0..335c15ffe2a8f67a37b8e389c8e4100fc666ca41 100644
--- a/boards/nucleo-f103/include/periph_conf.h
+++ b/boards/nucleo-f103/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -198,4 +198,4 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nucleo-f207/include/board.h b/boards/nucleo-f207/include/board.h
index b9d0c68ea67477b7447c5b4ad6068ff4691d8f99..0d594731024323303063499a4bd0e1e31b919e36 100644
--- a/boards/nucleo-f207/include/board.h
+++ b/boards/nucleo-f207/include/board.h
@@ -19,8 +19,8 @@
  * @author      Toon Stegen <toon.stegen@altran.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -66,5 +66,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f207/include/periph_conf.h b/boards/nucleo-f207/include/periph_conf.h
index cfe40c322368952da2a2df1022dc0d0605466da4..664f183fd5d0dd6b2eaa94dcc448b83abe88eecb 100644
--- a/boards/nucleo-f207/include/periph_conf.h
+++ b/boards/nucleo-f207/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Toon Stegen <toon.stegen@altran.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -282,5 +282,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f303/include/board.h b/boards/nucleo-f303/include/board.h
index b756fb97fd1e2b71357e1ce381e1320c18e3d2c1..80bd0cfa648a4ac10a09e8b52a733db23fa47e30 100755
--- a/boards/nucleo-f303/include/board.h
+++ b/boards/nucleo-f303/include/board.h
@@ -20,8 +20,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -33,5 +33,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f303/include/periph_conf.h b/boards/nucleo-f303/include/periph_conf.h
index be66076729d3ad55553b94efbf87c0420295f8c3..5b81d5b5c931ca1cacd814b18e69fcc3fa265385 100755
--- a/boards/nucleo-f303/include/periph_conf.h
+++ b/boards/nucleo-f303/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -238,4 +238,4 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nucleo-f334/include/board.h b/boards/nucleo-f334/include/board.h
index ffaefa782b65d0e78c36c660ecae851cd72dbdc1..5bc8846ed33b938698c206c6133720d9e5094fda 100644
--- a/boards/nucleo-f334/include/board.h
+++ b/boards/nucleo-f334/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 "board_common.h"
 
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f334/include/periph_conf.h b/boards/nucleo-f334/include/periph_conf.h
index e2cf5a933555ae69fa361149460a367897c6eabd..d7b602d0ba61d579b1461da0e1bed711cff3d40a 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
 
 #include "periph_cpu.h"
 
@@ -154,5 +154,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h
index 6e2be0642aac5785de2db2d57cca8db460b04d30..564cfc6f8755725a66dee344c1d2926168f6f6d7 100644
--- a/boards/nucleo-f401/include/board.h
+++ b/boards/nucleo-f401/include/board.h
@@ -18,8 +18,8 @@
  * @author      Lari Lehtomäki <lari@lehtomaki.fi>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f401/include/periph_conf.h b/boards/nucleo-f401/include/periph_conf.h
index 9d92ef8f268a9b63d44d4d460c0ad3f12df501d3..5ff2e339c8fcb911c2c96bbe91ab923905d4d173 100644
--- a/boards/nucleo-f401/include/periph_conf.h
+++ b/boards/nucleo-f401/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Lari Lehtomäki <lari@lehtomaki.fi>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -217,5 +217,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f446/include/board.h b/boards/nucleo-f446/include/board.h
index 1c9143a094e3207f13d48a8ef0f66439a2153024..8b1b0ae16ff59c1891fce25089628bd6ea1a01d5 100644
--- a/boards/nucleo-f446/include/board.h
+++ b/boards/nucleo-f446/include/board.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f446/include/periph_conf.h b/boards/nucleo-f446/include/periph_conf.h
index 31208df865e416f729defbdcb633bc37d913b217..b6738f594137cf4d8db507e27bec03abc91212c9 100644
--- a/boards/nucleo-f446/include/periph_conf.h
+++ b/boards/nucleo-f446/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -243,5 +243,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h
index d956b8a2b33c6f4066197d2813246c46552962ca..7d061fd80413c80521f6db07d5c4dca15df8a273 100644
--- a/boards/nucleo-l1/include/board.h
+++ b/boards/nucleo-l1/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 "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-l1/include/periph_conf.h b/boards/nucleo-l1/include/periph_conf.h
index e9e7ceaf24a55339ea4a6912c517052e0a0ec71e..03dfc14740a50bc072a671c83a0054ca570cd755 100644
--- a/boards/nucleo-l1/include/periph_conf.h
+++ b/boards/nucleo-l1/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
 
 #include "periph_cpu.h"
 
@@ -157,5 +157,5 @@ static const i2c_conf_t i2c_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo32-f042/include/board.h b/boards/nucleo32-f042/include/board.h
index 4dc207203e2938eb74e3b711e1cdca00c8cb0d75..516acc0a04385432a354d3f4463063be1eca416e 100644
--- a/boards/nucleo32-f042/include/board.h
+++ b/boards/nucleo32-f042/include/board.h
@@ -18,8 +18,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,5 +42,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo32-f042/include/periph_conf.h b/boards/nucleo32-f042/include/periph_conf.h
index b0bed0938e564128cafa17d8553b121cec487260..ea0ec392ca4dca7f385641cae9fc7826af4a2513 100644
--- a/boards/nucleo32-f042/include/periph_conf.h
+++ b/boards/nucleo32-f042/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -111,5 +111,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/openmote-cc2538/include/board.h b/boards/openmote-cc2538/include/board.h
index cfdbc60c010c55a0a1e173e747cf01b3b31eeeba..ce3de04ceca9bc9ce632580319ffac1b8140c53a 100644
--- a/boards/openmote-cc2538/include/board.h
+++ b/boards/openmote-cc2538/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"
@@ -95,5 +95,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/openmote-cc2538/include/periph_conf.h b/boards/openmote-cc2538/include/periph_conf.h
index bf0fde92212ab1363f073521de49333a04613265..845487b02dac21616e187122d3608492362c80fe 100644
--- a/boards/openmote-cc2538/include/periph_conf.h
+++ b/boards/openmote-cc2538/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 "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -133,5 +133,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* 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 8a2973cea878545404d53776647eff723740ac0f..190ec28f0ca39ef79bdcc8e2a7d0fbf08f7e08a3 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 ca9c318519a5bce49ad4249ee9389ed9295a4915..d0b9bd8813bc18f2711083ba8c47aa413f3beacd 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 d802089e871e198f56dec85cef61c18a996e366a..3cb9f6460059e53bba08de11e9ffbea01d9719de 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 "periph_cpu.h"
 
diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h
index 08cfd5b789c4791649d65e4bafbcd9d2be432851..57b33b39b4030e664a1ef9cb99c3a16962549942 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
 
 #include "periph_cpu.h"
 
@@ -105,4 +105,4 @@ static const timer_conf_t timer_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h
index 4805f5597f02ddb4abf40cf53beafc6fd57146af..b65a0711bb2d91ac8378e8a8e8784971c6c94141 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"
 
@@ -47,5 +47,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 f4db32da4ffa954eb39fb5a81dda49d200a0ed30..de0ebb2cf5a9e3b03c8a62ca1635335f14ea6f9a 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
 
 #include "periph_cpu.h"
 
@@ -125,4 +125,4 @@ static const timer_conf_t timer_config[] = {
 }
 #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 78764a33acf9c8b953e0c94e211069d230626ba9..dac8cef99c04cf98e4df60cbe420a7fb4f7a4c24 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 QEMU_I386_BOARD_H_
-#define QEMU_I386_BOARD_H_
+#ifndef QEMU_I386_BOARD_H
+#define 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 69959d5d706b19005b95beb2ccc0d72bf7b39dab..cb89aea39c55e469c246a1debb49eecbc6f72541 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 QEMU_I386_CPU_CONF_H_
-#define QEMU_I386_CPU_CONF_H_
+#ifndef QEMU_I386_CPU_CONF_H
+#define QEMU_I386_CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/remote-common/include/fancy_leds.h b/boards/remote-common/include/fancy_leds.h
index 4cc07528029c8bc6921d1a3700ff50f63f7ccafd..3fa9c83fefbb0b4925a4b7ce873351e562b4ef46 100644
--- a/boards/remote-common/include/fancy_leds.h
+++ b/boards/remote-common/include/fancy_leds.h
@@ -18,8 +18,8 @@
  * @author      Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef FANCY_LEDS_H_
-#define FANCY_LEDS_H_
+#ifndef FANCY_LEDS_H
+#define FANCY_LEDS_H
 
 #include "board_common.h"
 
@@ -63,5 +63,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* FANCY_LEDS_H_ */
+#endif /* FANCY_LEDS_H */
 /** @} */
diff --git a/boards/remote-common/include/periph_common.h b/boards/remote-common/include/periph_common.h
index 2a83f262bd17995bd372f8ae086148928c2e0abb..5a018d251937804d5555a52ee3ddce8a1d8d9316 100644
--- a/boards/remote-common/include/periph_common.h
+++ b/boards/remote-common/include/periph_common.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_COMMON_H_
-#define PERIPH_COMMON_H_
+#ifndef PERIPH_COMMON_H
+#define PERIPH_COMMON_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -78,5 +78,5 @@ static const timer_conf_t timer_config[] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_COMMON_H_ */
+#endif /* PERIPH_COMMON_H */
 /** @} */
diff --git a/boards/remote-pa/include/board.h b/boards/remote-pa/include/board.h
index 678cc195c665518699d71610fb436e6f6697c545..59ff1d90d1ec944fcdd3e3cce2b476209f76329d 100644
--- a/boards/remote-pa/include/board.h
+++ b/boards/remote-pa/include/board.h
@@ -20,8 +20,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -77,5 +77,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-pa/include/periph_conf.h b/boards/remote-pa/include/periph_conf.h
index 1d7e35ad051dcf17987878709cba5086b945e707..ee753928d466a18217f89e3fa087c4844ab13714 100644
--- a/boards/remote-pa/include/periph_conf.h
+++ b/boards/remote-pa/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -99,5 +99,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/remote-reva/include/board.h b/boards/remote-reva/include/board.h
index af1cf6fe350fbd5e304db285fd66921ea6c8a987..b93dd9f8f5e825b35c5bf364b012de7d46f59f8e 100644
--- a/boards/remote-reva/include/board.h
+++ b/boards/remote-reva/include/board.h
@@ -19,8 +19,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -114,5 +114,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h
index 8205fc5b37e29106796eef77ee468e43386a1c8e..2dfd7b1b2ef29a089e3928b4b703f45ca7cf3a02 100644
--- a/boards/remote-reva/include/periph_conf.h
+++ b/boards/remote-reva/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -100,5 +100,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/remote-revb/include/board.h b/boards/remote-revb/include/board.h
index 09d5264f75d6b8c5e068fe5b6815f6bfb268c9d7..619861cda74917f4920965c76b06acf901b635b8 100644
--- a/boards/remote-revb/include/board.h
+++ b/boards/remote-revb/include/board.h
@@ -19,8 +19,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -113,5 +113,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-revb/include/periph_conf.h b/boards/remote-revb/include/periph_conf.h
index d83727cafbe71f22c07f90b5db4be1eb157e1f5a..4890135cce8a012495721aa62c869e8e08608abc 100644
--- a/boards/remote-revb/include/periph_conf.h
+++ b/boards/remote-revb/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -100,5 +100,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end 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 d59f053ce492150ba5eb9c4848d81fc326d5f477..418a4f726d76e28c682d9a573dc646da75f81065 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -19,8 +19,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index 265484b85b94609117d449736c92e7d379c2bc7e..9834707849c3d8c196a17655d1b1e53dfc9b4b77 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -19,8 +19,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
 
 #include <stdint.h>
 
@@ -249,5 +249,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/seeeduino_arch-pro/include/board.h b/boards/seeeduino_arch-pro/include/board.h
index 2a3695eab02a523841cfe6b13dd521390ea6f00e..95600fb5b8401b86d201de97e56b9247e2a8be81 100644
--- a/boards/seeeduino_arch-pro/include/board.h
+++ b/boards/seeeduino_arch-pro/include/board.h
@@ -21,8 +21,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -71,5 +71,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/seeeduino_arch-pro/include/periph_conf.h b/boards/seeeduino_arch-pro/include/periph_conf.h
index 80922a0f8a03a5d0755819fc239ed020e8782c4f..568f60ae70e1dbf5af1655f841dcd10b66cd020c 100644
--- a/boards/seeeduino_arch-pro/include/periph_conf.h
+++ b/boards/seeeduino_arch-pro/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -90,5 +90,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/sodaq-autonomo/include/board.h b/boards/sodaq-autonomo/include/board.h
index a0f6e52d6edbc3b9569fa10f49f7b94ec344394c..eff9e336cfaaae2acf0f2af3e445d45967218ac6 100644
--- a/boards/sodaq-autonomo/include/board.h
+++ b/boards/sodaq-autonomo/include/board.h
@@ -18,8 +18,8 @@
  * @author      Kees Bakker <kees@sodaq.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -60,5 +60,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/sodaq-autonomo/include/periph_conf.h b/boards/sodaq-autonomo/include/periph_conf.h
index 826e1d48ca094e175061faab4e1e52d3073b5937..a5793881e1d6ab5978264d61c6c40924c868db84 100644
--- a/boards/sodaq-autonomo/include/periph_conf.h
+++ b/boards/sodaq-autonomo/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Kees Bakker <kees@sodaq.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include <stdint.h>
 
@@ -255,5 +255,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/spark-core/include/board.h b/boards/spark-core/include/board.h
index 3909af7abf614234f0dbded2f7c31337532b2c2c..0d46ed3e5d6b118281b438738eab90d6a0d33772 100644
--- a/boards/spark-core/include/board.h
+++ b/boards/spark-core/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 <stdint.h>
 
@@ -104,5 +104,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/spark-core/include/periph_conf.h b/boards/spark-core/include/periph_conf.h
index 4da0bbcbbab94f22364e72a52d52ddc36feb8feb..77697481e373c34824398c328525e8ce33d39a22 100644
--- a/boards/spark-core/include/periph_conf.h
+++ b/boards/spark-core/include/periph_conf.h
@@ -16,8 +16,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
 
 #include "periph_cpu.h"
 
@@ -127,5 +127,5 @@ static const uart_conf_t uart_config[] = {
 } /* 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 e677d90020da35b4986be4e546a0f1b3282e8e65..0ee41267a61af8ef1bb26ae74112fa51302ed90b 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"
 
@@ -61,5 +61,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 045913fb8629e6f3b6b1a869bff99b4b2d7b1587..cb2f3c72e0c4e1782eacbe338ea78da9cc84800c 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
 
 #include "periph_cpu.h"
 
@@ -161,4 +161,4 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h
index d54dcaf45ddf3bf30e2f539e02be55e2ed87d4a9..6c634f371a9f4bd197dfd014d1e216fc4f784510 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"
 
@@ -97,5 +97,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 28c703c1b6c326a751676f4fe790e8770d0392af..fda093ae63c274cdaed4a2c58869936d6229f6ec 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
 
 #include "periph_cpu.h"
 
@@ -250,4 +250,4 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h
index 98c95f1148d37c712f5919115f13b74907bb95e6..117bf15b37c7f1965d7381e630cd7426da0a97c7 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"
@@ -90,5 +90,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 4b0b9366bbef6e026c1173174471ced60a641794..0263c03ee1c9012f6ed98daf8e73c6a4447dda72 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
 
 #include "periph_cpu.h"
 
@@ -265,5 +265,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #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 aa24dffec7032521afb23f0c589dc2d12e840ef6..bdf1dc61988d76b4b69bf5d4a2bc93c53e94266f 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 332ef52ef45759aeafb9eead20ac06b937816027..b84ffc2ab8c8cf5ed11a6d7a0f01c11774896947 100644
--- a/boards/telosb/include/board.h
+++ b/boards/telosb/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TELOSB_BOARD_H_
-#define TELOSB_BOARD_H_
+#ifndef TELOSB_BOARD_H
+#define TELOSB_BOARD_H
 
 #include "cpu.h"
 
@@ -117,4 +117,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  TELOSB_BOARD_H_ */
+#endif /*  TELOSB_BOARD_H */
diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h
index 5978b4e19ef91a3e4ae3edb33b9fdbb564f760d8..26f247b9c9d03447f002a1e1a309370784db4cdf 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"
@@ -51,5 +51,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 c60d0f99919f8d6d3e8e169145e155856a0e27cd..1514e2d143899169a3e0cdcaad2fe7f7e6ecd6af 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
 
 #include "periph_cpu.h"
 
@@ -115,5 +115,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/waspmote-pro/include/board.h b/boards/waspmote-pro/include/board.h
index 1b3b9f9754002cece543659f669261fc30f62b88..84c497ad534e700acec8f2f953ddc8dfcc010a05 100644
--- a/boards/waspmote-pro/include/board.h
+++ b/boards/waspmote-pro/include/board.h
@@ -19,8 +19,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "waspmote_pinmap.h"
@@ -182,5 +182,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/waspmote-pro/include/periph_conf.h b/boards/waspmote-pro/include/periph_conf.h
index 22f7231fca79dde14ea1fcaa9682d57fd82dae03..614967c94dec27f3c5fc7074b51536241c13fbfb 100644
--- a/boards/waspmote-pro/include/periph_conf.h
+++ b/boards/waspmote-pro/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -111,4 +111,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/weio/include/board.h b/boards/weio/include/board.h
index 6dc51ac8b99721953a6e4c31a5c6f1dfe3c06ed8..c60da6698656d40c8c6d82576b0bdb2eb698585a 100644
--- a/boards/weio/include/board.h
+++ b/boards/weio/include/board.h
@@ -18,8 +18,8 @@
  * @author      Paul RATHGEB <paul.rathgeb@skynet.be>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -65,5 +65,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/weio/include/periph_conf.h b/boards/weio/include/periph_conf.h
index 732dbb56c901c1f843d03ea359026f7d69e24d06..8c786690557798e7a0ad59e3d44fff6689ae5365 100644
--- a/boards/weio/include/periph_conf.h
+++ b/boards/weio/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Paul RATHGEB <paul.rathgeb@skynet.be>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -132,5 +132,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/wsn430-common/include/board_common.h b/boards/wsn430-common/include/board_common.h
index 53cb6bfe9eeeba3f2bb7c875fcc3f142514748d2..ab800b49d55014f98be908c73034af21a901e3a1 100644
--- a/boards/wsn430-common/include/board_common.h
+++ b/boards/wsn430-common/include/board_common.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,5 +73,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_COMMON_H_ */
+#endif /* BOARD_COMMON_H */
 /** @} */
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index 49478dadd207ff9af7ed9aa7e53d758bf771ce53..b779f45481f27676649577d1bd164839b91b9161 100644
--- a/boards/wsn430-v1_3b/include/board.h
+++ b/boards/wsn430-v1_3b/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef WSN_BOARD_H_
-#define WSN_BOARD_H_
+#ifndef WSN_BOARD_H
+#define WSN_BOARD_H
 
 #include "board_common.h"
 
@@ -61,4 +61,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#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 537c62ea73d97b9004110f7c40ba341dff9210b6..c3df1c46ab1f87651928d06d1f93b0bc271f4c0a 100644
--- a/boards/wsn430-v1_4/include/board.h
+++ b/boards/wsn430-v1_4/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef WSN_BOARD_H_
-#define WSN_BOARD_H_
+#ifndef WSN_BOARD_H
+#define WSN_BOARD_H
 
 #include "board_common.h"
 
@@ -61,4 +61,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#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 54894f06a975280616bcd84ce519fdbb9a882875..4a95a735913a8f31a9bdea1e5bdc1ba9d7299e98 100644
--- a/boards/x86-multiboot-common/include/multiboot.h
+++ b/boards/x86-multiboot-common/include/multiboot.h
@@ -29,8 +29,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" {
@@ -234,5 +234,5 @@ typedef struct multiboot_mod_list multiboot_module_t;
 }
 #endif
 
-#endif  /** ! MULTIBOOT_H_ */
+#endif  /** ! MULTIBOOT_H */
 /** @} */
diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h
index 610a00ede691908f4778dc90c381c4887b73fa58..42fad7f4fd5fbdb5dc07c0dacdfd0cf9cd44b46b 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"
 
@@ -46,5 +46,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 fe0e2c9aaff5951163ba35ec8af3c7799bf2e209..2e67cc9b36e594284dd401f77c405722d2416a1e 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
 
 #include "periph_cpu.h"
 
@@ -139,4 +139,4 @@ static const i2c_conf_t i2c_config[] = {
 }
 #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 0a97ea221539785efe77b3e9e6c03b2051e7a6ef..3031846d7a969a9c7f48dc0419610478ba2f9d37 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 b5e22f159a13debfc6cb30523f9fb617fb48985f..d3c1bc7993412605072cd938eaadcd25b031d419 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
@@ -125,4 +125,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  Z1_BOARD_H_ */
+#endif /*  Z1_BOARD_H */
diff --git a/core/include/atomic.h b/core/include/atomic.h
index 80c2b6db5f7d81d96e2f5bb9607826bbc6094a93..615b1571d6ee474823a1c2b7d44daf77026dd9ff 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -18,8 +18,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef ATOMIC_H_
-#define ATOMIC_H_
+#ifndef ATOMIC_H
+#define ATOMIC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -149,5 +149,5 @@ static inline int atomic_set_to_zero(atomic_int_t *var)
 }
 #endif
 
-#endif /* ATOMIC_H_ */
+#endif /* ATOMIC_H */
 /** @} */
diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h
index 6a8521c0fb91a659e8149f9d32c743a976d10686..bd2c6e5f14b402ffd7b5f2945fa2528d88368c13 100644
--- a/core/include/bitarithm.h
+++ b/core/include/bitarithm.h
@@ -17,8 +17,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef BITARITHM_H_
-#define BITARITHM_H_
+#ifndef BITARITHM_H
+#define BITARITHM_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -122,5 +122,5 @@ unsigned bitarithm_bits_set(unsigned v);
 }
 #endif
 
-#endif /* BITARITHM_H_ */
+#endif /* BITARITHM_H */
 /** @} */
diff --git a/core/include/byteorder.h b/core/include/byteorder.h
index b081179472e7a77c6e4e3dab25f5466aeb02670b..fc07c0e16cc99885e5cc3f3afb6cb4ab494183d8 100644
--- a/core/include/byteorder.h
+++ b/core/include/byteorder.h
@@ -16,8 +16,8 @@
  * @author         René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef BYTEORDER_H_
-#define BYTEORDER_H_
+#ifndef BYTEORDER_H
+#define BYTEORDER_H
 
 #include <stdint.h>
 
@@ -422,5 +422,5 @@ static inline uint64_t NTOHLL(uint64_t v)
 }
 #endif
 
-#endif /* BYTEORDER_H_ */
+#endif /* BYTEORDER_H */
 /** @} */
diff --git a/core/include/irq.h b/core/include/irq.h
index bea97aefd7ab6a0cdfa7e2039dc662c599f606bb..048a9ed47236c67c661335080cab659c3872925c 100644
--- a/core/include/irq.h
+++ b/core/include/irq.h
@@ -18,8 +18,8 @@
  * @author      Freie Universität Berlin, Computer Systems & Telematics
  */
 
-#ifndef IRQ_H_
-#define IRQ_H_
+#ifndef IRQ_H
+#define IRQ_H
 
 #include <stdbool.h>
 #include "arch/irq_arch.h"
@@ -71,5 +71,5 @@ int irq_is_in(void);
 }
 #endif
 
-#endif /* IRQ_H_ */
+#endif /* IRQ_H */
 /** @} */
diff --git a/core/include/kernel_defines.h b/core/include/kernel_defines.h
index 7b19d138fa27d1e535144898f7d031f3d60f8742..6584935d8832f7eada4f6d8a032db0ff197f260b 100644
--- a/core/include/kernel_defines.h
+++ b/core/include/kernel_defines.h
@@ -16,8 +16,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef KERNEL_DEFINES_H_
-#define KERNEL_DEFINES_H_
+#ifndef KERNEL_DEFINES_H
+#define KERNEL_DEFINES_H
 
 #include <stddef.h>
 
@@ -118,5 +118,5 @@
 }
 #endif
 
-#endif /* KERNEL_DEFINES_H_ */
+#endif /* KERNEL_DEFINES_H */
 /** @} */
diff --git a/core/include/lifo.h b/core/include/lifo.h
index 93ba5411095e4f8e077550684ad4702b38c4a774..d6c9b8d9e3ca532d15985d1d2bc886aaed0c3ee8 100644
--- a/core/include/lifo.h
+++ b/core/include/lifo.h
@@ -20,8 +20,8 @@
  *          If you insert a value twice the LIFO will break.
  */
 
-#ifndef LIFO_H_
-#define LIFO_H_
+#ifndef LIFO_H
+#define LIFO_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -70,5 +70,5 @@ int lifo_get(int *array);
 }
 #endif
 
-#endif /* LIFO_H_ */
+#endif /* LIFO_H */
 /** @} */
diff --git a/core/include/msg.h b/core/include/msg.h
index fde9c6b99323699095f517ebca76c463a43540e6..5d55a7147c223f336f7f925284368757bc065782 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -162,8 +162,8 @@
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
 
-#ifndef MSG_H_
-#define MSG_H_
+#ifndef MSG_H
+#define MSG_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -383,5 +383,5 @@ void msg_queue_print(void);
 }
 #endif
 
-#endif /* MSG_H_ */
+#endif /* MSG_H */
 /** @} */
diff --git a/core/include/mutex.h b/core/include/mutex.h
index f2062629eee06054882c5a77c27beadbb5271c88..9f19967d0602a9102441db3f002418a5d19b4a6a 100644
--- a/core/include/mutex.h
+++ b/core/include/mutex.h
@@ -19,8 +19,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef MUTEX_H_
-#define MUTEX_H_
+#ifndef MUTEX_H
+#define MUTEX_H
 
 #include <stddef.h>
 
@@ -132,5 +132,5 @@ void mutex_unlock_and_sleep(mutex_t *mutex);
 }
 #endif
 
-#endif /* MUTEX_H_ */
+#endif /* MUTEX_H */
 /** @} */
diff --git a/cpu/arm7_common/include/VIC.h b/cpu/arm7_common/include/VIC.h
index ad0a8724667a401545be8faebe4f55478bcc11d1..b35c9d639b4262c1d0786c4e5774ffe86254a892 100644
--- a/cpu/arm7_common/include/VIC.h
+++ b/cpu/arm7_common/include/VIC.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef VIC_H_
-#define VIC_H_
+#ifndef VIC_H
+#define VIC_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpu/arm7_common/include/arm7_common.h b/cpu/arm7_common/include/arm7_common.h
index 8377c079db70975f510b326b2bacabb5392bad92..983b5277da28333578d1056653d232f35c6a0bc0 100644
--- a/cpu/arm7_common/include/arm7_common.h
+++ b/cpu/arm7_common/include/arm7_common.h
@@ -6,8 +6,8 @@
  * more details.
  */
 
-#ifndef ARM7_COMMON_H_
-#define ARM7_COMMON_H_
+#ifndef ARM7_COMMON_H
+#define ARM7_COMMON_H
 
 /**
  * @defgroup    cpu_arm7_common ARM7 CPU common
@@ -100,4 +100,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* ARM7_COMMON_H_ */
+#endif /* ARM7_COMMON_H */
diff --git a/cpu/arm7_common/include/arm_cpu.h b/cpu/arm7_common/include/arm_cpu.h
index b196e6987505f0e036fb265992fd52bbd22eaa76..c0051411f054db5318ebcf7239e0bf1aa036c5cb 100644
--- a/cpu/arm7_common/include/arm_cpu.h
+++ b/cpu/arm7_common/include/arm_cpu.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef ARM_CPU_H_
-#define ARM_CPU_H_
+#ifndef ARM_CPU_H
+#define ARM_CPU_H
 
 #include <stdint.h>
 #include "VIC.h"
@@ -29,4 +29,4 @@ void arm_reset(void);
 }
 #endif
 
-#endif /* ARM_CPU_H_ */
+#endif /* ARM_CPU_H */
diff --git a/cpu/arm7_common/include/iap.h b/cpu/arm7_common/include/iap.h
index 0995908dae6bd9ab56d61b485a34d985867f9d14..84c2086dc2ac94c2e84b434fb985059c4f3b6699 100644
--- a/cpu/arm7_common/include/iap.h
+++ b/cpu/arm7_common/include/iap.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef IAP_H_
-#define IAP_H_
+#ifndef IAP_H
+#define IAP_H
 
 #include <stdint.h>
 
diff --git a/cpu/atmega1281/include/periph_cpu.h b/cpu/atmega1281/include/periph_cpu.h
index 223da18738f5717baf93063ed744ad3167210238..3d7c73861e10606bc4e415994a729137addd117a 100644
--- a/cpu/atmega1281/include/periph_cpu.h
+++ b/cpu/atmega1281/include/periph_cpu.h
@@ -20,8 +20,8 @@
  * @author          Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,5 +46,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega2560/include/periph_cpu.h b/cpu/atmega2560/include/periph_cpu.h
index 9f08ffdaeefebb9d81444529f62e612b6c3b20ea..719eb9a7c06e3ee30b03e16d01ba760e778003e9 100644
--- a/cpu/atmega2560/include/periph_cpu.h
+++ b/cpu/atmega2560/include/periph_cpu.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -48,5 +48,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega328p/include/periph_cpu.h b/cpu/atmega328p/include/periph_cpu.h
index e7f67a2af9a34ac3c967321c46901317852001d5..2a7ff88f9f5952723442da084a953f51fefba87e 100644
--- a/cpu/atmega328p/include/periph_cpu.h
+++ b/cpu/atmega328p/include/periph_cpu.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -45,5 +45,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega_common/avr-libc-extra/errno.h b/cpu/atmega_common/avr-libc-extra/errno.h
index 7681c95b5bbf0dd596cc5ff3f7f3afc1a8e39354..1dcf5aab8670bc295113a15d87e9aafd4906796c 100644
--- a/cpu/atmega_common/avr-libc-extra/errno.h
+++ b/cpu/atmega_common/avr-libc-extra/errno.h
@@ -29,7 +29,7 @@
   POSSIBILITY OF SUCH DAMAGE. */
 
 
-#ifndef ERRNO_H_
+#ifndef ERRNO_H
 #define ERRNO_H_ 1
 
 /**
@@ -150,4 +150,4 @@ extern int errno;
 
 /** @} */
 
-#endif /* ERRNO_H_ */
+#endif /* ERRNO_H */
diff --git a/cpu/atmega_common/avr-libc-extra/inttypes.h b/cpu/atmega_common/avr-libc-extra/inttypes.h
index 751fd025f9b4986a9b6329a1193e57f5b8a8d11e..9c93b545353ca16f694bb9dcdfb136d73a619d0c 100644
--- a/cpu/atmega_common/avr-libc-extra/inttypes.h
+++ b/cpu/atmega_common/avr-libc-extra/inttypes.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef RIOT_INTTYPES_H_
-#define RIOT_INTTYPES_H_
+#ifndef RIOT_INTTYPES_H
+#define RIOT_INTTYPES_H
 
 #include_next <inttypes.h>
 
@@ -33,5 +33,5 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_INTTYPES_H_ */
+#endif /* RIOT_INTTYPES_H */
 /** @} */
diff --git a/cpu/atmega_common/avr-libc-extra/unistd.h b/cpu/atmega_common/avr-libc-extra/unistd.h
index a207def04b38fc5da2516c5938257a1ef663af05..7d9153f93e8d69cf6c31402a370da348aeb6a430 100644
--- a/cpu/atmega_common/avr-libc-extra/unistd.h
+++ b/cpu/atmega_common/avr-libc-extra/unistd.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNISTD_H_
-#define UNISTD_H_
+#ifndef UNISTD_H
+#define UNISTD_H
 
 #include <stdint.h>
 
@@ -29,4 +29,4 @@ unsigned int sleep(unsigned int seconds);
 }
 #endif
 
-#endif /* UNISTD_H_ */
+#endif /* UNISTD_H */
diff --git a/cpu/atmega_common/include/periph_cpu_common.h b/cpu/atmega_common/include/periph_cpu_common.h
index 7f005ddca72fd05a1e9bc331ae80cdcb791df604..62d3e200d26d0d18dc44764274de4c411942661e 100644
--- a/cpu/atmega_common/include/periph_cpu_common.h
+++ b/cpu/atmega_common/include/periph_cpu_common.h
@@ -20,8 +20,8 @@
  * @author          Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CPU_COMMON_H_
-#define PERIPH_CPU_COMMON_H_
+#ifndef PERIPH_CPU_COMMON_H
+#define PERIPH_CPU_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,5 +84,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_COMMON_H_ */
+#endif /* PERIPH_CPU_COMMON_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_ioc.h b/cpu/cc2538/include/cc2538_ioc.h
index 58abceea0453417e4a238c44491bd072950128ff..ed170fcc6f8ee92dc4762497f5786ddd24d88c36 100644
--- a/cpu/cc2538/include/cc2538_ioc.h
+++ b/cpu/cc2538/include/cc2538_ioc.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef CC2538_IOC_H_
-#define CC2538_IOC_H_
+#ifndef CC2538_IOC_H
+#define CC2538_IOC_H
 
 #include <stdint.h>
 
@@ -82,5 +82,5 @@ enum {
 } /* end extern "C" */
 #endif
 
-#endif /* CC2538_IOC_H_ */
+#endif /* CC2538_IOC_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_rf_internal.h b/cpu/cc2538/include/cc2538_rf_internal.h
index 9fd5e4df5a04a0f57f207d95cd332470f2028686..6f1430ed5a7924506e0505cc6c095e60508c0f1e 100644
--- a/cpu/cc2538/include/cc2538_rf_internal.h
+++ b/cpu/cc2538/include/cc2538_rf_internal.h
@@ -17,8 +17,8 @@
  * @author      Aaron Sowry <aaron@mutex.nz>
  */
 
-#ifndef CC2538_RF_INTERNAL_H_
-#define CC2538_RF_INTERNAL_H_
+#ifndef CC2538_RF_INTERNAL_H
+#define CC2538_RF_INTERNAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,5 +100,5 @@ bool RFCORE_ASSERT_failure(const char *expr, const char *func, int line);
 }
 #endif
 
-#endif /* CC2538_RF_INTERNAL_H_ */
+#endif /* CC2538_RF_INTERNAL_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_rf_netdev.h b/cpu/cc2538/include/cc2538_rf_netdev.h
index 3ab7768cbc4d79414597ee5e8e5112067f441032..fc0fc05554422f551c0ed3e431f6778f06c8b736 100644
--- a/cpu/cc2538/include/cc2538_rf_netdev.h
+++ b/cpu/cc2538/include/cc2538_rf_netdev.h
@@ -17,8 +17,8 @@
  * @author      Aaron Sowry <aaron@mutex.nz>
  */
 
-#ifndef CC2538_RF_NETDEV_H_
-#define CC2538_RF_NETDEV_H_
+#ifndef CC2538_RF_NETDEV_H
+#define CC2538_RF_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -35,5 +35,5 @@ extern const netdev2_driver_t cc2538_rf_driver;
 }
 #endif
 
-#endif /* CC2538_RF_NETDEV_H_ */
+#endif /* CC2538_RF_NETDEV_H */
 /** @} */
diff --git a/cpu/cc2538/include/periph_cpu.h b/cpu/cc2538/include/periph_cpu.h
index 1b859fb9107a3c18d13ccf8988b96910240c8966..3892a5d73c492bdfea89e2e1175d981fc2e09b33 100644
--- a/cpu/cc2538/include/periph_cpu.h
+++ b/cpu/cc2538/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 
@@ -109,5 +109,5 @@ typedef struct {
 
 #include "periph/dev_enums.h"
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/cc26x0/include/periph_cpu.h b/cpu/cc26x0/include/periph_cpu.h
index 0b87dfb526498e709403bd58cdcb294ed6d18ac3..705434bc13beb939a8d6c4df494c2f3502b2cfc0 100644
--- a/cpu/cc26x0/include/periph_cpu.h
+++ b/cpu/cc26x0/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Leon M. George <leon@georgemail.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 
@@ -68,5 +68,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/cc430/include/periph_cpu.h b/cpu/cc430/include/periph_cpu.h
index 8fc0270b536262512c3f5e831f542db7a85a5dac..dfd69849c74ba37cef5e1ed94fbf925fb102b2db 100644
--- a/cpu/cc430/include/periph_cpu.h
+++ b/cpu/cc430/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 #include "cc430_regs.h"
@@ -32,5 +32,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index 5294a3287abf687fe4a03df06c46aa9363332b5b..982f8fc38f2b4c9ed5e2052bad89c949c370eee1 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -27,8 +27,8 @@
  * @todo        remove include irq.h once core was adjusted
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 #include <stdio.h>
 
@@ -125,5 +125,5 @@ static inline void cortexm_isr_end(void)
 }
 #endif
 
-#endif /* CPU_H_ */
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/cpu_conf_common.h b/cpu/cortexm_common/include/cpu_conf_common.h
index 27a32ddd51b6078e851552c3887d3f8850c114e4..8d2d17744e14ca27cf34993a9f430fca2348b130 100644
--- a/cpu/cortexm_common/include/cpu_conf_common.h
+++ b/cpu/cortexm_common/include/cpu_conf_common.h
@@ -16,8 +16,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef CPU_CONF_COMMON_H_
-#define CPU_CONF_COMMON_H_
+#ifndef CPU_CONF_COMMON_H
+#define CPU_CONF_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,5 +61,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_CONF_COMMON_H_ */
+#endif /* CPU_CONF_COMMON_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/mpu.h b/cpu/cortexm_common/include/mpu.h
index 3506a2840da6e412819fa31697d427fb4d844c62..b93f22d49bd0665c3f3501ed427bfb0d03829865 100644
--- a/cpu/cortexm_common/include/mpu.h
+++ b/cpu/cortexm_common/include/mpu.h
@@ -18,8 +18,8 @@
  * @}
  */
 
-#ifndef MPU_H_
-#define MPU_H_
+#ifndef MPU_H
+#define MPU_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -160,4 +160,4 @@ int mpu_configure(uint_fast8_t region, uintptr_t base, uint_fast32_t attr);
 }
 #endif
 
-#endif /* MPU_H_ */
+#endif /* MPU_H */
diff --git a/cpu/cortexm_common/include/vectors_cortexm.h b/cpu/cortexm_common/include/vectors_cortexm.h
index f47957ccb99bb3b598fed10fa899c8e5294fd1d7..bbbe2908c1caf2d93f97f33fb092270e703d5468 100644
--- a/cpu/cortexm_common/include/vectors_cortexm.h
+++ b/cpu/cortexm_common/include/vectors_cortexm.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef VECTORS_DEFAULT_H_
-#define VECTORS_DEFAULT_H_
+#ifndef VECTORS_DEFAULT_H
+#define VECTORS_DEFAULT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,5 +114,5 @@ void dummy_handler_default(void);
 }
 #endif
 
-#endif /* VECTORS_DEFAULT_H_ */
+#endif /* VECTORS_DEFAULT_H */
 /** @} */
diff --git a/cpu/ezr32wg/include/periph_cpu.h b/cpu/ezr32wg/include/periph_cpu.h
index 9fa7637818fa0172088a9ec639eefb54210c12ce..f8a783de3fa4af6289fa3ce1671c445e058e74cb 100644
--- a/cpu/ezr32wg/include/periph_cpu.h
+++ b/cpu/ezr32wg/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 
@@ -133,5 +133,5 @@ typedef struct {
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/k60/include/MK60-comp.h b/cpu/k60/include/MK60-comp.h
index e4d61a115cbac637ad4831d7520facf7b8b61963..54b52469ce6145877d9281dd25d01d097474e44c 100644
--- a/cpu/k60/include/MK60-comp.h
+++ b/cpu/k60/include/MK60-comp.h
@@ -16,8 +16,8 @@
  * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef MK60_COMP_H_
-#define MK60_COMP_H_
+#ifndef MK60_COMP_H
+#define MK60_COMP_H
 
 #ifdef __cplusplus
 extern "C"
@@ -65,5 +65,5 @@ extern "C"
 #endif
 
 
-#endif /* MK60_COMP_H_ */
+#endif /* MK60_COMP_H */
 /** @} */
diff --git a/cpu/k60/include/cpu_conf.h b/cpu/k60/include/cpu_conf.h
index e1e5dda7e79ef4dd8a0deef8ed1f7aa28b1c3fc8..47ac0acbfe27f794d0fc0ec29f91c748a765c611 100644
--- a/cpu/k60/include/cpu_conf.h
+++ b/cpu/k60/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef CPU_CONF_H_
-#define CPU_CONF_H_
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -291,5 +291,5 @@ typedef enum llwu_wakeup_pin {
 }
 #endif
 
-#endif /* CPU_CONF_H_ */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/k60/include/system_MK60D10.h b/cpu/k60/include/system_MK60D10.h
index 386b566057e60f5af50d280ef75df032537cee64..0d25d849977adc4b985256a6ce6b09883ebf7e26 100644
--- a/cpu/k60/include/system_MK60D10.h
+++ b/cpu/k60/include/system_MK60D10.h
@@ -6,8 +6,8 @@
  * details.
  */
 
-#ifndef SYSTEM_MK60D10_H_
-#define SYSTEM_MK60D10_H_
+#ifndef SYSTEM_MK60D10_H
+#define SYSTEM_MK60D10_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpu/kinetis_common/include/periph_cpu.h b/cpu/kinetis_common/include/periph_cpu.h
index e04886c97579fafff5651e64fd4204c0e0bb8dab..19a5c496ad3702f5214b29335e1daca9f1055efc 100644
--- a/cpu/kinetis_common/include/periph_cpu.h
+++ b/cpu/kinetis_common/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 
@@ -248,5 +248,5 @@ void gpio_init_port(gpio_t pin, uint32_t pcr);
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lm4f120/include/periph_cpu.h b/cpu/lm4f120/include/periph_cpu.h
index d9838ff15a793b24fad3a67f2e81963e1958f675..05e1ac5b696daa9385f15dfeb9be8aa67a89acc2 100644
--- a/cpu/lm4f120/include/periph_cpu.h
+++ b/cpu/lm4f120/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Rakendra Thapa <rakendrathapa@gmail.com>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 #include "cpu_conf.h"
@@ -125,5 +125,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc11u34/include/periph_cpu.h b/cpu/lpc11u34/include/periph_cpu.h
index e44fb4ae55f6025980919287795976c1f4ef81e8..f11b8edbba5bfc6d8b536b0922fd38a2a9bd44aa 100644
--- a/cpu/lpc11u34/include/periph_cpu.h
+++ b/cpu/lpc11u34/include/periph_cpu.h
@@ -17,8 +17,8 @@
  * @author          Hauke Petersen<hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 #include "periph/dev_enums.h"
@@ -103,5 +103,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc1768/include/periph_cpu.h b/cpu/lpc1768/include/periph_cpu.h
index 050421431613c730a534a6456665a3c3a89840f0..a40a3734d82cc409dcad80e7c9cfac282591001e 100644
--- a/cpu/lpc1768/include/periph_cpu.h
+++ b/cpu/lpc1768/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 
@@ -31,5 +31,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc2387/include/cpu_conf.h b/cpu/lpc2387/include/cpu_conf.h
index b61f072d7f749cd5b38d10f140e3ae4abc5e61f9..f6e84f4db9b9b1c6c3dbbfc53152264398f0cc1d 100644
--- a/cpu/lpc2387/include/cpu_conf.h
+++ b/cpu/lpc2387/include/cpu_conf.h
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h
index 7c289d5cefaa199eca3dc5ff489ad591bce5eb4c..4eb0ca2f37a0c053f11cb800217a855fa3b84304 100644
--- a/cpu/lpc2387/include/lpc2387-adc.h
+++ b/cpu/lpc2387/include/lpc2387-adc.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef LPC2387ADC_H_
-#define LPC2387ADC_H_
+#ifndef LPC2387ADC_H
+#define LPC2387ADC_H
 
 /**
  * @defgroup    lpc2387_adc     LPC2387 ADC
@@ -51,4 +51,4 @@ void adc_init_2(void);
 #endif
 
 /** @} */
-#endif /* LPC2387ADC_H_ */
+#endif /* LPC2387ADC_H */
diff --git a/cpu/lpc2387/include/periph_cpu.h b/cpu/lpc2387/include/periph_cpu.h
index 5fbec237be48f7fcaad7fd7aa3ce2952a906f5f1..dbb757ffdb31f2adf11b13ab773832af021cf6ae 100644
--- a/cpu/lpc2387/include/periph_cpu.h
+++ b/cpu/lpc2387/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 #include "periph/dev_enums.h"
@@ -84,5 +84,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/msp430_common/include/cpu.h b/cpu/msp430_common/include/cpu.h
index 18b245af8c54134537838ea6cd837c5d51012d2c..88a1aac8469c85d089d0dc3163921af85aaf6acf 100644
--- a/cpu/msp430_common/include/cpu.h
+++ b/cpu/msp430_common/include/cpu.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 /**
  * @defgroup    cpu_msp430_common TI MSP430
@@ -164,4 +164,4 @@ static inline void cpu_print_last_instruction(void)
 #endif
 
 /** @} */
-#endif /* CPU_H_ */
+#endif /* CPU_H */
diff --git a/cpu/msp430_common/include/cpu_conf.h b/cpu/msp430_common/include/cpu_conf.h
index edd54020b5f3c05f427103e6d3dee7b8f79ac3ea..00b80740e2db6cd84dd79b0154b87c66878c0494 100644
--- a/cpu/msp430_common/include/cpu_conf.h
+++ b/cpu/msp430_common/include/cpu_conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/msp430_common/include/stdio.h b/cpu/msp430_common/include/stdio.h
index 2ac0b7b0698077f88cca5c6f3844d16b180ec505..145cdb79cccdc1252a7a6959ba2069a813f7d686 100644
--- a/cpu/msp430_common/include/stdio.h
+++ b/cpu/msp430_common/include/stdio.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
-#ifndef RIOT_MSP430_STDIO_H_
-#define RIOT_MSP430_STDIO_H_
+#ifndef RIOT_MSP430_STDIO_H
+#define RIOT_MSP430_STDIO_H
 
 /*
  * The MSP430 toolchain does not provide getchar in stdio.h.
@@ -37,4 +37,4 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_MSP430_STDIO_H_ */
+#endif /* RIOT_MSP430_STDIO_H */
diff --git a/cpu/msp430_common/include/stdlib.h b/cpu/msp430_common/include/stdlib.h
index 5e56eeaebe2d9935ec078872a9f57847784cb02b..615f16833e16eb969d06cd9e893a34eec1edf8aa 100644
--- a/cpu/msp430_common/include/stdlib.h
+++ b/cpu/msp430_common/include/stdlib.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
-#ifndef RIOT_MSP430_STDLIB_H_
-#define RIOT_MSP430_STDLIB_H_
+#ifndef RIOT_MSP430_STDLIB_H
+#define RIOT_MSP430_STDLIB_H
 
 /*
  * The MSP430 toolchain does not provide malloc, free, calloc etc. in stdlib.h.
@@ -37,4 +37,4 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_MSP430_STDLIB_H_ */
+#endif /* RIOT_MSP430_STDLIB_H */
diff --git a/cpu/msp430_common/include/sys/types.h b/cpu/msp430_common/include/sys/types.h
index d50105720c03a094e2736d918fc34c4624efa4a5..b6ae952372318223445a34f69ed17962f09c850c 100644
--- a/cpu/msp430_common/include/sys/types.h
+++ b/cpu/msp430_common/include/sys/types.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SYS_TYPES_H_
-#define SYS_TYPES_H_
+#ifndef SYS_TYPES_H
+#define SYS_TYPES_H
 
 #include "msp430_types.h"
 
@@ -19,4 +19,4 @@ extern "C" {
 }
 #endif
 
-#endif /* SYS_TYPES_H_ */
+#endif /* SYS_TYPES_H */
diff --git a/cpu/msp430_common/include/unistd.h b/cpu/msp430_common/include/unistd.h
index d7f05053f9c021b88faa53a41147f20f37811e58..234c89bb142f3663c0ddae85c7c8da355dcac69e 100644
--- a/cpu/msp430_common/include/unistd.h
+++ b/cpu/msp430_common/include/unistd.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNISTD_H_
-#define UNISTD_H_
+#ifndef UNISTD_H
+#define UNISTD_H
 
 #include <stdint.h>
 
@@ -31,4 +31,4 @@ unsigned int sleep(unsigned int seconds);
 }
 #endif
 
-#endif /* UNISTD_H_ */
+#endif /* UNISTD_H */
diff --git a/cpu/msp430fxyz/include/periph_cpu.h b/cpu/msp430fxyz/include/periph_cpu.h
index 2ed44482be974193c10a500e67c47bd5f951d447..ec0f5667306e4c9032cdbe8824e0a1d9aa66817e 100644
--- a/cpu/msp430fxyz/include/periph_cpu.h
+++ b/cpu/msp430fxyz/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 #include "msp430_regs.h"
@@ -92,5 +92,5 @@ void gpio_periph_mode(gpio_t pin, bool enable);
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/native/include/cpu_conf.h b/cpu/native/include/cpu_conf.h
index 88c71d9c1e1f704a14b40ee43e574839ea49be07..08dd88225ee3958db59d800bae91d0adb1eaaaad 100644
--- a/cpu/native/include/cpu_conf.h
+++ b/cpu/native/include/cpu_conf.h
@@ -13,8 +13,8 @@
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/native/include/periph_cpu.h b/cpu/native/include/periph_cpu.h
index 64e47da35a3484fc506431e8869baaf9fb0cac94..0b2c3766d4e26d5aa4686b680d4e65e819c56edd 100644
--- a/cpu/native/include/periph_cpu.h
+++ b/cpu/native/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 
@@ -36,5 +36,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/nrfmin.h b/cpu/nrf5x_common/include/nrfmin.h
index e43800514c61a8d923692e370f0b3c285829cfbd..32c88cdc5deefef749bca80702a52aad01f7e9c1 100644
--- a/cpu/nrf5x_common/include/nrfmin.h
+++ b/cpu/nrf5x_common/include/nrfmin.h
@@ -69,8 +69,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NRFMIN_H_
-#define NRFMIN_H_
+#ifndef NRFMIN_H
+#define NRFMIN_H
 
 #include "net/netdev2.h"
 
@@ -233,5 +233,5 @@ void nrfmin_set_txpower(int16_t power);
 }
 #endif
 
-#endif /* NRFMIN_H_ */
+#endif /* NRFMIN_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/nrfmin_gnrc.h b/cpu/nrf5x_common/include/nrfmin_gnrc.h
index dc1a971a40ba1f44a450afbca728908027532d6c..4b62af6e2f5346a15f3f04206d4367558bffd5fe 100644
--- a/cpu/nrf5x_common/include/nrfmin_gnrc.h
+++ b/cpu/nrf5x_common/include/nrfmin_gnrc.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NRFMIN_GNRC_H_
-#define NRFMIN_GNRC_H_
+#ifndef NRFMIN_GNRC_H
+#define NRFMIN_GNRC_H
 
 #include "nrfmin.h"
 
@@ -44,5 +44,5 @@ void gnrc_netdev2_nrfmin_init(void);
 }
 #endif
 
-#endif /* NRFMIN_GNRC_H_ */
+#endif /* NRFMIN_GNRC_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/periph_cpu_common.h b/cpu/nrf5x_common/include/periph_cpu_common.h
index 32fce39c297aa9f1b23da28c6c9328e86e6a4179..c34a24537b3e7e9712ffce37ff3c7b0ed035161e 100644
--- a/cpu/nrf5x_common/include/periph_cpu_common.h
+++ b/cpu/nrf5x_common/include/periph_cpu_common.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_COMMON_H_
-#define PERIPH_CPU_COMMON_H_
+#ifndef PERIPH_CPU_COMMON_H
+#define PERIPH_CPU_COMMON_H
 
 #include "cpu.h"
 
@@ -110,5 +110,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_COMMON_H_ */
+#endif /* PERIPH_CPU_COMMON_H */
 /** @} */
diff --git a/cpu/stellaris_common/include/cortex-m4-def.h b/cpu/stellaris_common/include/cortex-m4-def.h
index 7f4c19e9a850ecd20505a5a12c07acc706566a2a..a01aab04af3987d07be1d46b0c22b44b9743cc89 100644
--- a/cpu/stellaris_common/include/cortex-m4-def.h
+++ b/cpu/stellaris_common/include/cortex-m4-def.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_CORTEX_M4_DEF_H_
-#define STELLARIS_CORTEX_M4_DEF_H_
+#ifndef STELLARIS_CORTEX_M4_DEF_H
+#define STELLARIS_CORTEX_M4_DEF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -10062,4 +10062,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_CORTEX_M4_DEF_H_ */
+#endif /* STELLARIS_CORTEX_M4_DEF_H */
diff --git a/cpu/stellaris_common/include/hw_adc.h b/cpu/stellaris_common/include/hw_adc.h
index bb9af580f91c6b1612ef9415f8341e6fb5b1ab06..e5f784c527146196b176ccf0d1610f8e3dc5d71e 100644
--- a/cpu/stellaris_common/include/hw_adc.h
+++ b/cpu/stellaris_common/include/hw_adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_ADC_H_
-#define STELLARIS_HW_ADC_H_
+#ifndef STELLARIS_HW_ADC_H
+#define STELLARIS_HW_ADC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1357,4 +1357,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_ADC_H_ */
+#endif /* STELLARIS_HW_ADC_H */
diff --git a/cpu/stellaris_common/include/hw_gpio.h b/cpu/stellaris_common/include/hw_gpio.h
index 5c547fad30d0146073224f09b24ee30348b2235c..38d62f966f400434b186e280ea2fe9d7a9cbd03f 100644
--- a/cpu/stellaris_common/include/hw_gpio.h
+++ b/cpu/stellaris_common/include/hw_gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_GPIO_H_
-#define STELLARIS_HW_GPIO_H_
+#ifndef STELLARIS_HW_GPIO_H
+#define STELLARIS_HW_GPIO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,4 +197,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_GPIO_H_ */
+#endif /* STELLARIS_HW_GPIO_H */
diff --git a/cpu/stellaris_common/include/hw_hibernate.h b/cpu/stellaris_common/include/hw_hibernate.h
index 4b748009749035426ad3f10eb34b089be6cf886c..3c6416f831e4c21682f58e6cc6690b7a3a606fa8 100644
--- a/cpu/stellaris_common/include/hw_hibernate.h
+++ b/cpu/stellaris_common/include/hw_hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_HIBERNATE_H_
-#define STELLARIS_HW_HIBERNATE_H_
+#ifndef STELLARIS_HW_HIBERNATE_H
+#define STELLARIS_HW_HIBERNATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -291,4 +291,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_HIBERNATE_H_ */
+#endif /* STELLARIS_HW_HIBERNATE_H */
diff --git a/cpu/stellaris_common/include/hw_i2c.h b/cpu/stellaris_common/include/hw_i2c.h
index 30fcd0f5d791341811bed02c519152852a390d6b..8c91b53478387326d8bc03343953095e35c8056e 100644
--- a/cpu/stellaris_common/include/hw_i2c.h
+++ b/cpu/stellaris_common/include/hw_i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_I2C_H_
-#define STELLARIS_HW_I2C_H_
+#ifndef STELLARIS_HW_I2C_H
+#define STELLARIS_HW_I2C_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -494,4 +494,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_I2C_H_ */
+#endif /* STELLARIS_HW_I2C_H */
diff --git a/cpu/stellaris_common/include/hw_ints.h b/cpu/stellaris_common/include/hw_ints.h
index 14c77782ed09ad10b0eb0f60533d79ead337948d..2f449dc71c654d4454c0b0c05d012346eca279dd 100644
--- a/cpu/stellaris_common/include/hw_ints.h
+++ b/cpu/stellaris_common/include/hw_ints.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_INTS_H_
-#define STELLARIS_HW_INTS_H_
+#ifndef STELLARIS_HW_INTS_H
+#define STELLARIS_HW_INTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,4 +222,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_INTS_H_ */
+#endif /* STELLARIS_HW_INTS_H */
diff --git a/cpu/stellaris_common/include/hw_memmap.h b/cpu/stellaris_common/include/hw_memmap.h
index 8dccea6c657385d36ce921de67fb0911644f0746..2fcfd71b8ec95960ccff6c758f9df7b0e0a2ce01 100644
--- a/cpu/stellaris_common/include/hw_memmap.h
+++ b/cpu/stellaris_common/include/hw_memmap.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_MEMMAP_H_
-#define STELLARIS_HW_MEMMAP_H_
+#ifndef STELLARIS_HW_MEMMAP_H
+#define STELLARIS_HW_MEMMAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_MEMMAP_H_ */
+#endif /* STELLARIS_HW_MEMMAP_H */
diff --git a/cpu/stellaris_common/include/hw_nvic.h b/cpu/stellaris_common/include/hw_nvic.h
index a472561e250bb1c36c14a0f2ee0a017a4a809b9d..614929704bf19536990bf2f5121b75a5e48e585e 100644
--- a/cpu/stellaris_common/include/hw_nvic.h
+++ b/cpu/stellaris_common/include/hw_nvic.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_NVIC_H_
-#define STELLARIS_HW_NVIC_H_
+#ifndef STELLARIS_HW_NVIC_H
+#define STELLARIS_HW_NVIC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1722,4 +1722,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_NVIC_H_ */
+#endif /* STELLARIS_HW_NVIC_H */
diff --git a/cpu/stellaris_common/include/hw_pwm.h b/cpu/stellaris_common/include/hw_pwm.h
index e8c0368ee62d3103407aa62c56db038459e4b2cb..4a195eb0cd4b15a6835fe9407d84a259576de1a5 100644
--- a/cpu/stellaris_common/include/hw_pwm.h
+++ b/cpu/stellaris_common/include/hw_pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_PWM_H_
-#define STELLARIS_HW_PWM_H_
+#ifndef STELLARIS_HW_PWM_H
+#define STELLARIS_HW_PWM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -2025,4 +2025,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_PWM_H_ */
+#endif /* STELLARIS_HW_PWM_H */
diff --git a/cpu/stellaris_common/include/hw_ssi.h b/cpu/stellaris_common/include/hw_ssi.h
index 41bf1cc112d3cb16e642d1c808c79dd202a837d1..19386a65cd69aa1d80bc70b5c24d6b56e4f1316e 100644
--- a/cpu/stellaris_common/include/hw_ssi.h
+++ b/cpu/stellaris_common/include/hw_ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SSI_H_
-#define STELLARIS_HW_SSI_H_
+#ifndef STELLARIS_HW_SSI_H
+#define STELLARIS_HW_SSI_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -249,4 +249,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SSI_H_ */
+#endif /* STELLARIS_HW_SSI_H */
diff --git a/cpu/stellaris_common/include/hw_sysctl.h b/cpu/stellaris_common/include/hw_sysctl.h
index 097071a06b846aa74b549e9359372f246292b403..7b73a40408f05d205d82a727a13caeb54e869337 100644
--- a/cpu/stellaris_common/include/hw_sysctl.h
+++ b/cpu/stellaris_common/include/hw_sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SYSCTL_H_
-#define STELLARIS_HW_SYSCTL_H_
+#ifndef STELLARIS_HW_SYSCTL_H
+#define STELLARIS_HW_SYSCTL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -3681,4 +3681,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SYSCTL_H_ */
+#endif /* STELLARIS_HW_SYSCTL_H */
diff --git a/cpu/stellaris_common/include/hw_sysexc.h b/cpu/stellaris_common/include/hw_sysexc.h
index 999a328e67d092fd8cdd569f30a2248afed44814..6eec943f76f296b2de5b3dcaf85c53adade37036 100644
--- a/cpu/stellaris_common/include/hw_sysexc.h
+++ b/cpu/stellaris_common/include/hw_sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SYSEXC_H_
-#define STELLARIS_HW_SYSEXC_H_
+#ifndef STELLARIS_HW_SYSEXC_H
+#define STELLARIS_HW_SYSEXC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SYSEXC_H_ */
+#endif /* STELLARIS_HW_SYSEXC_H */
diff --git a/cpu/stellaris_common/include/hw_timer.h b/cpu/stellaris_common/include/hw_timer.h
index 949990e28ef10ef9e5b4cf16b1a0b85e790b6615..1945bdccdeef98d32e66dacf96dff0bd7fd25d05 100644
--- a/cpu/stellaris_common/include/hw_timer.h
+++ b/cpu/stellaris_common/include/hw_timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_TIMER_H_
-#define STELLARIS_HW_TIMER_H_
+#ifndef STELLARIS_HW_TIMER_H
+#define STELLARIS_HW_TIMER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -764,4 +764,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_TIMER_H_ */
+#endif /* STELLARIS_HW_TIMER_H */
diff --git a/cpu/stellaris_common/include/hw_types.h b/cpu/stellaris_common/include/hw_types.h
index c6aec30b07fdfbdadec8435826d253f7cff3e4de..aa9025918e188cc048b1461db0f97f1712c27503 100644
--- a/cpu/stellaris_common/include/hw_types.h
+++ b/cpu/stellaris_common/include/hw_types.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_TYPES_H_
-#define STELLARIS_HW_TYPES_H_
+#ifndef STELLARIS_HW_TYPES_H
+#define STELLARIS_HW_TYPES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,4 +223,4 @@ typedef unsigned char tBoolean;
 }
 #endif
 
-#endif /* STELLARIS_HW_TYPES_H_ */
+#endif /* STELLARIS_HW_TYPES_H */
diff --git a/cpu/stellaris_common/include/hw_uart.h b/cpu/stellaris_common/include/hw_uart.h
index 18986fc42238d1f1e30b58cb3ba35c07cd853117..eb786ca020add318df9acd9881163bce2ea3d0b1 100644
--- a/cpu/stellaris_common/include/hw_uart.h
+++ b/cpu/stellaris_common/include/hw_uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_UART_H_
-#define STELLARIS_HW_UART_H_
+#ifndef STELLARIS_HW_UART_H
+#define STELLARIS_HW_UART_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -527,4 +527,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_UART_H_ */
+#endif /* STELLARIS_HW_UART_H */
diff --git a/cpu/stellaris_common/include/hw_watchdog.h b/cpu/stellaris_common/include/hw_watchdog.h
index 2bc65a02ac2afdf88ccf36b6821c8b198f3f4fa2..d63fdc92ff13b0191dbab5a0b0872155f5bfefc4 100644
--- a/cpu/stellaris_common/include/hw_watchdog.h
+++ b/cpu/stellaris_common/include/hw_watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_WATCHDOG_H_
-#define STELLARIS_HW_WATCHDOG_H_
+#ifndef STELLARIS_HW_WATCHDOG_H
+#define STELLARIS_HW_WATCHDOG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,4 +196,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_WATCHDOG_H_ */
+#endif /* STELLARIS_HW_WATCHDOG_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/adc.h b/cpu/stellaris_common/include/stellaris_periph/adc.h
index 7446e651e673c14d09636ddb836c4bd4d7440b12..b5e3a04aa964988b2ebd2e57b02cf22f4ffa928d 100644
--- a/cpu/stellaris_common/include/stellaris_periph/adc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ADC_H_
-#define STELLARIS_ADC_H_
+#ifndef STELLARIS_ADC_H
+#define STELLARIS_ADC_H
 
 //*****************************************************************************
 //
@@ -308,4 +308,4 @@ extern unsigned long ADCPhaseDelayGet(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_ADC_H_ */
+#endif /* STELLARIS_ADC_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/comp.h b/cpu/stellaris_common/include/stellaris_periph/comp.h
index e6e204475fba9642caa31c7da8eea55a1bc72529..3c6c7e2bfbc6a5904e2957e0d00b502ae8fbc305 100644
--- a/cpu/stellaris_common/include/stellaris_periph/comp.h
+++ b/cpu/stellaris_common/include/stellaris_periph/comp.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_COMP_H_
-#define STELLARIS_COMP_H_
+#ifndef STELLARIS_COMP_H
+#define STELLARIS_COMP_H
 
 //*****************************************************************************
 //
@@ -142,4 +142,4 @@ extern void ComparatorIntClear(unsigned long ulBase, unsigned long ulComp);
 }
 #endif
 
-#endif /* STELLARIS_COMP_H_ */
+#endif /* STELLARIS_COMP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/cpu.h b/cpu/stellaris_common/include/stellaris_periph/cpu.h
index b0d8468e6b401861dd6e6cbb24cf0a998bbe72fb..6f5898db79a8ba3c80db2672effbd3424b8028a8 100644
--- a/cpu/stellaris_common/include/stellaris_periph/cpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/cpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_CPU_H_
-#define STELLARIS_CPU_H_
+#ifndef STELLARIS_CPU_H
+#define STELLARIS_CPU_H
 
 //*****************************************************************************
 //
@@ -72,4 +72,4 @@ extern void CPUbasepriSet(unsigned long ulNewBasepri);
 }
 #endif
 
-#endif /* STELLARIS_CPU_H_ */
+#endif /* STELLARIS_CPU_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/fpu.h b/cpu/stellaris_common/include/stellaris_periph/fpu.h
index 3c486b3558d67f1a11ca38b5eb1b2de70ac81c94..528bebe8572204a33ebd86a94576682e716bc71d 100644
--- a/cpu/stellaris_common/include/stellaris_periph/fpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/fpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_FPU_H_
-#define STELLARIS_FPU_H_
+#ifndef STELLARIS_FPU_H
+#define STELLARIS_FPU_H
 
 //*****************************************************************************
 //
@@ -109,4 +109,4 @@ extern void FPURoundingModeSet(unsigned long ulMode);
 }
 #endif
 
-#endif /* STELLARIS_FPU_H_ */
+#endif /* STELLARIS_FPU_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/gpio.h b/cpu/stellaris_common/include/stellaris_periph/gpio.h
index 32454b81f5be4a772c3d1415449691694f133df0..7537b11f9b63e1381680ff7546474d619d74f9b3 100644
--- a/cpu/stellaris_common/include/stellaris_periph/gpio.h
+++ b/cpu/stellaris_common/include/stellaris_periph/gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_GPIO_H_
-#define STELLARIS_GPIO_H_
+#ifndef STELLARIS_GPIO_H
+#define STELLARIS_GPIO_H
 
 //*****************************************************************************
 //
@@ -196,4 +196,4 @@ extern void GPIOADCTriggerDisable(unsigned long ulPort, unsigned char ucPins);
 }
 #endif
 
-#endif /* STELLARIS_GPIO_H_ */
+#endif /* STELLARIS_GPIO_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/hibernate.h b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
index 589028d11643ec0ec83e35c2c93b27ed4173bf02..82d83a8295eaaae4fbafdcb50bdedd9bfd7fa9b3 100644
--- a/cpu/stellaris_common/include/stellaris_periph/hibernate.h
+++ b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HIBERNATE_H_
-#define STELLARIS_HIBERNATE_H_
+#ifndef STELLARIS_HIBERNATE_H
+#define STELLARIS_HIBERNATE_H
 
 //*****************************************************************************
 //
@@ -164,4 +164,4 @@ extern unsigned long HibernateBatCheckDone(void);
 }
 #endif
 
-#endif  /* STELLARIS_HIBERNATE_H_ */
+#endif  /* STELLARIS_HIBERNATE_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/i2c.h b/cpu/stellaris_common/include/stellaris_periph/i2c.h
index 1b45a3366b2b9f90fbd20e304ed3e8b2b7f10dd8..1e65ebf7f9ff0239037532f27161e229d14a175d 100644
--- a/cpu/stellaris_common/include/stellaris_periph/i2c.h
+++ b/cpu/stellaris_common/include/stellaris_periph/i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_I2C_H_
-#define STELLARIS_I2C_H_
+#ifndef STELLARIS_I2C_H
+#define STELLARIS_I2C_H
 
 //*****************************************************************************
 //
@@ -221,4 +221,4 @@ extern unsigned long I2CSlaveStatus(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_I2C_H_ */
+#endif /* STELLARIS_I2C_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/interrupt.h b/cpu/stellaris_common/include/stellaris_periph/interrupt.h
index f7d23c17d4695ad343a8aa621c690546fc319d49..5d25dba50bcfae417ed2131fb0d0a8722a45d6f0 100644
--- a/cpu/stellaris_common/include/stellaris_periph/interrupt.h
+++ b/cpu/stellaris_common/include/stellaris_periph/interrupt.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_INTERRUPT_H_
-#define STELLARIS_INTERRUPT_H_
+#ifndef STELLARIS_INTERRUPT_H
+#define STELLARIS_INTERRUPT_H
 
 //*****************************************************************************
 //
@@ -90,4 +90,4 @@ extern unsigned long IntPriorityMaskGet(void);
 }
 #endif
 
-#endif /* STELLARIS_INTERRUPT_H_ */
+#endif /* STELLARIS_INTERRUPT_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/pin_map.h b/cpu/stellaris_common/include/stellaris_periph/pin_map.h
index 8bd33a4aad0fb9a163140e27f9c1c2bc5d6afebb..389a664bf37dcf71e8c2cf5eb957b69b48895d8f 100644
--- a/cpu/stellaris_common/include/stellaris_periph/pin_map.h
+++ b/cpu/stellaris_common/include/stellaris_periph/pin_map.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_PIN_MAP_H_
-#define STELLARIS_PIN_MAP_H_
+#ifndef STELLARIS_PIN_MAP_H
+#define STELLARIS_PIN_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -454,4 +454,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_PIN_MAP_H_ */
+#endif /* STELLARIS_PIN_MAP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/pwm.h b/cpu/stellaris_common/include/stellaris_periph/pwm.h
index 7692d624c18777b67fe091af0bc476ee7e020327..4e529d7df13dc9e3df9b1a45d8afb8436341b120 100644
--- a/cpu/stellaris_common/include/stellaris_periph/pwm.h
+++ b/cpu/stellaris_common/include/stellaris_periph/pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_PWM_H_
-#define STELLARIS_PWM_H_
+#ifndef STELLARIS_PWM_H
+#define STELLARIS_PWM_H
 
 //*****************************************************************************
 //
@@ -295,4 +295,4 @@ extern void PWMGenFaultClear(unsigned long ulBase, unsigned long ulGen,
 }
 #endif
 
-#endif /* STELLARIS_PWM_H_ */
+#endif /* STELLARIS_PWM_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/rom.h b/cpu/stellaris_common/include/stellaris_periph/rom.h
index aa92d03b83723595d8315ac5238f709920fffea2..d747a485fdba70d35f696c7fe6bfd22a7b89968e 100644
--- a/cpu/stellaris_common/include/stellaris_periph/rom.h
+++ b/cpu/stellaris_common/include/stellaris_periph/rom.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ROM_H_
-#define STELLARIS_ROM_H_
+#ifndef STELLARIS_ROM_H
+#define STELLARIS_ROM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -6749,4 +6749,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_ROM_H_ */
+#endif /* STELLARIS_ROM_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/rom_map.h b/cpu/stellaris_common/include/stellaris_periph/rom_map.h
index c48269eb3c965387c2b3abb50428b1b857c8a48d..c618d6cc0e49880ebe3a7d5fef71c28202028832 100644
--- a/cpu/stellaris_common/include/stellaris_periph/rom_map.h
+++ b/cpu/stellaris_common/include/stellaris_periph/rom_map.h
@@ -38,8 +38,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ROM_MAP_H_
-#define STELLARIS_ROM_MAP_H_
+#ifndef STELLARIS_ROM_MAP_H
+#define STELLARIS_ROM_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -5080,4 +5080,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_ROM_MAP_H_ */
+#endif /* STELLARIS_ROM_MAP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/ssi.h b/cpu/stellaris_common/include/stellaris_periph/ssi.h
index 00dbe38e69d0963169b38c7de8b5c74dd14f256a..259932e1a26b3ee72e40b76b590492973eecdb87 100644
--- a/cpu/stellaris_common/include/stellaris_periph/ssi.h
+++ b/cpu/stellaris_common/include/stellaris_periph/ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SSI_H_
-#define STELLARIS_SSI_H_
+#ifndef STELLARIS_SSI_H
+#define STELLARIS_SSI_H
 
 //*****************************************************************************
 //
@@ -148,4 +148,4 @@ extern unsigned long SSIClockSourceGet(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_SSI_H_ */
+#endif /* STELLARIS_SSI_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/sysctl.h b/cpu/stellaris_common/include/stellaris_periph/sysctl.h
index 21dd874188c4c804349c900c616b4b2bf4c00ee7..e91d169562f07153696498e986c0334997ffa1c7 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysctl.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSCTL_H_
-#define STELLARIS_SYSCTL_H_
+#ifndef STELLARIS_SYSCTL_H
+#define STELLARIS_SYSCTL_H
 
 //*****************************************************************************
 //
@@ -639,4 +639,4 @@ extern unsigned long SysCtlI2SMClkSet(unsigned long ulInputClock,
 }
 #endif
 
-#endif /* STELLARIS_SYSCTL_H_ */
+#endif /* STELLARIS_SYSCTL_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/sysexc.h b/cpu/stellaris_common/include/stellaris_periph/sysexc.h
index e61422baf661d2462da5a1c240408ecda14b8fd6..e2015db6886e0fd9ee3996c54cd35e368582ef4b 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysexc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSEXC_H_
-#define STELLARIS_SYSEXC_H_
+#ifndef STELLARIS_SYSEXC_H
+#define STELLARIS_SYSEXC_H
 
 //*****************************************************************************
 //
@@ -86,4 +86,4 @@ extern void SysExcIntClear(unsigned long ulIntFlags);
 }
 #endif
 
-#endif /* STELLARIS_SYSEXC_H_ */
+#endif /* STELLARIS_SYSEXC_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/systick.h b/cpu/stellaris_common/include/stellaris_periph/systick.h
index 399c8485153603ae7d43461c60b68ce6a4e693da..890f9701f312c500ec5c2d152bfe698f2388ecdd 100644
--- a/cpu/stellaris_common/include/stellaris_periph/systick.h
+++ b/cpu/stellaris_common/include/stellaris_periph/systick.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSTICK_H_
-#define STELLARIS_SYSTICK_H_
+#ifndef STELLARIS_SYSTICK_H
+#define STELLARIS_SYSTICK_H
 
 //*****************************************************************************
 //
@@ -75,4 +75,4 @@ extern unsigned long SysTickValueGet(void);
 }
 #endif
 
-#endif /* STELLARIS_SYSTICK_H_ */
+#endif /* STELLARIS_SYSTICK_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/timer.h b/cpu/stellaris_common/include/stellaris_periph/timer.h
index 2db3c6438084a438ce92fa52533093d105595cdc..4df1ebd8f0c12ff0d26ec52f610177d2a2498528 100644
--- a/cpu/stellaris_common/include/stellaris_periph/timer.h
+++ b/cpu/stellaris_common/include/stellaris_periph/timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_TIMER_H_
-#define STELLARIS_TIMER_H_
+#ifndef STELLARIS_TIMER_H
+#define STELLARIS_TIMER_H
 
 //*****************************************************************************
 //
@@ -233,4 +233,4 @@ extern void TimerQuiesce(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_TIMER_H_ */
+#endif /* STELLARIS_TIMER_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/uart.h b/cpu/stellaris_common/include/stellaris_periph/uart.h
index de0649784b2bafb6439823b1cd725e8ed90486a5..d96a09b248258ccc42f1546ee8e9e75feb7558b4 100644
--- a/cpu/stellaris_common/include/stellaris_periph/uart.h
+++ b/cpu/stellaris_common/include/stellaris_periph/uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_UART_H_
-#define STELLARIS_UART_H_
+#ifndef STELLARIS_UART_H
+#define STELLARIS_UART_H
 
 //*****************************************************************************
 //
@@ -272,4 +272,4 @@ extern void UART9BitAddrSend(unsigned long ulBase, unsigned char ucAddr);
 }
 #endif
 
-#endif /*  STELLARIS_UART_H_ */
+#endif /*  STELLARIS_UART_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/watchdog.h b/cpu/stellaris_common/include/stellaris_periph/watchdog.h
index 2a332479b3255e7f07edc93ed05d61ea074a6f31..bdca4ddc74b078b2364f77b1d92e1506a621cfbf 100644
--- a/cpu/stellaris_common/include/stellaris_periph/watchdog.h
+++ b/cpu/stellaris_common/include/stellaris_periph/watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_WATCHDOG_H_
-#define STELLARIS_WATCHDOG_H_
+#ifndef STELLARIS_WATCHDOG_H
+#define STELLARIS_WATCHDOG_H
 
 //*****************************************************************************
 //
@@ -92,4 +92,4 @@ extern void WatchdogStallDisable(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_WATCHDOG_H_ */
+#endif /* STELLARIS_WATCHDOG_H */
diff --git a/cpu/stm32f1/include/periph_cpu.h b/cpu/stm32f1/include/periph_cpu.h
index e27571ec8bf3b058802cb53de4f963ccc97e0fac..9b814bce02bee874a8f75b90f2008380d5a5d494 100644
--- a/cpu/stm32f1/include/periph_cpu.h
+++ b/cpu/stm32f1/include/periph_cpu.h
@@ -129,5 +129,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/stm32f3/include/periph_cpu.h b/cpu/stm32f3/include/periph_cpu.h
index c6f014ed858c82de4bec96df1a68c0716324db20..47f2260fffb49c1ecf1dcc6408a04fe79df2f4e7 100644
--- a/cpu/stm32f3/include/periph_cpu.h
+++ b/cpu/stm32f3/include/periph_cpu.h
@@ -87,5 +87,5 @@ void gpio_init_af(gpio_t pin, gpio_af_t af);
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/stm32l1/include/cpu_conf.h b/cpu/stm32l1/include/cpu_conf.h
index 3214ccce8c1374ce9e5cc59d7459aa37633f5345..18fef4e246a0453a4b384b5c61985142494ea071 100644
--- a/cpu/stm32l1/include/cpu_conf.h
+++ b/cpu/stm32l1/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #include "cpu_conf_common.h"
 
diff --git a/cpu/x86/include/cpu.h b/cpu/x86/include/cpu.h
index 754788403f571b442e02e06205c342660c688088..b7919adddf68f5b39337b3a2fea8d6e372fe7a51 100644
--- a/cpu/x86/include/cpu.h
+++ b/cpu/x86/include/cpu.h
@@ -26,8 +26,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU_X86_CPU_H_
-#define CPU_X86_CPU_H_
+#ifndef CPU_X86_CPU_H
+#define CPU_X86_CPU_H
 
 #include "kernel_defines.h"
 #include "irq.h"
diff --git a/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch b/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch
index a9c9ba423901fd13c329e437a8ab2793deeb4406..ba16def9e547e6825ddeb0e67c68f5af9cfaa538 100644
Binary files a/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch and b/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch differ
diff --git a/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch b/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch
index 067b754dc256561cf6fcc9ef715319292e0bec2a..4500d66b435e86ecca406d217555ad411a52ff56 100644
Binary files a/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch and b/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch differ
diff --git a/drivers/at86rf2xx/include/at86rf2xx_internal.h b/drivers/at86rf2xx/include/at86rf2xx_internal.h
index 0979285c07de352f57956ba58134102f7b85d535..9ced61ecdd68288500fd1bbc188dab4def4a5591 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_internal.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_internal.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef AT86RF2XX_INTERNAL_H_
-#define AT86RF2XX_INTERNAL_H_
+#ifndef AT86RF2XX_INTERNAL_H
+#define AT86RF2XX_INTERNAL_H
 
 #include <stdint.h>
 
@@ -179,5 +179,5 @@ void at86rf2xx_get_random(at86rf2xx_t *dev, uint8_t *data, const size_t len);
 }
 #endif
 
-#endif /* AT86RF2XX_INTERNAL_H_ */
+#endif /* AT86RF2XX_INTERNAL_H */
 /** @} */
diff --git a/drivers/at86rf2xx/include/at86rf2xx_netdev.h b/drivers/at86rf2xx/include/at86rf2xx_netdev.h
index 7b6e1f18a38af6a929f63002424229fa5c8d7322..cb4a844c4130d067ed6a95c3b02c059dd82d7d88 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_netdev.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_netdev.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef AT86RF2XX_NETDEV_H_
-#define AT86RF2XX_NETDEV_H_
+#ifndef AT86RF2XX_NETDEV_H
+#define AT86RF2XX_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -34,5 +34,5 @@ extern const netdev2_driver_t at86rf2xx_driver;
 }
 #endif
 
-#endif /* AT86RF2XX_NETDEV_H_ */
+#endif /* AT86RF2XX_NETDEV_H */
 /** @} */
diff --git a/drivers/at86rf2xx/include/at86rf2xx_registers.h b/drivers/at86rf2xx/include/at86rf2xx_registers.h
index ae2cb336b6f2dbc98a9778c34d230b4f247b2983..7359e68c18265339dd98624b31d2227fdc4c8d84 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_registers.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_registers.h
@@ -21,8 +21,8 @@
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
 
-#ifndef AT86RF2XX_REGISTERS_H_
-#define AT86RF2XX_REGISTERS_H_
+#ifndef AT86RF2XX_REGISTERS_H
+#define AT86RF2XX_REGISTERS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -348,5 +348,5 @@ extern "C" {
 }
 #endif
 
-#endif /* AT86RF2XX_REGISTERS_H_ */
+#endif /* AT86RF2XX_REGISTERS_H */
 /** @} */
diff --git a/drivers/bmp180/include/bmp180_internals.h b/drivers/bmp180/include/bmp180_internals.h
index 5bdf79abcba10b51d4290087e6ac7852f09e74b5..aea428816a7b82ec3a6a1ba1502b8b000bbe442d 100644
--- a/drivers/bmp180/include/bmp180_internals.h
+++ b/drivers/bmp180/include/bmp180_internals.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BMP180_REGS_H_
-#define BMP180_REGS_H_
+#ifndef BMP180_REGS_H
+#define BMP180_REGS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BMP180_REGS_H_ */
+#endif /* BMP180_REGS_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_internal.h b/drivers/cc2420/include/cc2420_internal.h
index ebb7a4eb5073bb5061caff4121303d3cb6e16076..3fc61813d08cfc0d866f72ac9e28a3c064059772 100644
--- a/drivers/cc2420/include/cc2420_internal.h
+++ b/drivers/cc2420/include/cc2420_internal.h
@@ -122,5 +122,5 @@ void cc2420_en_xosc(cc2420_t *dev);
 }
 #endif
 
-#endif /* CC2420_INTERNAL_H_ */
+#endif /* CC2420_INTERNAL_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_netdev.h b/drivers/cc2420/include/cc2420_netdev.h
index 2b260938edb0878b1a4bc7a05a22e37526a787fe..fb4a5eb8acd030a66adacf61a775314f7f15d785 100644
--- a/drivers/cc2420/include/cc2420_netdev.h
+++ b/drivers/cc2420/include/cc2420_netdev.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef CC2420_NETDEV_H_
-#define CC2420_NETDEV_H_
+#ifndef CC2420_NETDEV_H
+#define CC2420_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -37,5 +37,5 @@ extern const netdev2_driver_t cc2420_driver;
 }
 #endif
 
-#endif /* CC2420_NETDEV_H_ */
+#endif /* CC2420_NETDEV_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_registers.h b/drivers/cc2420/include/cc2420_registers.h
index c4a318c593e0bb913f6c974a2b641bf251053573..d84bc5976cde677591c922dfe4d84ce8e21375f7 100644
--- a/drivers/cc2420/include/cc2420_registers.h
+++ b/drivers/cc2420/include/cc2420_registers.h
@@ -18,8 +18,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef CC2420_REGISTERS_H_
-#define CC2420_REGISTERS_H_
+#ifndef CC2420_REGISTERS_H
+#define CC2420_REGISTERS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -238,4 +238,4 @@ enum {
 }
 #endif
 
-#endif /* CC2420_REGISTERS_H_ */
+#endif /* CC2420_REGISTERS_H */
diff --git a/drivers/hdc1000/include/hdc1000_regs.h b/drivers/hdc1000/include/hdc1000_regs.h
index c6a95b626360644a51665e8568f00e34f4f73a7d..4e9e3fac2dd03ac38a1c2d22e4e42fce43530af9 100644
--- a/drivers/hdc1000/include/hdc1000_regs.h
+++ b/drivers/hdc1000/include/hdc1000_regs.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef HDC1000_REGS_H_
-#define HDC1000_REGS_H_
+#ifndef HDC1000_REGS_H
+#define HDC1000_REGS_H
 
 #ifdef __cplusplus
 extern "C"
@@ -69,5 +69,5 @@ extern "C"
 }
 #endif
 
-#endif /* HDC1000_REGS_H_ */
+#endif /* HDC1000_REGS_H */
 /** @} */
diff --git a/drivers/include/adt7310.h b/drivers/include/adt7310.h
index a9876da9d293a90f8c4d45e7d3d4913fd6e3ea4f..2cf37fb190a0f88bef71810384d0de985ebc0559 100644
--- a/drivers/include/adt7310.h
+++ b/drivers/include/adt7310.h
@@ -47,8 +47,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef ADT7310_H_
-#define ADT7310_H_
+#ifndef ADT7310_H
+#define ADT7310_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -165,5 +165,5 @@ float adt7310_read_float(adt7310_t *dev);
 }
 #endif
 
-#endif /* ADT7310_H_ */
+#endif /* ADT7310_H */
 /** @} */
diff --git a/drivers/include/at30tse75x.h b/drivers/include/at30tse75x.h
index adccd607a3b1016141224d9cb3d923650f5b5a4d..3b7b684023ea31609953696bde353a76124ccc8c 100644
--- a/drivers/include/at30tse75x.h
+++ b/drivers/include/at30tse75x.h
@@ -22,8 +22,8 @@
  * @author      Daniel Krebs <github@daniel-krebs.net>
  */
 
-#ifndef AT30TSE75X_H_
-#define AT30TSE75X_H_
+#ifndef AT30TSE75X_H
+#define AT30TSE75X_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -309,4 +309,4 @@ int at30tse75x_get_temperature(at30tse75x_t* dev, float* temperature);
 #endif
 
 /** @} */
-#endif /* AT30TSE75X_H_ */
+#endif /* AT30TSE75X_H */
diff --git a/drivers/include/at86rf2xx.h b/drivers/include/at86rf2xx.h
index 627e7d636807f765242414a007575a0f741d7f53..74a9630836679f22416dc66f12c37feaa2239101 100644
--- a/drivers/include/at86rf2xx.h
+++ b/drivers/include/at86rf2xx.h
@@ -26,8 +26,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef AT86RF2XX_H_
-#define AT86RF2XX_H_
+#ifndef AT86RF2XX_H
+#define AT86RF2XX_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -447,5 +447,5 @@ void at86rf2xx_tx_exec(at86rf2xx_t *dev);
 }
 #endif
 
-#endif /* AT86RF2XX_H_ */
+#endif /* AT86RF2XX_H */
 /** @} */
diff --git a/drivers/include/bmp180.h b/drivers/include/bmp180.h
index 22c7869575620769ba02ce4f351bb640e3a925bb..830a2b36c9f11cf39531de2ef2af4890f4484087 100644
--- a/drivers/include/bmp180.h
+++ b/drivers/include/bmp180.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BMP180_H_
-#define BMP180_H_
+#ifndef BMP180_H
+#define BMP180_H
 
 #include "saul.h"
 #include "periph/i2c.h"
@@ -143,5 +143,5 @@ int bmp180_sealevel_pressure(bmp180_t *dev, int32_t altitude, int32_t *pressure_
 }
 #endif
 
-#endif /* BMP180_H_ */
+#endif /* BMP180_H */
 /** @} */
diff --git a/drivers/include/diskio.h b/drivers/include/diskio.h
index 245bc365476d0214275121b99d0038fa1df42002..35e9e277643f3595e412ec99a19b7e165ae8ca72 100644
--- a/drivers/include/diskio.h
+++ b/drivers/include/diskio.h
@@ -21,8 +21,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef DISKIO_H_
-#define DISKIO_H_
+#ifndef DISKIO_H
+#define DISKIO_H
 
 #include <stdint.h>
 
@@ -165,4 +165,4 @@ diskio_result_t mci_ioctl(unsigned char ctrl, void *buff);
 #endif
 
 /** @} */
-#endif /* DISKIO_H_ */
+#endif /* DISKIO_H */
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 6070ee6bbfdffbd837e86bd196bd3715ffe02bce..0faa924120d229f959a63f49c9cada86d9a7e36e 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -21,8 +21,8 @@
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  */
 
-#ifndef GPIOINT_H_
-#define GPIOINT_H_
+#ifndef GPIOINT_H
+#define GPIOINT_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -74,4 +74,4 @@ void gpioint_init(void);
 #endif
 
 /** @} */
-#endif /* GPIOINT_H_ */
+#endif /* GPIOINT_H */
diff --git a/drivers/include/hih6130.h b/drivers/include/hih6130.h
index 3d3712e802d5312c330a1a4a61ee36638b256de5..9502f3ee241f8752da500d6fcdc7b490ba04ab1f 100644
--- a/drivers/include/hih6130.h
+++ b/drivers/include/hih6130.h
@@ -20,8 +20,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef HIH6130_H_
-#define HIH6130_H_
+#ifndef HIH6130_H
+#define HIH6130_H
 
 #include <stdint.h>
 
@@ -66,5 +66,5 @@ int hih6130_get_humidity_temperature_float(hih6130_t *dev,
 }
 #endif
 
-#endif /* HIH6130_H_ */
+#endif /* HIH6130_H */
 /** @} */
diff --git a/drivers/include/io1_xplained.h b/drivers/include/io1_xplained.h
index 16b51b8f69b54378ddb7197f8e4de2126ccd5b5b..c45157e6948718f9a99c542627feda231f48f787 100644
--- a/drivers/include/io1_xplained.h
+++ b/drivers/include/io1_xplained.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef IO1_XPLAINED_H_
-#define IO1_XPLAINED_H_
+#ifndef IO1_XPLAINED_H
+#define IO1_XPLAINED_H
 
 #include "saul.h"
 #include "at30tse75x.h"
@@ -105,5 +105,5 @@ int io1_xplained_toggle_led(void);
 }
 #endif
 
-#endif /* IO1_XPLAINED_H_ */
+#endif /* IO1_XPLAINED_H */
 /** @} */
diff --git a/drivers/include/jc42.h b/drivers/include/jc42.h
index a11384b3a9e0780cead24c56720b390f9b4586b2..8ba08854c15c246754ce6e3fc7dd639a92f9b578 100644
--- a/drivers/include/jc42.h
+++ b/drivers/include/jc42.h
@@ -28,8 +28,8 @@
  * @author      Koen Zandberg <koen@bergzand.net>
  */
 
-#ifndef JC42_TEMP_H_
-#define JC42_TEMP_H_
+#ifndef JC42_TEMP_H
+#define JC42_TEMP_H
 
 #include "periph/i2c.h"
 #include "saul.h"
@@ -122,4 +122,4 @@ int jc42_get_temperature(jc42_t* dev, int16_t* temperature);
 #endif
 
 /** @} */
-#endif /* JC42_TEMP_H_ */
+#endif /* JC42_TEMP_H */
diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h
index f37ea2688e06315ace0417d5093c7c0dc2bc2f50..4af9faf2a13fcab8db3df3fe55c6a80ec8105c88 100644
--- a/drivers/include/kw2xrf.h
+++ b/drivers/include/kw2xrf.h
@@ -19,8 +19,8 @@
  * @author      Jonas Remmert <j.remmert@phytec.de>
  */
 
-#ifndef MKW2XDRF_H_
-#define MKW2XDRF_H_
+#ifndef MKW2XDRF_H
+#define MKW2XDRF_H
 
 #include <stdint.h>
 
diff --git a/drivers/include/led.h b/drivers/include/led.h
index 7415a39e54d306b991271e2d35ab022d62b86522..09fa19f7d62e59b6e71435866dab5e3ba9c74ca9 100644
--- a/drivers/include/led.h
+++ b/drivers/include/led.h
@@ -29,8 +29,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef LED_H_
-#define LED_H_
+#ifndef LED_H
+#define LED_H
 
 #include "board.h"
 
@@ -104,5 +104,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LED_H_ */
+#endif /* LED_H */
 /** @} */
diff --git a/drivers/include/lis3dh.h b/drivers/include/lis3dh.h
index 4e8377f81327621434256a0e18ea043ae7c8c5b3..ec4bfb8298c81149dcd5396051670187ea2afada 100644
--- a/drivers/include/lis3dh.h
+++ b/drivers/include/lis3dh.h
@@ -19,8 +19,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef LIS3DH_H_
-#define LIS3DH_H_
+#ifndef LIS3DH_H
+#define LIS3DH_H
 
 #include <stdint.h>
 
@@ -859,5 +859,5 @@ int lis3dh_get_fifo_level(lis3dh_t *dev);
 }
 #endif
 
-#endif /* LIS3DH_H_ */
+#endif /* LIS3DH_H */
 /** @} */
diff --git a/drivers/include/lm75a-temp-sensor.h b/drivers/include/lm75a-temp-sensor.h
index 560edca24ba19e4dc2674c2c7d04d231fe3e7932..d99452927bfe1efe0c354b8a00e5330b04b2aeb3 100644
--- a/drivers/include/lm75a-temp-sensor.h
+++ b/drivers/include/lm75a-temp-sensor.h
@@ -24,8 +24,8 @@
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
-#ifndef LM75A_H_
-#define LM75A_H_
+#ifndef LM75A_H
+#define LM75A_H
 
 #include <stdint.h>
 #include <math.h>
@@ -275,4 +275,4 @@ void lm75A_set_in_alarm(bool b);
 #endif
 
 /** @} */
-#endif /* LM75A_H_ */
+#endif /* LM75A_H */
diff --git a/drivers/include/mpu9150.h b/drivers/include/mpu9150.h
index c12ee75ce7b405ec8e565e6cf2148c2a4bd176ad..2ef93b85f6b9c09740a4cbe2e948bb8e1f315b5c 100644
--- a/drivers/include/mpu9150.h
+++ b/drivers/include/mpu9150.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef MPU9150_H_
-#define MPU9150_H_
+#ifndef MPU9150_H
+#define MPU9150_H
 
 #include "periph/i2c.h"
 
@@ -336,5 +336,5 @@ int mpu9150_set_compass_sample_rate(mpu9150_t *dev, uint8_t rate);
 }
 #endif
 
-#endif /* MPU9150_H_ */
+#endif /* MPU9150_H */
 /** @} */
diff --git a/drivers/include/net/netdev2/ieee802154.h b/drivers/include/net/netdev2/ieee802154.h
index b94a7f9d54017fcafbb879da860f97615ea4e11d..96bfc0cccafb29de72d644833218897c8963968d 100644
--- a/drivers/include/net/netdev2/ieee802154.h
+++ b/drivers/include/net/netdev2/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_IEEE802154_H_
-#define NETDEV2_IEEE802154_H_
+#ifndef NETDEV2_IEEE802154_H
+#define NETDEV2_IEEE802154_H
 
 #include "net/ieee802154.h"
 #include "net/gnrc/nettype.h"
@@ -164,5 +164,5 @@ int netdev2_ieee802154_set(netdev2_ieee802154_t *dev, netopt_t opt, void *value,
 }
 #endif
 
-#endif /* NETDEV2_IEEE802154_H_ */
+#endif /* NETDEV2_IEEE802154_H */
 /** @} */
diff --git a/drivers/include/nvram-spi.h b/drivers/include/nvram-spi.h
index 45a8e77c35af3044a37b86caae8d05fd7519fa77..c03a163106cc206feb55fd62a07cc444831be06a 100644
--- a/drivers/include/nvram-spi.h
+++ b/drivers/include/nvram-spi.h
@@ -20,8 +20,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef DRIVERS_NVRAM_SPI_H_
-#define DRIVERS_NVRAM_SPI_H_
+#ifndef DRIVERS_NVRAM_SPI_H
+#define DRIVERS_NVRAM_SPI_H
 
 #include <stdint.h>
 #include "nvram.h"
@@ -62,5 +62,5 @@ int nvram_spi_init(nvram_t *dev, nvram_spi_params_t *spi_params, size_t size);
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_SPI_H_ */
+#endif /* DRIVERS_NVRAM_SPI_H */
 /** @} */
diff --git a/drivers/include/nvram.h b/drivers/include/nvram.h
index b2db5cfec42fd747d4e86a40abc6dfd8b162bd1d..2ad3d9f13527d15fb8066ce174a6b8811b0e3bc5 100644
--- a/drivers/include/nvram.h
+++ b/drivers/include/nvram.h
@@ -24,8 +24,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef DRIVERS_NVRAM_H_
-#define DRIVERS_NVRAM_H_
+#ifndef DRIVERS_NVRAM_H
+#define DRIVERS_NVRAM_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -83,5 +83,5 @@ typedef struct nvram {
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_H_ */
+#endif /* DRIVERS_NVRAM_H */
 /** @} */
diff --git a/drivers/include/periph/cpuid.h b/drivers/include/periph/cpuid.h
index e673c30bcb15eb70e3386bd0b3d4aa731e54a29c..eca8142d6754641c8efea16595be801b8c912fd8 100644
--- a/drivers/include/periph/cpuid.h
+++ b/drivers/include/periph/cpuid.h
@@ -20,8 +20,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef PERIPH_CPUID_H_
-#define PERIPH_CPUID_H_
+#ifndef PERIPH_CPUID_H
+#define PERIPH_CPUID_H
 
 #include "periph_cpu.h"
 
@@ -51,7 +51,7 @@ void cpuid_get(void *id);
 }
 #endif
 
-#endif /* PERIPH_CPUID_H_ */
+#endif /* PERIPH_CPUID_H */
 /**
  * @}
  */
diff --git a/drivers/include/periph/dev_enums.h b/drivers/include/periph/dev_enums.h
index 3079719a1197d4ca328cfd24061892f89df9a9ec..0fa4524be6d762856ca1ce8dcc565296e624a7d9 100644
--- a/drivers/include/periph/dev_enums.h
+++ b/drivers/include/periph/dev_enums.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_COMPAT_H_
-#define PERIPH_COMPAT_H_
+#ifndef PERIPH_COMPAT_H
+#define PERIPH_COMPAT_H
 
 #include "periph_conf.h"
 
@@ -118,5 +118,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_COMPAT_H_ */
+#endif /* PERIPH_COMPAT_H */
 /** @} */
diff --git a/drivers/include/periph/pm.h b/drivers/include/periph/pm.h
index ff3f355308c4124ffec93477ce85dbe339371d76..bd6a1e72e3df668992990c8ac8b8bb72fbe3ea7d 100644
--- a/drivers/include/periph/pm.h
+++ b/drivers/include/periph/pm.h
@@ -23,8 +23,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PM_H_
-#define PM_H_
+#ifndef PM_H
+#define PM_H
 
 #include "assert.h"
 #include "periph_cpu.h"
@@ -54,5 +54,5 @@ void pm_set_lowest(void);
 }
 #endif
 
-#endif /* __PM_H_ */
+#endif /* __PM_H */
 /** @} */
diff --git a/drivers/include/pn532.h b/drivers/include/pn532.h
index a9c4e80eb8c13cccbe04232698ff08ddc662dabf..73dc57dec262fdef148729d88d2427388a692b6b 100644
--- a/drivers/include/pn532.h
+++ b/drivers/include/pn532.h
@@ -16,8 +16,8 @@
  * @author  Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef NFC_READER_INCLUDE_PN532_H_
-#define NFC_READER_INCLUDE_PN532_H_
+#ifndef NFC_READER_INCLUDE_PN532_H
+#define NFC_READER_INCLUDE_PN532_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -381,5 +381,5 @@ void pn532_release_passive(pn532_t *dev, unsigned target_id);
 }
 #endif
 
-#endif /* NFC_READER_INCLUDE_PN532_H_ */
+#endif /* NFC_READER_INCLUDE_PN532_H */
 /** @} */
diff --git a/drivers/include/sht11.h b/drivers/include/sht11.h
index 82df5e8ea3a38973e7c49c7022909df58cc6cb0f..ae3b7c4647eb347b8135e9f54a20fbbdf4eea3c6 100644
--- a/drivers/include/sht11.h
+++ b/drivers/include/sht11.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11_H_
-#define SHT11_H_
+#ifndef SHT11_H
+#define SHT11_H
 
 /**
  * @defgroup    drivers_sht11   SHT11
diff --git a/drivers/include/si70xx.h b/drivers/include/si70xx.h
index bc281c60bf95480ef35585eb060e4ac8b7a8c33f..0a2eee680309ba5138f4db2ed710fc92cf7786c6 100644
--- a/drivers/include/si70xx.h
+++ b/drivers/include/si70xx.h
@@ -18,8 +18,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef SI70XX_H_
-#define SI70XX_H_
+#ifndef SI70XX_H
+#define SI70XX_H
 
 #include "periph/i2c.h"
 
@@ -162,5 +162,5 @@ uint8_t si70xx_get_revision(si70xx_t *dev);
 }
 #endif
 
-#endif /* SI70XX_H_ */
+#endif /* SI70XX_H */
 /** @} */
diff --git a/drivers/include/srf02.h b/drivers/include/srf02.h
index 055f855be4f5f19452c7c109291a28b66a1c90e1..0456face2f8e291d4e9be6e33e105683d6f39182 100644
--- a/drivers/include/srf02.h
+++ b/drivers/include/srf02.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef SRF02_H_
-#define SRF02_H_
+#ifndef SRF02_H
+#define SRF02_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -129,5 +129,5 @@ void srf02_set_addr(srf02_t *dev, uint8_t new_addr);
 }
 #endif
 
-#endif /* SRF02_H_ */
+#endif /* SRF02_H */
 /** @} */
diff --git a/drivers/include/srf08.h b/drivers/include/srf08.h
index 4f41ac64ebc37777a0b28bdfd801943bf3c8841e..087121c40fce83cc651abd1ca40ccc667142bea5 100644
--- a/drivers/include/srf08.h
+++ b/drivers/include/srf08.h
@@ -24,8 +24,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef SRF08_H_
-#define SRF08_H_
+#ifndef SRF08_H
+#define SRF08_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -161,4 +161,4 @@ int srf08_get_distances(srf08_t *dev, uint16_t *range_array, int num_echos, srf0
 #endif
 
 /** @} */
-#endif /* SRF08_H_ */
+#endif /* SRF08_H */
diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h
index d0f993dca47cc065828b885778026e660ca1a676..a88398bbc84846b87e72e3e932b10c18d74e7adc 100644
--- a/drivers/include/xbee.h
+++ b/drivers/include/xbee.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef XBEE_H_
-#define XBEE_H_
+#ifndef XBEE_H
+#define XBEE_H
 
 #include <stdint.h>
 
@@ -222,5 +222,5 @@ int xbee_parse_hdr(xbee_t *dev, const uint8_t *xhdr, xbee_l2hdr_t *l2hdr);
 }
 #endif
 
-#endif /* XBEE_H_ */
+#endif /* XBEE_H */
 /** @} */
diff --git a/drivers/io1_xplained/include/io1_xplained_internals.h b/drivers/io1_xplained/include/io1_xplained_internals.h
index e3c929c3bfc0475f62a899ecbd431fe5c7b1755b..3fb6a5ce68e3f1db973abd8169e00578be8935a9 100644
--- a/drivers/io1_xplained/include/io1_xplained_internals.h
+++ b/drivers/io1_xplained/include/io1_xplained_internals.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef IO1_XPLAINED_INTERNALS_H_
-#define IO1_XPLAINED_INTERNALS_H_
+#ifndef IO1_XPLAINED_INTERNALS_H
+#define IO1_XPLAINED_INTERNALS_H
 
 #include "cpu.h"
 #include "periph_cpu.h"
@@ -56,5 +56,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IO1_XPLAINED_INTERNALS_H_ */
+#endif /* IO1_XPLAINED_INTERNALS_H */
 /** @} */
diff --git a/drivers/jc42/include/jc42_internal.h b/drivers/jc42/include/jc42_internal.h
index dbafae7028d3366f18ad4b41e895d3450eed5ed3..ec46507d27b2cf80ece3510544187e9597a93f17 100644
--- a/drivers/jc42/include/jc42_internal.h
+++ b/drivers/jc42/include/jc42_internal.h
@@ -16,8 +16,8 @@
  * @author      Koen Zandberg <koen@bergzand.net>
  */
 
-#ifndef JC42_INTERNAL_H_
-#define JC42_INTERNAL_H_
+#ifndef JC42_INTERNAL_H
+#define JC42_INTERNAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ extern "C" {
 /** @} */
 
 
-#endif /* JC42_INTERNAL_H_ */
+#endif /* JC42_INTERNAL_H */
diff --git a/drivers/mpu9150/include/mpu9150-regs.h b/drivers/mpu9150/include/mpu9150-regs.h
index 9dd6e59f605daacdfddf1cf8de30ac1715197a0b..e5ecb8da12eb8e2208b736a64e43e6c141e46a42 100644
--- a/drivers/mpu9150/include/mpu9150-regs.h
+++ b/drivers/mpu9150/include/mpu9150-regs.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef MPU9150_REGS_H_
-#define MPU9150_REGS_H_
+#ifndef MPU9150_REGS_H
+#define MPU9150_REGS_H
 
 
 #ifdef __cplusplus
@@ -99,5 +99,5 @@
 }
 #endif
 
-#endif /* MPU9150_REGS_H_ */
+#endif /* MPU9150_REGS_H */
 /** @} */
diff --git a/examples/riot_and_cpp/c_functions.h b/examples/riot_and_cpp/c_functions.h
index 068251b339bae0e73bb566a13c258edf72750f74..9d3ee18a8d26b08872c3afbf7baca54514976a89 100644
--- a/examples/riot_and_cpp/c_functions.h
+++ b/examples/riot_and_cpp/c_functions.h
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 
-#ifndef C_FUNCTIONS_H_
-#define C_FUNCTIONS_H_
+#ifndef C_FUNCTIONS_H
+#define C_FUNCTIONS_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/examples/riot_and_cpp/cpp_class.hpp b/examples/riot_and_cpp/cpp_class.hpp
index 81dc07e385f8749e94e31c50025acb770750fed8..19f0c075f9c2c43c8f4d12bc4fb9dbe440f23df4 100644
--- a/examples/riot_and_cpp/cpp_class.hpp
+++ b/examples/riot_and_cpp/cpp_class.hpp
@@ -20,8 +20,8 @@
  * @author      DangNhat Pham-Huu <51002279@stu.hcmut.edu.vn>
  */
 
-#ifndef CPP_CLASS_H_
-#define CPP_CLASS_H_
+#ifndef CPP_CLASS_H
+#define CPP_CLASS_H
 
 #include <cstdio>
 
diff --git a/pkg/emb6/include/board_conf.h b/pkg/emb6/include/board_conf.h
index 56c765618874e2714b9641de25a2c93bae1f0aaf..4cd41308e4e8678e8ee60fe487dfe2c34e68b6fb 100644
--- a/pkg/emb6/include/board_conf.h
+++ b/pkg/emb6/include/board_conf.h
@@ -18,8 +18,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef EMB6_BOARD_CONF_H_
-#define EMB6_BOARD_CONF_H_
+#ifndef EMB6_BOARD_CONF_H
+#define EMB6_BOARD_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,6 +41,6 @@ uint8_t board_conf(s_ns_t *ps_nStack);
 }
 #endif
 
-#endif /* EMB6_BOARD_CONF_H_ */
+#endif /* EMB6_BOARD_CONF_H */
 /** @} */
 /** @} */
diff --git a/pkg/emb6/include/emb6/conn/udp.h b/pkg/emb6/include/emb6/conn/udp.h
index dc835ca06bd0e7cd6e9467e4deca5628ec9c4962..07386f59f810fbea38dd87bf55d9fd768f6b488e 100644
--- a/pkg/emb6/include/emb6/conn/udp.h
+++ b/pkg/emb6/include/emb6/conn/udp.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef EMB6_CONN_UDP_H_
-#define EMB6_CONN_UDP_H_
+#ifndef EMB6_CONN_UDP_H
+#define EMB6_CONN_UDP_H
 
 #include <stdint.h>
 
@@ -58,5 +58,5 @@ struct conn_udp {
 }
 #endif
 
-#endif /* EMB6_CONN_UDP_H_ */
+#endif /* EMB6_CONN_UDP_H */
 /** @} */
diff --git a/pkg/emb6/include/emb6/netdev2.h b/pkg/emb6/include/emb6/netdev2.h
index 3076603ffcd7b66fad4ac7734934649a06597798..ca85fd8087070439f31e9ef76bd8fc3862e61ca6 100644
--- a/pkg/emb6/include/emb6/netdev2.h
+++ b/pkg/emb6/include/emb6/netdev2.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef EMB6_NETDEV2_H_
-#define EMB6_NETDEV2_H_
+#ifndef EMB6_NETDEV2_H
+#define EMB6_NETDEV2_H
 
 #include "net/netdev2.h"
 
@@ -52,5 +52,5 @@ int emb6_netdev2_setup(netdev2_t *dev);
 }
 #endif
 
-#endif /* EMB6_NETDEV2_H_ */
+#endif /* EMB6_NETDEV2_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip.h b/pkg/lwip/include/lwip.h
index 999d07bca092ca938523a0ecdc14cd37e857f7fa..a866c85c5b0a39672dd68e6fd2cbf32ef9a475b2 100644
--- a/pkg/lwip/include/lwip.h
+++ b/pkg/lwip/include/lwip.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_H_
-#define LWIP_H_
+#ifndef LWIP_H
+#define LWIP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,5 +41,5 @@ void lwip_bootstrap(void);
 }
 #endif
 
-#endif /* LWIP_H_ */
+#endif /* LWIP_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/conn.h b/pkg/lwip/include/lwip/conn.h
index be7bda1cff450ea0f32a33a136606cbef0e0fefc..4f815cb62dfe897f41cfdaa233e7bade860fcb2b 100644
--- a/pkg/lwip/include/lwip/conn.h
+++ b/pkg/lwip/include/lwip/conn.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_CONN_H_
-#define LWIP_CONN_H_
+#ifndef LWIP_CONN_H
+#define LWIP_CONN_H
 
 #include "lwip/api.h"
 
@@ -89,5 +89,5 @@ int lwip_conn_sendto(struct netconn *netconn, const void *data, size_t len,
 }
 #endif
 
-#endif /* LWIP_CONN_H_ */
+#endif /* LWIP_CONN_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/netif/netdev2.h b/pkg/lwip/include/lwip/netif/netdev2.h
index 93a7db9250e7c0dd558b98a62de7044bc28bdc84..0af5102148021c494afd724aac11ef7a6d563443 100644
--- a/pkg/lwip/include/lwip/netif/netdev2.h
+++ b/pkg/lwip/include/lwip/netif/netdev2.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_H_
-#define NETDEV2_H_
+#ifndef LWIP_NETDEV2_H
+#define LWIP_NETDEV2_H
 
 #include "net/ethernet.h"
 #include "net/netdev2.h"
@@ -58,5 +58,5 @@ err_t lwip_netdev2_init(struct netif *netif);
 }
 #endif
 
-#endif /* NETDEV2_H_ */
+#endif /* LWIP_NETDEV2_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/sock_internal.h b/pkg/lwip/include/lwip/sock_internal.h
index a0c0e464c6eacb30106679a95e363e1c7902bbad..1ac5860eecbdbecdf5179fcfe5371ef87495b7f2 100644
--- a/pkg/lwip/include/lwip/sock_internal.h
+++ b/pkg/lwip/include/lwip/sock_internal.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_INTERNAL_H_
-#define SOCK_INTERNAL_H_
+#ifndef SOCK_INTERNAL_H
+#define SOCK_INTERNAL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -55,5 +55,5 @@ ssize_t lwip_sock_send(struct netconn **conn, const void *data, size_t len,
 }
 #endif
 
-#endif /* SOCK_INTERNAL_H_ */
+#endif /* SOCK_INTERNAL_H */
 /** @} */
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index 404864eb25fbd6bf26e2ae4d7815936809656928..6dedf10f5a906121fe03513236aa52da2d7750a1 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_LWIPOPTS_H_
-#define LWIP_LWIPOPTS_H_
+#ifndef LWIP_LWIPOPTS_H
+#define LWIP_LWIPOPTS_H
 
 #include "thread.h"
 #include "net/gnrc/netif/hdr.h"
@@ -153,5 +153,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LWIP_LWIPOPTS_H_ */
+#endif /* LWIP_LWIPOPTS_H */
 /** @} */
diff --git a/pkg/lwip/include/sock_types.h b/pkg/lwip/include/sock_types.h
index e0d80501164623d9c8df0ad9c2faac164f5d398b..1dff41acf3ad82cab792863f57f0bd9dfa942f05 100644
--- a/pkg/lwip/include/sock_types.h
+++ b/pkg/lwip/include/sock_types.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_TYPES_H_
-#define SOCK_TYPES_H_
+#ifndef SOCK_TYPES_H
+#define SOCK_TYPES_H
 
 #include "net/af.h"
 #include "lwip/api.h"
@@ -37,5 +37,5 @@ struct sock_ip {
 }
 #endif
 
-#endif /* SOCK_TYPES_H_ */
+#endif /* SOCK_TYPES_H */
 /** @} */
diff --git a/pkg/nordic_softdevice_ble/src/ble-core.h b/pkg/nordic_softdevice_ble/src/ble-core.h
index 84c181d2eff4dd41250e184a4c0f14bfdcb70680..cfda2ae349e9a9a7cb3688cb8c7d1e7514f949ae 100644
--- a/pkg/nordic_softdevice_ble/src/ble-core.h
+++ b/pkg/nordic_softdevice_ble/src/ble-core.h
@@ -42,8 +42,8 @@
  * \author
  *         Wojciech Bober <wojciech.bober@nordicsemi.no>
  */
-#ifndef DEV_BLE_H_
-#define DEV_BLE_H_
+#ifndef DEV_BLE_H
+#define DEV_BLE_H
 
 #include <stdint.h>
 
@@ -52,7 +52,7 @@ void ble_advertising_init(const char *name);
 void ble_advertising_start(void);
 void ble_get_mac(uint8_t addr[8]);
 
-#endif /* DEV_BLE_H_ */
+#endif /* DEV_BLE_H */
 
 /**
  * @}
diff --git a/sys/embunit/ColorTextColors.h b/sys/embunit/ColorTextColors.h
index eb057b700409d8b4f3f651cb7a277344e3af142b..a6878b49cbb975888cb2f823e1eb1102b3888f30 100644
--- a/sys/embunit/ColorTextColors.h
+++ b/sys/embunit/ColorTextColors.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef EMBUNIT_COLORTEXTCOLORS_H_
-#define EMBUNIT_COLORTEXTCOLORS_H_
+#ifndef EMBUNIT_COLORTEXTCOLORS_H
+#define EMBUNIT_COLORTEXTCOLORS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,5 +53,5 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_COLORTEXTCOLORS_H_ */
+#endif/* EMBUNIT_COLORTEXTCOLORS_H */
 /** @} */
diff --git a/sys/include/base64.h b/sys/include/base64.h
index 21caa50a1ad56dcd4ba66b9e60a2971186112e87..c545cfab5baa7789fab760acdc9cc8de2619f733 100644
--- a/sys/include/base64.h
+++ b/sys/include/base64.h
@@ -17,8 +17,8 @@
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
 
-#ifndef BASE64_ENCODER_DECODER_H_
-#define BASE64_ENCODER_DECODER_H_
+#ifndef BASE64_ENCODER_DECODER_H
+#define BASE64_ENCODER_DECODER_H
 
 #include <stddef.h> /* for size_t */
 
@@ -79,4 +79,4 @@ int base64_decode(unsigned char *base64_in, size_t base64_in_size, \
 #endif
 
 /** @} */
-#endif /* BASE64_ENCODER_DECODER_H_ */
+#endif /* BASE64_ENCODER_DECODER_H */
diff --git a/sys/include/checksum/ucrc16.h b/sys/include/checksum/ucrc16.h
index 5e48e9a081adc124b8ff3ae7a707abd2bd14768c..60c2db524d645ecc13af4a939ea65619f650a1e1 100644
--- a/sys/include/checksum/ucrc16.h
+++ b/sys/include/checksum/ucrc16.h
@@ -26,8 +26,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef UCRC16_H_
-#define UCRC16_H_
+#ifndef UCRC16_H
+#define UCRC16_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -78,5 +78,5 @@ uint16_t ucrc16_calc_le(const uint8_t *buf, size_t len, uint16_t poly,
 }
 #endif
 
-#endif /* UCRC16_H_ */
+#endif /* UCRC16_H */
 /** @} */
diff --git a/sys/include/crypto/3des.h b/sys/include/crypto/3des.h
index 13c54dc2b8ddb788e4be6b8e52ec33e01027d157..1551f9e12b0f4b13aa5a2f7d2a1323643bab3304 100644
--- a/sys/include/crypto/3des.h
+++ b/sys/include/crypto/3des.h
@@ -26,8 +26,8 @@
 
 #include "crypto/ciphers.h"
 
-#ifndef THREEDES_H_
-#define THREEDES_H_
+#ifndef THREEDES_H
+#define THREEDES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -134,4 +134,4 @@ int tripledes_decrypt(const cipher_context_t *context, const uint8_t *crypt, uin
 #endif
 
 /** @} */
-#endif /* THREEDES_H_ */
+#endif /* THREEDES_H */
diff --git a/sys/include/crypto/cbcmode.h b/sys/include/crypto/cbcmode.h
index ecb1efaab0141bf08844c530884911154dad7844..4a3a80ee137708722a356f7d4de0ebd0156abadc 100644
--- a/sys/include/crypto/cbcmode.h
+++ b/sys/include/crypto/cbcmode.h
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#ifndef CBCMODE_H_
-#define CBCMODE_H_
+#ifndef CBCMODE_H
+#define CBCMODE_H
 
 #include "crypto/ciphers.h"
 
@@ -214,4 +214,4 @@ int block_cipher_mode_decrypt(CipherModeContext *context,
 #endif
 
 /** @} */
-#endif /* CBCMODE_H_ */
+#endif /* CBCMODE_H */
diff --git a/sys/include/crypto/chacha.h b/sys/include/crypto/chacha.h
index 5dd18f563235b4678d396990673977d94fb982ad..120e91171ccbc12d91f088dfd05f17f9dfc5d9c1 100644
--- a/sys/include/crypto/chacha.h
+++ b/sys/include/crypto/chacha.h
@@ -31,8 +31,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CRYPTO_CHACHA_H_
-#define CRYPTO_CHACHA_H_
+#ifndef CRYPTO_CHACHA_H
+#define CRYPTO_CHACHA_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -137,7 +137,7 @@ uint32_t chacha_prng_next(void);
 }
 #endif
 
-#endif /* ifndef CRYPTO_CHACHA_H_ */
+#endif /* ifndef CRYPTO_CHACHA_H */
 
 /**
  * @}
diff --git a/sys/include/crypto/ciphers.h b/sys/include/crypto/ciphers.h
index a003514ef3b6105e532f5d0f332db91b800d69af..d931b6746b2780149719f4bd87e64b571cea292a 100644
--- a/sys/include/crypto/ciphers.h
+++ b/sys/include/crypto/ciphers.h
@@ -19,8 +19,8 @@
  * @author      Mark Essien <markessien@gmail.com>
  */
 
-#ifndef CRYPTO_CIPHERS_H_
-#define CRYPTO_CIPHERS_H_
+#ifndef CRYPTO_CIPHERS_H
+#define CRYPTO_CIPHERS_H
 
 #include <stdint.h>
 
@@ -171,4 +171,4 @@ int cipher_get_block_size(const cipher_t* cipher);
 #endif
 
 /** @} */
-#endif /* CRYPTO_CIPHERS_H_ */
+#endif /* CRYPTO_CIPHERS_H */
diff --git a/sys/include/crypto/helper.h b/sys/include/crypto/helper.h
index 5af1551017b1d8e3b3b5fea3f52a753931449ae6..054a82d08f4fc81bbb2682984f22904b663f5b1e 100644
--- a/sys/include/crypto/helper.h
+++ b/sys/include/crypto/helper.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_HELPER_H_
-#define CRYPTO_MODES_HELPER_H_
+#ifndef CRYPTO_MODES_HELPER_H
+#define CRYPTO_MODES_HELPER_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -53,4 +53,4 @@ int crypto_equals(uint8_t *a, uint8_t *b, size_t len);
 }
 #endif
 
-#endif /* CRYPTO_MODES_HELPER_H_ */
+#endif /* CRYPTO_MODES_HELPER_H */
diff --git a/sys/include/crypto/modes/cbc.h b/sys/include/crypto/modes/cbc.h
index 338066fd8ab0f9a5251a212b8dfb37c56e6535be..022bfa20f14c70a6df32994840d7f9973094223c 100644
--- a/sys/include/crypto/modes/cbc.h
+++ b/sys/include/crypto/modes/cbc.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CBC_H_
-#define CRYPTO_MODES_CBC_H_
+#ifndef CRYPTO_MODES_CBC_H
+#define CRYPTO_MODES_CBC_H
 
 #include "crypto/ciphers.h"
 
@@ -58,4 +58,4 @@ int cipher_decrypt_cbc(cipher_t* cipher, uint8_t iv[16], uint8_t* input,
 }
 #endif
 
-#endif /* CRYPTO_MODES_CBC_H_ */
+#endif /* CRYPTO_MODES_CBC_H */
diff --git a/sys/include/crypto/modes/ccm.h b/sys/include/crypto/modes/ccm.h
index 6f31704b50f260c8a67fc40551a65ccfeb612ee1..c5cf5e1b6b41cddb2fe27b76170006cf06338f07 100644
--- a/sys/include/crypto/modes/ccm.h
+++ b/sys/include/crypto/modes/ccm.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CCM_H_
-#define CRYPTO_MODES_CCM_H_
+#ifndef CRYPTO_MODES_CCM_H
+#define CRYPTO_MODES_CCM_H
 
 #include "crypto/ciphers.h"
 
@@ -85,4 +85,4 @@ int cipher_decrypt_ccm(cipher_t* cipher, uint8_t* auth_data,
 }
 #endif
 
-#endif /* CRYPTO_MODES_CCM_H_ */
+#endif /* CRYPTO_MODES_CCM_H */
diff --git a/sys/include/crypto/modes/ctr.h b/sys/include/crypto/modes/ctr.h
index e1ce1ad7d14792cea769e4c6f8f352d3685447ee..f3db7af733093d9855cf72ae1b583fb8cdd1a24e 100644
--- a/sys/include/crypto/modes/ctr.h
+++ b/sys/include/crypto/modes/ctr.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CTR_H_
-#define CRYPTO_MODES_CTR_H_
+#ifndef CRYPTO_MODES_CTR_H
+#define CRYPTO_MODES_CTR_H
 
 #include "crypto/ciphers.h"
 
diff --git a/sys/include/crypto/modes/ecb.h b/sys/include/crypto/modes/ecb.h
index 4c0738c6bbc84f3ebe614c6d8f339ac4d2173d6c..2cb8aa7fc7540d27ccd4788d600cc9458f639beb 100644
--- a/sys/include/crypto/modes/ecb.h
+++ b/sys/include/crypto/modes/ecb.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_ECB_H_
-#define CRYPTO_MODES_ECB_H_
+#ifndef CRYPTO_MODES_ECB_H
+#define CRYPTO_MODES_ECB_H
 
 #include "crypto/ciphers.h"
 
diff --git a/sys/include/embUnit/AssertImpl.h b/sys/include/embUnit/AssertImpl.h
index c82d36523c12cea2b41552dd56c257372d67ae74..5ce4f45c7934abc4b311b4d834d7caf637f55e8d 100644
--- a/sys/include/embUnit/AssertImpl.h
+++ b/sys/include/embUnit/AssertImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: AssertImpl.h,v 1.6 2003/09/16 11:09:53 arms22 Exp $
  */
-#ifndef EMBUNIT_ASSERTIMPL_H_
-#define EMBUNIT_ASSERTIMPL_H_
+#ifndef EMBUNIT_ASSERTIMPL_H
+#define EMBUNIT_ASSERTIMPL_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ void assertImplementationCStr(const char *expected,const char *actual, long line
 }
 #endif
 
-#endif/* EMBUNIT_ASSERTIMPL_H_ */
+#endif/* EMBUNIT_ASSERTIMPL_H */
diff --git a/sys/include/embUnit/ColorOutputter.h b/sys/include/embUnit/ColorOutputter.h
index b1faed4a61b8d5690864390c5b2f123ceeb3fe62..e2aaadd1592c532db32980782fa9ca33b49084ee 100644
--- a/sys/include/embUnit/ColorOutputter.h
+++ b/sys/include/embUnit/ColorOutputter.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef EMBUNIT_COLOROUTPUTTER_H_
-#define EMBUNIT_COLOROUTPUTTER_H_
+#ifndef EMBUNIT_COLOROUTPUTTER_H
+#define EMBUNIT_COLOROUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -41,5 +41,5 @@ void ColorOutputter_printStatistics(OutputterRef self, TestResultRef result);
 }
 #endif
 
-#endif/* EMBUNIT_COLOROUTPUTTER_H_ */
+#endif/* EMBUNIT_COLOROUTPUTTER_H */
 /** @} */
diff --git a/sys/include/embUnit/ColorTextOutputter.h b/sys/include/embUnit/ColorTextOutputter.h
index ccced25ffff52b4503a55f15f5f13845d9d661c8..9aebdc83cbced961e4efc275e26868b4dc94e5ef 100644
--- a/sys/include/embUnit/ColorTextOutputter.h
+++ b/sys/include/embUnit/ColorTextOutputter.h
@@ -11,8 +11,8 @@
  *
  * @file    ColorTextOutputter.h
  */
-#ifndef EMBUNIT_COLORTEXTOUTPUTTER_H_
-#define EMBUNIT_COLORTEXTOUTPUTTER_H_
+#ifndef EMBUNIT_COLORTEXTOUTPUTTER_H
+#define EMBUNIT_COLORTEXTOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -26,5 +26,5 @@ OutputterRef ColorTextOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_COLORTEXTOUTPUTTER_H_ */
+#endif/* EMBUNIT_COLORTEXTOUTPUTTER_H */
 /** @} */
diff --git a/sys/include/embUnit/CompilerOutputter.h b/sys/include/embUnit/CompilerOutputter.h
index dad11aacca044946b683fd08c94ef285a20710e7..95612d176d0f7b595d53ab633364bff8b60a0217 100644
--- a/sys/include/embUnit/CompilerOutputter.h
+++ b/sys/include/embUnit/CompilerOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: CompilerOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_COMPILEROUTPUTTER_H_
-#define EMBUNIT_COMPILEROUTPUTTER_H_
+#ifndef EMBUNIT_COMPILEROUTPUTTER_H
+#define EMBUNIT_COMPILEROUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef CompilerOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_COMPILEROUTPUTTER_H_ */
+#endif/* EMBUNIT_COMPILEROUTPUTTER_H */
diff --git a/sys/include/embUnit/HelperMacro.h b/sys/include/embUnit/HelperMacro.h
index ef244eeaf3de2c6f022f29f029dd37ebbc1f247e..5e0a5333c2f7cb8ed57a7cfe4636443aa7145a04 100644
--- a/sys/include/embUnit/HelperMacro.h
+++ b/sys/include/embUnit/HelperMacro.h
@@ -32,8 +32,8 @@
  *
  * $Id: HelperMacro.h,v 1.3 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_HELPERMACRO_H_
-#define EMBUNIT_HELPERMACRO_H_
+#ifndef EMBUNIT_HELPERMACRO_H
+#define EMBUNIT_HELPERMACRO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_HELPERMACRO_H_ */
+#endif/* EMBUNIT_HELPERMACRO_H */
diff --git a/sys/include/embUnit/Outputter.h b/sys/include/embUnit/Outputter.h
index fe7746ff13a8cb96224da8684804a4f74ef7ca56..972e7f770dcc4d0972acca469417d72df688fabb 100644
--- a/sys/include/embUnit/Outputter.h
+++ b/sys/include/embUnit/Outputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: Outputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_OUTPUTTER_H_
-#define EMBUNIT_OUTPUTTER_H_
+#ifndef EMBUNIT_OUTPUTTER_H
+#define EMBUNIT_OUTPUTTER_H
 
 #include <embUnit/embUnit.h>
 
@@ -79,4 +79,4 @@ struct __Outputter {
 }
 #endif
 
-#endif/* EMBUNIT_OUTPUTTER_H_ */
+#endif/* EMBUNIT_OUTPUTTER_H */
diff --git a/sys/include/embUnit/RepeatedTest.h b/sys/include/embUnit/RepeatedTest.h
index b246d81155ed208886fecd40258152d9384fe6cc..345ff2e00b34f4b6f5bdb0f972cbf4f12a19b60d 100644
--- a/sys/include/embUnit/RepeatedTest.h
+++ b/sys/include/embUnit/RepeatedTest.h
@@ -32,8 +32,8 @@
  *
  * $Id: RepeatedTest.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_REPEATEDTEST_H_
-#define EMBUNIT_REPEATEDTEST_H_
+#ifndef EMBUNIT_REPEATEDTEST_H
+#define EMBUNIT_REPEATEDTEST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ extern const TestImplement RepeatedTestImplement;
 }
 #endif
 
-#endif/* EMBUNIT_REPEATEDTEST_H_ */
+#endif/* EMBUNIT_REPEATEDTEST_H */
diff --git a/sys/include/embUnit/Test.h b/sys/include/embUnit/Test.h
index 596d7dfa9b704e9b92c5a084c419e4ddccee8b3e..8475464b5cdad7947a2f324a00c4493983c1d6bc 100644
--- a/sys/include/embUnit/Test.h
+++ b/sys/include/embUnit/Test.h
@@ -32,8 +32,8 @@
  *
  * $Id: Test.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TEST_H_
-#define EMBUNIT_TEST_H_
+#ifndef EMBUNIT_TEST_H
+#define EMBUNIT_TEST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ struct __Test {
 }
 #endif
 
-#endif/* EMBUNIT_TEST_H_ */
+#endif/* EMBUNIT_TEST_H */
diff --git a/sys/include/embUnit/TestCaller.h b/sys/include/embUnit/TestCaller.h
index f67d50822bc86193bc22602de62c8e0621c7fc32..bc103d17f44d619eb037a24f3d40206bfe565a94 100644
--- a/sys/include/embUnit/TestCaller.h
+++ b/sys/include/embUnit/TestCaller.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCaller.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTCALLER_H_
-#define EMBUNIT_TESTCALLER_H_
+#ifndef EMBUNIT_TESTCALLER_H
+#define EMBUNIT_TESTCALLER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ extern const TestImplement TestCallerImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTCALLER_H_ */
+#endif/* EMBUNIT_TESTCALLER_H */
diff --git a/sys/include/embUnit/TestCase.h b/sys/include/embUnit/TestCase.h
index eb65522001ffe31eef2c666e5c2730b8fe50fdd2..be98e99a4ed998b7345307ee12844f3c05f21c31 100644
--- a/sys/include/embUnit/TestCase.h
+++ b/sys/include/embUnit/TestCase.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCase.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTCASE_H_
-#define EMBUNIT_TESTCASE_H_
+#ifndef EMBUNIT_TESTCASE_H
+#define EMBUNIT_TESTCASE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,4 +65,4 @@ extern const TestImplement TestCaseImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTCASE_H_ */
+#endif/* EMBUNIT_TESTCASE_H */
diff --git a/sys/include/embUnit/TestListener.h b/sys/include/embUnit/TestListener.h
index 7a9879d68f420eb4062d0a7ac3046910e6b7e700..ffb0fda448c14f5d4b055229b92d4acafd72f3b0 100644
--- a/sys/include/embUnit/TestListener.h
+++ b/sys/include/embUnit/TestListener.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestListener.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTLISTENER_H_
-#define EMBUNIT_TESTLISTENER_H_
+#ifndef EMBUNIT_TESTLISTENER_H
+#define EMBUNIT_TESTLISTENER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ struct __TestListner {
 }
 #endif
 
-#endif/* EMBUNIT_TESTLISTENER_H_ */
+#endif/* EMBUNIT_TESTLISTENER_H */
diff --git a/sys/include/embUnit/TestResult.h b/sys/include/embUnit/TestResult.h
index 5ec20d1dbc422d49466867cc762b9ea495d4a479..6d7167f60f7809ebee778d260c81130eb4ea6fab 100644
--- a/sys/include/embUnit/TestResult.h
+++ b/sys/include/embUnit/TestResult.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestResult.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTRESULT_H_
-#define EMBUNIT_TESTRESULT_H_
+#ifndef EMBUNIT_TESTRESULT_H
+#define EMBUNIT_TESTRESULT_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ void TestResult_addFailure(TestResult* self,Test* test,const char* msg,int line,
 }
 #endif
 
-#endif/* EMBUNIT_TESTRESULT_H_ */
+#endif/* EMBUNIT_TESTRESULT_H */
diff --git a/sys/include/embUnit/TestRunner.h b/sys/include/embUnit/TestRunner.h
index d592c6370df31f0eb6db74bee1deadeabf956408..dfab0a461bcaff594f76fe1b40341ff1bc553b7d 100644
--- a/sys/include/embUnit/TestRunner.h
+++ b/sys/include/embUnit/TestRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestRunner.h,v 1.6 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTRUNNER_H_
-#define EMBUNIT_TESTRUNNER_H_
+#ifndef EMBUNIT_TESTRUNNER_H
+#define EMBUNIT_TESTRUNNER_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -49,4 +49,4 @@ extern int TestRunnerHadErrors;
 }
 #endif
 
-#endif/* EMBUNIT_TESTRUNNER_H_ */
+#endif/* EMBUNIT_TESTRUNNER_H */
diff --git a/sys/include/embUnit/TestSuite.h b/sys/include/embUnit/TestSuite.h
index 788d403cd476987da0fe31d426f7c42dcc621d2e..2fc378d64d1e41e31a6986e7f66685280aa08c2d 100644
--- a/sys/include/embUnit/TestSuite.h
+++ b/sys/include/embUnit/TestSuite.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestSuite.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTSUITE_H_
-#define EMBUNIT_TESTSUITE_H_
+#ifndef EMBUNIT_TESTSUITE_H
+#define EMBUNIT_TESTSUITE_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -63,4 +63,4 @@ extern const TestImplement TestSuiteImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTSUITE_H_ */
+#endif/* EMBUNIT_TESTSUITE_H */
diff --git a/sys/include/embUnit/TextOutputter.h b/sys/include/embUnit/TextOutputter.h
index 0ee943285147c50931ddc4ecf817efb149eb4013..89a42aa7d7b509cf6cd2a0f56d16596f6ce1229e 100644
--- a/sys/include/embUnit/TextOutputter.h
+++ b/sys/include/embUnit/TextOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_TEXTOUTPUTTER_H_
-#define EMBUNIT_TEXTOUTPUTTER_H_
+#ifndef EMBUNIT_TEXTOUTPUTTER_H
+#define EMBUNIT_TEXTOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef TextOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_TEXTOUTPUTTER_H_ */
+#endif/* EMBUNIT_TEXTOUTPUTTER_H */
diff --git a/sys/include/embUnit/TextUIRunner.h b/sys/include/embUnit/TextUIRunner.h
index 7dfc23b51389b90f3d230f0294f1e88cd3fe24aa..ea711baac95823b652ddbdadaac0f92f7cea43b1 100644
--- a/sys/include/embUnit/TextUIRunner.h
+++ b/sys/include/embUnit/TextUIRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextUIRunner.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_TEXTUIRUNNER_H_
-#define EMBUNIT_TEXTUIRUNNER_H_
+#ifndef EMBUNIT_TEXTUIRUNNER_H
+#define EMBUNIT_TEXTUIRUNNER_H
 
 #include "Outputter.h"
 
@@ -53,4 +53,4 @@ void TextUIRunner_end(void);
 }
 #endif
 
-#endif/* EMBUNIT_TEXTUIRUNNER_H_ */
+#endif/* EMBUNIT_TEXTUIRUNNER_H */
diff --git a/sys/include/embUnit/XMLOutputter.h b/sys/include/embUnit/XMLOutputter.h
index 49e31a71fa08d06ab09f0c27fc52239f21746065..af9077c5b1fe9f41014ffb9f85b7df736a26aab7 100644
--- a/sys/include/embUnit/XMLOutputter.h
+++ b/sys/include/embUnit/XMLOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: XMLOutputter.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_XMLOUTPUTTER_H_
-#define EMBUNIT_XMLOUTPUTTER_H_
+#ifndef EMBUNIT_XMLOUTPUTTER_H
+#define EMBUNIT_XMLOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -48,4 +48,4 @@ OutputterRef XMLOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_XMLOUTPUTTER_H_ */
+#endif/* EMBUNIT_XMLOUTPUTTER_H */
diff --git a/sys/include/embUnit/embUnit.h b/sys/include/embUnit/embUnit.h
index 866eb7408d7ffe280045c784705caacd89931036..212da419d56c4a9f9349d22abed2186bdc77529b 100644
--- a/sys/include/embUnit/embUnit.h
+++ b/sys/include/embUnit/embUnit.h
@@ -32,8 +32,8 @@
  *
  * $Id: embUnit.h,v 1.4 2004/02/10 16:16:19 arms22 Exp $
  */
-#ifndef EMBUNIT_EMBUNIT_H_
-#define EMBUNIT_EMBUNIT_H_
+#ifndef EMBUNIT_EMBUNIT_H
+#define EMBUNIT_EMBUNIT_H
 
 #include <embUnit/Test.h>
 #include <embUnit/TestCase.h>
@@ -55,4 +55,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_EMBUNIT_H_ */
+#endif/* EMBUNIT_EMBUNIT_H */
diff --git a/sys/include/embUnit/embUnit_config.h b/sys/include/embUnit/embUnit_config.h
index 469a32a2ef94bb7b7d7fb20fd6b2a894a967a29f..85d6145b70b100f5ce01c2ae1f4e872ace57a85e 100644
--- a/sys/include/embUnit/embUnit_config.h
+++ b/sys/include/embUnit/embUnit_config.h
@@ -32,8 +32,8 @@
  *
  * $Id: config.h,v 1.7 2004/02/10 16:17:07 arms22 Exp $
  */
-#ifndef EMBUNIT_CONFIG_H_
-#define EMBUNIT_CONFIG_H_
+#ifndef EMBUNIT_CONFIG_H
+#define EMBUNIT_CONFIG_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_CONFIG_H_ */
+#endif/* EMBUNIT_CONFIG_H */
diff --git a/sys/include/embUnit/stdImpl.h b/sys/include/embUnit/stdImpl.h
index ac334906fabaa6065bfbf60c388a6a21fa8aee0c..88ee57b4f6541f9bbc2e48bdcc9accf446336af7 100644
--- a/sys/include/embUnit/stdImpl.h
+++ b/sys/include/embUnit/stdImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: stdImpl.h,v 1.4 2004/02/10 16:15:25 arms22 Exp $
  */
-#ifndef EMBUNIT_STDIMPL_H_
-#define EMBUNIT_STDIMPL_H_
+#ifndef EMBUNIT_STDIMPL_H
+#define EMBUNIT_STDIMPL_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -59,4 +59,4 @@ static inline char* stdimpl_itoa(int v,char *string,int r)
 }
 #endif
 
-#endif/* EMBUNIT_STDIMPL_H_ */
+#endif/* EMBUNIT_STDIMPL_H */
diff --git a/sys/include/fmt.h b/sys/include/fmt.h
index d70591f9c3cf6d08690b55ccd9137e2c204bb2db..e3144c824ca89d8cf7ceeb9be8e5a98a64bb42a4 100644
--- a/sys/include/fmt.h
+++ b/sys/include/fmt.h
@@ -19,8 +19,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef FMT_H_
-#define FMT_H_
+#ifndef FMT_H
+#define FMT_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -280,4 +280,4 @@ void print_str(const char* str);
 #endif
 
 /** @} */
-#endif /* FMT_H_ */
+#endif /* FMT_H */
diff --git a/sys/include/hashes.h b/sys/include/hashes.h
index 84ed3413f00e1624dde446dfaaa503253793e06d..8e338076349ef549cc60a5a8a4998c75fa781138 100644
--- a/sys/include/hashes.h
+++ b/sys/include/hashes.h
@@ -17,8 +17,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef HASHES_H_
-#define HASHES_H_
+#ifndef HASHES_H
+#define HASHES_H
 
 #include <stddef.h>
 #include <inttypes.h>
@@ -160,4 +160,4 @@ uint32_t one_at_a_time_hash(const uint8_t *buf, size_t len);
 #endif
 
 /** @} */
-#endif /* HASHES_H_ */
+#endif /* HASHES_H */
diff --git a/sys/include/hashes/sha256.h b/sys/include/hashes/sha256.h
index 5368aae2ce00e8c816b1f3465b54b4d8d88fde01..887d028865877e16bde19d778e3bb499c2ddd759 100644
--- a/sys/include/hashes/sha256.h
+++ b/sys/include/hashes/sha256.h
@@ -41,8 +41,8 @@
  * @author      Rene Kijewski
  */
 
-#ifndef _SHA256_H_
-#define _SHA256_H_
+#ifndef _SHA256_H
+#define _SHA256_H
 
 #include <inttypes.h>
 
@@ -203,4 +203,4 @@ int sha256_chain_verify_element(void *element,
 #endif
 
 /** @} */
-#endif /* _SHA256_H_ */
+#endif /* _SHA256_H */
diff --git a/sys/include/mineplex.h b/sys/include/mineplex.h
index 4f34d507360808eab1513fb5aaddd72e09741d90..4060ed1a2729a33d1e82241dd2176d90cca0403d 100644
--- a/sys/include/mineplex.h
+++ b/sys/include/mineplex.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MINEPLEX_H_
-#define MINEPLEX_H_
+#ifndef MINEPLEX_H
+#define MINEPLEX_H
 
 #include <stdint.h>
 
@@ -55,5 +55,5 @@ const uint8_t *mineplex_char(char c);
 }
 #endif
 
-#endif /* MINEPLEX_H_ */
+#endif /* MINEPLEX_H */
 /** @} */
diff --git a/sys/include/net/af.h b/sys/include/net/af.h
index ff4017d3cb89d12c83de73e1af5d3bf11250bf03..3b462b60ebfdefa441da6eff934bfdc03b6560da 100644
--- a/sys/include/net/af.h
+++ b/sys/include/net/af.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef AF_H_
-#define AF_H_
+#ifndef AF_H
+#define AF_H
 
 
 
@@ -47,5 +47,5 @@ enum {
 }
 #endif
 
-#endif /* AF_H_ */
+#endif /* AF_H */
 /** @} */
diff --git a/sys/include/net/conn.h b/sys/include/net/conn.h
index 8577d746caf6a69fe4061579251e3fe046e7a4f7..7ea944f3c08f9346c5063abfd3b3a04ed64a09e6 100644
--- a/sys/include/net/conn.h
+++ b/sys/include/net/conn.h
@@ -73,8 +73,8 @@
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef NET_CONN_H_
-#define NET_CONN_H_
+#ifndef NET_CONN_H
+#define NET_CONN_H
 
 #include "net/conn/ip.h"
 #include "net/conn/tcp.h"
@@ -101,5 +101,5 @@ ipv6_addr_t *conn_find_best_source(const ipv6_addr_t *dst);
 }
 #endif
 
-#endif /* NET_CONN_H_ */
+#endif /* NET_CONN_H */
 /** @} */
diff --git a/sys/include/net/conn/ip.h b/sys/include/net/conn/ip.h
index cdd24395f8241767b55efd2fcd68dcd7019dbc7d..f3cfd697eb393f9d1c1afe05399cc4f3e0bcc580 100644
--- a/sys/include/net/conn/ip.h
+++ b/sys/include/net/conn/ip.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_IP_H_
-#define NET_CONN_IP_H_
+#ifndef NET_CONN_IP_H
+#define NET_CONN_IP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -129,5 +129,5 @@ int conn_ip_sendto(const void *data, size_t len, const void *src, size_t src_len
 }
 #endif
 
-#endif /* NET_CONN_IP_H_ */
+#endif /* NET_CONN_IP_H */
 /** @} */
diff --git a/sys/include/net/conn/tcp.h b/sys/include/net/conn/tcp.h
index 7e5a17f6b9c4bb09fd72f5612aad78171d486629..c87e2ce40e70f45ad52d5b6ff5a2e6eff2361478 100644
--- a/sys/include/net/conn/tcp.h
+++ b/sys/include/net/conn/tcp.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_TCP_H_
-#define NET_CONN_TCP_H_
+#ifndef NET_CONN_TCP_H
+#define NET_CONN_TCP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -174,5 +174,5 @@ int conn_tcp_send(conn_tcp_t *conn, const void *data, size_t len);
 }
 #endif
 
-#endif /* NET_CONN_TCP_H_ */
+#endif /* NET_CONN_TCP_H */
 /** @} */
diff --git a/sys/include/net/conn/udp.h b/sys/include/net/conn/udp.h
index d1f6102ede1ee2a589d415579b6611955f9dd6d5..eddaf4b378804aa06517e3a90a9782a8d197d42d 100644
--- a/sys/include/net/conn/udp.h
+++ b/sys/include/net/conn/udp.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_UDP_H_
-#define NET_CONN_UDP_H_
+#ifndef NET_CONN_UDP_H
+#define NET_CONN_UDP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -147,5 +147,5 @@ int conn_udp_sendto(const void *data, size_t len, const void *src, size_t src_le
 }
 #endif
 
-#endif /* NET_CONN_UDP4_H_ */
+#endif /* NET_CONN_UDP4_H */
 /** @} */
diff --git a/sys/include/net/csma_sender.h b/sys/include/net/csma_sender.h
index 6faed9db60f12481cbfcc70a48702dabf62e74c9..981bcb71b543244b7a2b3ca91db1c019143a6e38 100644
--- a/sys/include/net/csma_sender.h
+++ b/sys/include/net/csma_sender.h
@@ -22,8 +22,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef CSMA_SENDER_H_
-#define CSMA_SENDER_H_
+#ifndef CSMA_SENDER_H
+#define CSMA_SENDER_H
 
 #include <stdint.h>
 
@@ -140,6 +140,6 @@ int csma_sender_cca_send(netdev2_t *dev, struct iovec *vector, unsigned count);
 }
 #endif
 
-#endif /* CSMA_SENDER_H_ */
+#endif /* CSMA_SENDER_H */
 
 /** @} */
diff --git a/sys/include/net/ethernet.h b/sys/include/net/ethernet.h
index d3914984ff1d372e3ca38409213dba0a18ae6dd5..a7dde2f642f23c378990ac72fc616f9ebbee9648 100644
--- a/sys/include/net/ethernet.h
+++ b/sys/include/net/ethernet.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef ETHERNET_H_
-#define ETHERNET_H_
+#ifndef ETHERNET_H
+#define ETHERNET_H
 
 #include <stdint.h>
 
@@ -74,7 +74,7 @@ static inline void ethernet_get_iid(eui64_t *eui64, uint8_t *mac)
 }
 #endif
 
-#endif /* ETHERNET_H_ */
+#endif /* ETHERNET_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethernet/hdr.h b/sys/include/net/ethernet/hdr.h
index ec39186ad1c092b401ca1833ab29af1aa9b5217d..f0716643d30cbe4e37326c3783f5a4e36309c019 100644
--- a/sys/include/net/ethernet/hdr.h
+++ b/sys/include/net/ethernet/hdr.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef ETHERNET_HDR_H_
-#define ETHERNET_HDR_H_
+#ifndef ETHERNET_HDR_H
+#define ETHERNET_HDR_H
 
 #include <inttypes.h>
 
@@ -51,7 +51,7 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* ETHERNET_HDR_H_ */
+#endif /* ETHERNET_HDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethertype.h b/sys/include/net/ethertype.h
index 1f823f7899c2bcb1eb0f8128229b746177523434..297c48a504855855f8cdc9b899fe20527f382c5b 100644
--- a/sys/include/net/ethertype.h
+++ b/sys/include/net/ethertype.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef ETHERTYPE_H_
-#define ETHERTYPE_H_
+#ifndef ETHERTYPE_H
+#define ETHERTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,7 +42,7 @@ extern "C" {
 }
 #endif
 
-#endif /* ETHERTYPE_H_ */
+#endif /* ETHERTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/eui64.h b/sys/include/net/eui64.h
index 5a68c8692eb6702380778d8527c4969951fce406..d4900b0301ee6bbfcdea9a0ba002fa723b05dc12 100644
--- a/sys/include/net/eui64.h
+++ b/sys/include/net/eui64.h
@@ -21,8 +21,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef EUI64_H_
-#define EUI64_H_
+#ifndef EUI64_H
+#define EUI64_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -44,5 +44,5 @@ typedef union {
 }
 #endif
 
-#endif /* EUI64_H_ */
+#endif /* EUI64_H */
 /** @} */
diff --git a/sys/include/net/fib.h b/sys/include/net/fib.h
index d5c19181c2c818db773ac193655f4cd1507f251a..7d19002b9db79ad652581156eb8704529cfc257c 100644
--- a/sys/include/net/fib.h
+++ b/sys/include/net/fib.h
@@ -22,8 +22,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef FIB_H_
-#define FIB_H_
+#ifndef FIB_H
+#define FIB_H
 
 #include <stdint.h>
 
@@ -513,5 +513,5 @@ int fib_devel_get_lifetime(fib_table_t *table, uint64_t *lifetime, uint8_t *dst,
 }
 #endif
 
-#endif /* FIB_H_ */
+#endif /* FIB_H */
 /** @} */
diff --git a/sys/include/net/fib/table.h b/sys/include/net/fib/table.h
index 02f0f86c6bf4aea95ee61115261c700dcec882b3..124c4724b87a309fcfb0cbd207a43a2bbf58374f 100644
--- a/sys/include/net/fib/table.h
+++ b/sys/include/net/fib/table.h
@@ -16,8 +16,8 @@
  * @author      Martin Landsmann <martin.landsmann@haw-hamburg.de>
  */
 
-#ifndef FIB_TABLE_H_
-#define FIB_TABLE_H_
+#ifndef FIB_TABLE_H
+#define FIB_TABLE_H
 
 #include <stdint.h>
 
@@ -139,5 +139,5 @@ typedef struct {
 }
 #endif
 
-#endif /* FIB_TABLE_H_ */
+#endif /* FIB_TABLE_H */
 /** @} */
diff --git a/sys/include/net/gnrc.h b/sys/include/net/gnrc.h
index 80c041e305552f9ce62152c1292df395bf5973e6..f055d44783c2733b1f48d7236a261a319f7c0f55 100644
--- a/sys/include/net/gnrc.h
+++ b/sys/include/net/gnrc.h
@@ -280,8 +280,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETBASE_H_
-#define GNRC_NETBASE_H_
+#ifndef GNRC_NETBASE_H
+#define GNRC_NETBASE_H
 
 #include "net/netopt.h"
 #include "net/gnrc/netdev.h"
@@ -303,5 +303,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_NETBASE_H_ */
+#endif /* GNRC_NETBASE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/coap.h b/sys/include/net/gnrc/coap.h
index b7785424f30c4161ef3cec4fc60c74450f1d372d..b45d5ab511d2194ffce102941cf7e0dfc10a3d9f 100644
--- a/sys/include/net/gnrc/coap.h
+++ b/sys/include/net/gnrc/coap.h
@@ -132,8 +132,8 @@
  * @author      Ken Bannister <kb2ma@runbox.com>
  */
 
-#ifndef GCOAP_H_
-#define GCOAP_H_
+#ifndef GCOAP_H
+#define GCOAP_H
 
 #include "net/gnrc.h"
 #include "net/gnrc/ipv6.h"
@@ -384,5 +384,5 @@ void gcoap_op_state(uint8_t *open_reqs);
 }
 #endif
 
-#endif /* GCOAP_H_ */
+#endif /* GCOAP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/conn.h b/sys/include/net/gnrc/conn.h
index ad0d2100ff2a9e407a3e35aba2994788332dd7d2..013efddeac3489b1b3ef2b246cfb66191007cf72 100644
--- a/sys/include/net/gnrc/conn.h
+++ b/sys/include/net/gnrc/conn.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_CONN_H_
-#define GNRC_CONN_H_
+#ifndef GNRC_CONN_H
+#define GNRC_CONN_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -127,5 +127,5 @@ int gnrc_conn_recvfrom(conn_t *conn, void *data, size_t max_len, void *addr, siz
 }
 #endif
 
-#endif /* GNRC_CONN_H_ */
+#endif /* GNRC_CONN_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6.h b/sys/include/net/gnrc/icmpv6.h
index f78018980463959a380d620e56408f9e51ff1759..deccdb4d81fda9de2a38cd3a4e8f7038fcb842e9 100644
--- a/sys/include/net/gnrc/icmpv6.h
+++ b/sys/include/net/gnrc/icmpv6.h
@@ -24,8 +24,8 @@
  * @todo build error messages
  */
 
-#ifndef GNRC_ICMPV6_H_
-#define GNRC_ICMPV6_H_
+#ifndef GNRC_ICMPV6_H
+#define GNRC_ICMPV6_H
 
 #include "kernel_types.h"
 #include "net/icmpv6.h"
@@ -79,7 +79,7 @@ int gnrc_icmpv6_calc_csum(gnrc_pktsnip_t *hdr, gnrc_pktsnip_t *pseudo_hdr);
 }
 #endif
 
-#endif /* GNRC_ICMPV6_H_ */
+#endif /* GNRC_ICMPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/icmpv6/echo.h b/sys/include/net/gnrc/icmpv6/echo.h
index 91279f93f9682b88e5f327cfb7f58718fd2191de..9a3066adf22f5841ca7a6824e496dac83c3efaf7 100644
--- a/sys/include/net/gnrc/icmpv6/echo.h
+++ b/sys/include/net/gnrc/icmpv6/echo.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_ICMPV6_ECHO_H_
-#define GNRC_ICMPV6_ECHO_H_
+#ifndef GNRC_ICMPV6_ECHO_H
+#define GNRC_ICMPV6_ECHO_H
 
 #include <inttypes.h>
 
@@ -62,5 +62,5 @@ void gnrc_icmpv6_echo_req_handle(kernel_pid_t iface, ipv6_hdr_t *ipv6_hdr,
 }
 #endif
 
-#endif /* GNRC_ICMPV6_ECHO_H_ */
+#endif /* GNRC_ICMPV6_ECHO_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6/error.h b/sys/include/net/gnrc/icmpv6/error.h
index 74b868b34598b3cc6a2d483daad51479eb27be92..f02e1a0afd1718d15db04528556ef976ece7a149 100644
--- a/sys/include/net/gnrc/icmpv6/error.h
+++ b/sys/include/net/gnrc/icmpv6/error.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_ICMPV6_ERROR_H_
-#define GNRC_ICMPV6_ERROR_H_
+#ifndef GNRC_ICMPV6_ERROR_H
+#define GNRC_ICMPV6_ERROR_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -165,5 +165,5 @@ static inline void gnrc_icmpv6_error_param_prob_send(uint8_t code, void *ptr,
 }
 #endif
 
-#endif /* GNRC_ICMPV6_ERROR_H_ */
+#endif /* GNRC_ICMPV6_ERROR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h
index 39d56387cb5db841ddc01de0f8bdce85e5797c94..d688b4ec05e73bdb05c677d35e9c329e554fed67 100644
--- a/sys/include/net/gnrc/ipv6.h
+++ b/sys/include/net/gnrc/ipv6.h
@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GNRC_IPV6_H_
-#define GNRC_IPV6_H_
+#ifndef GNRC_IPV6_H
+#define GNRC_IPV6_H
 
 #include "kernel_types.h"
 #include "net/gnrc.h"
@@ -151,7 +151,7 @@ ipv6_hdr_t *gnrc_ipv6_get_header(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_IPV6_H_ */
+#endif /* GNRC_IPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/blacklist.h b/sys/include/net/gnrc/ipv6/blacklist.h
index 8a954d06c4b01dbee290710c84a64470f6714459..e536dc6e3097f63bbe1d390011a1c21efef3a85c 100644
--- a/sys/include/net/gnrc/ipv6/blacklist.h
+++ b/sys/include/net/gnrc/ipv6/blacklist.h
@@ -19,8 +19,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Martin Landsmann <martin.landsmann@haw-hamburg.de>
  */
-#ifndef GNRC_IPV6_BLACKLIST_H_
-#define GNRC_IPV6_BLACKLIST_H_
+#ifndef GNRC_IPV6_BLACKLIST_H
+#define GNRC_IPV6_BLACKLIST_H
 
 #include <stdbool.h>
 
@@ -75,5 +75,5 @@ void gnrc_ipv6_blacklist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_BLACKLIST_H_ */
+#endif /* GNRC_IPV6_BLACKLIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/ext.h b/sys/include/net/gnrc/ipv6/ext.h
index a7bcdf5396081c562c5d7e83e05b329ec9b52668..995dbe25b6c2774a71d45abc304fa30d4299e2d0 100644
--- a/sys/include/net/gnrc/ipv6/ext.h
+++ b/sys/include/net/gnrc/ipv6/ext.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef GNRC_IPV6_EXT_H_
-#define GNRC_IPV6_EXT_H_
+#ifndef GNRC_IPV6_EXT_H
+#define GNRC_IPV6_EXT_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -81,7 +81,7 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_build(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *next,
 }
 #endif
 
-#endif /* GNRC_IPV6_EXT_H_ */
+#endif /* GNRC_IPV6_EXT_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/hdr.h b/sys/include/net/gnrc/ipv6/hdr.h
index 6828e2f4169f07a21258c0ea3e1f4c9dbc99f5eb..aab108d9d597e9e2ab9228ce7a38ef8fe807eed9 100644
--- a/sys/include/net/gnrc/ipv6/hdr.h
+++ b/sys/include/net/gnrc/ipv6/hdr.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_IPV6_HDR_H_
-#define GNRC_IPV6_HDR_H_
+#ifndef GNRC_IPV6_HDR_H
+#define GNRC_IPV6_HDR_H
 
 #include <stdint.h>
 
@@ -50,5 +50,5 @@ gnrc_pktsnip_t *gnrc_ipv6_hdr_build(gnrc_pktsnip_t *payload, const ipv6_addr_t *
 }
 #endif
 
-#endif /* GNRC_IPV6_HDR_H_ */
+#endif /* GNRC_IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/nc.h b/sys/include/net/gnrc/ipv6/nc.h
index babc73822f44fcf7268de2d7edff48e222c36ea4..c197428c65d8a81f4fb0e8c3dfff3e209fd2738b 100644
--- a/sys/include/net/gnrc/ipv6/nc.h
+++ b/sys/include/net/gnrc/ipv6/nc.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_IPV6_NC_H_
-#define GNRC_IPV6_NC_H_
+#ifndef GNRC_IPV6_NC_H
+#define GNRC_IPV6_NC_H
 
 #include <assert.h>
 #include <stdbool.h>
@@ -313,7 +313,7 @@ kernel_pid_t gnrc_ipv6_nc_get_l2_addr(uint8_t *l2_addr, uint8_t *l2_addr_len,
 }
 #endif
 
-#endif /* GNRC_IPV6_NC_H_ */
+#endif /* GNRC_IPV6_NC_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/netif.h b/sys/include/net/gnrc/ipv6/netif.h
index 4de109421e1cc400fb198c03862daa7376381b13..f3a913c355c053b70c3e105733bf927e89c24e09 100644
--- a/sys/include/net/gnrc/ipv6/netif.h
+++ b/sys/include/net/gnrc/ipv6/netif.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_IPV6_NETIF_H_
-#define GNRC_IPV6_NETIF_H_
+#ifndef GNRC_IPV6_NETIF_H
+#define GNRC_IPV6_NETIF_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -607,7 +607,7 @@ netstats_t *gnrc_ipv6_netif_get_stats(kernel_pid_t pid);
 }
 #endif
 
-#endif /* NETIF_H_ */
+#endif /* NETIF_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/whitelist.h b/sys/include/net/gnrc/ipv6/whitelist.h
index 50b4e3cb781375f41d2cfc8998bd7cdcab6bc83a..9977dafc38b65b6830c0685b6f50d69dff5f71bc 100644
--- a/sys/include/net/gnrc/ipv6/whitelist.h
+++ b/sys/include/net/gnrc/ipv6/whitelist.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_IPV6_WHITELIST_H_
-#define GNRC_IPV6_WHITELIST_H_
+#ifndef GNRC_IPV6_WHITELIST_H
+#define GNRC_IPV6_WHITELIST_H
 
 #include <stdbool.h>
 
@@ -73,5 +73,5 @@ void gnrc_ipv6_whitelist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_WHITELIST_H_ */
+#endif /* GNRC_IPV6_WHITELIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/internal.h b/sys/include/net/gnrc/mac/internal.h
index 0c09e333dab7180a561507635a1310048551e5e3..19300ad2657c25e4400ebf59f5a433d2e027b80a 100644
--- a/sys/include/net/gnrc/mac/internal.h
+++ b/sys/include/net/gnrc/mac/internal.h
@@ -18,8 +18,8 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_MAC_INTERNAL_H_
-#define GNRC_MAC_INTERNAL_H_
+#ifndef GNRC_MAC_INTERNAL_H
+#define GNRC_MAC_INTERNAL_H
 
 #include <stdint.h>
 #include <net/ieee802154.h>
@@ -76,5 +76,5 @@ void gnrc_mac_dispatch(gnrc_mac_rx_t* rx);
 }
 #endif
 
-#endif /* GNRC_MAC_INTERNAL_H_ */
+#endif /* GNRC_MAC_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
index 47b5c29070844360679c854eafb8394d7bcbe80b..fd860ecee1543c1c7f1d1e4f26970ca1520dd933 100644
--- a/sys/include/net/gnrc/mac/types.h
+++ b/sys/include/net/gnrc/mac/types.h
@@ -18,8 +18,8 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_MAC_TYPES_H_
-#define GNRC_MAC_TYPES_H_
+#ifndef GNRC_MAC_TYPES_H
+#define GNRC_MAC_TYPES_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -186,5 +186,5 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_MAC_TYPES_H_ */
+#endif /* GNRC_MAC_TYPES_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp.h b/sys/include/net/gnrc/ndp.h
index e939d708ca82e3bfb4d8a423450fb93d8bb6c349..425a360063b9b5aa815ddbd7f255a0805f9f3289 100644
--- a/sys/include/net/gnrc/ndp.h
+++ b/sys/include/net/gnrc/ndp.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_NDP_H_
-#define GNRC_NDP_H_
+#ifndef GNRC_NDP_H
+#define GNRC_NDP_H
 
 #include <inttypes.h>
 #include <stdlib.h>
@@ -557,7 +557,7 @@ gnrc_pktsnip_t *gnrc_ndp_opt_mtu_build(uint32_t mtu, gnrc_pktsnip_t *next);
 }
 #endif
 
-#endif /* GNRC_NDP_H_ */
+#endif /* GNRC_NDP_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ndp/host.h b/sys/include/net/gnrc/ndp/host.h
index 0fc2edf8e93f2b332fd4790e55e5b60c1338af0e..d073f488c82549be5d4bbab4e307378d80cb85f2 100644
--- a/sys/include/net/gnrc/ndp/host.h
+++ b/sys/include/net/gnrc/ndp/host.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_HOST_H_
-#define GNRC_NDP_HOST_H_
+#ifndef GNRC_NDP_HOST_H
+#define GNRC_NDP_HOST_H
 
 #include "net/gnrc/ipv6/netif.h"
 
@@ -50,5 +50,5 @@ void gnrc_ndp_host_retrans_rtr_sol(gnrc_ipv6_netif_t *iface);
 }
 #endif
 
-#endif /* GNRC_NDP_HOST_H_ */
+#endif /* GNRC_NDP_HOST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/internal.h b/sys/include/net/gnrc/ndp/internal.h
index 91177f626502a7f61f3ae1fd80022607d5c332bc..ad9767078093feb2cf46a4b9baaa404d300392e4 100644
--- a/sys/include/net/gnrc/ndp/internal.h
+++ b/sys/include/net/gnrc/ndp/internal.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_INTERNAL_H_
-#define GNRC_NDP_INTERNAL_H_
+#ifndef GNRC_NDP_INTERNAL_H
+#define GNRC_NDP_INTERNAL_H
 
 #include "kernel_types.h"
 #include "net/gnrc/ipv6/nc.h"
@@ -211,5 +211,5 @@ static inline void gnrc_ndp_internal_reset_nbr_sol_timer(gnrc_ipv6_nc_t *nc_entr
 }
 #endif
 
-#endif /* GNRC_NDP_INTERNAL_H_ */
+#endif /* GNRC_NDP_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/node.h b/sys/include/net/gnrc/ndp/node.h
index 60999cdbd71495a81bd2ac35b335e88ea83d64f0..a5f4ae1e1e69ce746cf78d0ed1a63618d0b73440 100644
--- a/sys/include/net/gnrc/ndp/node.h
+++ b/sys/include/net/gnrc/ndp/node.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_NODE_H_
-#define GNRC_NDP_NODE_H_
+#ifndef GNRC_NDP_NODE_H
+#define GNRC_NDP_NODE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,5 +49,5 @@ kernel_pid_t gnrc_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
 }
 #endif
 
-#endif /* GNRC_NDP_NODE_H_ */
+#endif /* GNRC_NDP_NODE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/router.h b/sys/include/net/gnrc/ndp/router.h
index d82c9705fb83bee195cef31180dd357c6d48f5b6..9658d5876f4d333179ab3810a58ba78b7551a2b1 100644
--- a/sys/include/net/gnrc/ndp/router.h
+++ b/sys/include/net/gnrc/ndp/router.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_ROUTER_H_
-#define GNRC_NDP_ROUTER_H_
+#ifndef GNRC_NDP_ROUTER_H
+#define GNRC_NDP_ROUTER_H
 
 #include <stdbool.h>
 
@@ -84,5 +84,5 @@ void gnrc_ndp_router_send_rtr_adv(gnrc_ipv6_nc_t *neighbor);
 }
 #endif
 
-#endif /* GNRC_NDP_ROUTER_H_ */
+#endif /* GNRC_NDP_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netapi.h b/sys/include/net/gnrc/netapi.h
index 25dc2a41dd731e6ad7156478d9e7133fb0ae4ac5..15b3a136c3d3a183df041648b6ffd081327b0ebf 100644
--- a/sys/include/net/gnrc/netapi.h
+++ b/sys/include/net/gnrc/netapi.h
@@ -55,8 +55,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETAPI_H_
-#define GNRC_NETAPI_H_
+#ifndef GNRC_NETAPI_H
+#define GNRC_NETAPI_H
 
 #include "thread.h"
 #include "net/netopt.h"
@@ -210,7 +210,7 @@ int gnrc_netapi_set(kernel_pid_t pid, netopt_t opt, uint16_t context,
 }
 #endif
 
-#endif /* GNRC_NETAPI_H_ */
+#endif /* GNRC_NETAPI_H */
 /**
  * @}^
  */
diff --git a/sys/include/net/gnrc/netdev.h b/sys/include/net/gnrc/netdev.h
index 08e2aa3968b4aaee35b753999de1d1f7a8650780..fb8aac313f533a51c7bedaace066e3cbf0e703f6 100644
--- a/sys/include/net/gnrc/netdev.h
+++ b/sys/include/net/gnrc/netdev.h
@@ -24,8 +24,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETDEV_H_
-#define GNRC_NETDEV_H_
+#ifndef GNRC_NETDEV_H
+#define GNRC_NETDEV_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -189,5 +189,5 @@ struct gnrc_netdev {
 }
 #endif
 
-#endif /* GNRC_NETDEV_H_ */
+#endif /* GNRC_NETDEV_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev2/ieee802154.h b/sys/include/net/gnrc/netdev2/ieee802154.h
index c9acf9405b8e31ddaae13e9fdec488843230946d..b55b26695790876cfb2a2f0502068cc6930dd507 100644
--- a/sys/include/net/gnrc/netdev2/ieee802154.h
+++ b/sys/include/net/gnrc/netdev2/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETDEV2_IEEE802154_H_
-#define GNRC_NETDEV2_IEEE802154_H_
+#ifndef GNRC_NETDEV2_IEEE802154_H
+#define GNRC_NETDEV2_IEEE802154_H
 
 #include "net/netdev2/ieee802154.h"
 #include "net/gnrc/netdev2.h"
@@ -42,5 +42,5 @@ int gnrc_netdev2_ieee802154_init(gnrc_netdev2_t *gnrc_netdev2,
 }
 #endif
 
-#endif /* GNRC_IEEE802154_H_ */
+#endif /* GNRC_IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev2/xbee_adpt.h b/sys/include/net/gnrc/netdev2/xbee_adpt.h
index 68106c4e974c6d8f70bd1717d309cf23858ddd01..d1f254fab307cbfa91213083bbc82455916e577f 100644
--- a/sys/include/net/gnrc/netdev2/xbee_adpt.h
+++ b/sys/include/net/gnrc/netdev2/xbee_adpt.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETDEV2_XBEE_ADPT_H_
-#define GNRC_NETDEV2_XBEE_ADPT_H_
+#ifndef GNRC_NETDEV2_XBEE_ADPT_H
+#define GNRC_NETDEV2_XBEE_ADPT_H
 
 #include "xbee.h"
 #include "net/gnrc/netdev2.h"
@@ -48,5 +48,5 @@ void gnrc_netdev2_xbee_init(gnrc_netdev2_t *gnrc_netdev2, xbee_t *dev);
 }
 #endif
 
-#endif /* GNRC_NETDEV2_XBEE_ADPT_H_ */
+#endif /* GNRC_NETDEV2_XBEE_ADPT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/neterr.h b/sys/include/net/gnrc/neterr.h
index 19d1c41ceb24d4a2a13bba707eeba651bc93e1fd..838ddc7577235f39ddf3a3e5f7c50a4c68d4cfc4 100644
--- a/sys/include/net/gnrc/neterr.h
+++ b/sys/include/net/gnrc/neterr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETERR_H_
-#define GNRC_NETERR_H_
+#ifndef GNRC_NETERR_H
+#define GNRC_NETERR_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -89,5 +89,5 @@ static inline int gnrc_neterr_reg(gnrc_pktsnip_t *pkt)
 }
 #endif
 
-#endif /* GNRC_NETERR_H_ */
+#endif /* GNRC_NETERR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif.h b/sys/include/net/gnrc/netif.h
index 176b63170e5428c5994b7103aa365ab0ced789ed..f033aa2d9a9469f943d5b89a01df259276dee8b7 100644
--- a/sys/include/net/gnrc/netif.h
+++ b/sys/include/net/gnrc/netif.h
@@ -22,8 +22,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef GNRC_NETIF_H_
-#define GNRC_NETIF_H_
+#ifndef GNRC_NETIF_H
+#define GNRC_NETIF_H
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -142,5 +142,5 @@ size_t gnrc_netif_addr_from_str(uint8_t *out, size_t out_len, const char *str);
 }
 #endif
 
-#endif /* GNRC_NETIF_H_ */
+#endif /* GNRC_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif/hdr.h b/sys/include/net/gnrc/netif/hdr.h
index bcb93ad038dc8c6030b2927f6ad3015bf418c1a5..425278d71de2b5613cb411ea743396ac15afc0de 100644
--- a/sys/include/net/gnrc/netif/hdr.h
+++ b/sys/include/net/gnrc/netif/hdr.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef NETIF_HDR_H_
-#define NETIF_HDR_H_
+#ifndef NETIF_HDR_H
+#define NETIF_HDR_H
 
 #include <string.h>
 #include <stdint.h>
@@ -234,5 +234,5 @@ int gnrc_netif_hdr_get_srcaddr(gnrc_pktsnip_t* pkt, uint8_t** pointer_to_addr);
 }
 #endif
 
-#endif /* NETIF_HDR_H_ */
+#endif /* NETIF_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netreg.h b/sys/include/net/gnrc/netreg.h
index e078a51d9c2d1e3cedd2a862f87a3d7c9ece9c58..0e506683eda2708daadba35a5a1c856d121353b2 100644
--- a/sys/include/net/gnrc/netreg.h
+++ b/sys/include/net/gnrc/netreg.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETREG_H_
-#define NETREG_H_
+#ifndef NETREG_H
+#define NETREG_H
 
 #include <inttypes.h>
 
@@ -340,5 +340,5 @@ int gnrc_netreg_calc_csum(gnrc_pktsnip_t *hdr, gnrc_pktsnip_t *pseudo_hdr);
 }
 #endif
 
-#endif /* NETREG_H_ */
+#endif /* NETREG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettest.h b/sys/include/net/gnrc/nettest.h
index 6b7e9fddb3067feb88fae049651ffd949f98df32..5c1446c7ebd806fc704a19a7900b88f7886023f3 100644
--- a/sys/include/net/gnrc/nettest.h
+++ b/sys/include/net/gnrc/nettest.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETTEST_H_
-#define GNRC_NETTEST_H_
+#ifndef GNRC_NETTEST_H
+#define GNRC_NETTEST_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -264,5 +264,5 @@ void gnrc_nettest_reset(void);
 }
 #endif
 
-#endif /* GNRC_NETTEST_H_ */
+#endif /* GNRC_NETTEST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettype.h b/sys/include/net/gnrc/nettype.h
index ea52551f4c6e6f9195075030d52e8015b72ded4f..6bc8777b9d4785e9f0035cf2a58f1fc3b8ea1564 100644
--- a/sys/include/net/gnrc/nettype.h
+++ b/sys/include/net/gnrc/nettype.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETTYPE_H_
-#define GNRC_NETTYPE_H_
+#ifndef GNRC_NETTYPE_H
+#define GNRC_NETTYPE_H
 
 #include <inttypes.h>
 
@@ -245,5 +245,5 @@ static inline uint8_t gnrc_nettype_to_protnum(gnrc_nettype_t type)
 }
 #endif
 
-#endif /* GNRC_NETTYPE_H_ */
+#endif /* GNRC_NETTYPE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nomac.h b/sys/include/net/gnrc/nomac.h
index dcbefda65f622a99c7036c2f60e32cf2526d38b3..343433a17dc3b36d0708a4d8b5d368522148f1d7 100644
--- a/sys/include/net/gnrc/nomac.h
+++ b/sys/include/net/gnrc/nomac.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NOMAC_H_
-#define GNRC_NOMAC_H_
+#ifndef GNRC_NOMAC_H
+#define GNRC_NOMAC_H
 
 #include "net/gnrc/netdev.h"
 
@@ -58,5 +58,5 @@ kernel_pid_t gnrc_nomac_init(char *stack, int stacksize, char priority,
 }
 #endif
 
-#endif /* __NOMAC_H_ */
+#endif /* __NOMAC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pkt.h b/sys/include/net/gnrc/pkt.h
index b068ca3b00c56d7848d5126c6f14887e497e19e1..e6756bbc4bc3b2702c15e8763e6b3c87ffde085f 100644
--- a/sys/include/net/gnrc/pkt.h
+++ b/sys/include/net/gnrc/pkt.h
@@ -19,8 +19,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
-#ifndef GNRC_PKT_H_
-#define GNRC_PKT_H_
+#ifndef GNRC_PKT_H
+#define GNRC_PKT_H
 
 #include <inttypes.h>
 #include <stdlib.h>
@@ -196,5 +196,5 @@ gnrc_pktsnip_t *gnrc_pktsnip_search_type(gnrc_pktsnip_t *pkt,
 }
 #endif
 
-#endif /* GNRC_PKT_H_ */
+#endif /* GNRC_PKT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktbuf.h b/sys/include/net/gnrc/pktbuf.h
index af21f4a087067fb62535677f302a9cb1b34b891d..5939f17df89861140aa8782fbadebbaa0b0cddf7 100644
--- a/sys/include/net/gnrc/pktbuf.h
+++ b/sys/include/net/gnrc/pktbuf.h
@@ -27,8 +27,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
-#ifndef GNRC_PKTBUF_H_
-#define GNRC_PKTBUF_H_
+#ifndef GNRC_PKTBUF_H
+#define GNRC_PKTBUF_H
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -310,5 +310,5 @@ bool gnrc_pktbuf_is_sane(void);
 }
 #endif
 
-#endif /* GNRC_PKTBUF_H_ */
+#endif /* GNRC_PKTBUF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h
index 63d095a50f3ad77b71ce216543d2d05e8f46fd65..0afdaf079d971a9503a31b1c66c72c95857422ac 100644
--- a/sys/include/net/gnrc/pktdump.h
+++ b/sys/include/net/gnrc/pktdump.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_PKTDUMP_H_
-#define GNRC_PKTDUMP_H_
+#ifndef GNRC_PKTDUMP_H
+#define GNRC_PKTDUMP_H
 
 #include "kernel_types.h"
 
@@ -66,5 +66,5 @@ kernel_pid_t gnrc_pktdump_init(void);
 }
 #endif
 
-#endif /* GNRC_PKTDUMP_H_ */
+#endif /* GNRC_PKTDUMP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktqueue.h b/sys/include/net/gnrc/pktqueue.h
index e13c7c70d90b75000a58694fac2b7efc91d8b786..8826032391e726ffd89597a7da4aa12c74585957 100644
--- a/sys/include/net/gnrc/pktqueue.h
+++ b/sys/include/net/gnrc/pktqueue.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_PKTQUEUE_H_
-#define GNRC_PKTQUEUE_H_
+#ifndef GNRC_PKTQUEUE_H
+#define GNRC_PKTQUEUE_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -84,7 +84,7 @@ static inline gnrc_pktqueue_t *gnrc_pktqueue_remove_head(gnrc_pktqueue_t **queue
 }
 #endif
 
-#endif /* GNRC_PKTQUEUE_H_ */
+#endif /* GNRC_PKTQUEUE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h
index 997e194fdc5829f9137dad7b687ab65c2e4b5ea9..f2647f0c9717ccb75eac2bff52149c8457d5641e 100644
--- a/sys/include/net/gnrc/rpl.h
+++ b/sys/include/net/gnrc/rpl.h
@@ -95,8 +95,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_H_
-#define GNRC_RPL_H_
+#ifndef GNRC_RPL_H
+#define GNRC_RPL_H
 
 #include <string.h>
 #include <stdint.h>
@@ -634,5 +634,5 @@ static inline void gnrc_rpl_config_pio(gnrc_rpl_dodag_t *dodag, bool status)
 }
 #endif
 
-#endif /* GNRC_RPL_H_ */
+#endif /* GNRC_RPL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/dodag.h b/sys/include/net/gnrc/rpl/dodag.h
index 95ed66d5b3837e842e9d0ece52c4deacf1eeea50..9bc181481d7c6a2b1e07c04533486d8baef76017 100644
--- a/sys/include/net/gnrc/rpl/dodag.h
+++ b/sys/include/net/gnrc/rpl/dodag.h
@@ -20,8 +20,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_DODAG_H_
-#define GNRC_RPL_DODAG_H_
+#ifndef GNRC_RPL_DODAG_H
+#define GNRC_RPL_DODAG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -173,7 +173,7 @@ void gnrc_rpl_router_operation(gnrc_rpl_dodag_t *dodag);
 }
 #endif
 
-#endif /* GNRC_RPL_DODAG_H_ */
+#endif /* GNRC_RPL_DODAG_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/p2p.h b/sys/include/net/gnrc/rpl/p2p.h
index c1e0819b206adc8e71cfcc8a0e70707d432df3e5..e8f9f51884f965aa4cc09bbf17d944b4f939bed4 100644
--- a/sys/include/net/gnrc/rpl/p2p.h
+++ b/sys/include/net/gnrc/rpl/p2p.h
@@ -20,8 +20,8 @@
  *
  * @author  Cenk Gündoğan <mail@cgundogan.de>
  */
-#ifndef GNRC_RPL_P2P_H_
-#define GNRC_RPL_P2P_H_
+#ifndef GNRC_RPL_P2P_H
+#define GNRC_RPL_P2P_H
 
 #include "net/ipv6/addr.h"
 #include "net/gnrc.h"
@@ -176,5 +176,5 @@ void gnrc_rpl_p2p_update(void);
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_H_ */
+#endif /* GNRC_RPL_P2P_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/p2p_dodag.h b/sys/include/net/gnrc/rpl/p2p_dodag.h
index 466c7b71a9252a661e4344ea12a3d2f7bef59677..cc285b01aeebdf042ba119590bf37514384ad137 100644
--- a/sys/include/net/gnrc/rpl/p2p_dodag.h
+++ b/sys/include/net/gnrc/rpl/p2p_dodag.h
@@ -18,8 +18,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_P2P_DODAG_H_
-#define GNRC_RPL_P2P_DODAG_H_
+#ifndef GNRC_RPL_P2P_DODAG_H
+#define GNRC_RPL_P2P_DODAG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,7 +68,7 @@ gnrc_rpl_p2p_ext_t *gnrc_rpl_p2p_ext_get(gnrc_rpl_dodag_t *dodag);
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_DODAG_H_ */
+#endif /* GNRC_RPL_P2P_DODAG_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/p2p_structs.h b/sys/include/net/gnrc/rpl/p2p_structs.h
index 69602baf456b9e43ef49ab1477718f06cc110c57..39c87e5be51a42088fde7ec5c7e9c2d03fc3184f 100644
--- a/sys/include/net/gnrc/rpl/p2p_structs.h
+++ b/sys/include/net/gnrc/rpl/p2p_structs.h
@@ -18,8 +18,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_P2P_STRUCTS_H_
-#define GNRC_RPL_P2P_STRUCTS_H_
+#ifndef GNRC_RPL_P2P_STRUCTS_H
+#define GNRC_RPL_P2P_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,7 +100,7 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_STRUCTS_H_ */
+#endif /* GNRC_RPL_P2P_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/srh.h b/sys/include/net/gnrc/rpl/srh.h
index 8ed747a3853fa4544ba28b1c5b3b5c8fed398699..e8cdf79e492693a76fefd74d5ad7a9b93f597ebd 100644
--- a/sys/include/net/gnrc/rpl/srh.h
+++ b/sys/include/net/gnrc/rpl/srh.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_RPL_SRH_H_
-#define GNRC_RPL_SRH_H_
+#ifndef GNRC_RPL_SRH_H
+#define GNRC_RPL_SRH_H
 
 #include "net/ipv6/hdr.h"
 #include "net/ipv6/addr.h"
@@ -70,5 +70,5 @@ int gnrc_rpl_srh_process(ipv6_hdr_t *ipv6, gnrc_rpl_srh_t *rh);
 }
 #endif
 
-#endif /* GNRC_RPL_SRH_H_ */
+#endif /* GNRC_RPL_SRH_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/structs.h b/sys/include/net/gnrc/rpl/structs.h
index 06f7bd6c24884da58dd069a647854232b5e15e82..d61ceeea613cd204f39ddc86b46b284b1b531f80 100644
--- a/sys/include/net/gnrc/rpl/structs.h
+++ b/sys/include/net/gnrc/rpl/structs.h
@@ -20,8 +20,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_STRUCTS_H_
-#define GNRC_RPL_STRUCTS_H_
+#ifndef GNRC_RPL_STRUCTS_H
+#define GNRC_RPL_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -280,7 +280,7 @@ struct gnrc_rpl_instance {
 }
 #endif
 
-#endif /* GNRC_RPL_STRUCTS_H_ */
+#endif /* GNRC_RPL_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/sixlowpan.h b/sys/include/net/gnrc/sixlowpan.h
index 6f76c2698e025101e9a691ee87e8d67f8a1d0872..a0e564a7b5c1b9949bda7c04ddae927ee837ee38 100644
--- a/sys/include/net/gnrc/sixlowpan.h
+++ b/sys/include/net/gnrc/sixlowpan.h
@@ -97,8 +97,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_H_
-#define GNRC_SIXLOWPAN_H_
+#ifndef GNRC_SIXLOWPAN_H
+#define GNRC_SIXLOWPAN_H
 
 #include <stdbool.h>
 
@@ -150,5 +150,5 @@ kernel_pid_t gnrc_sixlowpan_init(void);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_H_ */
+#endif /* GNRC_SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/ctx.h b/sys/include/net/gnrc/sixlowpan/ctx.h
index 6d5aa862167450d2e2021da7d3edc08e747c51c3..ae4d9ff9f849f3adca6c29d19af788cab9c0c51a 100644
--- a/sys/include/net/gnrc/sixlowpan/ctx.h
+++ b/sys/include/net/gnrc/sixlowpan/ctx.h
@@ -23,8 +23,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_CTX_H_
-#define GNRC_SIXLOWPAN_CTX_H_
+#ifndef GNRC_SIXLOWPAN_CTX_H
+#define GNRC_SIXLOWPAN_CTX_H
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -136,5 +136,5 @@ void gnrc_sixlowpan_ctx_reset(void);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_CTX_H_ */
+#endif /* GNRC_SIXLOWPAN_CTX_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/frag.h b/sys/include/net/gnrc/sixlowpan/frag.h
index 47bc4060635ff8fde74a218903d808c6f924fe62..53a62c3c4f4e5612593ae25a01205103a79101db 100644
--- a/sys/include/net/gnrc/sixlowpan/frag.h
+++ b/sys/include/net/gnrc/sixlowpan/frag.h
@@ -22,8 +22,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
-#ifndef GNRC_SIXLOWPAN_FRAG_H_
-#define GNRC_SIXLOWPAN_FRAG_H_
+#ifndef GNRC_SIXLOWPAN_FRAG_H
+#define GNRC_SIXLOWPAN_FRAG_H
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -72,5 +72,5 @@ void gnrc_sixlowpan_frag_handle_pkt(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_FRAG_H_ */
+#endif /* GNRC_SIXLOWPAN_FRAG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/iphc.h b/sys/include/net/gnrc/sixlowpan/iphc.h
index 4d6bcd0dd804cb7cc14fd68c811cee343ad16b46..14dcbb9fb05105aad3e28cee30397ffe60ae1bc8 100644
--- a/sys/include/net/gnrc/sixlowpan/iphc.h
+++ b/sys/include/net/gnrc/sixlowpan/iphc.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_IPHC_H_
-#define GNRC_SIXLOWPAN_IPHC_H_
+#ifndef GNRC_SIXLOWPAN_IPHC_H
+#define GNRC_SIXLOWPAN_IPHC_H
 
 #include <stdbool.h>
 
@@ -64,5 +64,5 @@ bool gnrc_sixlowpan_iphc_encode(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_IPHC_H_ */
+#endif /* GNRC_SIXLOWPAN_IPHC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd.h b/sys/include/net/gnrc/sixlowpan/nd.h
index 91fac57ec2934a1735f5abd40ca806f34bc61a9a..14eece0958cc8891e294c64a85479169c7bf1afa 100644
--- a/sys/include/net/gnrc/sixlowpan/nd.h
+++ b/sys/include/net/gnrc/sixlowpan/nd.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_ND_H_
-#define GNRC_SIXLOWPAN_ND_H_
+#ifndef GNRC_SIXLOWPAN_ND_H
+#define GNRC_SIXLOWPAN_ND_H
 
 #include <stdint.h>
 
@@ -282,5 +282,5 @@ gnrc_pktsnip_t *gnrc_sixlowpan_nd_opt_abr_build(uint32_t version, uint16_t ltime
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_ND_H_ */
+#endif /* GNRC_SIXLOWPAN_ND_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd/border_router.h b/sys/include/net/gnrc/sixlowpan/nd/border_router.h
index 73e95b6630fa70183d2e9306da0d5365bd97ac03..f461626dcd2936647afeb3c1c363a7ae19b86c78 100644
--- a/sys/include/net/gnrc/sixlowpan/nd/border_router.h
+++ b/sys/include/net/gnrc/sixlowpan/nd/border_router.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_BORDER_ROUTER_H_
-#define GNRC_SIXLOWPAN_BORDER_ROUTER_H_
+#ifndef GNRC_SIXLOWPAN_BORDER_ROUTER_H
+#define GNRC_SIXLOWPAN_BORDER_ROUTER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_BORDER_ROUTER_H_ */
+#endif /* GNRC_SIXLOWPAN_BORDER_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd/router.h b/sys/include/net/gnrc/sixlowpan/nd/router.h
index 551f732abd039d0ca2da80a07f5a25a5b7bd6014..99114c03ffd1bac0803d132ebc0444a02d273c01 100644
--- a/sys/include/net/gnrc/sixlowpan/nd/router.h
+++ b/sys/include/net/gnrc/sixlowpan/nd/router.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_ND_ROUTER_H_
-#define GNRC_SIXLOWPAN_ND_ROUTER_H_
+#ifndef GNRC_SIXLOWPAN_ND_ROUTER_H
+#define GNRC_SIXLOWPAN_ND_ROUTER_H
 
 #include <stdbool.h>
 
@@ -222,5 +222,5 @@ void gnrc_sixlowpan_nd_router_abr_rem_ctx(gnrc_sixlowpan_nd_router_abr_t *abr, u
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_ND_ROUTER_H_ */
+#endif /* GNRC_SIXLOWPAN_ND_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/netif.h b/sys/include/net/gnrc/sixlowpan/netif.h
index 13589d1c075fd24e149504e33bcb07734146f88c..855eb20edc8f88a4dd761a255e5bf0994efd6634 100644
--- a/sys/include/net/gnrc/sixlowpan/netif.h
+++ b/sys/include/net/gnrc/sixlowpan/netif.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_NETIF_H_
-#define GNRC_SIXLOWPAN_NETIF_H_
+#ifndef GNRC_SIXLOWPAN_NETIF_H
+#define GNRC_SIXLOWPAN_NETIF_H
 
 #include <stdbool.h>
 
@@ -73,5 +73,5 @@ gnrc_sixlowpan_netif_t *gnrc_sixlowpan_netif_get(kernel_pid_t pid);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_NETIF_H_ */
+#endif /* GNRC_SIXLOWPAN_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/slip.h b/sys/include/net/gnrc/slip.h
index f21244befe95597d5f519c8c870be82fb8abc4ee..85e25586040d2e21ad11823af8155a70cedf4151 100644
--- a/sys/include/net/gnrc/slip.h
+++ b/sys/include/net/gnrc/slip.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_SLIP_H_
-#define GNRC_SLIP_H_
+#ifndef GNRC_SLIP_H
+#define GNRC_SLIP_H
 
 #include <inttypes.h>
 
@@ -88,5 +88,5 @@ kernel_pid_t gnrc_slip_init(gnrc_slip_dev_t *dev, uart_t uart, uint32_t baudrate
 }
 #endif
 
-#endif /* __SLIP_H_ */
+#endif /* __SLIP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tftp.h b/sys/include/net/gnrc/tftp.h
index 9b724bbc3adc2410ab846e19df1d9c09f679005b..48475c4145118a99ef70cdcc53294ca49b51f8d5 100644
--- a/sys/include/net/gnrc/tftp.h
+++ b/sys/include/net/gnrc/tftp.h
@@ -32,8 +32,8 @@
  * @author      Nick van IJzendoorn <nijzendoorn@engineering-spirit.nl>
  */
 
-#ifndef GNRC_TFTP_H_
-#define GNRC_TFTP_H_
+#ifndef GNRC_TFTP_H
+#define GNRC_TFTP_H
 
 #include <inttypes.h>
 
@@ -199,7 +199,7 @@ int gnrc_tftp_client_write(ipv6_addr_t *addr, const char *file_name, tftp_mode_t
 }
 #endif
 
-#endif /* GNRC_TFTP_H_ */
+#endif /* GNRC_TFTP_H */
 
 /**
  * @}
diff --git a/sys/include/net/gnrc/udp.h b/sys/include/net/gnrc/udp.h
index cc8b921fb06f4758a3a76ab7d602c3660f1c3d58..b9e1ec3c311e1f0287ee93bd0877ff3ada63316b 100644
--- a/sys/include/net/gnrc/udp.h
+++ b/sys/include/net/gnrc/udp.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_UDP_H_
-#define GNRC_UDP_H_
+#ifndef GNRC_UDP_H
+#define GNRC_UDP_H
 
 #include <stdint.h>
 
@@ -92,5 +92,5 @@ int gnrc_udp_init(void);
 }
 #endif
 
-#endif /* GNRC_UDP_H_ */
+#endif /* GNRC_UDP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/zep.h b/sys/include/net/gnrc/zep.h
index 9e0e55b97cdd3a6ea888fac3573944016677b276..6317d26c293664695cccc2736d7c70193b5e92dc 100644
--- a/sys/include/net/gnrc/zep.h
+++ b/sys/include/net/gnrc/zep.h
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef GNRC_ZEP_H_
-#define GNRC_ZEP_H_
+#ifndef GNRC_ZEP_H
+#define GNRC_ZEP_H
 
 #include <inttypes.h>
 
@@ -236,7 +236,7 @@ kernel_pid_t gnrc_zep_init(gnrc_zep_t *dev, uint16_t src_port, ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* GNRC_ZEP_H_ */
+#endif /* GNRC_ZEP_H */
 /**
  * @}
  */
diff --git a/sys/include/net/iana/portrange.h b/sys/include/net/iana/portrange.h
index 2ea7acdc339020c3934e89e48ec696002ba0d5fe..bc421634ce5ed3f581883f38c5fe2f238b9fa548 100644
--- a/sys/include/net/iana/portrange.h
+++ b/sys/include/net/iana/portrange.h
@@ -17,8 +17,8 @@
  *
  * @author  smlng <s@mlng.net>,
  */
-#ifndef IANA_H_
-#define IANA_H_
+#ifndef IANA_H
+#define IANA_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,5 +43,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IANA_H_ */
+#endif /* IANA_H */
 /** @} */
diff --git a/sys/include/net/icmp.h b/sys/include/net/icmp.h
index 533225e31d9bd5cfabf9cbea24902d41510eba41..ccdf2a96c87ec54b23de9fd6669573f8e46990b6 100644
--- a/sys/include/net/icmp.h
+++ b/sys/include/net/icmp.h
@@ -20,8 +20,8 @@
  *
  * @author  José Ignacio Alamos <jialamos@uc.cl>
  */
-#ifndef ICMP_H_
-#define ICMP_H_
+#ifndef ICMP_H
+#define ICMP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* ICMP_H_ */
+#endif /* ICMP_H */
 /** @} */
diff --git a/sys/include/net/icmpv6.h b/sys/include/net/icmpv6.h
index 256bf04c4fc2efd22a029adafb3acf40d9128dc6..19342af92acc4adb012ba75bf972707307419275 100644
--- a/sys/include/net/icmpv6.h
+++ b/sys/include/net/icmpv6.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef ICMPV6_H_
-#define ICMPV6_H_
+#ifndef ICMPV6_H
+#define ICMPV6_H
 
 #include <stdint.h>
 
@@ -221,5 +221,5 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* ICMPV6_H_ */
+#endif /* ICMPV6_H */
 /** @} */
diff --git a/sys/include/net/ieee802154.h b/sys/include/net/ieee802154.h
index ff169fb21ef0bbfe382b18a1a7749a4ca51981f3..0aa61e2b3e5317653c5d22437e0c14a4cfaa5463 100644
--- a/sys/include/net/ieee802154.h
+++ b/sys/include/net/ieee802154.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef IEEE802154_H_
-#define IEEE802154_H_
+#ifndef IEEE802154_H
+#define IEEE802154_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -298,5 +298,5 @@ static inline eui64_t *ieee802154_get_iid(eui64_t *eui64, const uint8_t *addr,
 }
 #endif
 
-#endif /* IEEE802154_H_ */
+#endif /* IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/inet_csum.h b/sys/include/net/inet_csum.h
index 6356e96998154526467cf64df9e7ee5cc94276e9..1d24ea75fd60ed79293772a51f625f660b59d38a 100644
--- a/sys/include/net/inet_csum.h
+++ b/sys/include/net/inet_csum.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef INET_CSUM_H_
-#define INET_CSUM_H_
+#ifndef INET_CSUM_H
+#define INET_CSUM_H
 
 #include <inttypes.h>
 #include <stddef.h>
@@ -77,5 +77,5 @@ static inline uint16_t inet_csum(uint16_t sum, const uint8_t *buf, uint16_t len)
 }
 #endif
 
-#endif /* INET_CSUM_H_ */
+#endif /* INET_CSUM_H */
 /** @} */
diff --git a/sys/include/net/ipv4.h b/sys/include/net/ipv4.h
index 4632e484e75d59e6765974af3484bd63b33438eb..ccca570dde18e11ac40766b66aadd903f9268a97 100644
--- a/sys/include/net/ipv4.h
+++ b/sys/include/net/ipv4.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV4_H_
-#define IPV4_H_
+#ifndef IPV4_H
+#define IPV4_H
 
 #include "net/ipv4/addr.h"
 
@@ -31,5 +31,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IPV4_H_ */
+#endif /* IPV4_H */
 /** @} */
diff --git a/sys/include/net/ipv4/addr.h b/sys/include/net/ipv4/addr.h
index 61222847303a56dc68fd5474bb97ea496b766e3a..0f99f9df0dade337480b811cc35e6c643ac18b11 100644
--- a/sys/include/net/ipv4/addr.h
+++ b/sys/include/net/ipv4/addr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV4_ADDR_H_
-#define IPV4_ADDR_H_
+#ifndef IPV4_ADDR_H
+#define IPV4_ADDR_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -87,5 +87,5 @@ ipv4_addr_t *ipv4_addr_from_str(ipv4_addr_t *result, const char *addr);
 }
 #endif
 
-#endif /* IPV4_ADDR_H_ */
+#endif /* IPV4_ADDR_H */
 /** @} */
diff --git a/sys/include/net/ipv6.h b/sys/include/net/ipv6.h
index aa5a4d56b1a63afda18bd3e14e4271325982c49e..f5a68a8f1040fa62f5a4ed0b897ea756b4198aba 100644
--- a/sys/include/net/ipv6.h
+++ b/sys/include/net/ipv6.h
@@ -21,8 +21,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_H_
-#define IPV6_H_
+#ifndef IPV6_H
+#define IPV6_H
 
 #include "net/ipv6/addr.h"
 #include "net/ipv6/ext.h"
@@ -46,5 +46,5 @@ extern "C" {
 #endif
 
 
-#endif /* IPV6_H_ */
+#endif /* IPV6_H */
 /** @} */
diff --git a/sys/include/net/ipv6/addr.h b/sys/include/net/ipv6/addr.h
index a46d27f98ef98e1b4c2cdf99dcdcf78c0ca5fc0e..89ecb4d70ba0bbc075ffd7362d8dea8ce1955fde 100644
--- a/sys/include/net/ipv6/addr.h
+++ b/sys/include/net/ipv6/addr.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef IPV6_ADDR_H_
-#define IPV6_ADDR_H_
+#ifndef IPV6_ADDR_H
+#define IPV6_ADDR_H
 
 #include <stdbool.h>
 #include <string.h>
@@ -780,7 +780,7 @@ void ipv6_addr_print(const ipv6_addr_t *addr);
 }
 #endif
 
-#endif /* IPV6_ADDR_H_ */
+#endif /* IPV6_ADDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ipv6/ext.h b/sys/include/net/ipv6/ext.h
index 0f4ab66dd2796441c79a0586d67199deb2b7585f..6b842c59cc68eb2981d6194949b8e9b2da952876 100644
--- a/sys/include/net/ipv6/ext.h
+++ b/sys/include/net/ipv6/ext.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_EXT_H_
-#define IPV6_EXT_H_
+#ifndef IPV6_EXT_H
+#define IPV6_EXT_H
 
 #include <stdint.h>
 
@@ -60,5 +60,5 @@ static inline ipv6_ext_t *ipv6_ext_get_next(ipv6_ext_t *ext)
 }
 #endif
 
-#endif /* IPV6_EXT_H_ */
+#endif /* IPV6_EXT_H */
 /** @} */
diff --git a/sys/include/net/ipv6/ext/rh.h b/sys/include/net/ipv6/ext/rh.h
index b26b97cc4ff81873e583a19530d5234e59994f43..a02c4752fdde87e0938a695505c30899c3deaeaa 100644
--- a/sys/include/net/ipv6/ext/rh.h
+++ b/sys/include/net/ipv6/ext/rh.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_EXT_RH_H_
-#define IPV6_EXT_RH_H_
+#ifndef IPV6_EXT_RH_H
+#define IPV6_EXT_RH_H
 
 #include <stdint.h>
 
@@ -73,5 +73,5 @@ int ipv6_ext_rh_process(ipv6_hdr_t *ipv6, ipv6_ext_rh_t *ext);
 }
 #endif
 
-#endif /* IPV6_EXT_RH_H_ */
+#endif /* IPV6_EXT_RH_H */
 /** @} */
diff --git a/sys/include/net/ipv6/hdr.h b/sys/include/net/ipv6/hdr.h
index 265dd9c71e69ac47be6eca336b9cca87f80bd79c..e607c061271563e2c058f2786873da1c7515ad2f 100644
--- a/sys/include/net/ipv6/hdr.h
+++ b/sys/include/net/ipv6/hdr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_HDR_H_
-#define IPV6_HDR_H_
+#ifndef IPV6_HDR_H
+#define IPV6_HDR_H
 
 #include <stdint.h>
 
@@ -308,5 +308,5 @@ void ipv6_hdr_print(ipv6_hdr_t *hdr);
 }
 #endif
 
-#endif /* IPV6_HDR_H_ */
+#endif /* IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/ndp.h b/sys/include/net/ndp.h
index ed9f12410179a5fa686c7878452d4cf255961b4d..d3a04fbae36a2af4b96a3ec6a8f9682b2760f543 100644
--- a/sys/include/net/ndp.h
+++ b/sys/include/net/ndp.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NDP_H_
-#define NDP_H_
+#ifndef NDP_H
+#define NDP_H
 
 #include <stdint.h>
 
@@ -291,5 +291,5 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* NDP_H_ */
+#endif /* NDP_H */
 /** @} */
diff --git a/sys/include/net/netdev2_test.h b/sys/include/net/netdev2_test.h
index 8af455ad715986ae66e4d51d548f723f938ec207..9e3c751b77a75ccdc29c67a3f9e70c5281565b5f 100644
--- a/sys/include/net/netdev2_test.h
+++ b/sys/include/net/netdev2_test.h
@@ -76,8 +76,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_TEST_H_
-#define NETDEV2_TEST_H_
+#ifndef NETDEV2_TEST_H
+#define NETDEV2_TEST_H
 
 #include "mutex.h"
 
@@ -302,5 +302,5 @@ void netdev2_test_reset(netdev2_test_t *dev);
 }
 #endif
 
-#endif /* NETDEV2_TEST_H_ */
+#endif /* NETDEV2_TEST_H */
 /** @} */
diff --git a/sys/include/net/netopt.h b/sys/include/net/netopt.h
index d9a02b1060749b3a70f42b7a611c23cb3acc0a5d..9ef932f756873d159542b5e289a227f9004aa366 100644
--- a/sys/include/net/netopt.h
+++ b/sys/include/net/netopt.h
@@ -22,8 +22,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NETOPT_H_
-#define NETOPT_H_
+#ifndef NETOPT_H
+#define NETOPT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -303,5 +303,5 @@ const char *netopt2str(netopt_t opt);
 }
 #endif
 
-#endif /* NETOPT_H_ */
+#endif /* NETOPT_H */
 /** @} */
diff --git a/sys/include/net/ntp_packet.h b/sys/include/net/ntp_packet.h
index c9e84b18e3775b3c67b6cbed7b6302afc09f1286..3484d54f643d12e7db849f54f43c1819fe2fd4da 100644
--- a/sys/include/net/ntp_packet.h
+++ b/sys/include/net/ntp_packet.h
@@ -19,8 +19,8 @@
  * @author      Martine Lenders <m.lenders@fu-berlin.de>
  */
 
-#ifndef NTP_PACKET_H_
-#define NTP_PACKET_H_
+#ifndef NTP_PACKET_H
+#define NTP_PACKET_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -163,5 +163,5 @@ static inline ntp_mode_t ntp_packet_get_mode(ntp_packet_t *packet)
 }
 #endif
 
-#endif /* NTP_PACKET_H_ */
+#endif /* NTP_PACKET_H */
 /** @} */
diff --git a/sys/include/net/ppp/hdr.h b/sys/include/net/ppp/hdr.h
index 4e22e0c1575bb1e37f8e15183a9a33fc19db46df..b4b29966177f21fc07344d60c5a8085b605846b1 100644
--- a/sys/include/net/ppp/hdr.h
+++ b/sys/include/net/ppp/hdr.h
@@ -18,8 +18,8 @@
  * @author  José Ignacio Alamos
  */
 
-#ifndef PPP_HDR_H_
-#define PPP_HDR_H_
+#ifndef PPP_HDR_H
+#define PPP_HDR_H
 
 #include <inttypes.h>
 
@@ -63,5 +63,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* PPP_HDR_H_ */
+#endif /* PPP_HDR_H */
 /** @} */
diff --git a/sys/include/net/ppptype.h b/sys/include/net/ppptype.h
index c2d14085a1ee056bbb28fc91c1650a7d7971b691..69d23c51faca9dc8c0f2836a0ca5224d7d4df22c 100644
--- a/sys/include/net/ppptype.h
+++ b/sys/include/net/ppptype.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef PPPTYPE_H_
-#define PPPTYPE_H_
+#ifndef PPPTYPE_H
+#define PPPTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +44,7 @@ extern "C" {
 }
 #endif
 
-#endif /* PPPTYPE_H_ */
+#endif /* PPPTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/protnum.h b/sys/include/net/protnum.h
index b1d00281f6a600d225e3ed536f4f205ff2ec7216..1db38342e45f894898320faa040f2d39ee1848c7 100644
--- a/sys/include/net/protnum.h
+++ b/sys/include/net/protnum.h
@@ -23,8 +23,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef PROTNUM_H_
-#define PROTNUM_H_
+#ifndef PROTNUM_H
+#define PROTNUM_H
 
 
 #ifdef __cplusplus
@@ -182,5 +182,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PROTNUM_H_ */
+#endif /* PROTNUM_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan.h b/sys/include/net/sixlowpan.h
index eb9bdac4eac7540d2caa5259437bb90a826d288c..de9c54f4328d5108d4d87616dc759433ce743203 100644
--- a/sys/include/net/sixlowpan.h
+++ b/sys/include/net/sixlowpan.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SIXLOWPAN_H_
-#define SIXLOWPAN_H_
+#ifndef SIXLOWPAN_H
+#define SIXLOWPAN_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -261,5 +261,5 @@ void sixlowpan_print(uint8_t *data, size_t size);
 }
 #endif
 
-#endif /* SIXLOWPAN_H_ */
+#endif /* SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan/nd.h b/sys/include/net/sixlowpan/nd.h
index ef8e91d39e6e6c76b7c783da32ff1793cce9ed1d..30a05fb180195007e8d1272989cf18643b320bd5 100644
--- a/sys/include/net/sixlowpan/nd.h
+++ b/sys/include/net/sixlowpan/nd.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SIXLOWPAN_ND_H_
-#define SIXLOWPAN_ND_H_
+#ifndef SIXLOWPAN_ND_H
+#define SIXLOWPAN_ND_H
 
 #include <stdint.h>
 
@@ -227,5 +227,5 @@ static inline void sixlowpan_nd_opt_6ctx_set_cid(sixlowpan_nd_opt_6ctx_t *ctx_op
 }
 #endif
 
-#endif /* SIXLOWPAN_ND_H_ */
+#endif /* SIXLOWPAN_ND_H */
 /** @} */
diff --git a/sys/include/net/sntp.h b/sys/include/net/sntp.h
index 7390438fcc227cabfdb33ad99e085a08d2fdc27b..23594a75a78cdb029144c6beb3550e6fb9228a43 100644
--- a/sys/include/net/sntp.h
+++ b/sys/include/net/sntp.h
@@ -19,8 +19,8 @@
  * @author      Martine Lenders <m.lenders@fu-berlin.de>
  */
 
-#ifndef SNTP_H_
-#define SNTP_H_
+#ifndef SNTP_H
+#define SNTP_H
 
 #include <stdint.h>
 #include "net/sock/udp.h"
@@ -51,5 +51,5 @@ int64_t sntp_get_offset(void);
 }
 #endif
 
-#endif /* SNTP_H_ */
+#endif /* SNTP_H */
 /** @} */
diff --git a/sys/include/net/sock.h b/sys/include/net/sock.h
index c1b8949c5a7b9b95db7399dd0f1b39f71f2758b2..dee7d009e778ccc16e8cd8e9dd5e192a4c557618 100644
--- a/sys/include/net/sock.h
+++ b/sys/include/net/sock.h
@@ -98,8 +98,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NET_SOCK_H_
-#define NET_SOCK_H_
+#ifndef NET_SOCK_H
+#define NET_SOCK_H
 
 #include <stdint.h>
 
@@ -231,5 +231,5 @@ struct _sock_tl_ep {
 }
 #endif
 
-#endif /* NET_SOCK_H_ */
+#endif /* NET_SOCK_H */
 /** @} */
diff --git a/sys/include/net/sock/ip.h b/sys/include/net/sock/ip.h
index 4b8d166f6a5edf43005c49c15a7d0c8d0d0b5eea..4ef4cf70530087c797f25b4bb5c57610b91ccc03 100644
--- a/sys/include/net/sock/ip.h
+++ b/sys/include/net/sock/ip.h
@@ -265,8 +265,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_IP_H_
-#define NET_SOCK_IP_H_
+#ifndef NET_SOCK_IP_H
+#define NET_SOCK_IP_H
 
 #include <assert.h>
 #include <stdint.h>
@@ -454,5 +454,5 @@ ssize_t sock_ip_send(sock_ip_t *sock, const void *data, size_t len,
 }
 #endif
 
-#endif /* NET_SOCK_IP_H_ */
+#endif /* NET_SOCK_IP_H */
 /** @} */
diff --git a/sys/include/net/sock/tcp.h b/sys/include/net/sock/tcp.h
index a1151d2c53fbbc5774922c3c8e83048af37f555c..29f3e32301cdb216ea00d27e0cdec39a7adb78fc 100644
--- a/sys/include/net/sock/tcp.h
+++ b/sys/include/net/sock/tcp.h
@@ -296,8 +296,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_TCP_H_
-#define NET_SOCK_TCP_H_
+#ifndef NET_SOCK_TCP_H
+#define NET_SOCK_TCP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -534,5 +534,5 @@ ssize_t sock_tcp_write(sock_tcp_t *sock, const void *data, size_t len);
 }
 #endif
 
-#endif /* NET_SOCK_TCP_H_ */
+#endif /* NET_SOCK_TCP_H */
 /** @} */
diff --git a/sys/include/net/sock/udp.h b/sys/include/net/sock/udp.h
index bea58f3e18d7050134d59c058db99395959ff1ea..bd37fb351c3ef06f3b9133b5aeae42d176e173a7 100644
--- a/sys/include/net/sock/udp.h
+++ b/sys/include/net/sock/udp.h
@@ -265,8 +265,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_UDP_H_
-#define NET_SOCK_UDP_H_
+#ifndef NET_SOCK_UDP_H
+#define NET_SOCK_UDP_H
 
 #include <assert.h>
 #include <stdint.h>
@@ -439,5 +439,5 @@ ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,
 }
 #endif
 
-#endif /* NET_SOCK_UDP_H_ */
+#endif /* NET_SOCK_UDP_H */
 /** @} */
diff --git a/sys/include/net/udp.h b/sys/include/net/udp.h
index 836dd2d747ec8ea9b18983695460355bc4beef26..8d3b5cd08289ee52e85453bd65180f10a4322065 100644
--- a/sys/include/net/udp.h
+++ b/sys/include/net/udp.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef UDP_H_
-#define UDP_H_
+#ifndef UDP_H
+#define UDP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ void udp_hdr_print(udp_hdr_t *hdr);
 }
 #endif
 
-#endif /* UDP_H_ */
+#endif /* UDP_H */
 /** @} */
diff --git a/sys/include/pm_layered.h b/sys/include/pm_layered.h
index 85db1ea020d792f950fa89a1b60d34e3b2df4572..e97c9e7c9eab72a39db46b5590fa794bb07d3de6 100644
--- a/sys/include/pm_layered.h
+++ b/sys/include/pm_layered.h
@@ -30,8 +30,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PM_LAYERED_H_
-#define PM_LAYERED_H_
+#ifndef PM_LAYERED_H
+#define PM_LAYERED_H
 
 #include "assert.h"
 #include "periph/pm.h"
@@ -71,5 +71,5 @@ void pm_set(unsigned mode);
 }
 #endif
 
-#endif /* __PM_LAYERED_H_ */
+#endif /* __PM_LAYERED_H */
 /** @} */
diff --git a/sys/include/universal_address.h b/sys/include/universal_address.h
index 05ff005ba83900da26308e57b71e23aac3bcf013..1228ea6225924c48e7fcf39c46259469c904487b 100644
--- a/sys/include/universal_address.h
+++ b/sys/include/universal_address.h
@@ -18,8 +18,8 @@
  * @author      Martin Landsmann
  */
 
-#ifndef UNIVERSAL_ADDRESS_H_
-#define UNIVERSAL_ADDRESS_H_
+#ifndef UNIVERSAL_ADDRESS_H
+#define UNIVERSAL_ADDRESS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -171,5 +171,5 @@ void universal_address_print_table(void);
 }
 #endif
 
-#endif /* UNIVERSAL_ADDRESS_H_ */
+#endif /* UNIVERSAL_ADDRESS_H */
 /** @} */
diff --git a/sys/include/xtimer/implementation.h b/sys/include/xtimer/implementation.h
index 62fc0ffb2202e43f950827f3bbacc60723ed8382..54d8a024930ee1ef3ecee5d1ccd938023e2ed25b 100644
--- a/sys/include/xtimer/implementation.h
+++ b/sys/include/xtimer/implementation.h
@@ -16,8 +16,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
-#ifndef XTIMER_IMPLEMENTATION_H_
-#define XTIMER_IMPLEMENTATION_H_
+#ifndef XTIMER_IMPLEMENTATION_H
+#define XTIMER_IMPLEMENTATION_H
 
 #ifndef XTIMER_H
 #error "Do not include this file directly! Use xtimer.h instead"
diff --git a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
index e95c576f54baa00e39db32eb2d3b3ef236284989..c93bf58e5d9b8ebf6686e81fd08422eff0366433 100644
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_FRAG_RBUF_H_
-#define GNRC_SIXLOWPAN_FRAG_RBUF_H_
+#ifndef GNRC_SIXLOWPAN_FRAG_RBUF_H
+#define GNRC_SIXLOWPAN_FRAG_RBUF_H
 
 #include <inttypes.h>
 
@@ -104,5 +104,5 @@ void rbuf_add(gnrc_netif_hdr_t *netif_hdr, gnrc_pktsnip_t *frag,
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_FRAG_RBUF_H_ */
+#endif /* GNRC_SIXLOWPAN_FRAG_RBUF_H */
 /** @} */
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
index 2d9077dba64594421cb8dbd5cd704c46ce30c7b7..c2fc9c3f1e04e6c51f83c0ce1cbfe36abb84ba69 100644
--- a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
+++ b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
@@ -16,8 +16,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef RPL_NETSTATS_H_
-#define RPL_NETSTATS_H_
+#ifndef RPL_NETSTATS_H
+#define RPL_NETSTATS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -187,5 +187,5 @@ static inline void gnrc_rpl_netstats_tx_DAO_ACK(netstats_rpl_t *netstats, size_t
 }
 #endif
 
-#endif /* RPL_NETSTATS_H_ */
+#endif /* RPL_NETSTATS_H */
 /** @} */
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
index ec649f90fa843584ccab766b369dc927b2e5e832..cb4e555ba08fc7bb6742fd9e167e5b53ab9bc37d 100644
--- a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
+++ b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
@@ -16,8 +16,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_VALIDATION_H_
-#define GNRC_RPL_VALIDATION_H_
+#ifndef GNRC_RPL_VALIDATION_H
+#define GNRC_RPL_VALIDATION_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -143,5 +143,5 @@ static inline bool gnrc_rpl_validation_DAO_ACK(gnrc_rpl_dao_ack_t *dao_ack, uint
 }
 #endif
 
-#endif /* GNRC_RPL_VALIDATION_H_ */
+#endif /* GNRC_RPL_VALIDATION_H */
 /** @} */
diff --git a/sys/net/gnrc/sock/include/gnrc_sock_internal.h b/sys/net/gnrc/sock/include/gnrc_sock_internal.h
index c4c218dc2427ff5c34ba829f92ceb5785f319377..98ba45e1901b542a5a6a8eba69e9a6afeb82288d 100644
--- a/sys/net/gnrc/sock/include/gnrc_sock_internal.h
+++ b/sys/net/gnrc/sock/include/gnrc_sock_internal.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SOCK_INTERNAL_H_
-#define GNRC_SOCK_INTERNAL_H_
+#ifndef GNRC_SOCK_INTERNAL_H
+#define GNRC_SOCK_INTERNAL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -112,5 +112,5 @@ ssize_t gnrc_sock_send(gnrc_pktsnip_t *payload, sock_ip_ep_t *local,
 }
 #endif
 
-#endif /* GNRC_SOCK_INTERNAL_H_ */
+#endif /* GNRC_SOCK_INTERNAL_H */
 /** @} */
diff --git a/sys/net/gnrc/sock/include/sock_types.h b/sys/net/gnrc/sock/include/sock_types.h
index a72b17c8022380c1ea79a708d6feb5e0e9305c0b..82e446d414b4e73b18dcfcffa31e69e76cc8e9ab 100644
--- a/sys/net/gnrc/sock/include/sock_types.h
+++ b/sys/net/gnrc/sock/include/sock_types.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_TYPES_H_
-#define SOCK_TYPES_H_
+#ifndef SOCK_TYPES_H
+#define SOCK_TYPES_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -79,5 +79,5 @@ struct sock_udp {
 }
 #endif
 
-#endif /* SOCK_TYPES_H_ */
+#endif /* SOCK_TYPES_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/iib_table.h b/sys/net/routing/nhdp/iib_table.h
index 02c4a5249db5da49387a36f6ce5d0ff423bc4c49..65be11fce4f45f68a5984c19a458709c93ce3e1b 100644
--- a/sys/net/routing/nhdp/iib_table.h
+++ b/sys/net/routing/nhdp/iib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef IIB_TABLE_H_
-#define IIB_TABLE_H_
+#ifndef IIB_TABLE_H
+#define IIB_TABLE_H
 
 #include "timex.h"
 #include "kernel_types.h"
@@ -185,5 +185,5 @@ void iib_process_metric_refresh(void);
 }
 #endif
 
-#endif /* IIB_TABLE_H_ */
+#endif /* IIB_TABLE_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/lib_table.h b/sys/net/routing/nhdp/lib_table.h
index 00f45e4fe5e9c9bef1262fc8a00368bd07d401d6..a063d7140b148bf17ce815503f097361851dea28 100644
--- a/sys/net/routing/nhdp/lib_table.h
+++ b/sys/net/routing/nhdp/lib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef LIB_TABLE_H_
-#define LIB_TABLE_H_
+#ifndef LIB_TABLE_H
+#define LIB_TABLE_H
 
 #include "kernel_types.h"
 
@@ -85,5 +85,5 @@ uint8_t lib_is_reg_addr(kernel_pid_t if_pid, nhdp_addr_t *addr);
 }
 #endif
 
-#endif /* LIB_TABLE_H_ */
+#endif /* LIB_TABLE_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp.h b/sys/net/routing/nhdp/nhdp.h
index f3ad5b10180fe0d824a1fceda235f1ca2d207e07..e720fe3e3e2ad75e1bd910ea8c9ccc912604a7b6 100644
--- a/sys/net/routing/nhdp/nhdp.h
+++ b/sys/net/routing/nhdp/nhdp.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_H_
-#define NHDP_H_
+#ifndef NHDP_H
+#define NHDP_H
 
 #include "timex.h"
 #include "xtimer.h"
@@ -204,5 +204,5 @@ int nhdp_add_address(kernel_pid_t if_pid, uint8_t *addr, size_t addr_size, uint8
 }
 #endif
 
-#endif /* NHDP_H_ */
+#endif /* NHDP_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_address.h b/sys/net/routing/nhdp/nhdp_address.h
index 33ae2b71261c7ae445e73a0cc0d78d9231fe034c..3ad444fd09ce612082728391c7b6dc170a13d601 100644
--- a/sys/net/routing/nhdp/nhdp_address.h
+++ b/sys/net/routing/nhdp/nhdp_address.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_ADDRESS_H_
-#define NHDP_ADDRESS_H_
+#ifndef NHDP_ADDRESS_H
+#define NHDP_ADDRESS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -138,5 +138,5 @@ nhdp_addr_t *nhdp_get_addr_db_head(void);
 }
 #endif
 
-#endif /* NHDP_ADDRESS_H_ */
+#endif /* NHDP_ADDRESS_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_metric.h b/sys/net/routing/nhdp/nhdp_metric.h
index 9ea5232fd620776379dc11d508df2cefa83933b9..2dc62a4e86a7053abff884386dd410f89709ea0f 100644
--- a/sys/net/routing/nhdp/nhdp_metric.h
+++ b/sys/net/routing/nhdp/nhdp_metric.h
@@ -21,8 +21,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_METRIC_H_
-#define NHDP_METRIC_H_
+#ifndef NHDP_METRIC_H
+#define NHDP_METRIC_H
 
 #include "rfc5444/rfc5444.h"
 
@@ -90,4 +90,4 @@ extern "C" {
 }
 #endif
 
-#endif /* NHDP_METRIC_H_ */
+#endif /* NHDP_METRIC_H */
diff --git a/sys/net/routing/nhdp/nhdp_reader.h b/sys/net/routing/nhdp/nhdp_reader.h
index 15f4af37c2c65a43eee6bce6450731635fa8f7c1..838ee0cf6a89cfddc034b3d0e7be6a22c15fc1d6 100644
--- a/sys/net/routing/nhdp/nhdp_reader.h
+++ b/sys/net/routing/nhdp/nhdp_reader.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_READER_H_
-#define NHDP_READER_H_
+#ifndef NHDP_READER_H
+#define NHDP_READER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,5 +54,5 @@ int nhdp_reader_handle_packet(kernel_pid_t rcvg_if_pid, void *buffer, size_t len
 }
 #endif
 
-#endif /* NHDP_READER_H_ */
+#endif /* NHDP_READER_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_writer.h b/sys/net/routing/nhdp/nhdp_writer.h
index 111ab0f74031cc9b097c4e1ed2f0b1c08ed4a970..f945408494dc138d059e4ed1388f1e2abda81d25 100644
--- a/sys/net/routing/nhdp/nhdp_writer.h
+++ b/sys/net/routing/nhdp/nhdp_writer.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_WRITER_H_
-#define NHDP_WRITER_H_
+#ifndef NHDP_WRITER_H
+#define NHDP_WRITER_H
 
 #include "rfc5444/rfc5444_iana.h"
 #include "rfc5444/rfc5444_writer.h"
@@ -76,5 +76,5 @@ void nhdp_writer_add_addr(struct rfc5444_writer *wr, nhdp_addr_t *addr,
 }
 #endif
 
-#endif /* NHDP_WRITER_H_ */
+#endif /* NHDP_WRITER_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nib_table.h b/sys/net/routing/nhdp/nib_table.h
index 700ce8c72141e50a8fa728d1b0954fd88b617c03..4d9dd4db492719fd59f1908688d3925475aad707 100644
--- a/sys/net/routing/nhdp/nib_table.h
+++ b/sys/net/routing/nhdp/nib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NIB_TABLE_H_
-#define NIB_TABLE_H_
+#ifndef NIB_TABLE_H
+#define NIB_TABLE_H
 
 #include "timex.h"
 
@@ -102,5 +102,5 @@ void nib_reset_nb_entry_sym(nib_entry_t *nib_entry, timex_t *now);
 }
 #endif
 
-#endif /* NIB_TABLE_H_ */
+#endif /* NIB_TABLE_H */
 /** @} */
diff --git a/sys/posix/include/semaphore.h b/sys/posix/include/semaphore.h
index 176d2b439bfd9c465c867ce502324dd474fad23d..c10d4f76af789774ece3af28501e2e1db1b12328 100644
--- a/sys/posix/include/semaphore.h
+++ b/sys/posix/include/semaphore.h
@@ -22,8 +22,8 @@
  * @author  Víctor Ariño <victor.arino@zii.aero>
  */
 
-#ifndef POSIX_SEMAPHORE_H_
-#define POSIX_SEMAPHORE_H_
+#ifndef POSIX_SEMAPHORE_H
+#define POSIX_SEMAPHORE_H
 
 #include <errno.h>
 #include <time.h>
@@ -291,5 +291,5 @@ static inline int sem_getvalue(sem_t *sem, int *sval)
 }
 #endif
 
-#endif  /* POSIX_SEMAPHORE_H_ */
+#endif  /* POSIX_SEMAPHORE_H */
 /** @} */
diff --git a/sys/posix/include/sys/bytes.h b/sys/posix/include/sys/bytes.h
index 86d4872f6211d4c3e3eee85a83017e1eda55320b..440519c1f9ef123f4a733288b6d0f271117ac162 100644
--- a/sys/posix/include/sys/bytes.h
+++ b/sys/posix/include/sys/bytes.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef BYTES_H_
-#define BYTES_H_
+#ifndef BYTES_H
+#define BYTES_H
 
 #include "byteorder.h"
 
@@ -92,5 +92,5 @@ typedef size_t socklen_t;           /**< socket address length */
 }
 #endif
 
-#endif /* BYTES_H_ */
+#endif /* BYTES_H */
 /** @} */
diff --git a/sys/posix/pthread/include/pthread_spin.h b/sys/posix/pthread/include/pthread_spin.h
index e089fa630e5160819ac6a0466ceaf582c1af0b88..9d0c31ea3f14dab014c524092ff5bcfa9cc52c90 100644
--- a/sys/posix/pthread/include/pthread_spin.h
+++ b/sys/posix/pthread/include/pthread_spin.h
@@ -17,8 +17,8 @@
  *          Use irq_disable() and irq_restore() for shortterm locks instead.
  */
 
-#ifndef SYS_POSIX_PTHREAD_SPIN_H_
-#define SYS_POSIX_PTHREAD_SPIN_H_
+#ifndef SYS_POSIX_PTHREAD_SPIN_H
+#define SYS_POSIX_PTHREAD_SPIN_H
 
 #include <errno.h>
 
diff --git a/tests/driver_at86rf2xx/common.h b/tests/driver_at86rf2xx/common.h
index 8829b6e54d5b05d2247bf76306d12497adb38f4a..b81ab4553ff0effade9bf094c69e531ffc0835e8 100644
--- a/tests/driver_at86rf2xx/common.h
+++ b/tests/driver_at86rf2xx/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef COMMON_H_
-#define COMMON_H_
+#ifndef COMMON_H
+#define COMMON_H
 
 #include <stdint.h>
 
@@ -49,5 +49,5 @@ void print_addr(uint8_t *addr, size_t addr_len);
 }
 #endif
 
-#endif /* COMMON_H_ */
+#endif /* COMMON_H */
 /** @} */
diff --git a/tests/emb6/common.h b/tests/emb6/common.h
index 0efd9e9afa1df0cece7f6e54d1460b04ab5efea8..0e8a419659b16b46654aed6f376f9a15a9b97969 100644
--- a/tests/emb6/common.h
+++ b/tests/emb6/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef MAIN_H_
-#define MAIN_H_
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -75,5 +75,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H_ */
+#endif /* MAIN_H */
 /** @} */
diff --git a/tests/gnrc_sock_ip/constants.h b/tests/gnrc_sock_ip/constants.h
index 88776e4ee242ec889a916271de391f9d5e0e3e4c..0f7082954022655cbcaeb9768d098b2e81a6ff32 100644
--- a/tests/gnrc_sock_ip/constants.h
+++ b/tests/gnrc_sock_ip/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/gnrc_sock_ip/stack.h b/tests/gnrc_sock_ip/stack.h
index 637ef466f5ec2dc994b2ef05709bd834c2618208..f5ab509da90dc84f10634ccdc45647d06c119e44 100644
--- a/tests/gnrc_sock_ip/stack.h
+++ b/tests/gnrc_sock_ip/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -86,5 +86,5 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/gnrc_sock_udp/constants.h b/tests/gnrc_sock_udp/constants.h
index fefe41663889cf44e7590569a183e3bd139f542d..9e9c2fa3d0c3ff860fcea4902b501c9c3ec65b22 100644
--- a/tests/gnrc_sock_udp/constants.h
+++ b/tests/gnrc_sock_udp/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -40,5 +40,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/gnrc_sock_udp/stack.h b/tests/gnrc_sock_udp/stack.h
index 415057a3a9128edc91f504a117408d5b183dd750..8f83392f79c3ee3bb6063af9a8040adc318210c7 100644
--- a/tests/gnrc_sock_udp/stack.h
+++ b/tests/gnrc_sock_udp/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -91,5 +91,5 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/lwip/common.h b/tests/lwip/common.h
index 635f1dae94a867d2e078f035b42051d160ef6bbe..8dfb62951bddc56d7a5d82834b0961e7ecda3e4c 100644
--- a/tests/lwip/common.h
+++ b/tests/lwip/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef MAIN_H_
-#define MAIN_H_
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -77,5 +77,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H_ */
+#endif /* MAIN_H */
 /** @} */
diff --git a/tests/lwip_sock_ip/constants.h b/tests/lwip_sock_ip/constants.h
index 7e0aef28437ee949c347741724e5104a0b284073..4ddf6271499555e4adbc33c3266bb134c43c017f 100644
--- a/tests/lwip_sock_ip/constants.h
+++ b/tests/lwip_sock_ip/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -44,5 +44,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/lwip_sock_ip/stack.h b/tests/lwip_sock_ip/stack.h
index ad05a37668eeef6c39b58fa121809e2cf175f5c7..bdbac98ebb498f70a02700594c11c32b8a913372 100644
--- a/tests/lwip_sock_ip/stack.h
+++ b/tests/lwip_sock_ip/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -119,5 +119,5 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/unittests/README.md b/tests/unittests/README.md
index bcfbde4a5852e855dd4ce3026127f84e9fbb0294..a56d82151a63cb2c0c354575b70f6a55b09423c5 100644
--- a/tests/unittests/README.md
+++ b/tests/unittests/README.md
@@ -149,8 +149,8 @@ The test header ``tests-<modulename>/tests-<module>.h`` of a module you add to `
  *
  * @author      <author>
  */
-#ifndef TESTS_<MODULE>_H_
-#define TESTS_<MODULE>_H_
+#ifndef TESTS_<MODULE>_H
+#define TESTS_<MODULE>_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -177,7 +177,7 @@ Test *tests_<module>_<header2>_tests(void);
 }
 #endif
 
-#endif /* TESTS_<MODULE>_H_ */
+#endif /* TESTS_<MODULE>_H */
 /** @} */
 ```
 
diff --git a/tests/unittests/common/unittests-constants.h b/tests/unittests/common/unittests-constants.h
index b20583bedc31fe4b1d7f8ddbc237f09acc9f7c61..e36e2ceac7bd981d0db6cf57307ff1ea5e68d603 100644
--- a/tests/unittests/common/unittests-constants.h
+++ b/tests/unittests/common/unittests-constants.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNITTESTS_CONSTANTS_H_
-#define UNITTESTS_CONSTANTS_H_
+#ifndef UNITTESTS_CONSTANTS_H
+#define UNITTESTS_CONSTANTS_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -65,5 +65,5 @@ extern "C" {
 }
 #endif
 
-#endif /* UNITTESTS_CONSTANTS_H_ */
+#endif /* UNITTESTS_CONSTANTS_H */
 /** @} */
diff --git a/tests/unittests/map.h b/tests/unittests/map.h
index 5efe141a928108c3975674b43908d53911ac3cb0..13bf1e107d3abc06127080340f2e7a2f1802941c 100644
--- a/tests/unittests/map.h
+++ b/tests/unittests/map.h
@@ -26,8 +26,8 @@
  * prior written authorization from the authors.
  */
 
-#ifndef UNITTESTS_MAP_H_
-#define UNITTESTS_MAP_H_
+#ifndef UNITTESTS_MAP_H
+#define UNITTESTS_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,4 +56,4 @@ extern "C" {
 }
 #endif
 
-#endif /* UNITTESTS_MAP_H_ */
+#endif /* UNITTESTS_MAP_H */
diff --git a/tests/unittests/tests-base64/tests-base64.h b/tests/unittests/tests-base64/tests-base64.h
index d0d5e80df5b93773e4776aa75248a9ab8cfe88b5..d3f21d19c16689aa39c63e4af69c3c8ad9426bcf 100644
--- a/tests/unittests/tests-base64/tests-base64.h
+++ b/tests/unittests/tests-base64/tests-base64.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_BASE64_H_
-#define TESTS_BASE64_H_
+#ifndef TESTS_BASE64_H
+#define TESTS_BASE64_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_base64_tests(void);
 }
 #endif
 
-#endif /* TESTS_BASE64_H_ */
+#endif /* TESTS_BASE64_H */
 /** @} */
diff --git a/tests/unittests/tests-bloom/tests-bloom-sets.h b/tests/unittests/tests-bloom/tests-bloom-sets.h
index 672eaf9506b6f2302c518490828d4a345652a3e3..f2d7d20b9594fd7e60ab1cf7a79b98f3575f82e8 100644
--- a/tests/unittests/tests-bloom/tests-bloom-sets.h
+++ b/tests/unittests/tests-bloom/tests-bloom-sets.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef TESTS_BLOOM_SETS_H_
-#define TESTS_BLOOM_SETS_H_
+#ifndef TESTS_BLOOM_SETS_H
+#define TESTS_BLOOM_SETS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1033,4 +1033,4 @@ const char* const B[10] = {"interbedded"
 }
 #endif
 
-#endif /* TESTS_BLOOM_SETS_H_ */
+#endif /* TESTS_BLOOM_SETS_H */
diff --git a/tests/unittests/tests-bloom/tests-bloom.h b/tests/unittests/tests-bloom/tests-bloom.h
index ab2082d4bd72fbd4b462db3af363e832cb9fd02a..9de0f3eb37d2fcac9b8cb19e68218e1f6ca5a6c8 100644
--- a/tests/unittests/tests-bloom/tests-bloom.h
+++ b/tests/unittests/tests-bloom/tests-bloom.h
@@ -15,8 +15,8 @@
  *
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  */
-#ifndef TESTS_BLOOM_H_
-#define TESTS_BLOOM_H_
+#ifndef TESTS_BLOOM_H
+#define TESTS_BLOOM_H
 
 #include "embUnit.h"
 
@@ -40,5 +40,5 @@ Test *tests_bloom_tests(void);
 }
 #endif
 
-#endif /* TESTS_BLOOM_H_ */
+#endif /* TESTS_BLOOM_H */
 /** @} */
diff --git a/tests/unittests/tests-core/tests-core.h b/tests/unittests/tests-core/tests-core.h
index 35ad00788ee8196c5c3ce67ed381be0dadac50b8..71dd58792eaa762b4747bd31a971a1dab91801eb 100644
--- a/tests/unittests/tests-core/tests-core.h
+++ b/tests/unittests/tests-core/tests-core.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_CORE_H_
-#define TESTS_CORE_H_
+#ifndef TESTS_CORE_H
+#define TESTS_CORE_H
 
 #include "embUnit.h"
 
@@ -89,5 +89,5 @@ Test *tests_core_ringbuffer_tests(void);
 }
 #endif
 
-#endif /* TESTS_CORE_H_ */
+#endif /* TESTS_CORE_H */
 /** @} */
diff --git a/tests/unittests/tests-crypto/tests-crypto.h b/tests/unittests/tests-crypto/tests-crypto.h
index cd2bfabc736339ea3d2038eb992be47188ffc4a7..30d557e7023aed4dc24ad918fd00b2a96c6af874 100644
--- a/tests/unittests/tests-crypto/tests-crypto.h
+++ b/tests/unittests/tests-crypto/tests-crypto.h
@@ -16,8 +16,8 @@
  *
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  */
-#ifndef TESTS_CRYPTO_H_
-#define TESTS_CRYPTO_H_
+#ifndef TESTS_CRYPTO_H
+#define TESTS_CRYPTO_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -63,5 +63,5 @@ Test* tests_crypto_modes_ctr_tests(void);
 }
 #endif
 
-#endif /* TESTS_CRYPTO_H_ */
+#endif /* TESTS_CRYPTO_H */
 /** @} */
diff --git a/tests/unittests/tests-div/tests-div.h b/tests/unittests/tests-div/tests-div.h
index 037ee6b0210101e920185c1aec8191d2ef8f27d5..c9c054dd475790ba1889a306124fcc20dbc4f21a 100644
--- a/tests/unittests/tests-div/tests-div.h
+++ b/tests/unittests/tests-div/tests-div.h
@@ -15,8 +15,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef TESTS_DIV_H_
-#define TESTS_DIV_H_
+#ifndef TESTS_DIV_H
+#define TESTS_DIV_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_div_tests(void);
 }
 #endif
 
-#endif /* TESTS_DIV_H_ */
+#endif /* TESTS_DIV_H */
 /** @} */
diff --git a/tests/unittests/tests-fib/tests-fib.h b/tests/unittests/tests-fib/tests-fib.h
index 91b645b39a38f9d9195a4acf370b9dd699716fd3..4e2bea76a0735006ce55707d9cbc99e045a4e0ba 100644
--- a/tests/unittests/tests-fib/tests-fib.h
+++ b/tests/unittests/tests-fib/tests-fib.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_FIB_H_
-#define TESTS_FIB_H_
+#ifndef TESTS_FIB_H
+#define TESTS_FIB_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_fib_tests(void);
 }
 #endif
 
-#endif /* TESTS_FIB_H_ */
+#endif /* TESTS_FIB_H */
 /** @} */
diff --git a/tests/unittests/tests-fib_sr/tests-fib_sr.h b/tests/unittests/tests-fib_sr/tests-fib_sr.h
index 6acdb9776b2b4f8571c5b5f7e928559079864931..21dab5d81db71614119cc39e6be6aea55fef493d 100644
--- a/tests/unittests/tests-fib_sr/tests-fib_sr.h
+++ b/tests/unittests/tests-fib_sr/tests-fib_sr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_FIB_H_
-#define TESTS_FIB_H_
+#ifndef TESTS_FIB_H
+#define TESTS_FIB_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_fib_sr_tests(void);
 }
 #endif
 
-#endif /* TESTS_FIB_H_ */
+#endif /* TESTS_FIB_H */
 /** @} */
diff --git a/tests/unittests/tests-fmt/tests-fmt.h b/tests/unittests/tests-fmt/tests-fmt.h
index ddfa9175662da87c4fcf5d9422596d15d3cc6125..f7644b067c38f07c839ae3d35163d5c78f05fdd1 100644
--- a/tests/unittests/tests-fmt/tests-fmt.h
+++ b/tests/unittests/tests-fmt/tests-fmt.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
-#ifndef TESTS_FMT_H_
-#define TESTS_FMT_H_
+#ifndef TESTS_FMT_H
+#define TESTS_FMT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_fmt(void);
 }
 #endif
 
-#endif /* TESTS_FMT_H_ */
+#endif /* TESTS_FMT_H */
 /** @} */
diff --git a/tests/unittests/tests-gcoap/tests-gcoap.h b/tests/unittests/tests-gcoap/tests-gcoap.h
index 74a3d8dfa6d16398d1314855f4951b1da68268ab..3eadaa28b4a7c892cfca82a8e04adeac1cad891f 100644
--- a/tests/unittests/tests-gcoap/tests-gcoap.h
+++ b/tests/unittests/tests-gcoap/tests-gcoap.h
@@ -15,8 +15,8 @@
  *
  * @author      Ken Bannister <kb2ma@runbox.com>
  */
-#ifndef TESTS_GCOAP_H_
-#define TESTS_GCOAP_H_
+#ifndef TESTS_GCOAP_H
+#define TESTS_GCOAP_H
 
 #include "embUnit.h"
 
@@ -36,5 +36,5 @@ void tests_gcoap(void);
 }
 #endif
 
-#endif /* TESTS_GCOAP_H_ */
+#endif /* TESTS_GCOAP_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h b/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
index 58904805cbb6fc1a6e3fd3d52e63c4202cf3e2e8..6342556a4117194d4db48dfb02984439ba4203ad 100644
--- a/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
+++ b/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
@@ -15,8 +15,8 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef TESTS_GNRC_IPV6_H_
-#define TESTS_GNRC_IPV6_H_
+#ifndef TESTS_GNRC_IPV6_H
+#define TESTS_GNRC_IPV6_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_ipv6(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_IPV6_H_ */
+#endif /* TESTS_GNRC_IPV6_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h b/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
index a31fda0a6125b0981227f8eac72ab24a2d6016cb..b013e11b71231bc6be0e10b65ab7b473d5fa602a 100644
--- a/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
+++ b/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_GNRC_IPV6_HDR_H_
-#define TESTS_GNRC_IPV6_HDR_H_
+#ifndef TESTS_GNRC_IPV6_HDR_H
+#define TESTS_GNRC_IPV6_HDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_ipv6_hdr(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_IPV6_HDR_H_ */
+#endif /* TESTS_GNRC_IPV6_HDR_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
index 00a55775af32c42587abecb43dc782aa93c7b005..3ff0240d26b8bbe2ea42d9620872a1940fdad218 100644
--- a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
+++ b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
@@ -15,8 +15,8 @@
  *
  * @author      Shuguo Zhuo <shuguo.zhuo@inria.fr>
  */
-#ifndef TESTS_PRIORITY_PKTQUEUE_H_
-#define TESTS_PRIORITY_PKTQUEUE_H_
+#ifndef TESTS_PRIORITY_PKTQUEUE_H
+#define TESTS_PRIORITY_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_mac_internal(void);
 }
 #endif
 
-#endif /* TESTS_PRIORITY_PKTQUEUE_H_ */
+#endif /* TESTS_PRIORITY_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h b/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
index 025100ebf41e4c4dae36511342a37317bc6724f2..3b6bbbf3fa23dee16df1f68472ab127228c9dc81 100644
--- a/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
+++ b/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_GNRC_NETIF_H_
-#define TESTS_GNRC_NETIF_H_
+#ifndef TESTS_GNRC_NETIF_H
+#define TESTS_GNRC_NETIF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_netif(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_NETIF_H_ */
+#endif /* TESTS_GNRC_NETIF_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h b/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
index 4c2b7750cf3b56b4f2dd60e7d85985e1b427342f..ff24c13b5f1ff62a123ddd17938b60842310888c 100644
--- a/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
+++ b/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
@@ -15,8 +15,8 @@
  *
  * @author      Takuo Yonezawa <Yonezawa-T2@mail.dnp.co.jp>
  */
-#ifndef TESTS_GNRC_UDP_H_
-#define TESTS_GNRC_UDP_H_
+#ifndef TESTS_GNRC_UDP_H
+#define TESTS_GNRC_UDP_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_udp(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_UDP_H_ */
+#endif /* TESTS_GNRC_UDP_H */
 /** @} */
diff --git a/tests/unittests/tests-hashes/tests-hashes.h b/tests/unittests/tests-hashes/tests-hashes.h
index c6dc6a2dc3dc751bf75a010a45c50710f6cfa125..3904c01336cd93236e80aa1e1e704fa2574ff02c 100644
--- a/tests/unittests/tests-hashes/tests-hashes.h
+++ b/tests/unittests/tests-hashes/tests-hashes.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_HASHES_H_
-#define TESTS_HASHES_H_
+#ifndef TESTS_HASHES_H
+#define TESTS_HASHES_H
 
 #include "embUnit.h"
 
@@ -69,5 +69,5 @@ Test *tests_hashes_sha256_chain_tests(void);
 }
 #endif
 
-#endif /* TESTS_CRYPTO_H_ */
+#endif /* TESTS_CRYPTO_H */
 /** @} */
diff --git a/tests/unittests/tests-ieee802154/tests-ieee802154.h b/tests/unittests/tests-ieee802154/tests-ieee802154.h
index fb376bd83eff4f98d93f6f004a6b88b3133408dc..8e16524acad6753102415ef5763d0e76f51838bb 100644
--- a/tests/unittests/tests-ieee802154/tests-ieee802154.h
+++ b/tests/unittests/tests-ieee802154/tests-ieee802154.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IEEE802154_H_
-#define TESTS_IEEE802154_H_
+#ifndef TESTS_IEEE802154_H
+#define TESTS_IEEE802154_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ieee802154(void);
 }
 #endif
 
-#endif /* TESTS_IEEE802154_H_ */
+#endif /* TESTS_IEEE802154_H */
 /** @} */
diff --git a/tests/unittests/tests-inet_csum/tests-inet_csum.h b/tests/unittests/tests-inet_csum/tests-inet_csum.h
index 9fe5558e438418b67b511efd67e1d3a7b8a8de67..31f0a68d4642db976d62d99827406edb972606bb 100644
--- a/tests/unittests/tests-inet_csum/tests-inet_csum.h
+++ b/tests/unittests/tests-inet_csum/tests-inet_csum.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_INET_CSUM_H_
-#define TESTS_INET_CSUM_H_
+#ifndef TESTS_INET_CSUM_H
+#define TESTS_INET_CSUM_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_inet_csum(void);
 }
 #endif
 
-#endif /* TESTS_INET_CSUM_H_ */
+#endif /* TESTS_INET_CSUM_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h b/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
index df743ee96a53785f80496cc787a79949505b19cf..8511dd0398d5f8505c3a87fb076da44624da189c 100644
--- a/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
+++ b/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV4_ADDR_H_
-#define TESTS_IPV4_ADDR_H_
+#ifndef TESTS_IPV4_ADDR_H
+#define TESTS_IPV4_ADDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv4_addr(void);
 }
 #endif
 
-#endif /* TESTS_IPV4_ADDR_H_ */
+#endif /* TESTS_IPV4_ADDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h b/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
index b91b796f6d7760775da192646fe9fa3e3de6655e..7b56371d0c50ddc02731038d7cd3e1a7189b708c 100644
--- a/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
+++ b/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_ADDR_H_
-#define TESTS_IPV6_ADDR_H_
+#ifndef TESTS_IPV6_ADDR_H
+#define TESTS_IPV6_ADDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_addr(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_ADDR_H_ */
+#endif /* TESTS_IPV6_ADDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h b/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
index aec9eee7e49e7e56491323ee785b8e820a922f16..d328424def301eaf95f724e754ffb075b106e224 100644
--- a/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
+++ b/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_HDR_H_
-#define TESTS_IPV6_HDR_H_
+#ifndef TESTS_IPV6_HDR_H
+#define TESTS_IPV6_HDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_hdr(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_HDR_H_ */
+#endif /* TESTS_IPV6_HDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h b/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
index d2dc8d4d1d59ec3f8fcf6fc4800b2ea74b73e377..457c6baa9a7455cccfc0d1ae3f43efc4472c9681 100644
--- a/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
+++ b/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_NC_H_
-#define TESTS_IPV6_NC_H_
+#ifndef TESTS_IPV6_NC_H
+#define TESTS_IPV6_NC_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_nc(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_NC_H_ */
+#endif /* TESTS_IPV6_NC_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h b/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
index f485837ea70cb9993429ccaabec93f13ac7a2724..5962a8f925e4e531c99bd0ae25a1b4791889c6dd 100644
--- a/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
+++ b/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_NETIF_H_
-#define TESTS_IPV6_NETIF_H_
+#ifndef TESTS_IPV6_NETIF_H
+#define TESTS_IPV6_NETIF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_netif(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_NETIF_H_ */
+#endif /* TESTS_IPV6_NETIF_H */
 /** @} */
diff --git a/tests/unittests/tests-netopt/tests-netopt.h b/tests/unittests/tests-netopt/tests-netopt.h
index 9c187f3792e51c9bc1fbef09002edda3f091cb93..a34cb9de6226cc98809d483707612c7aa1c99207 100644
--- a/tests/unittests/tests-netopt/tests-netopt.h
+++ b/tests/unittests/tests-netopt/tests-netopt.h
@@ -15,8 +15,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef TESTS_NETOPT_H_
-#define TESTS_NETOPT_H_
+#ifndef TESTS_NETOPT_H
+#define TESTS_NETOPT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_netopt(void);
 }
 #endif
 
-#endif /* TESTS_NETOPT_H_ */
+#endif /* TESTS_NETOPT_H */
 /** @} */
diff --git a/tests/unittests/tests-netreg/tests-netreg.h b/tests/unittests/tests-netreg/tests-netreg.h
index a14dca58b83779da1f5ef12e655a5b84fb316cb8..b683b91bd1b50ed8a0818d98192d328c056583b7 100644
--- a/tests/unittests/tests-netreg/tests-netreg.h
+++ b/tests/unittests/tests-netreg/tests-netreg.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_NETREG_H_
-#define TESTS_NETREG_H_
+#ifndef TESTS_NETREG_H
+#define TESTS_NETREG_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_netreg(void);
 }
 #endif
 
-#endif /* TESTS_NETREG_H_ */
+#endif /* TESTS_NETREG_H */
 /** @} */
diff --git a/tests/unittests/tests-pkt/tests-pkt.h b/tests/unittests/tests-pkt/tests-pkt.h
index e0af10e9d594f678718cfa48853a8b98f28bdb49..415348da89a11c2e744b690711048867a1de141f 100644
--- a/tests/unittests/tests-pkt/tests-pkt.h
+++ b/tests/unittests/tests-pkt/tests-pkt.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKT_H_
-#define TESTS_PKT_H_
+#ifndef TESTS_PKT_H
+#define TESTS_PKT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pkt(void);
 }
 #endif
 
-#endif /* TESTS_PKT_H_ */
+#endif /* TESTS_PKT_H */
 /** @} */
diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.h b/tests/unittests/tests-pktbuf/tests-pktbuf.h
index 4c07a20aaef409a5654b64f07fe552ba43038ef3..32f9c6be6523da8c422ebe310398fea754e5c255 100644
--- a/tests/unittests/tests-pktbuf/tests-pktbuf.h
+++ b/tests/unittests/tests-pktbuf/tests-pktbuf.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKTBUF_H_
-#define TESTS_PKTBUF_H_
+#ifndef TESTS_PKTBUF_H
+#define TESTS_PKTBUF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pktbuf(void);
 }
 #endif
 
-#endif /* TESTS_PKTBUF_H_ */
+#endif /* TESTS_PKTBUF_H */
 /** @} */
diff --git a/tests/unittests/tests-pktqueue/tests-pktqueue.h b/tests/unittests/tests-pktqueue/tests-pktqueue.h
index a280cd447d22feeffa9ea39fa0ea9a16f7106ef4..3aa680ac2d8a5d4ae69b34b07da03bc6b67d610d 100644
--- a/tests/unittests/tests-pktqueue/tests-pktqueue.h
+++ b/tests/unittests/tests-pktqueue/tests-pktqueue.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKTQUEUE_H_
-#define TESTS_PKTQUEUE_H_
+#ifndef TESTS_PKTQUEUE_H
+#define TESTS_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pktqueue(void);
 }
 #endif
 
-#endif /* TESTS_PKTQUEUE_H_ */
+#endif /* TESTS_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-printf_float/tests-printf_float.h b/tests/unittests/tests-printf_float/tests-printf_float.h
index 01afa14dd66b2f6c7341aba298b0512b18871651..0d1032aab88fdb04c1fbf5581cd57b18d2f80131 100644
--- a/tests/unittests/tests-printf_float/tests-printf_float.h
+++ b/tests/unittests/tests-printf_float/tests-printf_float.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_PRINTF_FLOAT_H_
-#define TESTS_PRINTF_FLOAT_H_
+#ifndef TESTS_PRINTF_FLOAT_H
+#define TESTS_PRINTF_FLOAT_H
 
 #include "embUnit.h"
 
@@ -34,5 +34,5 @@ void tests_printf_float(void);
 }
 #endif
 
-#endif /* TESTS_PRINTF_FLOAT_H_ */
+#endif /* TESTS_PRINTF_FLOAT_H */
 /** @} */
diff --git a/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h b/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
index 87f8c5d4cfd500ae9ef06de841996fe8da6aafaf..4c4eb52a5c59c32c7a8c436a7dcf6f9a6345a16b 100644
--- a/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
+++ b/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
@@ -15,8 +15,8 @@
  *
  * @author      Shuguo Zhuo <shuguo.zhuo@inria.fr>
  */
-#ifndef TESTS_PRIORITY_PKTQUEUE_H_
-#define TESTS_PRIORITY_PKTQUEUE_H_
+#ifndef TESTS_PRIORITY_PKTQUEUE_H
+#define TESTS_PRIORITY_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_priority_pktqueue(void);
 }
 #endif
 
-#endif /* TESTS_PRIORITY_PKTQUEUE_H_ */
+#endif /* TESTS_PRIORITY_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-rpl_srh/tests-rpl_srh.h b/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
index 180ea81322a0ed8f09a9a35aeb2b0fff82337b00..45d44ccb3cd85d064ac60ee2ec0969d0803c0242 100644
--- a/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
+++ b/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
-#ifndef TESTS_RPL_SRH_H_
-#define TESTS_RPL_SRH_H_
+#ifndef TESTS_RPL_SRH_H
+#define TESTS_RPL_SRH_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_rpl_srh(void);
 }
 #endif
 
-#endif /* TESTS_RPL_SRH_H_ */
+#endif /* TESTS_RPL_SRH_H */
 /** @} */
diff --git a/tests/unittests/tests-saul_reg/tests-saul_reg.h b/tests/unittests/tests-saul_reg/tests-saul_reg.h
index 464bd43723f98c3b8d5a92886b00dc34734c445e..41f1beb9634676b7b696f0f91dd10dfd6a737730 100644
--- a/tests/unittests/tests-saul_reg/tests-saul_reg.h
+++ b/tests/unittests/tests-saul_reg/tests-saul_reg.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_SAUL_REG_H_
-#define TESTS_SAUL_REG_H_
+#ifndef TESTS_SAUL_REG_H
+#define TESTS_SAUL_REG_H
 
 #include "embUnit.h"
 
@@ -34,5 +34,5 @@ void tests_saul_reg(void);
 }
 #endif
 
-#endif /* TESTS_SAUL_REG_H_ */
+#endif /* TESTS_SAUL_REG_H */
 /** @} */
diff --git a/tests/unittests/tests-seq/tests-seq.h b/tests/unittests/tests-seq/tests-seq.h
index e3fa96343cd634ea5b072c1c48a4f0ba84ca3fc5..b8904866f063d7a0a9ee358b7b00af1fb629dab7 100644
--- a/tests/unittests/tests-seq/tests-seq.h
+++ b/tests/unittests/tests-seq/tests-seq.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
-#ifndef TESTS_SEQ_H_
-#define TESTS_SEQ_H_
+#ifndef TESTS_SEQ_H
+#define TESTS_SEQ_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_seq(void);
 }
 #endif
 
-#endif /* TESTS_SEQ_H_ */
+#endif /* TESTS_SEQ_H */
 /** @} */
diff --git a/tests/unittests/tests-sixlowpan/tests-sixlowpan.h b/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
index 48be671b4ad8edfb87b394fd3fd45d46ffb864c4..700c76db9c9c958a6efbf45fee6af8c7f3704be1 100644
--- a/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
+++ b/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
@@ -15,8 +15,8 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef TESTS_SIXLOWPAN_H_
-#define TESTS_SIXLOWPAN_H_
+#ifndef TESTS_SIXLOWPAN_H
+#define TESTS_SIXLOWPAN_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_sixlowpan(void);
 }
 #endif
 
-#endif /* TESTS_SIXLOWPAN_H_ */
+#endif /* TESTS_SIXLOWPAN_H */
 /** @} */
diff --git a/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h b/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
index 3a4c911b8c76f6511d535b6cb9ef45d17a391a75..06cd96a4bcb78a53391c0a49709a1af6048b38dc 100644
--- a/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
+++ b/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_SIXLOWPAN_CTX_H_
-#define TESTS_SIXLOWPAN_CTX_H_
+#ifndef TESTS_SIXLOWPAN_CTX_H
+#define TESTS_SIXLOWPAN_CTX_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_sixlowpan_ctx(void);
 }
 #endif
 
-#endif /* TESTS_SIXLOWPAN_CTX_H_ */
+#endif /* TESTS_SIXLOWPAN_CTX_H */
 /** @} */
diff --git a/tests/unittests/tests-timex/tests-timex.h b/tests/unittests/tests-timex/tests-timex.h
index 55ae5d2e718431a298fee6bf91d962a27c57bdfd..3d8c0ca19221ddc2e2c0c453bb2d52e9c84d9b5a 100644
--- a/tests/unittests/tests-timex/tests-timex.h
+++ b/tests/unittests/tests-timex/tests-timex.h
@@ -16,8 +16,8 @@
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  * @author      Daniel Jentsch <d.jentsch@fu-berlin.de>
  */
-#ifndef TESTS_TIMEX_H_
-#define TESTS_TIMEX_H_
+#ifndef TESTS_TIMEX_H
+#define TESTS_TIMEX_H
 
 #include "embUnit.h"
 
@@ -41,5 +41,5 @@ Test *tests_timex_tests(void);
 }
 #endif
 
-#endif /* TESTS_TIMEX_H_ */
+#endif /* TESTS_TIMEX_H */
 /** @} */
diff --git a/tests/unittests/tests-ubjson/tests-ubjson.h b/tests/unittests/tests-ubjson/tests-ubjson.h
index fb190f4a829e2518e4dca25951afcda0d41e0455..2087ab4a0a33b58fb41593216dbdad4c9debac50 100644
--- a/tests/unittests/tests-ubjson/tests-ubjson.h
+++ b/tests/unittests/tests-ubjson/tests-ubjson.h
@@ -26,8 +26,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef TESTS_UBJSON_H_
-#define TESTS_UBJSON_H_
+#ifndef TESTS_UBJSON_H
+#define TESTS_UBJSON_H
 
 #include "embUnit.h"
 #include "kernel_defines.h"
@@ -50,5 +50,5 @@ void test_ubjson_empty_object(void);
 }
 #endif
 
-#endif /* TESTS_UBJSON_H_ */
+#endif /* TESTS_UBJSON_H */
 /** @} */