diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
index 81c523c7283b5155108baa966d3ec4d2942158d6..bc1f91bd97762b14f3ca965d3795f24a0930472f 100644
--- a/boards/avsextrem/include/board.h
+++ b/boards/avsextrem/include/board.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef BOARDCONF_H
-#define BOARDCONF_H
+#ifndef BOARD_H
+#define BOARD_H
 #include "bitarithm.h"
 #include "msba2_common.h"
 
@@ -60,4 +60,4 @@ void init_clks1(void);
 #endif
 
 /** @} */
-#endif /* BOARDCONF_H */
+#endif /* BOARD_H */
diff --git a/boards/calliope-mini/include/board.h b/boards/calliope-mini/include/board.h
index aa890627da4cfa7632f2630ef60703acf2f19dfa..6da549ddb61143910af2d3653773b016993202e4 100644
--- a/boards/calliope-mini/include/board.h
+++ b/boards/calliope-mini/include/board.h
@@ -73,5 +73,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
index dce97b73adb0169237e548980503e8696813e025..284692f5c0c422a968706bd8ac03db00e561e040 100644
--- a/boards/chronos/include/board.h
+++ b/boards/chronos/include/board.h
@@ -18,8 +18,8 @@
  * @author      unknown
  */
 
-#ifndef CHRONOS_BOARD_H
-#define CHRONOS_BOARD_H
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -59,5 +59,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CHRONOS_BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/ek-lm4f120xl/include/board.h b/boards/ek-lm4f120xl/include/board.h
index 118be9dca3cd8971daacabae0afc224d7bc646e8..d6444f67245fdbfb75f9f93a1f69b44a49e7bdb5 100644
--- a/boards/ek-lm4f120xl/include/board.h
+++ b/boards/ek-lm4f120xl/include/board.h
@@ -64,5 +64,5 @@ extern void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/frdm-k64f/include/board.h b/boards/frdm-k64f/include/board.h
index ffff7a2bef70bed074599f70a491867c3c8b1ab2..839edeba404ea929a9d4ac27e7c59d0bec57de2a 100644
--- a/boards/frdm-k64f/include/board.h
+++ b/boards/frdm-k64f/include/board.h
@@ -64,5 +64,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/microbit/include/board.h b/boards/microbit/include/board.h
index c111003c7a33d498d0fcea97dfa728cf29248b46..5ae51646d47349c77e646206a3b8e2b14827b878 100644
--- a/boards/microbit/include/board.h
+++ b/boards/microbit/include/board.h
@@ -89,5 +89,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/mips-malta/include/board.h b/boards/mips-malta/include/board.h
index 9d69c1bbc69ce86631d77c462d7ce9c0327b6790..d17a3f00deaa1deb9963dac34b9a7f738ec8011c 100644
--- a/boards/mips-malta/include/board.h
+++ b/boards/mips-malta/include/board.h
@@ -20,8 +20,8 @@
  * @author      Neil Jones <neil.jones@imgtec.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/mips-malta/include/periph_conf.h b/boards/mips-malta/include/periph_conf.h
index 22af279c8ba7d1225e297d695d34f2bdc32b47ca..edefe3837d2803f0408078dfd368314e227f6708 100644
--- a/boards/mips-malta/include/periph_conf.h
+++ b/boards/mips-malta/include/periph_conf.h
@@ -20,8 +20,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef _PERIPH_CONF_H_
-#define _PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,5 +55,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 4e464165694dd7510b1132b0f3dba6901ec3db53..5509a67857fb736451fdef7a3b044b4d70893ca4 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 SHT11_BOARD_H
+#define SHT11_BOARD_H
 
 /**
  * @ingroup     msb_430h
@@ -46,4 +46,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H */
+#endif /* SHT11_BOARD_H */
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index c9372e09e3b1ce65e7aea3a794854f0784167b46..a053c327f338d41cdb072833b4845f9a31e44820 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 BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -64,4 +64,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  MSB_BOARD_H */
+#endif /* BOARD_H */
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index 6d6f1cbe832bd84ba6f792ae99fc53eb3b59e599..8fc284faa1f3e9e1463c13ccc82d6f55edd99058 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 BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -52,4 +52,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* MSB_BOARD_H */
+#endif /* BOARD_H */
diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h
index 5016948a6487f3273c777160d8d5fac6936f6951..4ab9808a469e1b978bec436255bb729ca25570fd 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 SHT11_BOARD_H
+#define SHT11_BOARD_H
 
 /**
  * @ingroup     lpc2387
@@ -53,4 +53,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H */
+#endif /* SHT11_BOARD_H */
diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h
index 6c81ffc5e6f6bf5023c49c2aecad103d714dce44..de935216a6a4fa0d6978ecaf9a72770d0b6fffc7 100644
--- a/boards/msba2-common/include/msba2_common.h
+++ b/boards/msba2-common/include/msba2_common.h
@@ -43,4 +43,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 8ccd9a72db57c840a600053fae67efb08b9b4604..71bcc6e63c1aeaf8263acebd256286e00bd6514f 100644
--- a/boards/msba2-common/tools/src/control_2xxx.h
+++ b/boards/msba2-common/tools/src/control_2xxx.h
@@ -22,4 +22,4 @@
 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 dd6d26ba4e12b69857aabe33da6cdc228d6120b0..93cf0af0ccb33392ae058c773738fbe43cb06396 100644
--- a/boards/msba2-common/tools/src/lpc2k_pgm.h
+++ b/boards/msba2-common/tools/src/lpc2k_pgm.h
@@ -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 e5f1a3b67ab2b6f04dde78459ec69879e603f8ad..049b9e5009dc87ac6a5498ca919d7b434b3e9cbd 100644
--- a/boards/msba2-common/tools/src/serial.h
+++ b/boards/msba2-common/tools/src/serial.h
@@ -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/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index 0b9125d2717dd59283f82bbfb1466440912d201e..b062f261d6a21cc95264c0de3596caa79bdc4496 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 PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -374,5 +374,5 @@ static const spi_conf_t spi_config[] = {
 }
 #endif
 
-#endif /* MULLE_PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nrf51dongle/include/board.h b/boards/nrf51dongle/include/board.h
index 71eaabc263860f051a7b76da717cd32ecabeb1d2..28a0095814dfe47fe722ddfdc4daef4ebc5eac07 100644
--- a/boards/nrf51dongle/include/board.h
+++ b/boards/nrf51dongle/include/board.h
@@ -72,5 +72,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nrf52840dk/include/board.h b/boards/nrf52840dk/include/board.h
index c9c0ce4997ab21af2f22126d3009c55511aa95fb..544e434a7626b86a8bb934135fe73b67b930ac4a 100644
--- a/boards/nrf52840dk/include/board.h
+++ b/boards/nrf52840dk/include/board.h
@@ -78,5 +78,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nrf52840dk/include/periph_conf.h b/boards/nrf52840dk/include/periph_conf.h
index 728563c0d09779d7e95b64af01b9d66a70c227b2..40b3e7215bcc7e0c52ba5e5fe02b906050ccc776 100644
--- a/boards/nrf52840dk/include/periph_conf.h
+++ b/boards/nrf52840dk/include/periph_conf.h
@@ -98,4 +98,4 @@ static const spi_conf_t spi_config[] = {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nrf52dk/include/board.h b/boards/nrf52dk/include/board.h
index 6550dee0f91ec3364d64502faa62396054f2bfe4..7794dc6e0a02efd70b6e7835ac7ce3b612f157be 100644
--- a/boards/nrf52dk/include/board.h
+++ b/boards/nrf52dk/include/board.h
@@ -77,5 +77,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nrf52dk/include/periph_conf.h b/boards/nrf52dk/include/periph_conf.h
index 96c46616f125c2fac73c0377edf9d12cb5da0e20..db49936295a0334134ef657265fac398fd5529d1 100644
--- a/boards/nrf52dk/include/periph_conf.h
+++ b/boards/nrf52dk/include/periph_conf.h
@@ -98,4 +98,4 @@ static const spi_conf_t spi_config[] = {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nrf6310/include/board.h b/boards/nrf6310/include/board.h
index 10ca769c130cfc4730b111e05d5166795a469feb..b90960c60c67a19e4c12629246c9b8875b71e412 100644
--- a/boards/nrf6310/include/board.h
+++ b/boards/nrf6310/include/board.h
@@ -63,5 +63,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f411/include/board.h b/boards/nucleo-f411/include/board.h
index 7c4f23a8cfc88600d99b6f2728674c5e74198e62..7c822ac487cd74ef877e9c5cfc567cbd4aba5292 100644
--- a/boards/nucleo-f411/include/board.h
+++ b/boards/nucleo-f411/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-f411/include/periph_conf.h b/boards/nucleo-f411/include/periph_conf.h
index d46b05dc7b9979232b358c338aac6064d2dec39f..27be57ac6b7db67d2bc8c6b4fb0a1bdc318a4895 100644
--- a/boards/nucleo-f411/include/periph_conf.h
+++ b/boards/nucleo-f411/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"
 
@@ -244,5 +244,5 @@ static const spi_conf_t spi_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo32-f031/include/board.h b/boards/nucleo32-f031/include/board.h
index 7d59d6e1eb03cf8b7b904b144ee943ae24104f5a..e06c9370e3a5b4b8f220df0a1518f922a652a5c8 100644
--- a/boards/nucleo32-f031/include/board.h
+++ b/boards/nucleo32-f031/include/board.h
@@ -20,8 +20,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#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/nucleo32-f031/include/periph_conf.h b/boards/nucleo32-f031/include/periph_conf.h
index a9f6e210c1f9c4f331f923ac1b9d143b3c816d75..590d516acc87566074b1162d0b2673bca5dad2e2 100644
--- a/boards/nucleo32-f031/include/periph_conf.h
+++ b/boards/nucleo32-f031/include/periph_conf.h
@@ -17,8 +17,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"
 
@@ -200,5 +200,5 @@ static const spi_conf_t spi_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h
index d743a81fb64d8fdd5b8f373409ce8fdfb80f2402..ceff900080ca5365112100a70077c80ba39c7878 100644
--- a/boards/pca10000/include/board.h
+++ b/boards/pca10000/include/board.h
@@ -72,5 +72,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/pic32-wifire/include/board.h b/boards/pic32-wifire/include/board.h
index cf611ab179e8be2734421af258b1f07dd58135be..eaf2f461270ca0632fe78de4992310e40a097e77 100644
--- a/boards/pic32-wifire/include/board.h
+++ b/boards/pic32-wifire/include/board.h
@@ -25,8 +25,8 @@
  * @author      Neil Jones <Neil.Jones@imgtec.com>
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "periph_conf.h"
 
@@ -56,5 +56,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* _BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/pic32-wifire/include/periph_conf.h b/boards/pic32-wifire/include/periph_conf.h
index d2a09517cecee261117c6589ed2ef8dc8d5cff57..e1ae1fdfdbf6c5613b3d6014c9364bd55bb93c3b 100644
--- a/boards/pic32-wifire/include/periph_conf.h
+++ b/boards/pic32-wifire/include/periph_conf.h
@@ -19,8 +19,8 @@
  *
  * @author       Neil Jones <Neil.Jones@imgtec.com>
  */
-#ifndef _PERIPH_CONF_H_
-#define _PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -60,5 +60,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h
index c9d63b9e93aea371d5259b529c4b667c6dbce27c..97badcb8bd6b1bb9a0a4aecbdffbc48353d09327 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 BOARD_H
+#define BOARD_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,7 +37,7 @@ extern "C" {
 }
 #endif
 
-#endif /* QEMU_I386_BOARD_H */
+#endif /* BOARD_H */
 
 /**
  * @}
diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h
index 638322693ab4479b525088432f9f21aa3a2b9437..e49ea0338878e2703a378adbe6163c1452667c82 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 CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,6 +35,6 @@ extern "C" {
 }
 #endif
 
-#endif /* QEMU_I386_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 
 /** @} */
diff --git a/boards/saml21-xpro/include/board.h b/boards/saml21-xpro/include/board.h
index 794a03e401ab00872e33d3192d3024b48095b1dd..8e60c2ed7e31b17c262a3124fb406387586a20ed 100644
--- a/boards/saml21-xpro/include/board.h
+++ b/boards/saml21-xpro/include/board.h
@@ -55,5 +55,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h
index f245040ce84ef3a388b32a821a5b732776f27299..db027e2b78d88105e2f46ebe2c8d3d60abde7843 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 BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -116,4 +116,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  TELOSB_BOARD_H */
+#endif /* BOARD_H */
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index 7256f2d83e8abd9cd66c75b5d0106debaebd37b6..3836c71056006ca2714ec3a78a26777dadcc1677 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 BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -60,4 +60,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#endif /* WSN_BOARD_H */
+#endif /* BOARD_H */
diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
index d2055666708637a18ba66f2246bb13eb2e6fa32d..9771516bc3185799cafc4b4707c68ace48ca1b8e 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 BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -60,4 +60,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#endif /*  WSN_BOARD_H */
+#endif /* BOARD_H */
diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h
index 4a95a735913a8f31a9bdea1e5bdc1ba9d7299e98..09d57042b29b6b0fb03ed64d9a0b566dde5b75f4 100644
--- a/boards/x86-multiboot-common/include/multiboot.h
+++ b/boards/x86-multiboot-common/include/multiboot.h
@@ -234,5 +234,5 @@ typedef struct multiboot_mod_list multiboot_module_t;
 }
 #endif
 
-#endif  /** ! MULTIBOOT_H */
+#endif /* MULTIBOOT_H */
 /** @} */
diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h
index 0b40bcc64f9430d9d853c8e52bf323b5d1be5ea2..9b1dc254a0f8563d189577bf405b6e9c0a59f20f 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 BOARD_H
+#define BOARD_H
 
 /**
  * @defgroup    boards_z1 Zolertia Z1
@@ -123,4 +123,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  Z1_BOARD_H */
+#endif /* BOARD_H */
diff --git a/core/include/arch/irq_arch.h b/core/include/arch/irq_arch.h
index 863af6fd48c82d914902cc8e25ace88b6df09236..306aac3a3ade584a11ec6d5b9ff989c4f58af2d8 100644
--- a/core/include/arch/irq_arch.h
+++ b/core/include/arch/irq_arch.h
@@ -22,8 +22,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef IRQ_ARCH_H
-#define IRQ_ARCH_H
+#ifndef ARCH_IRQ_ARCH_H
+#define ARCH_IRQ_ARCH_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -77,5 +77,5 @@ int irq_arch_in(void);
 }
 #endif
 
-#endif /* IRQ_ARCH_H */
+#endif /* ARCH_IRQ_ARCH_H */
 /** @} */
diff --git a/core/include/arch/panic_arch.h b/core/include/arch/panic_arch.h
index 715d3877a1d797afdb5f1aaa05387a1b33bace48..f103239b4d2c55c38ad88574db9610dedd9a990e 100644
--- a/core/include/arch/panic_arch.h
+++ b/core/include/arch/panic_arch.h
@@ -16,8 +16,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PANIC_ARCH_H
-#define PANIC_ARCH_H
+#ifndef ARCH_PANIC_ARCH_H
+#define ARCH_PANIC_ARCH_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -35,5 +35,5 @@ void panic_arch(void);
 }
 #endif
 
-#endif /* REBOOT_ARCH_H */
+#endif /* ARCH_PANIC_ARCH_H */
 /** @} */
diff --git a/core/include/arch/thread_arch.h b/core/include/arch/thread_arch.h
index 7a27986bf08d4cc790fd7578e15bb3a72910f7e8..58ddcb8ee67bd1de90d13a719992201070937ff3 100644
--- a/core/include/arch/thread_arch.h
+++ b/core/include/arch/thread_arch.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef THREAD_ARCH_H
-#define THREAD_ARCH_H
+#ifndef ARCH_THREAD_ARCH_H
+#define ARCH_THREAD_ARCH_H
 
 #include "kernel_defines.h"
 
@@ -92,5 +92,5 @@ void thread_arch_yield(void);
 }
 #endif
 
-#endif /* THREAD_ARCH_H */
+#endif /* ARCH_THREAD_ARCH_H */
 /** @} */
diff --git a/core/include/native_sched.h b/core/include/native_sched.h
index 1b561181debba8e0bbd11fea862f79042aefa540..6e7e5145555d023ca1cdd6a7daecb0701746cfcb 100644
--- a/core/include/native_sched.h
+++ b/core/include/native_sched.h
@@ -20,8 +20,8 @@
  * @author      Raphael Hiesgen <raphael.hiesgen@haw-hamburg.de>
  */
 
-#ifndef NATIVE_SCHEDULER_H
-#define NATIVE_SCHEDULER_H
+#ifndef NATIVE_SCHED_H
+#define NATIVE_SCHED_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,5 +54,5 @@ inline int sched_yield(void)
 }
 #endif
 
-#endif /* NATIVE_SCHEDULER_H */
+#endif /* NATIVE_SCHED_H */
 /** @} */
diff --git a/core/include/priority_queue.h b/core/include/priority_queue.h
index 8c55a74232277a09c1b3a14dd7f5320c02172ef8..bceae1bb6c2fa7bb0893fe178080806916b236f4 100644
--- a/core/include/priority_queue.h
+++ b/core/include/priority_queue.h
@@ -16,8 +16,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef PRIORITY_QUEUE_H
+#define PRIORITY_QUEUE_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -132,4 +132,4 @@ void priority_queue_print_node(priority_queue_t *root);
 #endif
 
 /** @} */
-#endif /* QUEUE_H */
+#endif /* PRIORITY_QUEUE_H */
diff --git a/core/include/rmutex.h b/core/include/rmutex.h
index 81a3c33f0911c149857c7d71aa9f27b8248fcbeb..880bbf0ea28adbde828639adbbd9e78cec755cd4 100644
--- a/core/include/rmutex.h
+++ b/core/include/rmutex.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef RMUTEX_H_
-#define RMUTEX_H_
+#ifndef RMUTEX_H
+#define RMUTEX_H
 
 #include <stdatomic.h>
 
@@ -106,5 +106,5 @@ void rmutex_unlock(rmutex_t *rmutex);
 }
 #endif
 
-#endif /* RMUTEX_H_ */
+#endif /* RMUTEX_H */
 /** @} */
diff --git a/core/include/sched.h b/core/include/sched.h
index 7a833984bcf021a77a2e0228453f92affb7b3637..0c11db12ef116ef5d35224c27930a6a5c58e6122 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -77,8 +77,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef SCHEDULER_H
-#define SCHEDULER_H
+#ifndef SCHED_H
+#define SCHED_H
 
 #include <stddef.h>
 #include "kernel_defines.h"
@@ -202,5 +202,5 @@ void sched_register_cb(void (*callback)(uint32_t, uint32_t));
 }
 #endif
 
-#endif /* SCHEDULER_H */
+#endif /* SCHED_H */
 /** @} */
diff --git a/core/include/thread_flags.h b/core/include/thread_flags.h
index 1e78f193456b57bb38e5bc5f32c6d438453e049e..e87538eb1c71de9f1997f6bf5f7ad5472a6541c8 100644
--- a/core/include/thread_flags.h
+++ b/core/include/thread_flags.h
@@ -47,8 +47,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef THREAD_FLAG_H
-#define THREAD_FLAG_H
+#ifndef THREAD_FLAGS_H
+#define THREAD_FLAGS_H
 
 #include "kernel_types.h"
 #include "sched.h"  /* for thread_t typedef */
@@ -152,4 +152,4 @@ int thread_flags_wake(thread_t *thread);
 #endif
 
 /** @} */
-#endif /* THREAD_FLAG_H */
+#endif /* THREAD_FLAGS_H */
diff --git a/cpu/atmega_common/avr-libc-extra/inttypes.h b/cpu/atmega_common/avr-libc-extra/inttypes.h
index 9c93b545353ca16f694bb9dcdfb136d73a619d0c..b98eef4c8202eb5ca484476c99fcf35aa0112314 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 INTTYPES_H
+#define INTTYPES_H
 
 #include_next <inttypes.h>
 
@@ -33,5 +33,5 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_INTTYPES_H */
+#endif /* INTTYPES_H */
 /** @} */
diff --git a/cpu/atmega_common/avr-libc-extra/time.h b/cpu/atmega_common/avr-libc-extra/time.h
index 00a6c87bd172ceb8756cfa115a9d23221d097367..c287fac2e0b536d87218199481ff9b1bae5e72eb 100644
--- a/cpu/atmega_common/avr-libc-extra/time.h
+++ b/cpu/atmega_common/avr-libc-extra/time.h
@@ -524,7 +524,7 @@ extern "C" {
 }
 #endif
 
-#endif              /* TIME_H  */
+#endif /* TIME_H */
 
 /**
 \endcond
diff --git a/cpu/atmega_common/include/cpu.h b/cpu/atmega_common/include/cpu.h
index 4be4234a4bcee3b336236f0ab35388144a6ddf36..45361f2b19bb4bbb9ed3cb13f708267e476dda5e 100644
--- a/cpu/atmega_common/include/cpu.h
+++ b/cpu/atmega_common/include/cpu.h
@@ -24,8 +24,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef ATMEGA_COMMON_H
-#define ATMEGA_COMMON_H
+#ifndef CPU_H
+#define CPU_H
 
 #include <stdio.h>
 #include <stdint.h>
@@ -83,5 +83,5 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif /* ATMEGA_COMMON_H */
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/atmega_common/include/sys/stat.h b/cpu/atmega_common/include/sys/stat.h
index 49e8533c65740910d659babf4863e092d89734b1..1099df2470a387601a3c3ec762c3d469ea04589f 100644
--- a/cpu/atmega_common/include/sys/stat.h
+++ b/cpu/atmega_common/include/sys/stat.h
@@ -12,8 +12,8 @@
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef SYS_STAT_H_
-#define SYS_STAT_H_
+#ifndef SYS_STAT_H
+#define SYS_STAT_H
 
 #include <time.h> /* for struct timespec */
 #include <sys/types.h> /* for fsblkcnt_t, fsfilcnt_t */
@@ -115,6 +115,6 @@ int    utimensat(int, const char *, const struct timespec [2], int);
 }
 #endif
 
-#endif /* SYS_STAT_H_ */
+#endif /* SYS_STAT_H */
 
 /** @} */
diff --git a/cpu/atmega_common/include/sys/time.h b/cpu/atmega_common/include/sys/time.h
index 7339088cb8984daab99d2f101880e964f9c53d05..2dfa8b99bab2d5a85db8c704abaee227d9ac0735 100644
--- a/cpu/atmega_common/include/sys/time.h
+++ b/cpu/atmega_common/include/sys/time.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef ATMEGA_TIME_H
-#define ATMEGA_TIME_H
+#ifndef SYS_TIME_H
+#define SYS_TIME_H
 
 #include <sys/types.h>
 #include <time.h>
@@ -29,4 +29,4 @@ struct timeval {
 }
 #endif
 
-#endif /* ATMEGA_TIME_H */
+#endif /* SYS_TIME_H */
diff --git a/cpu/atmega_common/include/sys/types.h b/cpu/atmega_common/include/sys/types.h
index 7cce094a6c83e9c4e8c4dacf56ecd37bd2559316..1ae38413a425a17fb98124153e38d17f03e12721 100644
--- a/cpu/atmega_common/include/sys/types.h
+++ b/cpu/atmega_common/include/sys/types.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef SYS_TYPES_H_
-#define SYS_TYPES_H_
+#ifndef SYS_TYPES_H
+#define SYS_TYPES_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -44,4 +44,4 @@ typedef     uint32_t useconds_t;  /**< Used for time in microseconds */
 }
 #endif
 
-#endif /* SYS_TYPES_H_ */
+#endif /* SYS_TYPES_H */
diff --git a/cpu/cc2538/include/cc2538.h b/cpu/cc2538/include/cc2538.h
index b74c20bd4a59495c0ab5716ac7b0d8951caf4b02..bca9ff73760d0d6b17e71344f425eba91dbe680f 100644
--- a/cpu/cc2538/include/cc2538.h
+++ b/cpu/cc2538/include/cc2538.h
@@ -16,8 +16,8 @@
  * @author          Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef _CC2538_
-#define _CC2538_
+#ifndef CC2538_H
+#define CC2538_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -815,6 +815,6 @@ typedef volatile uint32_t cc2538_reg_t; /**< Least-significant 32 bits of the IE
 }
 #endif
 
-#endif /* _CC2538_ */
+#endif /* CC2538_H */
 
 /*@}*/
diff --git a/cpu/cc2538/include/cc2538_gptimer.h b/cpu/cc2538/include/cc2538_gptimer.h
index a9ce1945374ae5fb22f2d6a624814c3a8a71af55..3a79544f68b4872d5362e9f08855e153118da8eb 100644
--- a/cpu/cc2538/include/cc2538_gptimer.h
+++ b/cpu/cc2538/include/cc2538_gptimer.h
@@ -17,8 +17,8 @@
  * @author          Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef GPTIMER_H
-#define GPTIMER_H
+#ifndef CC2538_GPTIMER_H
+#define CC2538_GPTIMER_H
 
 #include <stdint.h>
 
@@ -180,6 +180,6 @@ void isr_timer3_chan1(void);                /**< RIOT Timer 3 Channel 1 Interrup
 } /* end extern "C" */
 #endif
 
-#endif /* GPTIMER_H */
+#endif /* CC2538_GPTIMER_H */
 
 /* @} */
diff --git a/cpu/cc26x0/include/cc26x0.h b/cpu/cc26x0/include/cc26x0.h
index 3ddbac92fae9d0726ffd15fc39a0537ddd26c517..8f3f13b92917f52d10bee7f9119482d6d06ca23c 100644
--- a/cpu/cc26x0/include/cc26x0.h
+++ b/cpu/cc26x0/include/cc26x0.h
@@ -16,8 +16,8 @@
  * @author          Leon M. George <leon@georgemail.eu>
  */
 
-#ifndef CC26x0_H
-#define CC26x0_H
+#ifndef CC26X0_H
+#define CC26X0_H
 
 #include <stdint.h>
 
@@ -112,6 +112,6 @@ typedef enum IRQn
 }
 #endif
 
-#endif /* CC26x0_H */
+#endif /* CC26X0_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_aux.h b/cpu/cc26x0/include/cc26x0_aux.h
index a790bb63d4475159ec10176354a1e7adc73c4a6b..ee4483d9adc9b1f8bcb10d608993bfbc8185e056 100644
--- a/cpu/cc26x0/include/cc26x0_aux.h
+++ b/cpu/cc26x0/include/cc26x0_aux.h
@@ -13,8 +13,8 @@
  * @brief           CC26x0 AUX register definitions
  */
 
-#ifndef CC26x0_AUX_H
-#define CC26x0_AUX_H
+#ifndef CC26X0_AUX_H
+#define CC26X0_AUX_H
 
 #include <stdbool.h>
 
@@ -253,6 +253,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_AUX_H */
+#endif /* CC26X0_AUX_H */
 
 /** @}*/
diff --git a/cpu/cc26x0/include/cc26x0_ccfg.h b/cpu/cc26x0/include/cc26x0_ccfg.h
index 89d2ffc9ecbb3a4fe538a2fa54966a33bdd4d75b..e972deaf4dc0a02dfdb7d1557e19996a32576f8b 100644
--- a/cpu/cc26x0/include/cc26x0_ccfg.h
+++ b/cpu/cc26x0/include/cc26x0_ccfg.h
@@ -13,8 +13,8 @@
  * @brief           CC26x0 CCFG register definitions
  */
 
-#ifndef CC26x0_CCFG_H
-#define CC26x0_CCFG_H
+#ifndef CC26X0_CCFG_H
+#define CC26X0_CCFG_H
 
 #include <cc26x0.h>
 
@@ -65,6 +65,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_CCFG_H */
+#endif /* CC26X0_CCFG_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_fcfg.h b/cpu/cc26x0/include/cc26x0_fcfg.h
index 9450f791056ffd9350d057bb7087fde288c29dd7..3dd9578aecf4d080f99d4d2d4e8614f7b45b9dd1 100644
--- a/cpu/cc26x0/include/cc26x0_fcfg.h
+++ b/cpu/cc26x0/include/cc26x0_fcfg.h
@@ -13,8 +13,8 @@
  * @brief           CC26x0 FCFG register definitions
  */
 
-#ifndef CC26x0_FCFG_H
-#define CC26x0_FCFG_H
+#ifndef CC26X0_FCFG_H
+#define CC26X0_FCFG_H
 
 #include <cc26x0.h>
 
@@ -134,6 +134,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_FCFG_H */
+#endif /* CC26X0_FCFG_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_gpio.h b/cpu/cc26x0/include/cc26x0_gpio.h
index 7e4c81a59e64f881a5f6c074b25bb3078e4057a4..46bd5b964d4f992fe395c16ae62e9bc02a4402fc 100644
--- a/cpu/cc26x0/include/cc26x0_gpio.h
+++ b/cpu/cc26x0/include/cc26x0_gpio.h
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef CC26x0_GPIO_H
-#define CC26x0_GPIO_H
+#ifndef CC26X0_GPIO_H
+#define CC26X0_GPIO_H
 
 #include "cc26x0.h"
 
@@ -58,6 +58,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_GPIO_H */
+#endif /* CC26X0_GPIO_H */
 
 /** @} */
diff --git a/cpu/cc26x0/include/cc26x0_gpt.h b/cpu/cc26x0/include/cc26x0_gpt.h
index a6ce5b504339556518d47aa38923405989ff0f81..2c553c0abcba5e10071ffecdcc3b1a236e0a3cac 100644
--- a/cpu/cc26x0/include/cc26x0_gpt.h
+++ b/cpu/cc26x0/include/cc26x0_gpt.h
@@ -16,8 +16,8 @@
  * @author          Leon George <leon@georgemail.eu>
  */
 
-#ifndef CC26x0_GPT_H
-#define CC26x0_GPT_H
+#ifndef CC26X0_GPT_H
+#define CC26X0_GPT_H
 
 #include "cc26x0.h"
 
@@ -207,5 +207,5 @@ typedef struct {
 }
 #endif
 
-#endif /* CC26x0_GPT_H */
+#endif /* CC26X0_GPT_H */
 /** @} */
diff --git a/cpu/cc26x0/include/cc26x0_i2c.h b/cpu/cc26x0/include/cc26x0_i2c.h
index 6a34c13b4406b58f44430d5f2aefea764776a4fc..2dc2e466d588fccb3f39838e23b372c6833e5a9f 100644
--- a/cpu/cc26x0/include/cc26x0_i2c.h
+++ b/cpu/cc26x0/include/cc26x0_i2c.h
@@ -16,8 +16,8 @@
  * @author          Leon George <leon@georgemail.eu>
  */
 
-#ifndef CC26x0_I2C_H
-#define CC26x0_I2C_H
+#ifndef CC26X0_I2C_H
+#define CC26X0_I2C_H
 
 #include "cc26x0.h"
 
@@ -67,6 +67,6 @@ typedef struct {
 }
 #endif
 
-#endif /* CC26x0_I2C_H */
+#endif /* CC26X0_I2C_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_ioc.h b/cpu/cc26x0/include/cc26x0_ioc.h
index facf2b66dbc5a7791a2107063b0c93fda1d153d3..e481a7b0233b3d0a8e0daad05ec2f1f4c4e1b29c 100644
--- a/cpu/cc26x0/include/cc26x0_ioc.h
+++ b/cpu/cc26x0/include/cc26x0_ioc.h
@@ -16,8 +16,8 @@
  * @author          Leon George <leon@georgemail.eu>
  */
 
-#ifndef CC26x0_IOC_H
-#define CC26x0_IOC_H
+#ifndef CC26X0_IOC_H
+#define CC26X0_IOC_H
 
 #include "cc26x0.h"
 
@@ -159,6 +159,6 @@ typedef struct {
 }
 #endif
 
-#endif /* CC26x0_IOC_H */
+#endif /* CC26X0_IOC_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_prcm.h b/cpu/cc26x0/include/cc26x0_prcm.h
index 5310d1d9daaf2acdfdfa4282b45d091c6cb04e24..8912089e032d2a39829b8454f3712cb46323f274 100644
--- a/cpu/cc26x0/include/cc26x0_prcm.h
+++ b/cpu/cc26x0/include/cc26x0_prcm.h
@@ -14,8 +14,8 @@
  * @brief           CC26x0 PRCM register definitions
  */
 
-#ifndef CC26x0_PRCM_H
-#define CC26x0_PRCM_H
+#ifndef CC26X0_PRCM_H
+#define CC26X0_PRCM_H
 
 #include <cc26x0.h>
 
@@ -317,6 +317,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_PRCM_H */
+#endif /* CC26X0_PRCM_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_uart.h b/cpu/cc26x0/include/cc26x0_uart.h
index d0ca4a7f18241a8cca2a66f79d993ecf14d88c15..12cc17df6a19362561401d4d818cbeb17cd01eda 100644
--- a/cpu/cc26x0/include/cc26x0_uart.h
+++ b/cpu/cc26x0/include/cc26x0_uart.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef CC26x0_UART_H
-#define CC26x0_UART_H
+#ifndef CC26X0_UART_H
+#define CC26X0_UART_H
 
 #include "cc26x0.h"
 
@@ -129,5 +129,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x8_UART_H */
+#endif /* CC26X0_UART_H */
 /** @} */
diff --git a/cpu/cc26x0/include/cc26x0_vims.h b/cpu/cc26x0/include/cc26x0_vims.h
index c65fd4545e55d69ef5cea0f8740c761f31e61c61..905a4bdd122499dee980e4d2b156727d68314ed6 100644
--- a/cpu/cc26x0/include/cc26x0_vims.h
+++ b/cpu/cc26x0/include/cc26x0_vims.h
@@ -14,8 +14,8 @@
  * @brief           CC26x0 VIMS register definitions
  */
 
-#ifndef CC26x0_VIMS_H
-#define CC26x0_VIMS_H
+#ifndef CC26X0_VIMS_H
+#define CC26X0_VIMS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -232,6 +232,6 @@ typedef struct {
 }
 #endif
 
-#endif /* CC26x0_VIMS_H */
+#endif /* CC26X0_VIMS_H */
 
 /*@}*/
diff --git a/cpu/cc26x0/include/cc26x0_wdt.h b/cpu/cc26x0/include/cc26x0_wdt.h
index 3137adca9a4c2c66abdf99ce9785b3d3361e03f0..3ff93178526f3aa240726109d2389d2ef0c603de 100644
--- a/cpu/cc26x0/include/cc26x0_wdt.h
+++ b/cpu/cc26x0/include/cc26x0_wdt.h
@@ -14,8 +14,8 @@
  * @brief           CC26x0 WDT register definitions
  */
 
-#ifndef CC26x0_WDT_H
-#define CC26x0_WDT_H
+#ifndef CC26X0_WDT_H
+#define CC26X0_WDT_H
 
 #include <cc26x0.h>
 
@@ -51,6 +51,6 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26x0_WDT_H */
+#endif /* CC26X0_WDT_H */
 
 /*@}*/
diff --git a/cpu/cc430/include/cc430-adc.h b/cpu/cc430/include/cc430-adc.h
index cd01612da37d43b468169a5657d3bbdbd8b0267a..ac25b830ab19256ce646c9d457f04cbee468ea85 100644
--- a/cpu/cc430/include/cc430-adc.h
+++ b/cpu/cc430/include/cc430-adc.h
@@ -49,4 +49,4 @@ extern uint8_t  adc12_data_ready;
 }
 #endif
 
-#endif
+#endif /* CC430_ADC_H */
diff --git a/cpu/cc430/include/cc430-rtc.h b/cpu/cc430/include/cc430-rtc.h
index a1e6374a1e3dad56777b68373cbc2d6496b7fa63..e01ea015eca0e393517ace86c505c2ef7b295ea9 100644
--- a/cpu/cc430/include/cc430-rtc.h
+++ b/cpu/cc430/include/cc430-rtc.h
@@ -48,4 +48,4 @@ void rtc_remove_alarm(void);
 }
 #endif
 
-#endif
+#endif /* CC430_RTC_H */
diff --git a/cpu/cc430/include/periph_cpu.h b/cpu/cc430/include/periph_cpu.h
index c14e77537cec61d1976042b1a9fb56e9d53349ba..15e19626ffc797a47703ced51b7c79ab07bcdef3 100644
--- a/cpu/cc430/include/periph_cpu.h
+++ b/cpu/cc430/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 PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 #include "cc430_regs.h"
@@ -32,5 +32,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_PERIPH_H */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/vectors_cortexm.h b/cpu/cortexm_common/include/vectors_cortexm.h
index 031513be06eac1586d1038ac65b46215e29ff5f8..21406c768dcc9041d95e20cb6002efc055b78d5d 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_CORTEXM_H
+#define VECTORS_CORTEXM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -122,5 +122,5 @@ void dummy_handler_default(void);
 }
 #endif
 
-#endif /* VECTORS_DEFAULT_H */
+#endif /* VECTORS_CORTEXM_H */
 /** @} */
diff --git a/cpu/ezr32wg/include/cpu_conf.h b/cpu/ezr32wg/include/cpu_conf.h
index 7bbad89e52f4052cfe30d0fab092c7c5d8c45132..febf214b586466cf9779bdaec0d9e55fb418ed6d 100644
--- a/cpu/ezr32wg/include/cpu_conf.h
+++ b/cpu/ezr32wg/include/cpu_conf.h
@@ -46,5 +46,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/ezr32wg/include/periph_cpu.h b/cpu/ezr32wg/include/periph_cpu.h
index f1ad2aad927b936754db7b3707e2bb9b03b6054d..338a7a0bbf6c7766b25c630e2665e657c7279578 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 PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 
@@ -137,5 +137,5 @@ typedef struct {
 }
 #endif
 
-#endif /* CPU_PERIPH_H */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/kinetis_common/include/mcg.h b/cpu/kinetis_common/include/mcg.h
index 7d12c768ea4a9e76aa113a74d510b77993aa5f56..2c17c179c541d7b687eb30610680989e16959cc5 100644
--- a/cpu/kinetis_common/include/mcg.h
+++ b/cpu/kinetis_common/include/mcg.h
@@ -97,8 +97,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef MCG_CPU_H
-#define MCG_CPU_H
+#ifndef MCG_H
+#define MCG_H
 
 #include "periph_conf.h"
 
@@ -133,4 +133,4 @@ int kinetis_mcg_set_mode(kinetis_mcg_mode_t mode);
 #endif /* KINETIS_CPU_USE_MCG */
 /** @} */
 
-#endif /* MCG_CPU_H */
+#endif /* MCG_H */
diff --git a/cpu/lpc2387/include/cpu_conf.h b/cpu/lpc2387/include/cpu_conf.h
index a50a5ee247c2c4f5ce9e64422950fd83aa29fff9..15696ef3a2ce3f2217972921107b1d9425136505 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 CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,4 +68,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* CPUCONF_H */
+#endif /* CPU_CONF_H */
diff --git a/cpu/mips32r2_common/include/cpu.h b/cpu/mips32r2_common/include/cpu.h
index cb1d1c633c3af738031402ec7eb3ceafb9b91095..119adc58ac031e427c442fce5855646d57d13ff1 100644
--- a/cpu/mips32r2_common/include/cpu.h
+++ b/cpu/mips32r2_common/include/cpu.h
@@ -18,8 +18,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,5 +44,5 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/mips32r2_common/include/cpu_conf.h b/cpu/mips32r2_common/include/cpu_conf.h
index 74fa00c7d9eb11a5496bdd14c5ddc433d522dddd..d4d65a02522128a3ea194b4bec803c8e2e3e0e80 100644
--- a/cpu/mips32r2_common/include/cpu_conf.h
+++ b/cpu/mips32r2_common/include/cpu_conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef _CPU_CONF_H_
-#define _CPU_CONF_H_
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 /**
  * @defgroup    cpu_mips32r2_commom MIPS32R2 Common
@@ -64,5 +64,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/mips32r2_common/include/eic_irq.h b/cpu/mips32r2_common/include/eic_irq.h
index d7db558357f84fef6a24d87296395ba4d018bf12..c24c38875c898ceeeb28e71e178fd605f1324f98 100644
--- a/cpu/mips32r2_common/include/eic_irq.h
+++ b/cpu/mips32r2_common/include/eic_irq.h
@@ -17,8 +17,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef EIC_IRQ_H_
-#define EIC_IRQ_H_
+#ifndef EIC_IRQ_H
+#define EIC_IRQ_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,5 +65,5 @@ void eic_irq_ack(int irq_num);
 }
 #endif
 
-#endif
+#endif /* EIC_IRQ_H */
 /** @} */
diff --git a/cpu/mips_pic32mx/include/cpu.h b/cpu/mips_pic32mx/include/cpu.h
index 4419212ba64879b89651bf060a37955b760111c2..820584037b283a6f069ce244290e5db6b9dba3e3 100644
--- a/cpu/mips_pic32mx/include/cpu.h
+++ b/cpu/mips_pic32mx/include/cpu.h
@@ -20,8 +20,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,5 +51,5 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/mips_pic32mx/include/cpu_conf.h b/cpu/mips_pic32mx/include/cpu_conf.h
index 6ef3af3e1a0dc5e4a56d4afc7ff0607ec42079a3..6db3ffbdbc2618287613ea42fc7b3e13a2b13312 100644
--- a/cpu/mips_pic32mx/include/cpu_conf.h
+++ b/cpu/mips_pic32mx/include/cpu_conf.h
@@ -19,8 +19,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef _CPU_CONF_H_
-#define _CPU_CONF_H_
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,5 +64,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/mips_pic32mz/include/cpu.h b/cpu/mips_pic32mz/include/cpu.h
index 54299718c7d6e6470ac1a8db1b681fd19e7bfa6c..399f66de50bf3513e6caf867468a1d6b496311c7 100644
--- a/cpu/mips_pic32mz/include/cpu.h
+++ b/cpu/mips_pic32mz/include/cpu.h
@@ -19,8 +19,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,5 +50,5 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/mips_pic32mz/include/cpu_conf.h b/cpu/mips_pic32mz/include/cpu_conf.h
index f2bd995541d1bfe2fb96857173abfcdb008d9850..3e120effb0de8a826152e58a58747be5c7a765a0 100644
--- a/cpu/mips_pic32mz/include/cpu_conf.h
+++ b/cpu/mips_pic32mz/include/cpu_conf.h
@@ -19,8 +19,8 @@
  * @author      Neil Jones <neil.jones@imgtec.com>
  */
 
-#ifndef _CPU_CONF_H_
-#define _CPU_CONF_H_
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,5 +65,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/msp430_common/include/cpu_conf.h b/cpu/msp430_common/include/cpu_conf.h
index 00b80740e2db6cd84dd79b0154b87c66878c0494..3bf046d1d2548b2a1bc0660b5bdd8c40467ebbcc 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 CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H */
+#endif /* CPU_CONF_H */
diff --git a/cpu/msp430_common/include/stdatomic.h b/cpu/msp430_common/include/stdatomic.h
index acecd28db2c2c67dd27aaed0d5549fb9bfc18c68..052fbf0db744453aca3397360a563b05399d6e89 100644
--- a/cpu/msp430_common/include/stdatomic.h
+++ b/cpu/msp430_common/include/stdatomic.h
@@ -29,8 +29,8 @@
 
 /* This file was imported into RIOT from newlib 2.3.0 */
 
-#ifndef STDATOMIC_H_
-#define STDATOMIC_H_
+#ifndef STDATOMIC_H
+#define STDATOMIC_H
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>
@@ -423,4 +423,4 @@ atomic_flag_clear(volatile atomic_flag *__object)
 }
 #endif
 
-#endif /* !_STDATOMIC_H_ */
+#endif /* STDATOMIC_H */
diff --git a/cpu/msp430_common/include/stdio.h b/cpu/msp430_common/include/stdio.h
index 8cfb4cd38ef20d0a532e8c083e1bc5d58f28be51..2a5223ba6024f7f6c9517e4c3c42f7c1959b9672 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 STDIO_H
+#define STDIO_H
 
 /*
  * The MSP430 toolchain does not provide getchar in stdio.h.
@@ -41,4 +41,4 @@ int getchar(void);
 }
 #endif
 
-#endif /* RIOT_MSP430_STDIO_H */
+#endif /* STDIO_H */
diff --git a/cpu/msp430_common/include/stdlib.h b/cpu/msp430_common/include/stdlib.h
index 615f16833e16eb969d06cd9e893a34eec1edf8aa..20bc817c84a3dfa39c5c0c37291a36154d01d990 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 STDLIB_H
+#define 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 /* STDLIB_H */
diff --git a/cpu/msp430_common/include/sys/cdefs.h b/cpu/msp430_common/include/sys/cdefs.h
index 19c773b81c9771156329024c1140b646f1a5a39e..06ad62ba3f8669b1f934b8d12f8c68ae99dd964c 100644
--- a/cpu/msp430_common/include/sys/cdefs.h
+++ b/cpu/msp430_common/include/sys/cdefs.h
@@ -39,8 +39,8 @@
 
 /* This file was imported into RIOT from newlib 2.3.0 */
 
-#ifndef _SYS_CDEFS_H_
-#define _SYS_CDEFS_H_
+#ifndef SYS_CDEFS_H
+#define SYS_CDEFS_H
 
 #include <sys/features.h>
 #include <stddef.h>
@@ -708,4 +708,4 @@ extern "C" {
 }
 #endif
 
-#endif /* !_SYS_CDEFS_H_ */
+#endif /* SYS_CDEFS_H */
diff --git a/cpu/msp430_common/include/sys/features.h b/cpu/msp430_common/include/sys/features.h
index ce4da2772bab66cf3194cbad70a6d69ce5a3ebf1..19ff7e05ebdc01e2fb272f540d4209d2fa46b555 100644
--- a/cpu/msp430_common/include/sys/features.h
+++ b/cpu/msp430_common/include/sys/features.h
@@ -20,8 +20,8 @@
 
 /* This file was imported into RIOT from newlib 2.3.0 */
 
-#ifndef _SYS_FEATURES_H
-#define _SYS_FEATURES_H
+#ifndef SYS_FEATURES_H
+#define SYS_FEATURES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -511,4 +511,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif /* _SYS_FEATURES_H */
+#endif /* SYS_FEATURES_H */
diff --git a/cpu/msp430_common/include/sys/stat.h b/cpu/msp430_common/include/sys/stat.h
index e87823272e074a29a0f4a40fc140d29085ab7896..2b3ec0933d6a32bdffcbc5ed3c5cb8a4bbfd1cc9 100644
--- a/cpu/msp430_common/include/sys/stat.h
+++ b/cpu/msp430_common/include/sys/stat.h
@@ -18,8 +18,8 @@
 /* without the GCC pragma above #include_next will trigger a pedantic error */
 #include_next <sys/stat.h>
 #else
-#ifndef SYS_STAT_H_
-#define SYS_STAT_H_
+#ifndef SYS_STAT_H
+#define SYS_STAT_H
 
 #include <time.h> /* for struct timespec */
 #include <sys/types.h> /* for fsblkcnt_t, fsfilcnt_t */
@@ -121,7 +121,7 @@ int    utimensat(int, const char *, const struct timespec [2], int);
 }
 #endif
 
-#endif /* SYS_STAT_H_ */
+#endif /* SYS_STAT_H */
 
 #endif /* CPU_NATIVE */
 
diff --git a/cpu/msp430_common/include/sys/time.h b/cpu/msp430_common/include/sys/time.h
index 9b0e16573a155ca473b375840c414c3c8e750f2d..3a56dc7fdb52f8a69a33298629343bd9dbee156d 100644
--- a/cpu/msp430_common/include/sys/time.h
+++ b/cpu/msp430_common/include/sys/time.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef TIME_H
-#define TIME_H
+#ifndef SYS_TIME_H
+#define SYS_TIME_H
 
 #include "msp430_types.h"
 
@@ -19,4 +19,4 @@ extern "C" {
 }
 #endif
 
-#endif /* TIME_H */
+#endif /* SYS_TIME_H */
diff --git a/cpu/msp430_common/include/time.h b/cpu/msp430_common/include/time.h
index 683e16edcf8a1470b08640cf0f029d7a8ed76b85..9664d656c83f0ad5ff9c72291f7a89eb9b57b9cb 100644
--- a/cpu/msp430_common/include/time.h
+++ b/cpu/msp430_common/include/time.h
@@ -17,8 +17,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef MSPGCC_TIME_H
-#define MSPGCC_TIME_H
+#ifndef TIME_H
+#define TIME_H
 
 #include <sys/types.h>
 #include "msp430_types.h"
@@ -47,5 +47,5 @@ struct tm {
 }
 #endif
 
-#endif
+#endif /* TIME_H */
 /** @} */
diff --git a/cpu/msp430fxyz/include/periph_cpu.h b/cpu/msp430fxyz/include/periph_cpu.h
index 85ab53d5fbbec2c2f9f0af4f2723623512a95bef..9d1e3319f45d6603508bd6328049adfc2a9fa874 100644
--- a/cpu/msp430fxyz/include/periph_cpu.h
+++ b/cpu/msp430fxyz/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 PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 #include "msp430_regs.h"
@@ -132,5 +132,5 @@ void gpio_periph_mode(gpio_t pin, bool enable);
 }
 #endif
 
-#endif /* CPU_PERIPH_H */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/native/include/async_read.h b/cpu/native/include/async_read.h
index 0f61d1a6a6fefc3e0af7201e582efc31ca970f3c..620170d57650de5070035f030a591c360a0bfca7 100644
--- a/cpu/native/include/async_read.h
+++ b/cpu/native/include/async_read.h
@@ -71,5 +71,5 @@ void native_async_read_add_handler(int fd, void *arg, native_async_read_callback
 }
 #endif
 
-#endif
+#endif /* ASYNC_READ_H */
 /** @} */
diff --git a/cpu/native/include/cpu.h b/cpu/native/include/cpu.h
index efc4ad76600cec7c165b5b652d7e2f8e9c55b663..f838a76cfe1311d254b338f830b555045877a5d3 100644
--- a/cpu/native/include/cpu.h
+++ b/cpu/native/include/cpu.h
@@ -17,8 +17,8 @@
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
-#ifndef _CPU_H
-#define _CPU_H
+#ifndef CPU_H
+#define CPU_H
 
 #include <stdio.h>
 
@@ -42,4 +42,4 @@ __attribute__((always_inline)) static inline void cpu_print_last_instruction(voi
 #endif
 
 /** @} */
-#endif //_CPU_H
+#endif /* CPU_H */
diff --git a/cpu/native/include/cpu_conf.h b/cpu/native/include/cpu_conf.h
index 08dd88225ee3958db59d800bae91d0adb1eaaaad..16f305f2484870a00d750bfb8f98764c2db84190 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 CPU_CONF_H
+#define CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H */
+#endif /* CPU_CONF_H */
diff --git a/cpu/native/include/native_internal.h b/cpu/native/include/native_internal.h
index d93d740f08141bc28d551bf6cd89c4515d49d3d1..716c526cd54e3328b0407bafdb4aaaf2f7108b8f 100644
--- a/cpu/native/include/native_internal.h
+++ b/cpu/native/include/native_internal.h
@@ -16,8 +16,8 @@
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
-#ifndef _NATIVE_INTERNAL_H
-#define _NATIVE_INTERNAL_H
+#ifndef NATIVE_INTERNAL_H
+#define NATIVE_INTERNAL_H
 
 #include <signal.h>
 #include <stdio.h>
@@ -188,4 +188,4 @@ int unregister_interrupt(int sig);
 #include "sched.h"
 
 /** @} */
-#endif /* _NATIVE_INTERNAL_H */
+#endif /* NATIVE_INTERNAL_H */
diff --git a/cpu/native/include/netdev_tap_params.h b/cpu/native/include/netdev_tap_params.h
index 17038dd10650bf78a61f99ee02650d1470242935..4fe6e1af40ab0874131254181a720e76077401fb 100644
--- a/cpu/native/include/netdev_tap_params.h
+++ b/cpu/native/include/netdev_tap_params.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef NETDEV_TAP_PARAMS_H_
-#define NETDEV_TAP_PARAMS_H_
+#ifndef NETDEV_TAP_PARAMS_H
+#define NETDEV_TAP_PARAMS_H
 
 #include "netdev_tap.h"
 
@@ -46,5 +46,5 @@ extern netdev_tap_params_t netdev_tap_params[NETDEV_TAP_MAX];
 }
 #endif
 
-#endif /* NETDEV_TAP_PARAMS_H_ */
+#endif /* NETDEV_TAP_PARAMS_H */
 /** @} */
diff --git a/cpu/native/include/tty_uart.h b/cpu/native/include/tty_uart.h
index 73d2547ff4c2d7caafe6934e78140a6569f74e3a..880104b2d6ed84b0dc73a23e9be43ed323e0a2e0 100644
--- a/cpu/native/include/tty_uart.h
+++ b/cpu/native/include/tty_uart.h
@@ -37,5 +37,5 @@ void tty_uart_setup(uart_t uart, const char *name);
 }
 #endif
 
-#endif
+#endif /* TTY_UART_H */
 /** @} */
diff --git a/cpu/native/osx-libc-extra/malloc.h b/cpu/native/osx-libc-extra/malloc.h
index 21ba4201d63ed7e2be1f7f1ef38aa32f3dff731e..681341c433d92d49a4ab7f8b8008370c07b597f6 100644
--- a/cpu/native/osx-libc-extra/malloc.h
+++ b/cpu/native/osx-libc-extra/malloc.h
@@ -63,7 +63,7 @@ extern void free (void *ptr);
 }
 #endif
 
-#endif /* malloc.h */
+#endif /* MALLOC_H */
 
 /**
  * @}
diff --git a/cpu/nrf51/include/periph_cpu.h b/cpu/nrf51/include/periph_cpu.h
index ba473fcf86d57ae087a0d0881078bbb27b3d9865..d41b968a5e79013214f48ffd72119091a9cd7a80 100644
--- a/cpu/nrf51/include/periph_cpu.h
+++ b/cpu/nrf51/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_
-#define PERIPH_CPU_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -63,5 +63,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/nrf52/include/periph_cpu.h b/cpu/nrf52/include/periph_cpu.h
index 370e9fdaf383db77022befd5e3dba86bb93f26c8..21bd8c306069f2346f87786e436e6b999c066fbb 100644
--- a/cpu/nrf52/include/periph_cpu.h
+++ b/cpu/nrf52/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_
-#define PERIPH_CPU_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CPU_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/sam0_common/include/periph_cpu_common.h b/cpu/sam0_common/include/periph_cpu_common.h
index 65bb36a5e7f2f203d5eb76a0c636f119447717fa..461b1e2753052d7e45e22f9201770abb04fa3981 100644
--- a/cpu/sam0_common/include/periph_cpu_common.h
+++ b/cpu/sam0_common/include/periph_cpu_common.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_COMMON_H
-#define CPU_PERIPH_COMMON_H
+#ifndef PERIPH_CPU_COMMON_H
+#define PERIPH_CPU_COMMON_H
 
 #include "cpu.h"
 
@@ -215,5 +215,5 @@ typedef struct {
 }
 #endif
 
-#endif /* CPU_PERIPH_COMMON_H */
+#endif /* PERIPH_CPU_COMMON_H */
 /** @} */
diff --git a/cpu/samd21/include/periph_cpu.h b/cpu/samd21/include/periph_cpu.h
index 81cdcdcbff50fd2e70d4c039247dc3a5e3fe6412..3f5313ea1f94dc4b9b09f649530a288922d2f98e 100644
--- a/cpu/samd21/include/periph_cpu.h
+++ b/cpu/samd21/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 PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <limits.h>
 
@@ -129,5 +129,5 @@ typedef enum {
 }
 #endif
 
-#endif /* CPU_PERIPH_H */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/stm32f0/include/cpu_conf.h b/cpu/stm32f0/include/cpu_conf.h
index 062ee8cc535365512331213c5a1bd8685b654d3a..bdba44642a0e6796707f69511cb42e4607e5ce47 100644
--- a/cpu/stm32f0/include/cpu_conf.h
+++ b/cpu/stm32f0/include/cpu_conf.h
@@ -20,8 +20,8 @@
  * @author          Alexandre Abadie <alexandre.abadie@inria.fr>
 */
 
-#ifndef STM32F0_CPU_CONF_H
-#define STM32F0_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -87,5 +87,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32F0_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32f3/include/cpu_conf.h b/cpu/stm32f3/include/cpu_conf.h
index cab91ac8b9daa8b2245221c1be616e349ea03fd9..925cf28ff6727dea0aa93204b6aaecde4d474c94 100644
--- a/cpu/stm32f3/include/cpu_conf.h
+++ b/cpu/stm32f3/include/cpu_conf.h
@@ -19,8 +19,8 @@
  * @author          Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef STM32F3_CPU_CONF_H
-#define STM32F3_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -54,5 +54,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32F3_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32f4/include/cpu_conf.h b/cpu/stm32f4/include/cpu_conf.h
index 9c6824ba8cab5c9fd16b1dda20ff529544b0b95e..bca30e773d5c8b0075e14dbc0354d547c7b340e7 100644
--- a/cpu/stm32f4/include/cpu_conf.h
+++ b/cpu/stm32f4/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef STM32F4_CPU_CONF_H
-#define STM32F4_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32F4_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32f7/include/cpu_conf.h b/cpu/stm32f7/include/cpu_conf.h
index d5c7224abd044558f70b72956478f6c934db6ed2..307b6830b2d213e4b279fbd8e5ca8c4e7e642f89 100644
--- a/cpu/stm32f7/include/cpu_conf.h
+++ b/cpu/stm32f7/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.pertersen@fu-berlin.de>
 */
 
-#ifndef STM32F7_CPU_CONF_H
-#define STM32F7_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -49,5 +49,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32F7_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32l0/include/cpu_conf.h b/cpu/stm32l0/include/cpu_conf.h
index afd7d4be1a79db13375fe0e9d32434bd5b3676ee..0eeb53593702c709240c07bbdc8c853262a82507 100644
--- a/cpu/stm32l0/include/cpu_conf.h
+++ b/cpu/stm32l0/include/cpu_conf.h
@@ -20,8 +20,8 @@
  * @author          Alexandre Abadie <alexandre.abadie@inria.fr>
 */
 
-#ifndef STM32L0_CPU_CONF_H
-#define STM32L0_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -51,5 +51,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32F0_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stm32l1/include/cpu_conf.h b/cpu/stm32l1/include/cpu_conf.h
index 024b43c5c5408035e1454ee525234e5d8f94c973..44e075b51f6d87ec446881d1931461a6c0c944f0 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 CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -42,6 +42,6 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
 /** @} */
diff --git a/cpu/stm32l4/include/cpu_conf.h b/cpu/stm32l4/include/cpu_conf.h
index f0406b265e8d52b05a76ec60a12e251e93ef78c0..eed07c222d47b3c6ed2af24ee1201792c15606c3 100644
--- a/cpu/stm32l4/include/cpu_conf.h
+++ b/cpu/stm32l4/include/cpu_conf.h
@@ -20,8 +20,8 @@
  * @author          Alexandre Abadie <alexandre.abadie@inria.fr>
 */
 
-#ifndef STM32L4_CPU_CONF_H
-#define STM32L4_CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -51,5 +51,5 @@ extern "C" {
 }
 #endif
 
-#endif /* STM32L4_CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/x86/include/cpu.h b/cpu/x86/include/cpu.h
index 56f1b432f0f1fa97835d07d4c6a20e68f56b3575..ef1ca69842f236d744a4cd66460d6b7468738f56 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_H
+#define CPU_H
 
 #include "kernel_defines.h"
 #include "irq.h"
@@ -124,6 +124,6 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif /* CPU_X86_CPU_H */
+#endif /* CPU_H */
 
 /** @} */
diff --git a/cpu/x86/include/periph_cpu.h b/cpu/x86/include/periph_cpu.h
index a6c66c8595ce2cb51101a6645eba9c2501a264ef..de2bd40af52413a212d83bf689840cfcfaf5cde1 100644
--- a/cpu/x86/include/periph_cpu.h
+++ b/cpu/x86/include/periph_cpu.h
@@ -25,8 +25,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PERIPH_CONF_
-#define PERIPH_CONF_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,6 +36,6 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_ */
+#endif /* PERIPH_CPU_H */
 
 /** @} */
diff --git a/cpu/x86/include/ucontext.h b/cpu/x86/include/ucontext.h
index f6b2356fc3853562c758db66134c6bcc57dcee9e..c4c3d5dd3393837690fc6403915b3539149806be 100644
--- a/cpu/x86/include/ucontext.h
+++ b/cpu/x86/include/ucontext.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__UCONTEXT__HPP__
-#define CPU__X86__UCONTEXT__HPP__
+#ifndef UCONTEXT_H
+#define UCONTEXT_H
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -169,6 +169,6 @@ int swapcontext(ucontext_t *oucp, const ucontext_t *ucp);
 }
 #endif
 
-#endif
+#endif /* UCONTEXT_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_cmos.h b/cpu/x86/include/x86_cmos.h
index e8de2ab0aa4abaa8b677a7d9bb0e78b426e9ed86..d9ec146716909ecdf6f65241853bee2b2e3acc79 100644
--- a/cpu/x86/include/x86_cmos.h
+++ b/cpu/x86/include/x86_cmos.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__CMOS__H__
-#define CPU__X86__CMOS__H__
+#ifndef X86_CMOS_H
+#define X86_CMOS_H
 
 #include "x86_ports.h"
 
@@ -66,6 +66,6 @@ void x86_cmos_serial(uint8_t (*serial)[CMOS_SERIAL_LEN]);
 }
 #endif
 
-#endif
+#endif /* X86_CMOS_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_interrupts.h b/cpu/x86/include/x86_interrupts.h
index e1f45583532f73d07cecee5ff351762740c26f35..6007e6fb2368a658b873504fcd8b6f837e939541 100644
--- a/cpu/x86/include/x86_interrupts.h
+++ b/cpu/x86/include/x86_interrupts.h
@@ -26,8 +26,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__INTERRUPTS__H__
-#define CPU__X86__INTERRUPTS__H__
+#ifndef X86_INTERRUPTS_H
+#define X86_INTERRUPTS_H
 
 #include "ucontext.h"
 
@@ -160,6 +160,6 @@ void x86_print_registers(struct x86_pushad *orig_ctx, unsigned long error_code);
 }
 #endif
 
-#endif
+#endif /* X86_INTERRUPTS_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_kernel_memory.h b/cpu/x86/include/x86_kernel_memory.h
index 8c86abe5694033aab58d4f129d0964ffa1e7cfba..973ed2dfc817ad6d5e01f40a23ebf21eccee0235 100644
--- a/cpu/x86/include/x86_kernel_memory.h
+++ b/cpu/x86/include/x86_kernel_memory.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef KERNEL_MEMORY_H__
-#define KERNEL_MEMORY_H__
+#ifndef X86_KERNEL_MEMORY_H
+#define X86_KERNEL_MEMORY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -119,6 +119,6 @@ extern char _heap_start;
 }
 #endif
 
-#endif
+#endif /* X86_KERNEL_MEMORY_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_memory.h b/cpu/x86/include/x86_memory.h
index b9bb81352f8ff20d40e0a53aec9303af67d3b0c8..3a4b85082a4acd4f948cca6e1483e88228828234 100644
--- a/cpu/x86/include/x86_memory.h
+++ b/cpu/x86/include/x86_memory.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__MEMORY__H__
-#define CPU__X86__MEMORY__H__
+#ifndef X86_MEMORY_H
+#define X86_MEMORY_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -178,6 +178,6 @@ void x86_init_gdt(void);
 }
 #endif
 
-#endif
+#endif /* X86_MEMORY_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_pci.h b/cpu/x86/include/x86_pci.h
index d42018f3e5065caa711820cf6113e85f2d563f90..cc9f8124f251749b4c2596f3e7564c9ceafad423 100644
--- a/cpu/x86/include/x86_pci.h
+++ b/cpu/x86/include/x86_pci.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__PCI__H__
-#define CPU__X86__PCI__H__
+#ifndef X86_PCI_H
+#define X86_PCI_H
 
 #include "x86_pci_init.h"
 #include "x86_pic.h"
@@ -418,6 +418,6 @@ void x86_pci_set_irq(struct x86_known_pci_device *d, uint8_t irq_num);
 }
 #endif
 
-#endif
+#endif /* X86_PCI_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_pci_strings.h b/cpu/x86/include/x86_pci_strings.h
index b34a3be4d72c938fb237e67854ca13319b18b5e2..6e8386508e3ec50fbbde01c332d2fad09c958c7d 100644
--- a/cpu/x86/include/x86_pci_strings.h
+++ b/cpu/x86/include/x86_pci_strings.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__PCI_NAMES__H__
-#define CPU__X86__PCI_NAMES__H__
+#ifndef X86_PCI_STRINGS_H
+#define X86_PCI_STRINGS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,6 +56,6 @@ const char *x86_pci_device_id_to_string(unsigned vendor_id, unsigned device_id,
 }
 #endif
 
-#endif
+#endif /* X86_PCI_STRINGS_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_pic.h b/cpu/x86/include/x86_pic.h
index 7ef111e16b144f2e1f4f40edc5c0d902dc44acdb..b94a56b6fddf2e748a4feeb89bd4a1bb5d50f948 100644
--- a/cpu/x86/include/x86_pic.h
+++ b/cpu/x86/include/x86_pic.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__PIC__H__
-#define CPU__X86__PIC__H__
+#ifndef X86_PIC_H
+#define X86_PIC_H
 
 #include <stdint.h>
 
@@ -171,6 +171,6 @@ void x86_pic_disable_irq(unsigned num);
 }
 #endif
 
-#endif
+#endif /* X86_PIC_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_pit.h b/cpu/x86/include/x86_pit.h
index 3eab35d5c9336ab89297cdb8578f04adbcec6cdb..d31977b7d703c6e9c0537ce358bd6fda91eb9bc0 100644
--- a/cpu/x86/include/x86_pit.h
+++ b/cpu/x86/include/x86_pit.h
@@ -31,8 +31,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__PIT__H__
-#define CPU__X86__PIT__H__
+#ifndef X86_PIT_H
+#define X86_PIT_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -117,6 +117,6 @@ bool x86_pit_set(unsigned channel, unsigned mode, unsigned hz);
 }
 #endif
 
-#endif
+#endif /* X86_PIT_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_ports.h b/cpu/x86/include/x86_ports.h
index d0b8177fc295ae193fb26110f5623b540a33ce1c..16584a19b8d5d0774b877dd6703784f8a3c70c77 100644
--- a/cpu/x86/include/x86_ports.h
+++ b/cpu/x86/include/x86_ports.h
@@ -23,8 +23,8 @@
 
 // Copy of Pintos' threads/io.h, license header extracted from Pintos' LICENSE file.
 
-#ifndef CPU__X86__PORTS_H__
-#define CPU__X86__PORTS_H__
+#ifndef X86_PORTS_H
+#define X86_PORTS_H
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -191,4 +191,4 @@ static inline void  __attribute__((always_inline)) io_wait(void)
 }
 #endif
 
-#endif
+#endif /* X86_PORTS_H */
diff --git a/cpu/x86/include/x86_reboot.h b/cpu/x86/include/x86_reboot.h
index e39981f2d7f216dca6c6ddf45270757ad01f3882..02ff7228d15e4963f22db8eb3c382cf42fa90417 100644
--- a/cpu/x86/include/x86_reboot.h
+++ b/cpu/x86/include/x86_reboot.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__REBOOT__H__
-#define CPU__X86__REBOOT__H__
+#ifndef X86_REBOOT_H
+#define X86_REBOOT_H
 
 #include <stdbool.h>
 #include "kernel_defines.h"
@@ -93,6 +93,6 @@ void x86_set_shutdown_fun(x86_shutdown_t fun);
 }
 #endif
 
-#endif
+#endif /* X86_REBOOT_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_registers.h b/cpu/x86/include/x86_registers.h
index 894083a77a3734e3d80193a278a5020943883f5c..1489ec5a4213a1c84de2501238410eb58197021f 100644
--- a/cpu/x86/include/x86_registers.h
+++ b/cpu/x86/include/x86_registers.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__REGISTERS__H__
-#define CPU__X86__REGISTERS__H__
+#ifndef X86_REGISTERS_H
+#define X86_REGISTERS_H
 
 #include <stdint.h>
 
@@ -258,6 +258,6 @@ static inline uint64_t X86_CR_ATTR cpuid_caps(void)
 }
 #endif
 
-#endif
+#endif /* X86_REGISTERS_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_rtc.h b/cpu/x86/include/x86_rtc.h
index a94505607a956d0d72daf9f57f256b8f5ac3c7a9..3928843c6fd80ad3d64e93aba5471341482d120d 100644
--- a/cpu/x86/include/x86_rtc.h
+++ b/cpu/x86/include/x86_rtc.h
@@ -28,8 +28,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__RTC__H__
-#define CPU__X86__RTC__H__
+#ifndef X86_RTC_H
+#define X86_RTC_H
 
 #include "msg.h"
 #include "x86_cmos.h"
@@ -215,6 +215,6 @@ void x86_rtc_set_update_callback(x86_rtc_callback_t cb);
 }
 #endif
 
-#endif
+#endif /* X86_RTC_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_threading.h b/cpu/x86/include/x86_threading.h
index 8f58aa68af9a02a83a63c298a238814ef32c4be3..257f47bd28d90b96b9523e383faa9d491baf0468 100644
--- a/cpu/x86/include/x86_threading.h
+++ b/cpu/x86/include/x86_threading.h
@@ -26,8 +26,8 @@
  * @author     René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__THREADING__H__
-#define CPU__X86__THREADING__H__
+#ifndef X86_THREADING_H
+#define X86_THREADING_H
 
 #include <stdbool.h>
 
@@ -52,6 +52,6 @@ extern bool x86_in_isr;
 }
 #endif
 
-#endif
+#endif /* X86_THREADING_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_uart.h b/cpu/x86/include/x86_uart.h
index 0ac0cfb4bbc13446ce3901ca4463b0e4cc06d1d9..bf983f9a2442737e0bffd194914bcb8dae50201c 100644
--- a/cpu/x86/include/x86_uart.h
+++ b/cpu/x86/include/x86_uart.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__UART__H__
-#define CPU__X86__UART__H__
+#ifndef X86_UART_H
+#define X86_UART_H
 
 #include "x86_pic.h"
 
@@ -179,6 +179,6 @@ enum iir_t {
 }
 #endif
 
-#endif
+#endif /* X86_UART_H */
 
 /** @} */
diff --git a/cpu/x86/include/x86_videoram.h b/cpu/x86/include/x86_videoram.h
index c15c91c7ffc4f801a46a32b34cd2ef66c84d4c86..7cefb7ab8571c8bed52abf0808da689db0b05824 100644
--- a/cpu/x86/include/x86_videoram.h
+++ b/cpu/x86/include/x86_videoram.h
@@ -25,8 +25,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU__X86__VIDEORAM_H__
-#define CPU__X86__VIDEORAM_H__
+#ifndef X86_VIDEORAM_H
+#define X86_VIDEORAM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,6 +65,6 @@ void videoram_put_hex(unsigned long v);
 }
 #endif
 
-#endif
+#endif /* X86_VIDEORAM_H */
 
 /** @} */
diff --git a/drivers/bh1750fvi/include/bh1750fvi_internal.h b/drivers/bh1750fvi/include/bh1750fvi_internal.h
index b9d65347bd1b1d23919d25ec22a20e624c1d82ef..4dc629a5c17d4a0db3ec9e53ea3074a8d3d46930 100644
--- a/drivers/bh1750fvi/include/bh1750fvi_internal.h
+++ b/drivers/bh1750fvi/include/bh1750fvi_internal.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BH1750FVI_REGS_H
-#define BH1750FVI_REGS_H
+#ifndef BH1750FVI_INTERNAL_H
+#define BH1750FVI_INTERNAL_H
 
 
 #ifdef __cplusplus
@@ -63,5 +63,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BH1750FVI_REGS_H */
+#endif /* BH1750FVI_INTERNAL_H */
 /** @} */
diff --git a/drivers/bmp180/include/bmp180_internals.h b/drivers/bmp180/include/bmp180_internals.h
index aea428816a7b82ec3a6a1ba1502b8b000bbe442d..3941ab3afbf74bb34a753b6c0d8b5843a8e988ec 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_INTERNALS_H
+#define BMP180_INTERNALS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BMP180_REGS_H */
+#endif /* BMP180_INTERNALS_H */
 /** @} */
diff --git a/drivers/cc110x/include/cc110x-defines.h b/drivers/cc110x/include/cc110x-defines.h
index 1c1966ef832296595c524d771730ecec8599f836..0d48799f2aeefa1c79f5961b1ad7bf175bc27643 100644
--- a/drivers/cc110x/include/cc110x-defines.h
+++ b/drivers/cc110x/include/cc110x-defines.h
@@ -204,4 +204,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif
+#endif /* CC110X_DEFINES_H */
diff --git a/drivers/cc110x/include/gnrc_netdev_cc110x.h b/drivers/cc110x/include/gnrc_netdev_cc110x.h
index 9e900075a76628ed566910c50b1a5c9ca4cc4e22..9cd9fdb367243b0474c67600edca0dae17878c66 100644
--- a/drivers/cc110x/include/gnrc_netdev_cc110x.h
+++ b/drivers/cc110x/include/gnrc_netdev_cc110x.h
@@ -19,8 +19,8 @@
 #include "net/gnrc/netdev.h"
 #include "cc110x-netdev.h"
 
-#ifndef GNRC_CC110X_H
-#define GNRC_CC110X_H
+#ifndef GNRC_NETDEV_CC110X_H
+#define GNRC_NETDEV_CC110X_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,5 +41,5 @@ int gnrc_netdev_cc110x_init(gnrc_netdev_t *gnrc_netdev, netdev_cc110x_t *dev);
 }
 #endif
 
-#endif /* GNRC_CC110X_H */
+#endif /* GNRC_NETDEV_CC110X_H */
 /** @} */
diff --git a/drivers/dynamixel/include/dynamixel_crc.h b/drivers/dynamixel/include/dynamixel_crc.h
index 603d0e1654979512b69b981d28bb0a9bff593e62..c47fada42d28973cfaeba5fcef8b4924936ef42a 100644
--- a/drivers/dynamixel/include/dynamixel_crc.h
+++ b/drivers/dynamixel/include/dynamixel_crc.h
@@ -33,5 +33,5 @@ uint16_t dynamixel_crc_update(uint16_t crc_accum, const uint8_t *buffer, size_t
 }
 #endif
 
-#endif
+#endif /* DYNAMIXEL_CRC_H */
 /** @} */
diff --git a/drivers/dynamixel/include/dynamixel_protocol.h b/drivers/dynamixel/include/dynamixel_protocol.h
index 221032d3a056dd49e24fbb2391ecf40527e3bb12..03762b4db7081b59ea17077e40ee70700b1b42f9 100644
--- a/drivers/dynamixel/include/dynamixel_protocol.h
+++ b/drivers/dynamixel/include/dynamixel_protocol.h
@@ -91,5 +91,5 @@ typedef enum {
 }
 #endif
 
-#endif
+#endif /* DYNAMIXEL_PROTOCOL_H */
 /** @} */
diff --git a/drivers/dynamixel/include/dynamixel_reader.h b/drivers/dynamixel/include/dynamixel_reader.h
index 7569df7157b1c9d76db89210883e9bc1bfc2bc46..ee61d7da5145fd66a19edb2d1837fba52fa0a5ba 100644
--- a/drivers/dynamixel/include/dynamixel_reader.h
+++ b/drivers/dynamixel/include/dynamixel_reader.h
@@ -146,5 +146,5 @@ static inline size_t dynamixel_reader_status_get_payload_size(const dynamixel_re
 }
 #endif
 
-#endif
+#endif /* DYNAMIXEL_READER_H */
 /** @} */
diff --git a/drivers/dynamixel/include/dynamixel_writer.h b/drivers/dynamixel/include/dynamixel_writer.h
index 7f0f339682483adf7444b7bfe6674c30426431c3..0d07182a9715d905b603eccfd61e9f852c0b89ab 100644
--- a/drivers/dynamixel/include/dynamixel_writer.h
+++ b/drivers/dynamixel/include/dynamixel_writer.h
@@ -98,5 +98,5 @@ void dynamixel_writer_read_make(dynamixel_writer_t *writer, uint8_t id, uint16_t
 }
 #endif
 
-#endif
+#endif /* DYNAMIXEL_WRITER_H */
 /** @} */
diff --git a/drivers/encx24j600/include/encx24j600_defines.h b/drivers/encx24j600/include/encx24j600_defines.h
index c56f169e58fa1e32a96896a9866cf75a64ba1ae1..dfc435ceb60201a51ea0b148442baf68f6d0fae2 100644
--- a/drivers/encx24j600/include/encx24j600_defines.h
+++ b/drivers/encx24j600/include/encx24j600_defines.h
@@ -17,8 +17,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef ENCX24J600_REGS_H
-#define ENCX24J600_REGS_H
+#ifndef ENCX24J600_DEFINES_H
+#define ENCX24J600_DEFINES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -202,5 +202,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif /* ENCX24J600_REGS_H */
+#endif /* ENCX24J600_DEFINES_H */
 /** @} */
diff --git a/drivers/feetech/include/feetech_protocol.h b/drivers/feetech/include/feetech_protocol.h
index 98ddfd4c5d5e18ff73b689e6ace284a108647d6a..7e8cffa3e61519acd32ab1ea816045bb0203cbfe 100644
--- a/drivers/feetech/include/feetech_protocol.h
+++ b/drivers/feetech/include/feetech_protocol.h
@@ -95,5 +95,5 @@ typedef enum {
 }
 #endif
 
-#endif
+#endif /* FEETECH_PROTOCOL_H */
 /** @} */
diff --git a/drivers/feetech/include/feetech_reader.h b/drivers/feetech/include/feetech_reader.h
index a119819454dd5adb4c0956d013190aa349984ffa..ac62bf5d0518dcc9a8dbbce03f1730367ad69ef7 100644
--- a/drivers/feetech/include/feetech_reader.h
+++ b/drivers/feetech/include/feetech_reader.h
@@ -293,5 +293,5 @@ const uint8_t *feetech_reader_sync_write_item_get_payload(const feetech_reader_t
 }
 #endif
 
-#endif
+#endif /* FEETECH_READER_H */
 /** @} */
diff --git a/drivers/feetech/include/feetech_writer.h b/drivers/feetech/include/feetech_writer.h
index a09210430d97ffad4be97207b2a643b663d2fb75..64412d1c0e94184bb079931b979f180f29ebd625 100644
--- a/drivers/feetech/include/feetech_writer.h
+++ b/drivers/feetech/include/feetech_writer.h
@@ -181,5 +181,5 @@ void feetech_writer_sync_write_add_16bits(feetech_writer_t *writer, uint8_t id,
 }
 #endif
 
-#endif
+#endif /* FEETECH_WRITER_H */
 /** @} */
diff --git a/drivers/ina220/include/ina220-regs.h b/drivers/ina220/include/ina220-regs.h
index 13bf8f1c70c239428b88c499c292954ae84f5490..02257154b60ef41a24d11c56ca63594208823797 100644
--- a/drivers/ina220/include/ina220-regs.h
+++ b/drivers/ina220/include/ina220-regs.h
@@ -46,5 +46,5 @@ typedef enum ina220_reg {
 }
 #endif
 
-#endif /* __L3G4200D_REGS_H */
+#endif /* INA220_REGS_H */
 /** @} */
diff --git a/drivers/include/dynamixel.h b/drivers/include/dynamixel.h
index fc8108e70b239ff226bacb9e692da6665286396b..cc50a013d57580ec841fb1414265b8f5bb12a919 100644
--- a/drivers/include/dynamixel.h
+++ b/drivers/include/dynamixel.h
@@ -167,5 +167,5 @@ int dynamixel_read(dynamixel_t *device, dynamixel_addr_t reg, uint8_t *data, siz
 }
 #endif
 
-#endif
+#endif /* DYNAMIXEL_H */
 /** @} */
diff --git a/drivers/include/feetech.h b/drivers/include/feetech.h
index 1a155f5d91c8f7d48c02464a6152454320bf52db..4005d2101eda7144c6b17ce98340a4a68b7e2f62 100644
--- a/drivers/include/feetech.h
+++ b/drivers/include/feetech.h
@@ -166,5 +166,5 @@ int feetech_read(feetech_t *device, feetech_addr_t addr, uint8_t *data, size_t l
 }
 #endif
 
-#endif
+#endif /* FEETECH_H */
 /** @} */
diff --git a/drivers/include/hdc1000.h b/drivers/include/hdc1000.h
index 61af2fe1d4b6806e07b0b38e6c507bb46cbd0aa3..1b1f4cb5b886c5083c7a200d52cb6e47b0025a94 100644
--- a/drivers/include/hdc1000.h
+++ b/drivers/include/hdc1000.h
@@ -157,5 +157,5 @@ int hdc1000_read(hdc1000_t *dev, int16_t *temp, int16_t *hum);
 }
 #endif
 
-#endif
+#endif /* HDC1000_H */
 /** @} */
diff --git a/drivers/include/jc42.h b/drivers/include/jc42.h
index 8ba08854c15c246754ce6e3fc7dd639a92f9b578..feda4931c873a4cf4316b056ffd7a37e6269c5d3 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_H
+#define JC42_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_H */
diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h
index fe0571a4bd1e6979d2b82239c83ed46100b210d1..90d2ec329147fa1fe1c851b5de7f5a414b7775cf 100644
--- a/drivers/include/kw2xrf.h
+++ b/drivers/include/kw2xrf.h
@@ -20,8 +20,8 @@
  * @author      Sebastian Meiling <s@mlng.net>
  */
 
-#ifndef KW2XDRF_H
-#define KW2XDRF_H
+#ifndef KW2XRF_H
+#define KW2XRF_H
 
 #include <stdint.h>
 
@@ -170,5 +170,5 @@ void kw2xrf_reset_phy(kw2xrf_t *dev);
 }
 #endif
 
-#endif /* KW2XDRF_H */
+#endif /* KW2XRF_H */
 /** @} */
diff --git a/drivers/include/mag3110.h b/drivers/include/mag3110.h
index 5669e0a3c7a7e658782b52443d2843b773f3d9b9..c05b3134ad657e3de0d32e249e972a3e242bb2e7 100644
--- a/drivers/include/mag3110.h
+++ b/drivers/include/mag3110.h
@@ -202,5 +202,5 @@ int mag3110_read_dtemp(mag3110_t *dev, int8_t *dtemp);
 }
 #endif
 
-#endif
+#endif /* MAG3110_H */
 /** @} */
diff --git a/drivers/include/mpl3115a2.h b/drivers/include/mpl3115a2.h
index 7064d069e2a2e94e61de68b8031140f467dc8e08..7d0a1459d1eb512950955c7fcfa9f46f14629cd7 100644
--- a/drivers/include/mpl3115a2.h
+++ b/drivers/include/mpl3115a2.h
@@ -161,5 +161,5 @@ int mpl3115a2_read_temp(mpl3115a2_t *dev, int16_t *temp);
 }
 #endif
 
-#endif
+#endif /* MPL3115A2_H */
 /** @} */
diff --git a/drivers/include/mtd_spi_nor.h b/drivers/include/mtd_spi_nor.h
index a8cb949c9ba484b4eda583adb38b88eabe007bbf..16ce87880c420817bb0d40e0089f03704c0eec72 100644
--- a/drivers/include/mtd_spi_nor.h
+++ b/drivers/include/mtd_spi_nor.h
@@ -21,8 +21,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef MTD_SPI_NOR_H_
-#define MTD_SPI_NOR_H_
+#ifndef MTD_SPI_NOR_H
+#define MTD_SPI_NOR_H
 
 #include <stdint.h>
 
@@ -144,5 +144,5 @@ extern const mtd_spi_nor_opcode_t mtd_spi_nor_opcode_default;
 }
 #endif
 
-#endif /* MTD_SPI_NOR_H_ */
+#endif /* MTD_SPI_NOR_H */
 /** @} */
diff --git a/drivers/include/net/netdev.h b/drivers/include/net/netdev.h
index b512df9ee802734f7da2078ac5a22460f06696cb..1cb505c4e07ec49e2572bad7a96a00b24b0d90b6 100644
--- a/drivers/include/net/netdev.h
+++ b/drivers/include/net/netdev.h
@@ -43,8 +43,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NETDEV_H
-#define NETDEV_H
+#ifndef NET_NETDEV_H
+#define NET_NETDEV_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -234,4 +234,4 @@ typedef struct netdev_driver {
 }
 #endif
 /** @} */
-#endif /* NETDEV_H */
+#endif /* NET_NETDEV_H */
diff --git a/drivers/include/net/netdev/eth.h b/drivers/include/net/netdev/eth.h
index 6eef3430c541f9b485028b58f318bf212764a09f..dabcf34172e71cf12b04c671b8d3b8fc5e39e2d5 100644
--- a/drivers/include/net/netdev/eth.h
+++ b/drivers/include/net/netdev/eth.h
@@ -16,8 +16,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NETDEV_ETH_H
-#define NETDEV_ETH_H
+#ifndef NET_NETDEV_ETH_H
+#define NET_NETDEV_ETH_H
 
 #include <stdint.h>
 
@@ -62,4 +62,4 @@ int netdev_eth_set(netdev_t *dev, netopt_t opt, void *value, size_t value_len);
 }
 #endif
 /** @} */
-#endif /* NETDEV_ETH_H */
+#endif /* NET_NETDEV_ETH_H */
diff --git a/drivers/include/net/netdev/ieee802154.h b/drivers/include/net/netdev/ieee802154.h
index b66e5dbad8281cf88093fb3839faf89c564b2b95..3d247e3f3ed214d9c9365d039264f842ef40d789 100644
--- a/drivers/include/net/netdev/ieee802154.h
+++ b/drivers/include/net/netdev/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV_IEEE802154_H
-#define NETDEV_IEEE802154_H
+#ifndef NET_NETDEV_IEEE802154_H
+#define NET_NETDEV_IEEE802154_H
 
 #include "net/ieee802154.h"
 #include "net/gnrc/nettype.h"
@@ -164,5 +164,5 @@ int netdev_ieee802154_set(netdev_ieee802154_t *dev, netopt_t opt, void *value,
 }
 #endif
 
-#endif /* NETDEV_IEEE802154_H */
+#endif /* NET_NETDEV_IEEE802154_H */
 /** @} */
diff --git a/drivers/include/nvram-spi.h b/drivers/include/nvram-spi.h
index c064d93e228b3b443aca12559720a05b4e31d82f..20344369472115e38db36181167cec503f4e5c0f 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 NVRAM_SPI_H
+#define NVRAM_SPI_H
 
 #include <stdint.h>
 #include "nvram.h"
@@ -64,5 +64,5 @@ int nvram_spi_init(nvram_t *dev, nvram_spi_params_t *spi_params, size_t size);
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_SPI_H */
+#endif /* NVRAM_SPI_H */
 /** @} */
diff --git a/drivers/include/nvram.h b/drivers/include/nvram.h
index 4eab01be30c4b3678303165aff631220147808fa..04334ad07521f4144eeb2ad1cbe5ac9bfa583dae 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 NVRAM_H
+#define NVRAM_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -91,5 +91,5 @@ extern const vfs_file_ops_t nvram_vfs_ops;
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_H */
+#endif /* NVRAM_H */
 /** @} */
diff --git a/drivers/include/pcd8544.h b/drivers/include/pcd8544.h
index 825bc4c759cc8f28ab8693dd9c0d71702def6dac..191a1ab79fa9b3936d5ec396814311f1b969658e 100644
--- a/drivers/include/pcd8544.h
+++ b/drivers/include/pcd8544.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PDC8544_H
-#define PDC8544_H
+#ifndef PCD8544_H
+#define PCD8544_H
 
 #include <stdint.h>
 
@@ -198,5 +198,5 @@ void pcd8544_riot(pcd8544_t *dev);
 }
 #endif
 
-#endif /* PDC8544_H */
+#endif /* PCD8544_H */
 /** @} */
diff --git a/drivers/include/periph/dev_enums.h b/drivers/include/periph/dev_enums.h
index 7b5de6e29a5c7d924c220cfc95d104e53e50841d..94d484cae5d15af6e9cae0d871584f12b633fffd 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_DEV_ENUMS_H
+#define PERIPH_DEV_ENUMS_H
 
 #include "periph_conf.h"
 
@@ -99,5 +99,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_COMPAT_H */
+#endif /* PERIPH_DEV_ENUMS_H */
 /** @} */
diff --git a/drivers/include/periph/flashpage.h b/drivers/include/periph/flashpage.h
index bda2f8d6c772bae8141ade6a2e2b8973906633a9..d5a1e71793ebcb7a5c495a9107d8aefb663e28af 100644
--- a/drivers/include/periph/flashpage.h
+++ b/drivers/include/periph/flashpage.h
@@ -30,8 +30,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef FLASHPAGE_H
-#define FLASHPAGE_H
+#ifndef PERIPH_FLASHPAGE_H
+#define PERIPH_FLASHPAGE_H
 
 #include <stdint.h>
 
@@ -145,5 +145,5 @@ int flashpage_write_and_verify(int page, void *data);
 }
 #endif
 
-#endif /* FLASHPAGE_H */
+#endif /* PERIPH_FLASHPAGE_H */
 /** @} */
diff --git a/drivers/include/periph/gpio.h b/drivers/include/periph/gpio.h
index d75018bb9e7611906526bbe9c473f7a13522cc59..f7290fdbc3690b133f41c7ca34a9417081a1ec1b 100644
--- a/drivers/include/periph/gpio.h
+++ b/drivers/include/periph/gpio.h
@@ -50,8 +50,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GPIO_H
-#define GPIO_H
+#ifndef PERIPH_GPIO_H
+#define PERIPH_GPIO_H
 
 #include <limits.h>
 
@@ -223,5 +223,5 @@ void gpio_write(gpio_t pin, int value);
 }
 #endif
 
-#endif /* GPIO_H */
+#endif /* PERIPH_GPIO_H */
 /** @} */
diff --git a/drivers/include/periph/i2c.h b/drivers/include/periph/i2c.h
index 8eb36d59c0c553af3c4105f7fad8711a4fd6bbb2..fa16653064177ca0aba899fccb5bde3d92f5f661 100644
--- a/drivers/include/periph/i2c.h
+++ b/drivers/include/periph/i2c.h
@@ -51,8 +51,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef I2C_H
-#define I2C_H
+#ifndef PERIPH_I2C_H
+#define PERIPH_I2C_H
 
 #include <stdint.h>
 #include <limits.h>
@@ -283,5 +283,5 @@ void i2c_poweroff(i2c_t dev);
 }
 #endif
 
-#endif /* I2C_H */
+#endif /* PERIPH_I2C_H */
 /** @} */
diff --git a/drivers/include/periph/pm.h b/drivers/include/periph/pm.h
index 538210b48544bc2a156db62fabc76d013c22d9e7..56432a77603fb6b597042d331ffcda1415844040 100644
--- a/drivers/include/periph/pm.h
+++ b/drivers/include/periph/pm.h
@@ -20,8 +20,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PM_H
-#define PM_H
+#ifndef PERIPH_PM_H
+#define PERIPH_PM_H
 
 #include "assert.h"
 #include "periph_cpu.h"
@@ -51,5 +51,5 @@ void pm_set_lowest(void);
 }
 #endif
 
-#endif /* __PM_H */
+#endif /* PERIPH_PM_H */
 /** @} */
diff --git a/drivers/include/periph/rtc.h b/drivers/include/periph/rtc.h
index 935bb30afa37481173388f72e2c4c8be0dc4cd33..720b0232600efc89c7499aa79a0a38c98446c551 100644
--- a/drivers/include/periph/rtc.h
+++ b/drivers/include/periph/rtc.h
@@ -23,8 +23,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef RTC_H
-#define RTC_H
+#ifndef PERIPH_RTC_H
+#define PERIPH_RTC_H
 
 #include <time.h>
 #include "periph_conf.h"
@@ -114,5 +114,5 @@ void rtc_poweroff(void);
 }
 #endif
 
-#endif /* RTC_H */
+#endif /* PERIPH_RTC_H */
 /** @} */
diff --git a/drivers/include/periph/rtt.h b/drivers/include/periph/rtt.h
index 3675c4fa445beae616a2eb734f8cf5acf04f401c..04b8cdd0310b51e3b7b84457065248bc78b6630b 100644
--- a/drivers/include/periph/rtt.h
+++ b/drivers/include/periph/rtt.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef RTT_H
-#define RTT_H
+#ifndef PERIPH_RTT_H
+#define PERIPH_RTT_H
 
 #include "periph_conf.h"
 
@@ -172,5 +172,5 @@ void rtt_poweroff(void);
 }
 #endif
 
-#endif /* RTT_H */
+#endif /* PERIPH_RTT_H */
 /** @} */
diff --git a/drivers/include/pn532.h b/drivers/include/pn532.h
index 47072ba47e6c35c18cce9f1f5c92792d6240676d..38f35c8a67ae09db1bfe5e364868efe4e54ecf3e 100644
--- a/drivers/include/pn532.h
+++ b/drivers/include/pn532.h
@@ -18,8 +18,8 @@
  * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef NFC_READER_INCLUDE_PN532_H
-#define NFC_READER_INCLUDE_PN532_H
+#ifndef PN532_H
+#define PN532_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -383,5 +383,5 @@ void pn532_release_passive(pn532_t *dev, unsigned target_id);
 }
 #endif
 
-#endif /* NFC_READER_INCLUDE_PN532_H */
+#endif /* PN532_H */
 /** @} */
diff --git a/drivers/include/tcs37727.h b/drivers/include/tcs37727.h
index 9d09dd9bb1667efb86f8a9ec9013fa4154504d44..479bbad6e1db6512d97c607a33308fb3c96e5d71 100644
--- a/drivers/include/tcs37727.h
+++ b/drivers/include/tcs37727.h
@@ -139,5 +139,5 @@ void tcs37727_read(tcs37727_t *dev, tcs37727_data_t *data);
 }
 #endif
 
-#endif
+#endif /* TCS37727_H */
 /** @} */
diff --git a/drivers/include/tmp006.h b/drivers/include/tmp006.h
index 5fbc68a0d54d3d0a4d84dd36c05406676bc3551a..f4afb3452548b103407ff617e5a9701ac1cd62bd 100644
--- a/drivers/include/tmp006.h
+++ b/drivers/include/tmp006.h
@@ -205,5 +205,5 @@ void tmp006_convert(int16_t rawv, int16_t rawt,  float *tamb, float *tobj);
 }
 #endif
 
-#endif
+#endif /* TMP006_H */
 /** @} */
diff --git a/drivers/include/tsl2561.h b/drivers/include/tsl2561.h
index a78c98750c961ae5c57e16b900f59e40c82c691f..20b1ea5517e53b44ab93e7052d242944593aa671 100644
--- a/drivers/include/tsl2561.h
+++ b/drivers/include/tsl2561.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef TSL2561_H_
-#define TSL2561_H_
+#ifndef TSL2561_H
+#define TSL2561_H
 
 #include "saul.h"
 #include "periph/i2c.h"
@@ -109,5 +109,5 @@ uint16_t tsl2561_read_illuminance(tsl2561_t *dev);
 }
 #endif
 
-#endif /* TSL2561_H_ */
+#endif /* TSL2561_H */
 /** @} */
diff --git a/drivers/include/w5100.h b/drivers/include/w5100.h
index 321d218e94c52bd5feb4ffbb78b5e06ea4f847d9..361bd2f048a8c52242096fc26ca50cdad7dd6cb0 100644
--- a/drivers/include/w5100.h
+++ b/drivers/include/w5100.h
@@ -81,5 +81,5 @@ void w5100_setup(w5100_t *dev, const w5100_params_t *params);
 }
 #endif
 
-#endif /* W5100_h */
+#endif /* W5100_H */
 /* @} */
diff --git a/drivers/kw2xrf/include/kw2xrf_reg.h b/drivers/kw2xrf/include/kw2xrf_reg.h
index 7ef7eca59d4cb19866ff0e4b4830c81e0e53acd7..97a10ae350b61d123b39e68a8d37ecdd1e65175e 100644
--- a/drivers/kw2xrf/include/kw2xrf_reg.h
+++ b/drivers/kw2xrf/include/kw2xrf_reg.h
@@ -50,8 +50,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef MKW2XD_MODEM_REG_H
-#define MKW2XD_MODEM_REG_H
+#ifndef KW2XRF_REG_H
+#define KW2XRF_REG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -564,5 +564,5 @@ enum mkw2xdrf_iregister {
 }
 #endif
 
-#endif /* MKW2XD_MODEM_REG_H */
+#endif /* KW2XRF_REG_H */
 /** @} */
diff --git a/drivers/kw2xrf/include/overwrites.h b/drivers/kw2xrf/include/overwrites.h
index d5480bb9d68cbe7f890b786dfc0195be5b6c7cef..817ed8e095cd94a9f9f5c79afe38069ddbd90cc3 100644
--- a/drivers/kw2xrf/include/overwrites.h
+++ b/drivers/kw2xrf/include/overwrites.h
@@ -31,8 +31,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef OVERWRITES_H_
-#define OVERWRITES_H_
+#ifndef OVERWRITES_H
+#define OVERWRITES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -311,4 +311,4 @@ end of deprecated versions */
 #ifdef __cplusplus
 }
 #endif
-#endif  //OVERWRITES_H_
+#endif /* OVERWRITES_H */
diff --git a/drivers/lsm6dsl/include/lsm6dsl_internal.h b/drivers/lsm6dsl/include/lsm6dsl_internal.h
index f11c4e3c59544ac3f2bf8d10e9fa2e7243acbd8f..7d112db207c307a7c94083b7d32dee5ac8d3fe32 100644
--- a/drivers/lsm6dsl/include/lsm6dsl_internal.h
+++ b/drivers/lsm6dsl/include/lsm6dsl_internal.h
@@ -153,5 +153,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LSM6DS_LINTERNAL_H */
+#endif /* LSM6DSL_INTERNAL_H */
 /** @} */
diff --git a/drivers/mag3110/include/mag3110_reg.h b/drivers/mag3110/include/mag3110_reg.h
index 81311aa3c4a666860fa220e5766ba770699571ca..6e74e7dbfa3196d4a2b4f7a093d50f2b06ed1dfb 100644
--- a/drivers/mag3110/include/mag3110_reg.h
+++ b/drivers/mag3110/include/mag3110_reg.h
@@ -76,5 +76,5 @@ extern "C"
 }
 #endif
 
-#endif
+#endif /* MAG3110_REG_H */
 /** @} */
diff --git a/drivers/mma8x5x/include/mma8x5x_regs.h b/drivers/mma8x5x/include/mma8x5x_regs.h
index fdcdfb07991f4e5df2ae0e7325cc21927312c0e4..30d4bd2f24c07f9579414575c9eb573be888942c 100644
--- a/drivers/mma8x5x/include/mma8x5x_regs.h
+++ b/drivers/mma8x5x/include/mma8x5x_regs.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef MMA8X5X_REG_H
-#define MMA8X5X_REG_H
+#ifndef MMA8X5X_REGS_H
+#define MMA8X5X_REGS_H
 
 #ifdef __cplusplus
 extern "C"
@@ -258,5 +258,5 @@ extern "C"
 }
 #endif
 
-#endif
+#endif /* MMA8X5X_REGS_H */
 /** @} */
diff --git a/drivers/mpl3115a2/include/mpl3115a2_reg.h b/drivers/mpl3115a2/include/mpl3115a2_reg.h
index d9a77106a74dda3356ab03face8dcb7714426ff9..b7470e1420454cf08bb91852153ef40d6ba3360b 100644
--- a/drivers/mpl3115a2/include/mpl3115a2_reg.h
+++ b/drivers/mpl3115a2/include/mpl3115a2_reg.h
@@ -130,5 +130,5 @@ extern "C"
 }
 #endif
 
-#endif
+#endif /* MPL3115A2_REG_H */
 /** @} */
diff --git a/drivers/pcd8544/include/pcd8544_internal.h b/drivers/pcd8544/include/pcd8544_internal.h
index 719639e511f9e53dbdb18c674ce43f9d88154f4f..eaf60bb766ce95103ff52b254a896b700a8b7d7e 100644
--- a/drivers/pcd8544/include/pcd8544_internal.h
+++ b/drivers/pcd8544/include/pcd8544_internal.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PDC8544_INTERNAL_H
-#define PDC8544_INTERNAL_H
+#ifndef PCD8544_INTERNAL_H
+#define PCD8544_INTERNAL_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -72,5 +72,5 @@
 }
 #endif
 
-#endif /* PDC8544_INTERNAL_H */
+#endif /* PCD8544_INTERNAL_H */
 /** @} */
diff --git a/drivers/tcs37727/include/tcs37727-internal.h b/drivers/tcs37727/include/tcs37727-internal.h
index 5950f774ac195cae46d0035dfc73fbde9754f46e..54f3f940e37828471a39668d89d232223f80cc57 100644
--- a/drivers/tcs37727/include/tcs37727-internal.h
+++ b/drivers/tcs37727/include/tcs37727-internal.h
@@ -131,5 +131,5 @@ extern "C"
 }
 #endif
 
-#endif
+#endif /* TCS37727_INTERNAL_H */
 /** @} */
diff --git a/drivers/tsl2561/include/tsl2561_internals.h b/drivers/tsl2561/include/tsl2561_internals.h
index 6d0e1932cd478fb4c27efaa99fa78d83ee9f226d..01c4dbde640db1865e2e17fa8033c50f3cf58d8d 100644
--- a/drivers/tsl2561/include/tsl2561_internals.h
+++ b/drivers/tsl2561/include/tsl2561_internals.h
@@ -17,8 +17,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef TSL2561_REGS_H_
-#define TSL2561_REGS_H_
+#ifndef TSL2561_INTERNALS_H
+#define TSL2561_INTERNALS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,5 +104,5 @@ extern "C" {
 }
 #endif
 
-#endif /* TSL2561_REGS_H_ */
+#endif /* TSL2561_INTERNALS_H */
 /** @} */
diff --git a/drivers/tsl2561/include/tsl2561_params.h b/drivers/tsl2561/include/tsl2561_params.h
index 7fc4ae233939f50f245ceb8ba53ddd93d4bf7b45..2bdf8717c7e0b5b40fafc216861605c3ca1f50a8 100644
--- a/drivers/tsl2561/include/tsl2561_params.h
+++ b/drivers/tsl2561/include/tsl2561_params.h
@@ -75,5 +75,5 @@ saul_reg_info_t tsl2561_saul_reg_info[] =
 }
 #endif
 
-#endif // TSL2561_PARAMS_H
+#endif /* TSL2561_PARAMS_H */
 /** @} */
diff --git a/drivers/uart_half_duplex/include/uart_half_duplex.h b/drivers/uart_half_duplex/include/uart_half_duplex.h
index 3b791d345bbe7c608943f174232ef1f4401298f3..e3e0fcef043e86a558ae549070e01668dd0fd86f 100644
--- a/drivers/uart_half_duplex/include/uart_half_duplex.h
+++ b/drivers/uart_half_duplex/include/uart_half_duplex.h
@@ -140,5 +140,5 @@ size_t uart_half_duplex_recv(uart_half_duplex_t *dev, size_t size);
 }
 #endif
 
-#endif
+#endif /* UART_HALF_DUPLEX_H */
 /** @} */
diff --git a/pkg/emb6/include/board_conf.h b/pkg/emb6/include/board_conf.h
index 4cd41308e4e8678e8ee60fe487dfe2c34e68b6fb..884c1a66ed3979325281aaea462ac22753bd2ecd 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 BOARD_CONF_H
+#define 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 /* BOARD_CONF_H */
 /** @} */
 /** @} */
diff --git a/pkg/emb6/include/sock_types.h b/pkg/emb6/include/sock_types.h
index 6ce812b6c4409e25efe183cb6fb09ac897bf162c..f81f70b4da98c982dfede6f3198684371344ce69 100644
--- a/pkg/emb6/include/sock_types.h
+++ b/pkg/emb6/include/sock_types.h
@@ -17,8 +17,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 <stdatomic.h>
 
@@ -62,5 +62,5 @@ struct sock_udp {
 }
 #endif
 
-#endif /* SOCK_TYPES_H_ */
+#endif /* SOCK_TYPES_H */
 /** @} */
diff --git a/pkg/lwip/include/arch/cc.h b/pkg/lwip/include/arch/cc.h
index d4a943684b0b1ff893d24ff3ae55cb76939427b8..d31d7d8f710bf9f9265a484869aab6f5048b64e4 100644
--- a/pkg/lwip/include/arch/cc.h
+++ b/pkg/lwip/include/arch/cc.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_ARCH_CC_H
-#define LWIP_ARCH_CC_H
+#ifndef ARCH_CC_H
+#define ARCH_CC_H
 
 #include <assert.h>
 #include <inttypes.h>
@@ -111,5 +111,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LWIP_ARCH_CC_H */
+#endif /* ARCH_CC_H */
 /** @} */
diff --git a/pkg/lwip/include/arch/sys_arch.h b/pkg/lwip/include/arch/sys_arch.h
index 27c6f8192d349a197da415bc4a022b599fe1a7d9..aad33a1b75bf0392b59a6be3c8466ddbfe8a3b03 100644
--- a/pkg/lwip/include/arch/sys_arch.h
+++ b/pkg/lwip/include/arch/sys_arch.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_ARCH_SYS_ARCH_H
-#define LWIP_ARCH_SYS_ARCH_H
+#ifndef ARCH_SYS_ARCH_H
+#define ARCH_SYS_ARCH_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -84,5 +84,5 @@ static inline void sys_mbox_set_invalid(sys_mbox_t *mbox)
 }
 #endif
 
-#endif /* LWIP_ARCH_SYS_ARCH_H */
+#endif /* ARCH_SYS_ARCH_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/netif/netdev.h b/pkg/lwip/include/lwip/netif/netdev.h
index 29cc028a2b07a2a433001ea22ae03dc276b8cc34..c3b1ec77cfb2393beb164a6c1b87d30f43583777 100644
--- a/pkg/lwip/include/lwip/netif/netdev.h
+++ b/pkg/lwip/include/lwip/netif/netdev.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_NETDEV_H
-#define LWIP_NETDEV_H
+#ifndef LWIP_NETIF_NETDEV_H
+#define LWIP_NETIF_NETDEV_H
 
 #include "net/ethernet.h"
 #include "net/netdev.h"
@@ -58,5 +58,5 @@ err_t lwip_netdev_init(struct netif *netif);
 }
 #endif
 
-#endif /* LWIP_NETDEV_H */
+#endif /* LWIP_NETIF_NETDEV_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/sock_internal.h b/pkg/lwip/include/lwip/sock_internal.h
index f47d39f0c1c9ee4fa1873c24f143be30d6cfe061..68eca56794b1a3b4c9ad7aca5a47ba935a4c8bfe 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 LWIP_SOCK_INTERNAL_H
+#define LWIP_SOCK_INTERNAL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -65,5 +65,5 @@ ssize_t lwip_sock_send(struct netconn **conn, const void *data, size_t len,
 }
 #endif
 
-#endif /* SOCK_INTERNAL_H */
+#endif /* LWIP_SOCK_INTERNAL_H */
 /** @} */
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index c6632eec01040ba5f71837faf614720c12924d89..0fcfc7c8a700d26b53668c985d1e7396942354c5 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 LWIPOPTS_H
+#define LWIPOPTS_H
 
 #include "thread.h"
 #include "net/gnrc/netif/hdr.h"
@@ -155,5 +155,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LWIP_LWIPOPTS_H */
+#endif /* LWIPOPTS_H */
 /** @} */
diff --git a/pkg/nordic_softdevice_ble/src/ble-core.h b/pkg/nordic_softdevice_ble/src/ble-core.h
index 764f88eaeb0c80a64990c3c2cf16de17e2c8b9ea..05b43c68f7417f9af94897113328d1fd246f5117 100644
--- a/pkg/nordic_softdevice_ble/src/ble-core.h
+++ b/pkg/nordic_softdevice_ble/src/ble-core.h
@@ -43,8 +43,8 @@
  *
  * @author  Wojciech Bober <wojciech.bober@nordicsemi.no>
  */
-#ifndef DEV_BLE_H
-#define DEV_BLE_H
+#ifndef BLE_CORE_H
+#define BLE_CORE_H
 
 #include <stdint.h>
 
@@ -80,7 +80,7 @@ void ble_get_mac(uint8_t addr[8]);
 }
 #endif
 
-#endif /* DEV_BLE_H */
+#endif /* BLE_CORE_H */
 
 /**
  * @}
diff --git a/pkg/spiffs/include/spiffs_config.h b/pkg/spiffs/include/spiffs_config.h
index 9909e85d436d23c57698fcb280b8e1cc0357b9dc..892b271df2dcd8eb28d0f52720d3c9a17bb035a3 100644
--- a/pkg/spiffs/include/spiffs_config.h
+++ b/pkg/spiffs/include/spiffs_config.h
@@ -28,8 +28,8 @@
  *      Author: petera
  */
 
-#ifndef SPIFFS_CONFIG_H_
-#define SPIFFS_CONFIG_H_
+#ifndef SPIFFS_CONFIG_H
+#define SPIFFS_CONFIG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -298,4 +298,4 @@ typedef int16_t s16_t;
 }
 #endif
 
-#endif /* SPIFFS_CONFIG_H_ */
+#endif /* SPIFFS_CONFIG_H */
diff --git a/sys/embunit/ColorTextColors.h b/sys/embunit/ColorTextColors.h
index a6878b49cbb975888cb2f823e1eb1102b3888f30..f615a9982a5fdca04d8aed8527291e1baa691f87 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 COLORTEXTCOLORS_H
+#define COLORTEXTCOLORS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,5 +53,5 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_COLORTEXTCOLORS_H */
+#endif /* COLORTEXTCOLORS_H */
 /** @} */
diff --git a/sys/include/base64.h b/sys/include/base64.h
index c545cfab5baa7789fab760acdc9cc8de2619f733..46f332a321d59598ec4c2b0e0e34194588aedb12 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_H
+#define BASE64_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_H */
diff --git a/sys/include/bloom.h b/sys/include/bloom.h
index d669cbb49adbdbde92f1ed69d487aa6dd1147952..3b2c841153d1db7ab370088607bc0cb4d3c40ec3 100644
--- a/sys/include/bloom.h
+++ b/sys/include/bloom.h
@@ -120,8 +120,8 @@
  * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef _BLOOM_FILTER_H
-#define _BLOOM_FILTER_H
+#ifndef BLOOM_H
+#define BLOOM_H
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -233,4 +233,4 @@ bool bloom_check(bloom_t *bloom, const uint8_t *buf, size_t len);
 #endif
 
 /** @} */
-#endif /* _BLOOM_FILTER_H */
+#endif /* BLOOM_H */
diff --git a/sys/include/cbor.h b/sys/include/cbor.h
index c7d85c063517aa138f7a8d3593122d8d8c24f961..0acfffacefe81e8202aa77d93af2da70737fd7a2 100644
--- a/sys/include/cbor.h
+++ b/sys/include/cbor.h
@@ -706,6 +706,6 @@ bool cbor_at_end(const cbor_stream_t *stream, size_t offset);
 }
 #endif
 
-#endif
+#endif /* CBOR_H */
 
 /** @} */
diff --git a/sys/include/checksum/crc16_ccitt.h b/sys/include/checksum/crc16_ccitt.h
index a6d198f46535eb624b329eddf76b1635bd2f6000..5d6279ea7dbab7e95f0a22da1b921e037ce002cc 100644
--- a/sys/include/checksum/crc16_ccitt.h
+++ b/sys/include/checksum/crc16_ccitt.h
@@ -27,8 +27,8 @@
  * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
-#ifndef CRC16_CCITT_H
-#define CRC16_CCITT_H
+#ifndef CHECKSUM_CRC16_CCITT_H
+#define CHECKSUM_CRC16_CCITT_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -66,6 +66,6 @@ uint16_t crc16_ccitt_calc(const unsigned char *buf, size_t len);
 }
 #endif
 
-#endif /* CRC16_CCITT_H */
+#endif /* CHECKSUM_CRC16_CCITT_H */
 
 /** @} */
diff --git a/sys/include/checksum/fletcher16.h b/sys/include/checksum/fletcher16.h
index 234b47db7206900ea3fcda9ce086d47062729bd7..fc8b8e1ea0cdf0cb6476befe14898be4150b0c56 100644
--- a/sys/include/checksum/fletcher16.h
+++ b/sys/include/checksum/fletcher16.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef FLETCHER16_H
-#define FLETCHER16_H
+#ifndef CHECKSUM_FLETCHER16_H
+#define CHECKSUM_FLETCHER16_H
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -46,6 +46,6 @@ uint16_t fletcher16(const uint8_t *buf, size_t bytes);
 }
 #endif
 
-#endif /* FLETCHER16_H */
+#endif /* CHECKSUM_FLETCHER16_H */
 
 /** @} */
diff --git a/sys/include/checksum/fletcher32.h b/sys/include/checksum/fletcher32.h
index 67d000d4ffd8d60b674271d187db103f87dd16fa..8f23851e974b14b6acc68da754e349a7971aa5ce 100644
--- a/sys/include/checksum/fletcher32.h
+++ b/sys/include/checksum/fletcher32.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef FLETCHER32_H
-#define FLETCHER32_H
+#ifndef CHECKSUM_FLETCHER32_H
+#define CHECKSUM_FLETCHER32_H
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -47,6 +47,6 @@ uint32_t fletcher32(const uint16_t *buf, size_t words);
 }
 #endif
 
-#endif /* FLETCHER32_H */
+#endif /* CHECKSUM_FLETCHER32_H */
 
 /** @} */
diff --git a/sys/include/checksum/ucrc16.h b/sys/include/checksum/ucrc16.h
index 60c2db524d645ecc13af4a939ea65619f650a1e1..67e7d3e4fa37678b3dff51194e4e8131583e40cd 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 CHECKSUM_UCRC16_H
+#define CHECKSUM_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 /* CHECKSUM_UCRC16_H */
 /** @} */
diff --git a/sys/include/crypto/aes.h b/sys/include/crypto/aes.h
index 9ce7d07fba8a988e392b652ff932c9423d4f9701..0a1b9b820f726ebad749776ef008ce787d2cd06d 100644
--- a/sys/include/crypto/aes.h
+++ b/sys/include/crypto/aes.h
@@ -19,8 +19,8 @@
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
-#ifndef AES_H
-#define AES_H
+#ifndef CRYPTO_AES_H
+#define CRYPTO_AES_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -128,4 +128,4 @@ int aes_decrypt(const cipher_context_t *context, const uint8_t *cipher_block,
 #endif
 
 /** @} */
-#endif /* AES_H */
+#endif /* CRYPTO_AES_H */
diff --git a/sys/include/crypto/chacha.h b/sys/include/crypto/chacha.h
index 120e91171ccbc12d91f088dfd05f17f9dfc5d9c1..5e01aa6339613e9d754deccc97009ff9dfd29bd2 100644
--- a/sys/include/crypto/chacha.h
+++ b/sys/include/crypto/chacha.h
@@ -137,7 +137,7 @@ uint32_t chacha_prng_next(void);
 }
 #endif
 
-#endif /* ifndef CRYPTO_CHACHA_H */
+#endif /* CRYPTO_CHACHA_H */
 
 /**
  * @}
diff --git a/sys/include/crypto/helper.h b/sys/include/crypto/helper.h
index 054a82d08f4fc81bbb2682984f22904b663f5b1e..7744dc981d531e2fa264f8e9be9ba578a12451bc 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_HELPER_H
+#define CRYPTO_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_HELPER_H */
diff --git a/sys/include/ecc/hamming256.h b/sys/include/ecc/hamming256.h
index 5c2cc989186f1c212ec7adc1e2e194333d48e735..4852505396dcca2ca40e09f007aa8869b97a9d7d 100644
--- a/sys/include/ecc/hamming256.h
+++ b/sys/include/ecc/hamming256.h
@@ -15,8 +15,8 @@
  * @author      Lucas Jenß <lucas@x3ro.de>
  */
 
-#ifndef _HAMMING256_H
-#define _HAMMING256_H
+#ifndef ECC_HAMMING256_H
+#define ECC_HAMMING256_H
 
 #include <stdint.h>
 
@@ -68,5 +68,5 @@ uint8_t hamming_verify256x( uint8_t *data, uint32_t size, const uint8_t *code );
 }
 #endif
 
-#endif
+#endif /* ECC_HAMMING256_H */
 /** @} */
diff --git a/sys/include/embUnit.h b/sys/include/embUnit.h
index 22052d2a84d6ea4b6cc714e01a8a3cc2e1f2aad5..6bc1cbc3c90261740d13e26350eb4f59f6a648f3 100644
--- a/sys/include/embUnit.h
+++ b/sys/include/embUnit.h
@@ -16,8 +16,8 @@
  * @author Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef SYS_EMB_UNIT_H
-#define SYS_EMB_UNIT_H
+#ifndef EMBUNIT_H
+#define EMBUNIT_H
 
 #include "embUnit/embUnit.h"
 
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif /* SYS_EMB_UNIT_H */
+#endif /* EMBUNIT_H */
diff --git a/sys/include/embUnit/AssertImpl.h b/sys/include/embUnit/AssertImpl.h
index 5ce4f45c7934abc4b311b4d834d7caf637f55e8d..cf7e4951cf1256a81c8e9bff4c28fcca51989adb 100644
--- a/sys/include/embUnit/AssertImpl.h
+++ b/sys/include/embUnit/AssertImpl.h
@@ -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 e2aaadd1592c532db32980782fa9ca33b49084ee..1f40fa54683723751f7555f14c568731e79c8eee 100644
--- a/sys/include/embUnit/ColorOutputter.h
+++ b/sys/include/embUnit/ColorOutputter.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 9aebdc83cbced961e4efc275e26868b4dc94e5ef..8df9868131a0ba4b508ac8982c21b60dc88c967a 100644
--- a/sys/include/embUnit/ColorTextOutputter.h
+++ b/sys/include/embUnit/ColorTextOutputter.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 95612d176d0f7b595d53ab633364bff8b60a0217..49b4fb8a832cca2b260f6cb003ee9a024c41437a 100644
--- a/sys/include/embUnit/CompilerOutputter.h
+++ b/sys/include/embUnit/CompilerOutputter.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 5e0a5333c2f7cb8ed57a7cfe4636443aa7145a04..448997d50f9e0fb8fb660b751e3ba58c3c093b44 100644
--- a/sys/include/embUnit/HelperMacro.h
+++ b/sys/include/embUnit/HelperMacro.h
@@ -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 972e7f770dcc4d0972acca469417d72df688fabb..6ea9048c02e3e27999cadc78610203d6859bc397 100644
--- a/sys/include/embUnit/Outputter.h
+++ b/sys/include/embUnit/Outputter.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 345ff2e00b34f4b6f5bdb0f972cbf4f12a19b60d..a2fa7ccf2aa30cb828544586ced4c773e9e7e768 100644
--- a/sys/include/embUnit/RepeatedTest.h
+++ b/sys/include/embUnit/RepeatedTest.h
@@ -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 8475464b5cdad7947a2f324a00c4493983c1d6bc..20a512dd8d75e97da88f0f8ff03cca70102e22c9 100644
--- a/sys/include/embUnit/Test.h
+++ b/sys/include/embUnit/Test.h
@@ -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 bc103d17f44d619eb037a24f3d40206bfe565a94..0b99cd900f371e0317c4a7b8d8e31633d9f2eac5 100644
--- a/sys/include/embUnit/TestCaller.h
+++ b/sys/include/embUnit/TestCaller.h
@@ -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 be98e99a4ed998b7345307ee12844f3c05f21c31..60e878012ef34026ea8641ce92dfc0059f037f03 100644
--- a/sys/include/embUnit/TestCase.h
+++ b/sys/include/embUnit/TestCase.h
@@ -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 ffb0fda448c14f5d4b055229b92d4acafd72f3b0..e8a49d7bc163c2f3244a0f4b4f6c55db76d6160d 100644
--- a/sys/include/embUnit/TestListener.h
+++ b/sys/include/embUnit/TestListener.h
@@ -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 6d7167f60f7809ebee778d260c81130eb4ea6fab..06f1f932ce23b542d82b200203708b6eaafb8f26 100644
--- a/sys/include/embUnit/TestResult.h
+++ b/sys/include/embUnit/TestResult.h
@@ -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 dfab0a461bcaff594f76fe1b40341ff1bc553b7d..ba8b44a107b5ffaa120705757a0b6eea38458810 100644
--- a/sys/include/embUnit/TestRunner.h
+++ b/sys/include/embUnit/TestRunner.h
@@ -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 2fc378d64d1e41e31a6986e7f66685280aa08c2d..b88cebcf64220f1386d917d6d3ec52805231a37c 100644
--- a/sys/include/embUnit/TestSuite.h
+++ b/sys/include/embUnit/TestSuite.h
@@ -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 89a42aa7d7b509cf6cd2a0f56d16596f6ce1229e..29d6ad2ac3c33599c993258c2b9559cef0e9ebdc 100644
--- a/sys/include/embUnit/TextOutputter.h
+++ b/sys/include/embUnit/TextOutputter.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 ea711baac95823b652ddbdadaac0f92f7cea43b1..75892baa1107c33b110f0954b85e687f71fe109f 100644
--- a/sys/include/embUnit/TextUIRunner.h
+++ b/sys/include/embUnit/TextUIRunner.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 af9077c5b1fe9f41014ffb9f85b7df736a26aab7..31497f8eabbc28e3106eb9c5d4ab5fa716f5cf86 100644
--- a/sys/include/embUnit/XMLOutputter.h
+++ b/sys/include/embUnit/XMLOutputter.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 212da419d56c4a9f9349d22abed2186bdc77529b..f00d67379230126bdb77b52c4d96062d7b7d5981 100644
--- a/sys/include/embUnit/embUnit.h
+++ b/sys/include/embUnit/embUnit.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 85d6145b70b100f5ce01c2ae1f4e872ace57a85e..334e3813600014cbf1ab11d5533b046d4c62a96a 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_EMBUNIT_CONFIG_H
+#define EMBUNIT_EMBUNIT_CONFIG_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_CONFIG_H */
+#endif /* EMBUNIT_EMBUNIT_CONFIG_H */
diff --git a/sys/include/embUnit/stdImpl.h b/sys/include/embUnit/stdImpl.h
index 88ee57b4f6541f9bbc2e48bdcc9accf446336af7..7ae60e55acb55ac1b5d8aec1c2c136919370eaec 100644
--- a/sys/include/embUnit/stdImpl.h
+++ b/sys/include/embUnit/stdImpl.h
@@ -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/fs/constfs.h b/sys/include/fs/constfs.h
index 60fd6e1de06a3c484d57248412d37c198243d23d..4ed149f303af732a3f3c437ea2eba3de243787b6 100644
--- a/sys/include/fs/constfs.h
+++ b/sys/include/fs/constfs.h
@@ -21,8 +21,8 @@
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef CONSTFS_H_
-#define CONSTFS_H_
+#ifndef FS_CONSTFS_H
+#define FS_CONSTFS_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -61,6 +61,6 @@ extern const vfs_file_system_t constfs_file_system;
 }
 #endif
 
-#endif
+#endif /* FS_CONSTFS_H */
 
 /** @} */
diff --git a/sys/include/fs/devfs.h b/sys/include/fs/devfs.h
index 48f4460d9f2bdf5d6033a9625309f95b3a4a6285..4bc08d5133449ea5c7b494101831b4c22f749264 100644
--- a/sys/include/fs/devfs.h
+++ b/sys/include/fs/devfs.h
@@ -22,8 +22,8 @@
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef DEVFS_H_
-#define DEVFS_H_
+#ifndef FS_DEVFS_H
+#define FS_DEVFS_H
 
 #include "clist.h"
 #include "vfs.h"
@@ -89,6 +89,6 @@ int devfs_unregister(devfs_t *node);
 }
 #endif
 
-#endif
+#endif /* FS_DEVFS_H */
 
 /** @} */
diff --git a/sys/include/fs/spiffs_fs.h b/sys/include/fs/spiffs_fs.h
index f2ab03aa2989d63c7faaee1585c1949ed039668d..c9e7d241877ed4a13903e0174602edf2f0546a34 100644
--- a/sys/include/fs/spiffs_fs.h
+++ b/sys/include/fs/spiffs_fs.h
@@ -17,8 +17,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef SPIFFS_FS_H
-#define SPIFFS_FS_H
+#ifndef FS_SPIFFS_FS_H
+#define FS_SPIFFS_FS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -81,6 +81,6 @@ extern const vfs_file_system_t spiffs_file_system;
 }
 #endif
 
-#endif /* SPIFFS_FS_H */
+#endif /* FS_SPIFFS_FS_H */
 
 /** @} */
diff --git a/sys/include/hashes/sha1.h b/sys/include/hashes/sha1.h
index 362f6fefbaca4b2d35cb8d942b721fbc63a9e6d2..02ffd8dfb1ff40d09b3df65c2393441b9e475c80 100644
--- a/sys/include/hashes/sha1.h
+++ b/sys/include/hashes/sha1.h
@@ -23,8 +23,8 @@
 /* This code is public-domain - it is based on libcrypt
  * placed in the public domain by Wei Dai and other contributors. */
 
-#ifndef _SHA1_H
-#define _SHA1_H
+#ifndef HASHES_SHA1_H
+#define HASHES_SHA1_H
 
 #include <stdint.h>
 
@@ -118,5 +118,5 @@ void sha1_final_hmac(sha1_context *ctx, void *digest);
 }
 #endif
 
-#endif /* _SHA1_H */
+#endif /* HASHES_SHA1_H */
 /** @} */
diff --git a/sys/include/hashes/sha256.h b/sys/include/hashes/sha256.h
index 95b41a940ae49250223c434061523b45392b61d2..0a288342a21493ffad5753bcea9b7d7ef65886bf 100644
--- a/sys/include/hashes/sha256.h
+++ b/sys/include/hashes/sha256.h
@@ -43,8 +43,8 @@
  * @author      Hermann Lelong
  */
 
-#ifndef _SHA256_H
-#define _SHA256_H
+#ifndef HASHES_SHA256_H
+#define HASHES_SHA256_H
 
 #include <inttypes.h>
 
@@ -240,4 +240,4 @@ int sha256_chain_verify_element(void *element,
 #endif
 
 /** @} */
-#endif /* _SHA256_H */
+#endif /* HASHES_SHA256_H */
diff --git a/sys/include/luid.h b/sys/include/luid.h
index 974013f4d10ef7e6f43071c62dd475dd41914f0c..5ad2857bff28c883361a392dca3a8ce612f787e6 100644
--- a/sys/include/luid.h
+++ b/sys/include/luid.h
@@ -50,8 +50,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef LUID_H_
-#define LUID_H_
+#ifndef LUID_H
+#define LUID_H
 
 #include <stddef.h>
 
@@ -115,5 +115,5 @@ void luid_base(void *buf, size_t len);
 }
 #endif
 
-#endif /* LUID_H_ */
+#endif /* LUID_H */
 /** @} */
diff --git a/sys/include/net/af.h b/sys/include/net/af.h
index 3b462b60ebfdefa441da6eff934bfdc03b6560da..1e4780ab33a778b27c2d7c10707d2c9c53dd1917 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 NET_AF_H
+#define NET_AF_H
 
 
 
@@ -47,5 +47,5 @@ enum {
 }
 #endif
 
-#endif /* AF_H */
+#endif /* NET_AF_H */
 /** @} */
diff --git a/sys/include/net/csma_sender.h b/sys/include/net/csma_sender.h
index 17ef5747adcd508306e30da5fcf8ed7b03dd19fd..0928215f780f860368ffec79a80693a2b4402546 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 NET_CSMA_SENDER_H
+#define NET_CSMA_SENDER_H
 
 #include <stdint.h>
 
@@ -140,6 +140,6 @@ int csma_sender_cca_send(netdev_t *dev, struct iovec *vector, unsigned count);
 }
 #endif
 
-#endif /* CSMA_SENDER_H */
+#endif /* NET_CSMA_SENDER_H */
 
 /** @} */
diff --git a/sys/include/net/emcute.h b/sys/include/net/emcute.h
index b9affca636184a3bb3e60f5a1d7d3103274474b8..b0c1eb9762415e3937a6a4fa606d244d6d2e3eb4 100644
--- a/sys/include/net/emcute.h
+++ b/sys/include/net/emcute.h
@@ -82,8 +82,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MQTTSN_H
-#define MQTTSN_H
+#ifndef NET_EMCUTE_H
+#define NET_EMCUTE_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -377,5 +377,5 @@ const char *emcute_type_str(uint8_t type);
 }
 #endif
 
-#endif /* MQTTSN_H */
+#endif /* NET_EMCUTE_H */
 /** @} */
diff --git a/sys/include/net/ethernet.h b/sys/include/net/ethernet.h
index a7dde2f642f23c378990ac72fc616f9ebbee9648..93c2198b18586321d30283827754dee9ae1caec8 100644
--- a/sys/include/net/ethernet.h
+++ b/sys/include/net/ethernet.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef ETHERNET_H
-#define ETHERNET_H
+#ifndef NET_ETHERNET_H
+#define NET_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 /* NET_ETHERNET_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethernet/hdr.h b/sys/include/net/ethernet/hdr.h
index f0716643d30cbe4e37326c3783f5a4e36309c019..2742124ffeab213e7598c49517cc408a6fb486b2 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 NET_ETHERNET_HDR_H
+#define NET_ETHERNET_HDR_H
 
 #include <inttypes.h>
 
@@ -51,7 +51,7 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* ETHERNET_HDR_H */
+#endif /* NET_ETHERNET_HDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethertype.h b/sys/include/net/ethertype.h
index 297c48a504855855f8cdc9b899fe20527f382c5b..457ec45cb1fd29d10012c663668f0bd2edf73f09 100644
--- a/sys/include/net/ethertype.h
+++ b/sys/include/net/ethertype.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef ETHERTYPE_H
-#define ETHERTYPE_H
+#ifndef NET_ETHERTYPE_H
+#define NET_ETHERTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,7 +42,7 @@ extern "C" {
 }
 #endif
 
-#endif /* ETHERTYPE_H */
+#endif /* NET_ETHERTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/eui64.h b/sys/include/net/eui64.h
index d4900b0301ee6bbfcdea9a0ba002fa723b05dc12..a8fd090de54137e6d0a20948ecf1872a88a77c6f 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 NET_EUI64_H
+#define NET_EUI64_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -44,5 +44,5 @@ typedef union {
 }
 #endif
 
-#endif /* EUI64_H */
+#endif /* NET_EUI64_H */
 /** @} */
diff --git a/sys/include/net/fib.h b/sys/include/net/fib.h
index 7d19002b9db79ad652581156eb8704529cfc257c..ef33af7fbc70ca4a34459cffb215e8bb4ff91eeb 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 NET_FIB_H
+#define NET_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 /* NET_FIB_H */
 /** @} */
diff --git a/sys/include/net/fib/table.h b/sys/include/net/fib/table.h
index 124c4724b87a309fcfb0cbd207a43a2bbf58374f..3d14c773b2c7c7b98550519024028d548f8d23a7 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 NET_FIB_TABLE_H
+#define NET_FIB_TABLE_H
 
 #include <stdint.h>
 
@@ -139,5 +139,5 @@ typedef struct {
 }
 #endif
 
-#endif /* FIB_TABLE_H */
+#endif /* NET_FIB_TABLE_H */
 /** @} */
diff --git a/sys/include/net/gcoap.h b/sys/include/net/gcoap.h
index fc5b326048659bffb817fa4cfb853340fa1d130d..5107db4b587c4f5927b1cf31e51118451441cc8a 100644
--- a/sys/include/net/gcoap.h
+++ b/sys/include/net/gcoap.h
@@ -138,8 +138,8 @@
  * @author      Ken Bannister <kb2ma@runbox.com>
  */
 
-#ifndef GCOAP_H
-#define GCOAP_H
+#ifndef NET_GCOAP_H
+#define NET_GCOAP_H
 
 #include "net/sock/udp.h"
 #include "nanocoap.h"
@@ -415,5 +415,5 @@ uint8_t gcoap_op_state(void);
 }
 #endif
 
-#endif /* GCOAP_H */
+#endif /* NET_GCOAP_H */
 /** @} */
diff --git a/sys/include/net/gnrc.h b/sys/include/net/gnrc.h
index e35ec045bd8ffe3d33e33b3c372df8bf14dcff03..2d4e4467a7005abce79ce92c659b378ccd620851 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 NET_GNRC_H
+#define NET_GNRC_H
 
 #include "net/netopt.h"
 #include "net/gnrc/netapi.h"
@@ -302,5 +302,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_NETBASE_H */
+#endif /* NET_GNRC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6.h b/sys/include/net/gnrc/icmpv6.h
index deccdb4d81fda9de2a38cd3a4e8f7038fcb842e9..24c63e72a7be3ef9ea51df4d799128cd208759fd 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 NET_GNRC_ICMPV6_H
+#define NET_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 /* NET_GNRC_ICMPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/icmpv6/echo.h b/sys/include/net/gnrc/icmpv6/echo.h
index 9a3066adf22f5841ca7a6824e496dac83c3efaf7..98f95b650fde6c344d833037e0d800e5f9e5dae0 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 NET_GNRC_ICMPV6_ECHO_H
+#define NET_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 /* NET_GNRC_ICMPV6_ECHO_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6/error.h b/sys/include/net/gnrc/icmpv6/error.h
index f02e1a0afd1718d15db04528556ef976ece7a149..20d0343196f66b31ff8c648925b78ec9f572d949 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 NET_GNRC_ICMPV6_ERROR_H
+#define NET_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 /* NET_GNRC_ICMPV6_ERROR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h
index 0e89d852f74b8d56b144e0f9adbb67e1b16a78a1..11841393b298ba2bdce7adcd307bff5096bb6ab5 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 NET_GNRC_IPV6_H
+#define NET_GNRC_IPV6_H
 
 #include "kernel_types.h"
 #include "net/gnrc.h"
@@ -170,7 +170,7 @@ ipv6_hdr_t *gnrc_ipv6_get_header(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_IPV6_H */
+#endif /* NET_GNRC_IPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/blacklist.h b/sys/include/net/gnrc/ipv6/blacklist.h
index e536dc6e3097f63bbe1d390011a1c21efef3a85c..43a1a159bb2272cc6bc840c13f6fbcc93c3c052f 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 NET_GNRC_IPV6_BLACKLIST_H
+#define NET_GNRC_IPV6_BLACKLIST_H
 
 #include <stdbool.h>
 
@@ -75,5 +75,5 @@ void gnrc_ipv6_blacklist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_BLACKLIST_H */
+#endif /* NET_GNRC_IPV6_BLACKLIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/ext.h b/sys/include/net/gnrc/ipv6/ext.h
index 995dbe25b6c2774a71d45abc304fa30d4299e2d0..cf29bd504731d53442479f8abe033bb29bd10ee2 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 NET_GNRC_IPV6_EXT_H
+#define NET_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 /* NET_GNRC_IPV6_EXT_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/hdr.h b/sys/include/net/gnrc/ipv6/hdr.h
index aab108d9d597e9e2ab9228ce7a38ef8fe807eed9..00aea45726bbb9c24f425f74e4c627024b96b93d 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 NET_GNRC_IPV6_HDR_H
+#define NET_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 /* NET_GNRC_IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/nc.h b/sys/include/net/gnrc/ipv6/nc.h
index c197428c65d8a81f4fb0e8c3dfff3e209fd2738b..c233d90b948529a284a4088c579778c96661df4c 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 NET_GNRC_IPV6_NC_H
+#define NET_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 /* NET_GNRC_IPV6_NC_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/netif.h b/sys/include/net/gnrc/ipv6/netif.h
index 7e513dfa3d45fe4d29cb97235c94abb116ad2b41..bc1418ffd5753671266bf3e0ec7a988817a78e0f 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 NET_GNRC_IPV6_NETIF_H
+#define NET_GNRC_IPV6_NETIF_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -611,7 +611,7 @@ netstats_t *gnrc_ipv6_netif_get_stats(kernel_pid_t pid);
 }
 #endif
 
-#endif /* NETIF_H */
+#endif /* NET_GNRC_IPV6_NETIF_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/whitelist.h b/sys/include/net/gnrc/ipv6/whitelist.h
index 9977dafc38b65b6830c0685b6f50d69dff5f71bc..f67cc9decae274aa6f39a299c91f862874ad44af 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 NET_GNRC_IPV6_WHITELIST_H
+#define NET_GNRC_IPV6_WHITELIST_H
 
 #include <stdbool.h>
 
@@ -73,5 +73,5 @@ void gnrc_ipv6_whitelist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_WHITELIST_H */
+#endif /* NET_GNRC_IPV6_WHITELIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/internal.h b/sys/include/net/gnrc/mac/internal.h
index 912e9abc997cfaba47c58af2e56c10dc369d5456..538300690d20982029051efba28daf209855510b 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 NET_GNRC_MAC_INTERNAL_H
+#define NET_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 /* NET_GNRC_MAC_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/mac.h b/sys/include/net/gnrc/mac/mac.h
index 2299919844cfd5a34f541e453cf2a579a32cd896..ad0660053908aedd529482d4bff5af9cd8e4b2a2 100644
--- a/sys/include/net/gnrc/mac/mac.h
+++ b/sys/include/net/gnrc/mac/mac.h
@@ -21,8 +21,8 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_MAC_H
-#define GNRC_MAC_H
+#ifndef NET_GNRC_MAC_MAC_H
+#define NET_GNRC_MAC_MAC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,5 +60,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_MAC_H */
+#endif /* NET_GNRC_MAC_MAC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
index d69b2be3e8d8b820a6f58f7e592770337cd783a7..c18e2ffdb5ee1642c833169a589bc35a7779a92e 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 NET_GNRC_MAC_TYPES_H
+#define NET_GNRC_MAC_TYPES_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -186,5 +186,5 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_MAC_TYPES_H */
+#endif /* NET_GNRC_MAC_TYPES_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp.h b/sys/include/net/gnrc/ndp.h
index 425a360063b9b5aa815ddbd7f255a0805f9f3289..df745947ff6573d63f35b8ba1e402e3df6b9dfab 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 NET_GNRC_NDP_H
+#define NET_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 /* NET_GNRC_NDP_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ndp/host.h b/sys/include/net/gnrc/ndp/host.h
index d073f488c82549be5d4bbab4e307378d80cb85f2..deebb6a3022cc2a631590ac2d0ea54571e815275 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 NET_GNRC_NDP_HOST_H
+#define NET_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 /* NET_GNRC_NDP_HOST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/internal.h b/sys/include/net/gnrc/ndp/internal.h
index ad9767078093feb2cf46a4b9baaa404d300392e4..13fd68e357487e78177583a64e3c32851d2dd4f9 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 NET_GNRC_NDP_INTERNAL_H
+#define NET_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 /* NET_GNRC_NDP_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/node.h b/sys/include/net/gnrc/ndp/node.h
index a5f4ae1e1e69ce746cf78d0ed1a63618d0b73440..61ef12e14f0f99f7a48f5f996ebca423fe3a35e1 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 NET_GNRC_NDP_NODE_H
+#define NET_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 /* NET_GNRC_NDP_NODE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/router.h b/sys/include/net/gnrc/ndp/router.h
index 9658d5876f4d333179ab3810a58ba78b7551a2b1..21e78e9709aef6670e9c9dcb074d43c9b6c6572c 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 NET_GNRC_NDP_ROUTER_H
+#define NET_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 /* NET_GNRC_NDP_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netapi.h b/sys/include/net/gnrc/netapi.h
index 15b3a136c3d3a183df041648b6ffd081327b0ebf..f32939128543a2e483f878b98f7c48de12ac887d 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 NET_GNRC_NETAPI_H
+#define NET_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 /* NET_GNRC_NETAPI_H */
 /**
  * @}^
  */
diff --git a/sys/include/net/gnrc/netdev.h b/sys/include/net/gnrc/netdev.h
index b7d6d480c1cd365662664f2cbe716281a61b56cf..4313aa7c928a9c4c7a15859481032705386fcee7 100644
--- a/sys/include/net/gnrc/netdev.h
+++ b/sys/include/net/gnrc/netdev.h
@@ -26,8 +26,8 @@
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef GNRC_NETDEV_H
-#define GNRC_NETDEV_H
+#ifndef NET_GNRC_NETDEV_H
+#define NET_GNRC_NETDEV_H
 
 #include <assert.h>
 #include <stdint.h>
@@ -222,5 +222,5 @@ kernel_pid_t gnrc_netdev_init(char *stack, int stacksize, char priority,
 }
 #endif
 
-#endif /* GNRC_NETDEV_H */
+#endif /* NET_GNRC_NETDEV_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev/eth.h b/sys/include/net/gnrc/netdev/eth.h
index fafb366695ea198f7666d4f2707466ce899506e7..c9ce1d5fcedff9c2556f639ab84e69ea6924d5bd 100644
--- a/sys/include/net/gnrc/netdev/eth.h
+++ b/sys/include/net/gnrc/netdev/eth.h
@@ -16,8 +16,8 @@
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef GNRC_NETDEV_ETH_H
-#define GNRC_NETDEV_ETH_H
+#ifndef NET_GNRC_NETDEV_ETH_H
+#define NET_GNRC_NETDEV_ETH_H
 
 #include "net/gnrc/netdev.h"
 
@@ -40,5 +40,5 @@ int gnrc_netdev_eth_init(gnrc_netdev_t *gnrc_netdev, netdev_t *dev);
 }
 #endif
 
-#endif /* GNRC_NETDEV_ETH_H */
+#endif /* NET_GNRC_NETDEV_ETH_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev/ieee802154.h b/sys/include/net/gnrc/netdev/ieee802154.h
index 48cb8b0d8c885bc54386ab8cc72828a0838cf014..5db4660ce2f0a9629fdeb16de379566c77e10def 100644
--- a/sys/include/net/gnrc/netdev/ieee802154.h
+++ b/sys/include/net/gnrc/netdev/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETDEV_IEEE802154_H
-#define GNRC_NETDEV_IEEE802154_H
+#ifndef NET_GNRC_NETDEV_IEEE802154_H
+#define NET_GNRC_NETDEV_IEEE802154_H
 
 #include "net/netdev/ieee802154.h"
 #include "net/gnrc/netdev.h"
@@ -42,5 +42,5 @@ int gnrc_netdev_ieee802154_init(gnrc_netdev_t *gnrc_netdev,
 }
 #endif
 
-#endif /* GNRC_IEEE802154_H */
+#endif /* NET_GNRC_NETDEV_IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev/xbee_adpt.h b/sys/include/net/gnrc/netdev/xbee_adpt.h
index 11da5dee8a8ea66c5dc74987249f24b3ef5efd27..158f1b17973645498858b64847e074f83877ac29 100644
--- a/sys/include/net/gnrc/netdev/xbee_adpt.h
+++ b/sys/include/net/gnrc/netdev/xbee_adpt.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETDEV_XBEE_ADPT_H
-#define GNRC_NETDEV_XBEE_ADPT_H
+#ifndef NET_GNRC_NETDEV_XBEE_ADPT_H
+#define NET_GNRC_NETDEV_XBEE_ADPT_H
 
 #include "xbee.h"
 #include "net/gnrc/netdev.h"
@@ -48,5 +48,5 @@ void gnrc_netdev_xbee_init(gnrc_netdev_t *gnrc_netdev, xbee_t *dev);
 }
 #endif
 
-#endif /* GNRC_NETDEV_XBEE_ADPT_H */
+#endif /* NET_GNRC_NETDEV_XBEE_ADPT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/neterr.h b/sys/include/net/gnrc/neterr.h
index 838ddc7577235f39ddf3a3e5f7c50a4c68d4cfc4..6583294cc7ce59353acd3ddbac09efd094edf1ca 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 NET_GNRC_NETERR_H
+#define NET_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 /* NET_GNRC_NETERR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif.h b/sys/include/net/gnrc/netif.h
index f033aa2d9a9469f943d5b89a01df259276dee8b7..c92f33bbdce915baefe1b3b92c1b36fbf08dd2ab 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 NET_GNRC_NETIF_H
+#define NET_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 /* NET_GNRC_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif/hdr.h b/sys/include/net/gnrc/netif/hdr.h
index 3c75ba2651ef3e23b81e7d2e4e0e789f29b1112e..b1e101efd6bae771eb1a57d78b864d28fb5c495f 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 NET_GNRC_NETIF_HDR_H
+#define NET_GNRC_NETIF_HDR_H
 
 #include <string.h>
 #include <stdint.h>
@@ -242,5 +242,5 @@ int gnrc_netif_hdr_get_srcaddr(gnrc_pktsnip_t* pkt, uint8_t** pointer_to_addr);
 }
 #endif
 
-#endif /* NETIF_HDR_H */
+#endif /* NET_GNRC_NETIF_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netreg.h b/sys/include/net/gnrc/netreg.h
index 92f5141b0cd87c0bb1b59cd0545c0a17d1a666a3..381b771b722ea225c6b65ab03e3a21cee957c68a 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 NET_GNRC_NETREG_H
+#define NET_GNRC_NETREG_H
 
 #include <inttypes.h>
 
@@ -345,5 +345,5 @@ int gnrc_netreg_calc_csum(gnrc_pktsnip_t *hdr, gnrc_pktsnip_t *pseudo_hdr);
 }
 #endif
 
-#endif /* NETREG_H */
+#endif /* NET_GNRC_NETREG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettest.h b/sys/include/net/gnrc/nettest.h
index 5c1446c7ebd806fc704a19a7900b88f7886023f3..339af1971a6f724c319fda7ead99882bd0ca50be 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 NET_GNRC_NETTEST_H
+#define NET_GNRC_NETTEST_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -264,5 +264,5 @@ void gnrc_nettest_reset(void);
 }
 #endif
 
-#endif /* GNRC_NETTEST_H */
+#endif /* NET_GNRC_NETTEST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettype.h b/sys/include/net/gnrc/nettype.h
index 6bc8777b9d4785e9f0035cf2a58f1fc3b8ea1564..a455d24026cf3a182968243010fdc9099b2909a0 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 NET_GNRC_NETTYPE_H
+#define NET_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 /* NET_GNRC_NETTYPE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pkt.h b/sys/include/net/gnrc/pkt.h
index c170e60b6c4f878c87321fd61987389b52a9b0b7..647d8ca776b4f83a60389bc010909fa0c3eb848f 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 NET_GNRC_PKT_H
+#define NET_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 /* NET_GNRC_PKT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktbuf.h b/sys/include/net/gnrc/pktbuf.h
index c68f3ab0248da44e74f6a5b52ae37e56421e2431..014a2067bad8684edec68bc14ebc75c9b18f7433 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 NET_GNRC_PKTBUF_H
+#define NET_GNRC_PKTBUF_H
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -309,5 +309,5 @@ bool gnrc_pktbuf_is_sane(void);
 }
 #endif
 
-#endif /* GNRC_PKTBUF_H */
+#endif /* NET_GNRC_PKTBUF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h
index 0afdaf079d971a9503a31b1c66c72c95857422ac..6b25d6b785d5d2ec500047dbf4ced1fda9fc0321 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 NET_GNRC_PKTDUMP_H
+#define NET_GNRC_PKTDUMP_H
 
 #include "kernel_types.h"
 
@@ -66,5 +66,5 @@ kernel_pid_t gnrc_pktdump_init(void);
 }
 #endif
 
-#endif /* GNRC_PKTDUMP_H */
+#endif /* NET_GNRC_PKTDUMP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktqueue.h b/sys/include/net/gnrc/pktqueue.h
index 8826032391e726ffd89597a7da4aa12c74585957..fa6efe9f04924847c980ce207bf5420962b06133 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 NET_GNRC_PKTQUEUE_H
+#define NET_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 /* NET_GNRC_PKTQUEUE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/priority_pktqueue.h b/sys/include/net/gnrc/priority_pktqueue.h
index b3dc912df77f918581f66dc8f5090d06d6c547d9..eb3c6867bf25cdc9a96208655f6672fe2c291b50 100644
--- a/sys/include/net/gnrc/priority_pktqueue.h
+++ b/sys/include/net/gnrc/priority_pktqueue.h
@@ -20,8 +20,8 @@
  * @author      Shuguo Zhuo <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_PRIORITY_PKTQUEUE_H
-#define GNRC_PRIORITY_PKTQUEUE_H
+#ifndef NET_GNRC_PRIORITY_PKTQUEUE_H
+#define NET_GNRC_PRIORITY_PKTQUEUE_H
 
 #include <stdint.h>
 #include <priority_queue.h>
@@ -133,5 +133,5 @@ void gnrc_priority_pktqueue_push(gnrc_priority_pktqueue_t* queue,
 }
 #endif
 
-#endif /* GNRC_PRIORITY_PKTQUEUE_H */
+#endif /* NET_GNRC_PRIORITY_PKTQUEUE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h
index f2647f0c9717ccb75eac2bff52149c8457d5641e..2ca8557cdb61bf058ea0c1290f71eca17b14bd4b 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 NET_GNRC_RPL_H
+#define NET_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 /* NET_GNRC_RPL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/dodag.h b/sys/include/net/gnrc/rpl/dodag.h
index 9bc181481d7c6a2b1e07c04533486d8baef76017..c01ecfe6b5f0498da4f20069da0e769d30ec2758 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 NET_GNRC_RPL_DODAG_H
+#define NET_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 /* NET_GNRC_RPL_DODAG_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/of_manager.h b/sys/include/net/gnrc/rpl/of_manager.h
index db6b52104f0ccc2329722ca1da4345bbfcacc788..4901e791ec5baf0866a856d580deaaa7867cf9bf 100644
--- a/sys/include/net/gnrc/rpl/of_manager.h
+++ b/sys/include/net/gnrc/rpl/of_manager.h
@@ -16,8 +16,8 @@
  * @author  Fabian Brandt <fabianbr@zedat.fu-berlin.de>
  */
 
-#ifndef RPL_OFM_H
-#define RPL_OFM_H
+#ifndef NET_GNRC_RPL_OF_MANAGER_H
+#define NET_GNRC_RPL_OF_MANAGER_H
 
 #include "structs.h"
 
@@ -41,5 +41,5 @@ gnrc_rpl_of_t *gnrc_rpl_get_of_for_ocp(uint16_t ocp);
 }
 #endif
 
-#endif /* RPL_OFM_H */
+#endif /* NET_GNRC_RPL_OF_MANAGER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/p2p.h b/sys/include/net/gnrc/rpl/p2p.h
index e8f9f51884f965aa4cc09bbf17d944b4f939bed4..4dbe19b9d249dc3bc2b73a80db4ec08f6d8d3c88 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 NET_GNRC_RPL_P2P_H
+#define NET_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 /* NET_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 cc285b01aeebdf042ba119590bf37514384ad137..40179b2d9655e547a50fa3ef8df36e4d3f82e22c 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 NET_GNRC_RPL_P2P_DODAG_H
+#define NET_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 /* NET_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 39c87e5be51a42088fde7ec5c7e9c2d03fc3184f..0fcc42b752c90a03e73000bca041afedd2187db1 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 NET_GNRC_RPL_P2P_STRUCTS_H
+#define NET_GNRC_RPL_P2P_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,7 +100,7 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_STRUCTS_H */
+#endif /* NET_GNRC_RPL_P2P_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/srh.h b/sys/include/net/gnrc/rpl/srh.h
index e8cdf79e492693a76fefd74d5ad7a9b93f597ebd..5078198d4d0f9a4e4c911d847074869d3bae4ee8 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 NET_GNRC_RPL_SRH_H
+#define NET_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 /* NET_GNRC_RPL_SRH_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/structs.h b/sys/include/net/gnrc/rpl/structs.h
index 69afc52ea9a43ec5c6112101aff5536ef75ae0d2..2dbad50ba7ae20bc5e8c6dc42c8e54f264221f0e 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 NET_GNRC_RPL_STRUCTS_H
+#define NET_GNRC_RPL_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -293,7 +293,7 @@ struct gnrc_rpl_instance {
 }
 #endif
 
-#endif /* GNRC_RPL_STRUCTS_H */
+#endif /* NET_GNRC_RPL_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/sixlowpan.h b/sys/include/net/gnrc/sixlowpan.h
index a0e564a7b5c1b9949bda7c04ddae927ee837ee38..1f9b4a9e254acc9cd7b06fa9b91b2b4d6f8661bd 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 NET_GNRC_SIXLOWPAN_H
+#define NET_GNRC_SIXLOWPAN_H
 
 #include <stdbool.h>
 
@@ -150,5 +150,5 @@ kernel_pid_t gnrc_sixlowpan_init(void);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_H */
+#endif /* NET_GNRC_SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/ctx.h b/sys/include/net/gnrc/sixlowpan/ctx.h
index ae4d9ff9f849f3adca6c29d19af788cab9c0c51a..71132728b60073f6a533f3a241919a4a241722b1 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 NET_GNRC_SIXLOWPAN_CTX_H
+#define NET_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 /* NET_GNRC_SIXLOWPAN_CTX_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/frag.h b/sys/include/net/gnrc/sixlowpan/frag.h
index 53a62c3c4f4e5612593ae25a01205103a79101db..68f2c4d9bf9eefc42ff3be033f077884c0a53a04 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 NET_GNRC_SIXLOWPAN_FRAG_H
+#define NET_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 /* NET_GNRC_SIXLOWPAN_FRAG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/iphc.h b/sys/include/net/gnrc/sixlowpan/iphc.h
index 82e0c76041c71192cf2b2e929cb7fb8d10f33c99..a754dd84d6db2d944fe73621f7d4fca036e63674 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 NET_GNRC_SIXLOWPAN_IPHC_H
+#define NET_GNRC_SIXLOWPAN_IPHC_H
 
 #include <stdbool.h>
 
@@ -65,5 +65,5 @@ bool gnrc_sixlowpan_iphc_encode(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_IPHC_H */
+#endif /* NET_GNRC_SIXLOWPAN_IPHC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd.h b/sys/include/net/gnrc/sixlowpan/nd.h
index 14eece0958cc8891e294c64a85479169c7bf1afa..61bc05255699c633f54a846b217a77239f4f5667 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 NET_GNRC_SIXLOWPAN_ND_H
+#define NET_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 /* NET_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 f461626dcd2936647afeb3c1c363a7ae19b86c78..7d61d36f87a568af419f165fe9a38a92359e420f 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 NET_GNRC_SIXLOWPAN_ND_BORDER_ROUTER_H
+#define NET_GNRC_SIXLOWPAN_ND_BORDER_ROUTER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_BORDER_ROUTER_H */
+#endif /* NET_GNRC_SIXLOWPAN_ND_BORDER_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd/router.h b/sys/include/net/gnrc/sixlowpan/nd/router.h
index 61d37016228bf107615a0cd507cdc54d144b7c80..302a858f90b5649c116ba330f41314b433b91203 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 NET_GNRC_SIXLOWPAN_ND_ROUTER_H
+#define NET_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 /* NET_GNRC_SIXLOWPAN_ND_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/netif.h b/sys/include/net/gnrc/sixlowpan/netif.h
index 855eb20edc8f88a4dd761a255e5bf0994efd6634..c6a7a28510144de10a8f422ca8c6929b1f770e4f 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 NET_GNRC_SIXLOWPAN_NETIF_H
+#define NET_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 /* NET_GNRC_SIXLOWPAN_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/slip.h b/sys/include/net/gnrc/slip.h
index 85e25586040d2e21ad11823af8155a70cedf4151..ac6d249f521b996d59dd648782236574729d48b9 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 NET_GNRC_SLIP_H
+#define NET_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 /* NET_GNRC_SLIP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tcp.h b/sys/include/net/gnrc/tcp.h
index 67da62adedbcd20b68985b3eb3e352a2364f23c0..0902e8d836513831cbcbf594a762c2c42f019aab 100644
--- a/sys/include/net/gnrc/tcp.h
+++ b/sys/include/net/gnrc/tcp.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_H
-#define GNRC_TCP_H
+#ifndef NET_GNRC_TCP_H
+#define NET_GNRC_TCP_H
 
 #include <stdint.h>
 #include "net/gnrc/pkt.h"
@@ -216,5 +216,5 @@ gnrc_pktsnip_t *gnrc_tcp_hdr_build(gnrc_pktsnip_t *payload, uint16_t src, uint16
 }
 #endif
 
-#endif /* GNRC_TCP_H */
+#endif /* NET_GNRC_TCP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tcp/config.h b/sys/include/net/gnrc/tcp/config.h
index 427798f33f377711babaddabaeef76f9a2e0790f..ce9e2d27456f1b5dd13aeaf6d4c9808813227953 100644
--- a/sys/include/net/gnrc/tcp/config.h
+++ b/sys/include/net/gnrc/tcp/config.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_CONFIG_H
-#define GNRC_TCP_CONFIG_H
+#ifndef NET_GNRC_TCP_CONFIG_H
+#define NET_GNRC_TCP_CONFIG_H
 
 #include "timex.h"
 
@@ -141,5 +141,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_TCP_CONFIG_H */
+#endif /* NET_GNRC_TCP_CONFIG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tcp/tcb.h b/sys/include/net/gnrc/tcp/tcb.h
index 258482788d2e3be3fe3f85d33627800d57a034e8..eb54672ed63a1f41978f7063d2f595886ae523e9 100644
--- a/sys/include/net/gnrc/tcp/tcb.h
+++ b/sys/include/net/gnrc/tcp/tcb.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_TCB_H
-#define GNRC_TCP_TCB_H
+#ifndef NET_GNRC_TCP_TCB_H
+#define NET_GNRC_TCP_TCB_H
 
 #include <stdint.h>
 #include "kernel_types.h"
@@ -88,5 +88,5 @@ typedef struct _transmission_control_block {
 #ifdef __cplusplus
 }
 #endif
-#endif /* GNRC_TCP_TCB_H */
+#endif /* NET_GNRC_TCP_TCB_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tftp.h b/sys/include/net/gnrc/tftp.h
index 48475c4145118a99ef70cdcc53294ca49b51f8d5..f9c91515b5455116a550ce64b04153690402b52f 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 NET_GNRC_TFTP_H
+#define NET_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 /* NET_GNRC_TFTP_H */
 
 /**
  * @}
diff --git a/sys/include/net/gnrc/udp.h b/sys/include/net/gnrc/udp.h
index b9e1ec3c311e1f0287ee93bd0877ff3ada63316b..91e4bbe9818d8f984b8cdf47f00583ae8869ec3b 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 NET_GNRC_UDP_H
+#define NET_GNRC_UDP_H
 
 #include <stdint.h>
 
@@ -92,5 +92,5 @@ int gnrc_udp_init(void);
 }
 #endif
 
-#endif /* GNRC_UDP_H */
+#endif /* NET_GNRC_UDP_H */
 /** @} */
diff --git a/sys/include/net/iana/portrange.h b/sys/include/net/iana/portrange.h
index bc421634ce5ed3f581883f38c5fe2f238b9fa548..20f48be49006e8573a9841253a4e72204337f69a 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 NET_IANA_PORTRANGE_H
+#define NET_IANA_PORTRANGE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,5 +43,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IANA_H */
+#endif /* NET_IANA_PORTRANGE_H */
 /** @} */
diff --git a/sys/include/net/icmp.h b/sys/include/net/icmp.h
index ccdf2a96c87ec54b23de9fd6669573f8e46990b6..0fc5eac9916aa61fd379f92e43143e3a23a0ed84 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 NET_ICMP_H
+#define NET_ICMP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* ICMP_H */
+#endif /* NET_ICMP_H */
 /** @} */
diff --git a/sys/include/net/icmpv6.h b/sys/include/net/icmpv6.h
index 76cb52ba479cf606376505d13b60c2b9c4a7b90a..3a9e606e16952ab9335b90aaf1cabc7f3036f468 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 NET_ICMPV6_H
+#define NET_ICMPV6_H
 
 #include <stdint.h>
 
@@ -228,5 +228,5 @@ void icmpv6_hdr_print(icmpv6_hdr_t *hdr);
 }
 #endif
 
-#endif /* ICMPV6_H */
+#endif /* NET_ICMPV6_H */
 /** @} */
diff --git a/sys/include/net/ieee802154.h b/sys/include/net/ieee802154.h
index 987058dc82f6a68b1172553709ed6ca50e9cc037..ce67c103bb185779d36a40115a668299adc3edf0 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 NET_IEEE802154_H
+#define NET_IEEE802154_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -295,5 +295,5 @@ static inline eui64_t *ieee802154_get_iid(eui64_t *eui64, const uint8_t *addr,
 }
 #endif
 
-#endif /* IEEE802154_H */
+#endif /* NET_IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/inet_csum.h b/sys/include/net/inet_csum.h
index 1d24ea75fd60ed79293772a51f625f660b59d38a..4b89c16993853aea14e33e3fdbd0f7f4605ea367 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 NET_INET_CSUM_H
+#define NET_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 /* NET_INET_CSUM_H */
 /** @} */
diff --git a/sys/include/net/ipv4.h b/sys/include/net/ipv4.h
index ccca570dde18e11ac40766b66aadd903f9268a97..55d37c36a99035a6994a8c1d16ad10005817c80d 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 NET_IPV4_H
+#define NET_IPV4_H
 
 #include "net/ipv4/addr.h"
 
@@ -31,5 +31,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IPV4_H */
+#endif /* NET_IPV4_H */
 /** @} */
diff --git a/sys/include/net/ipv4/addr.h b/sys/include/net/ipv4/addr.h
index 0f99f9df0dade337480b811cc35e6c643ac18b11..9a5e5454a96fbeaab6ac531297e8721edeb36755 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 NET_IPV4_ADDR_H
+#define NET_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 /* NET_IPV4_ADDR_H */
 /** @} */
diff --git a/sys/include/net/ipv4/hdr.h b/sys/include/net/ipv4/hdr.h
index 7868bdc7368776b37e030562d7eae61fc309fecc..f7b5a393eb44d5b98a2c5102f7349c221b2db57c 100644
--- a/sys/include/net/ipv4/hdr.h
+++ b/sys/include/net/ipv4/hdr.h
@@ -17,8 +17,8 @@
  *
  * @author  José Ignacio Alamos <jialamos@uc.cl>
  */
-#ifndef IPV4_HDR_H
-#define IPV4_HDR_H
+#ifndef NET_IPV4_HDR_H
+#define NET_IPV4_HDR_H
 
 #include "byteorder.h"
 #include "net/ipv4/addr.h"
@@ -191,5 +191,5 @@ static inline uint16_t ipv4_hdr_get_fo(ipv4_hdr_t *hdr)
 }
 #endif
 
-#endif /* IPV4_HDR_H */
+#endif /* NET_IPV4_HDR_H */
 /** @} */
diff --git a/sys/include/net/ipv6.h b/sys/include/net/ipv6.h
index f5a68a8f1040fa62f5a4ed0b897ea756b4198aba..c7f66153c87e531a07f31e0ca92528ad8864f625 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 NET_IPV6_H
+#define NET_IPV6_H
 
 #include "net/ipv6/addr.h"
 #include "net/ipv6/ext.h"
@@ -46,5 +46,5 @@ extern "C" {
 #endif
 
 
-#endif /* IPV6_H */
+#endif /* NET_IPV6_H */
 /** @} */
diff --git a/sys/include/net/ipv6/addr.h b/sys/include/net/ipv6/addr.h
index 89ecb4d70ba0bbc075ffd7362d8dea8ce1955fde..7abe4575962ec86ebdf809c4d4635bd7c790654e 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 NET_IPV6_ADDR_H
+#define NET_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 /* NET_IPV6_ADDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ipv6/ext.h b/sys/include/net/ipv6/ext.h
index 6b842c59cc68eb2981d6194949b8e9b2da952876..6dee6dcfa82ca5313982c4b8202eac6f230575ad 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 NET_IPV6_EXT_H
+#define NET_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 /* NET_IPV6_EXT_H */
 /** @} */
diff --git a/sys/include/net/ipv6/ext/rh.h b/sys/include/net/ipv6/ext/rh.h
index 9f2b3c6a9910d2de55cd8fb513e07eb00ae98a90..fa22634c77062fad265c783cb70bef27c312b24c 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 NET_IPV6_EXT_RH_H
+#define NET_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 /* NET_IPV6_EXT_RH_H */
 /** @} */
diff --git a/sys/include/net/ipv6/hdr.h b/sys/include/net/ipv6/hdr.h
index e607c061271563e2c058f2786873da1c7515ad2f..a4f1aff1e76679c317304c6323de21b4f66230be 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 NET_IPV6_HDR_H
+#define NET_IPV6_HDR_H
 
 #include <stdint.h>
 
@@ -308,5 +308,5 @@ void ipv6_hdr_print(ipv6_hdr_t *hdr);
 }
 #endif
 
-#endif /* IPV6_HDR_H */
+#endif /* NET_IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/l2filter.h b/sys/include/net/l2filter.h
index 3e6403ebc8321c3d0ee2b641425cd685eec6f4f0..b013fb6486504ee8269643c5c5db0a73515db728 100644
--- a/sys/include/net/l2filter.h
+++ b/sys/include/net/l2filter.h
@@ -28,8 +28,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef L2FILTER_H
-#define L2FILTER_H
+#ifndef NET_L2FILTER_H
+#define NET_L2FILTER_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -125,5 +125,5 @@ bool l2filter_pass(const l2filter_t *list, const void *addr, size_t addr_len);
 }
 #endif
 
-#endif /* L2FILTER_H */
+#endif /* NET_L2FILTER_H */
 /** @} */
diff --git a/sys/include/net/ndp.h b/sys/include/net/ndp.h
index b96c45d3f8287eb032d880ecfe1f8ccca159026c..2e279dc18a42ce8caf11ce85742ee038f0f85b9a 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 NET_NDP_H
+#define NET_NDP_H
 
 #include <stdint.h>
 
@@ -291,5 +291,5 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* NDP_H */
+#endif /* NET_NDP_H */
 /** @} */
diff --git a/sys/include/net/netdev_test.h b/sys/include/net/netdev_test.h
index 22cf35cd1f8f453808785249669a2957b3af580b..9f9e63f511782d405248a239fd56be73c2256cc2 100644
--- a/sys/include/net/netdev_test.h
+++ b/sys/include/net/netdev_test.h
@@ -76,8 +76,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV_TEST_H
-#define NETDEV_TEST_H
+#ifndef NET_NETDEV_TEST_H
+#define NET_NETDEV_TEST_H
 
 #include "mutex.h"
 
@@ -302,5 +302,5 @@ void netdev_test_reset(netdev_test_t *dev);
 }
 #endif
 
-#endif /* NETDEV_TEST_H */
+#endif /* NET_NETDEV_TEST_H */
 /** @} */
diff --git a/sys/include/net/netopt.h b/sys/include/net/netopt.h
index 52c05d9c30f0be9e4c5e09bee49e90253167b1e1..505240f4a0a96ca4946b86631d8b11feedc15b32 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 NET_NETOPT_H
+#define NET_NETOPT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -323,5 +323,5 @@ const char *netopt2str(netopt_t opt);
 }
 #endif
 
-#endif /* NETOPT_H */
+#endif /* NET_NETOPT_H */
 /** @} */
diff --git a/sys/include/net/netstats.h b/sys/include/net/netstats.h
index 2e197eea04e42f1bd37d3a257b77f2df9ed0464c..c517b1e3c84928a192bec12968526c01578c12c5 100644
--- a/sys/include/net/netstats.h
+++ b/sys/include/net/netstats.h
@@ -20,8 +20,8 @@
 
 #include <stdint.h>
 
-#ifndef NETSTATS_H
-#define NETSTATS_H
+#ifndef NET_NETSTATS_H
+#define NET_NETSTATS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,5 +57,5 @@ typedef struct {
 }
 #endif
 
-#endif /* NETSTATS_H */
+#endif /* NET_NETSTATS_H */
 /** @} */
diff --git a/sys/include/net/ntp_packet.h b/sys/include/net/ntp_packet.h
index 51cd6597448e190983594123897edcb4d583c68c..d46e016ec479d7e9e379b23af7fd33ee973abbf1 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 NET_NTP_PACKET_H
+#define NET_NTP_PACKET_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -169,5 +169,5 @@ static inline ntp_mode_t ntp_packet_get_mode(ntp_packet_t *packet)
 }
 #endif
 
-#endif /* NTP_PACKET_H */
+#endif /* NET_NTP_PACKET_H */
 /** @} */
diff --git a/sys/include/net/packet.h b/sys/include/net/packet.h
index 043f58852a079d6a421fd643f21879259f3f49f0..5bc8ea68efbeb10735915833b142e540daab58d0 100644
--- a/sys/include/net/packet.h
+++ b/sys/include/net/packet.h
@@ -18,8 +18,8 @@
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef PACKET_H
-#define PACKET_H
+#ifndef NET_PACKET_H
+#define NET_PACKET_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,4 +45,4 @@ struct sockaddr_ll {
 /**
  * @}
  */
-#endif /* PACKET_H */
+#endif /* NET_PACKET_H */
diff --git a/sys/include/net/ppp/hdr.h b/sys/include/net/ppp/hdr.h
index b4b29966177f21fc07344d60c5a8085b605846b1..bf09e24ba4acb4fa6d209b76abcb36d1fb2b2b82 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 NET_PPP_HDR_H
+#define NET_PPP_HDR_H
 
 #include <inttypes.h>
 
@@ -63,5 +63,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* PPP_HDR_H */
+#endif /* NET_PPP_HDR_H */
 /** @} */
diff --git a/sys/include/net/ppptype.h b/sys/include/net/ppptype.h
index 69d23c51faca9dc8c0f2836a0ca5224d7d4df22c..067baa283c1748fd1946a29e34a06aeb18c58942 100644
--- a/sys/include/net/ppptype.h
+++ b/sys/include/net/ppptype.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef PPPTYPE_H
-#define PPPTYPE_H
+#ifndef NET_PPPTYPE_H
+#define NET_PPPTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +44,7 @@ extern "C" {
 }
 #endif
 
-#endif /* PPPTYPE_H */
+#endif /* NET_PPPTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/protnum.h b/sys/include/net/protnum.h
index 1db38342e45f894898320faa040f2d39ee1848c7..fd3800c2b2072846f1eeab87a0ab1e40a24dbe11 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 NET_PROTNUM_H
+#define NET_PROTNUM_H
 
 
 #ifdef __cplusplus
@@ -182,5 +182,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PROTNUM_H */
+#endif /* NET_PROTNUM_H */
 /** @} */
diff --git a/sys/include/net/rpl/rpl_netstats.h b/sys/include/net/rpl/rpl_netstats.h
index aa670a55132c53aa469727b57f3dd24d900076d5..2c2b54fcd36695ba382de685c54ba5a545076064 100644
--- a/sys/include/net/rpl/rpl_netstats.h
+++ b/sys/include/net/rpl/rpl_netstats.h
@@ -20,8 +20,8 @@
 
 #include <stdint.h>
 
-#ifndef NETSTATS_RPL_H
-#define NETSTATS_RPL_H
+#ifndef NET_RPL_RPL_NETSTATS_H
+#define NET_RPL_RPL_NETSTATS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,5 +73,5 @@ typedef struct {
 }
 #endif
 
-#endif /* NETSTATS_RPL_H */
+#endif /* NET_RPL_RPL_NETSTATS_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan.h b/sys/include/net/sixlowpan.h
index de9c54f4328d5108d4d87616dc759433ce743203..236c2096fd60f9cd705711ab610dad8e9ffd7ca9 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 NET_SIXLOWPAN_H
+#define NET_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 /* NET_SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan/nd.h b/sys/include/net/sixlowpan/nd.h
index 30a05fb180195007e8d1272989cf18643b320bd5..2edaf08ec431ddbae487a42f794ebf6f5e58edda 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 NET_SIXLOWPAN_ND_H
+#define NET_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 /* NET_SIXLOWPAN_ND_H */
 /** @} */
diff --git a/sys/include/net/sntp.h b/sys/include/net/sntp.h
index 8e8d80a8ac1d613629b8f655e59a0e1970351a9e..b3f4041ee49f3c7d6dfc3f421f3a1f2ad77d4ba3 100644
--- a/sys/include/net/sntp.h
+++ b/sys/include/net/sntp.h
@@ -20,8 +20,8 @@
  * @author      Martine Lenders <m.lenders@fu-berlin.de>
  */
 
-#ifndef SNTP_H
-#define SNTP_H
+#ifndef NET_SNTP_H
+#define NET_SNTP_H
 
 #include <stdint.h>
 #include <time.h>
@@ -66,5 +66,5 @@ static inline uint64_t sntp_get_unix_usec(void)
 }
 #endif
 
-#endif /* SNTP_H */
+#endif /* NET_SNTP_H */
 /** @} */
diff --git a/sys/include/net/sock/dns.h b/sys/include/net/sock/dns.h
index c2acf2fe62432a98d109dddf42a6e063a300d69f..d8417888b59aa59e30ffe4bba03097c29714cb4b 100644
--- a/sys/include/net/sock/dns.h
+++ b/sys/include/net/sock/dns.h
@@ -20,8 +20,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef SOCK_DNS_H
-#define SOCK_DNS_H
+#ifndef NET_SOCK_DNS_H
+#define NET_SOCK_DNS_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -94,5 +94,5 @@ extern sock_udp_ep_t sock_dns_server;
 }
 #endif
 
-#endif /* SOCK_DNS_H */
+#endif /* NET_SOCK_DNS_H */
 /** @} */
diff --git a/sys/include/net/sock/util.h b/sys/include/net/sock/util.h
index 6001481ed061b2c61325509c867b58ea31f58de5..950039083ae9e85a23de33b8d41a30a4b5430da9 100644
--- a/sys/include/net/sock/util.h
+++ b/sys/include/net/sock/util.h
@@ -20,8 +20,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef SOCK_UTIL_H
-#define SOCK_UTIL_H
+#ifndef NET_SOCK_UTIL_H
+#define NET_SOCK_UTIL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,5 +87,5 @@ int sock_udp_str2ep(sock_udp_ep_t *ep_out, const char *str);
 }
 #endif
 
-#endif /* SOCK_UTIL_H */
+#endif /* NET_SOCK_UTIL_H */
 /** @} */
diff --git a/sys/include/net/tcp.h b/sys/include/net/tcp.h
index c206fd9f34666f0dc23d36481b7bb7e8279f73e4..1eb0ee1fed4d9bc13bbbb561e1ad6521167872a2 100644
--- a/sys/include/net/tcp.h
+++ b/sys/include/net/tcp.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef TCP_H
-#define TCP_H
+#ifndef NET_TCP_H
+#define NET_TCP_H
 
 #include "byteorder.h"
 
@@ -86,5 +86,5 @@ void tcp_hdr_print(tcp_hdr_t *hdr);
 }
 #endif
 
-#endif /* TCP_H */
+#endif /* NET_TCP_H */
 /** @} */
diff --git a/sys/include/net/udp.h b/sys/include/net/udp.h
index 8d3b5cd08289ee52e85453bd65180f10a4322065..164e5165fbe41d62b22784a693339addf1d7728f 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 NET_UDP_H
+#define NET_UDP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ void udp_hdr_print(udp_hdr_t *hdr);
 }
 #endif
 
-#endif /* UDP_H */
+#endif /* NET_UDP_H */
 /** @} */
diff --git a/sys/include/net/uhcp.h b/sys/include/net/uhcp.h
index 1f8c21d358a725fd6a868b3e0264dea5217527fe..1baecf734a0f62cff1da56d8b6e1273ecf33831e 100644
--- a/sys/include/net/uhcp.h
+++ b/sys/include/net/uhcp.h
@@ -18,8 +18,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef UHCP_H
-#define UHCP_H
+#ifndef NET_UHCP_H
+#define NET_UHCP_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -175,5 +175,5 @@ int udp_sendto(uint8_t *buf, size_t len, uint8_t *dst, uint16_t dst_port, uhcp_i
 }
 #endif
 
-#endif /* UHCP_H */
+#endif /* NET_UHCP_H */
 /** @} */
diff --git a/sys/include/phydat.h b/sys/include/phydat.h
index 0a8162c5507f4d9358d22b8d48957b4ad64afc04..99d82f9abecddf8f8531325dbb96723e31863b3e 100644
--- a/sys/include/phydat.h
+++ b/sys/include/phydat.h
@@ -32,8 +32,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef SECT_DATA_H
-#define SECT_DATA_H
+#ifndef PHYDAT_H
+#define PHYDAT_H
 
 #include <stdint.h>
 #include <errno.h>
@@ -171,5 +171,5 @@ char phydat_scale_to_str(int8_t scale);
 }
 #endif
 
-#endif /* SECT_DATA_H */
+#endif /* PHYDAT_H */
 /** @} */
diff --git a/sys/include/pipe.h b/sys/include/pipe.h
index 6e91b269438f19c7a723ded761f148c1e936f5c0..c111ee37c338778c11fb858689de3bddc1f21a86 100644
--- a/sys/include/pipe.h
+++ b/sys/include/pipe.h
@@ -32,8 +32,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef PIPE__H
-#define PIPE__H
+#ifndef PIPE_H
+#define PIPE_H
 
 #include <sys/types.h>
 
@@ -121,7 +121,7 @@ void pipe_free(pipe_t *rp);
 }
 #endif
 
-#endif /* PIPE__H */
+#endif /* PIPE_H */
 /**
  * @}
  */
diff --git a/sys/include/pm_layered.h b/sys/include/pm_layered.h
index 9e99ac94fb4e12f8c5ed19a886146b067f465e62..5f4d813566fddfbd4c22feb5173ba83c5609f536 100644
--- a/sys/include/pm_layered.h
+++ b/sys/include/pm_layered.h
@@ -72,5 +72,5 @@ void pm_set(unsigned mode);
 }
 #endif
 
-#endif /* __PM_LAYERED_H */
+#endif /* PM_LAYERED_H */
 /** @} */
diff --git a/sys/include/tm.h b/sys/include/tm.h
index 005eb0d5092ff748c3c3ebb7f336b3a91bf5df32..d2a195de281f2f7402a4c9be21410f3fdb5a0910 100644
--- a/sys/include/tm.h
+++ b/sys/include/tm.h
@@ -14,8 +14,8 @@
  * @brief       Utility library for `struct tm`.
  */
 
-#ifndef SYS__TIMEX__TM__H
-#define SYS__TIMEX__TM__H
+#ifndef TM_H
+#define TM_H
 
 #include <time.h>
 #include <sys/time.h>
@@ -119,5 +119,5 @@ int tm_is_valid_time(int hour, int min, int sec) CONST;
 }
 #endif
 
-#endif /* SYS__TIMEX__TM__H */
+#endif /* TM_H */
 /** @} */
diff --git a/sys/include/ubjson.h b/sys/include/ubjson.h
index 431fd1f1f97cf55565fc2820461c0653afa5f344..fad8544fa14239bad7748559ddabd91b2ac3af41 100644
--- a/sys/include/ubjson.h
+++ b/sys/include/ubjson.h
@@ -28,8 +28,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef UBJSON_H__
-#define UBJSON_H__
+#ifndef UBJSON_H
+#define UBJSON_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -581,5 +581,5 @@ ssize_t ubjson_close_object(ubjson_cookie_t *__restrict cookie);
 }
 #endif
 
-#endif /* ifndef UBJSON_H__ */
+#endif /* UBJSON_H */
 /** @} */
diff --git a/sys/include/vfs.h b/sys/include/vfs.h
index 1862051042a0a488d225889d5256fec9fb957434..9b2beac45ff1533627d9f2d3c65c616c8da4ff2a 100644
--- a/sys/include/vfs.h
+++ b/sys/include/vfs.h
@@ -50,8 +50,8 @@
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef VFS_H_
-#define VFS_H_
+#ifndef VFS_H
+#define VFS_H
 
 #include <stdint.h>
 /* The stdatomic.h in GCC gives compilation errors with C++
@@ -830,6 +830,6 @@ const vfs_mount_t *vfs_iterate_mounts(const vfs_mount_t *cur);
 }
 #endif
 
-#endif
+#endif /* VFS_H */
 
 /** @} */
diff --git a/sys/include/xtimer/tick_conversion.h b/sys/include/xtimer/tick_conversion.h
index 7ceb77e0595731a0d6e31e185b4a56e6b18d9534..df989a2ce28060538153dcae86715ee33e4838ce 100644
--- a/sys/include/xtimer/tick_conversion.h
+++ b/sys/include/xtimer/tick_conversion.h
@@ -135,4 +135,4 @@ inline static uint64_t _xtimer_usec_from_ticks64(uint64_t ticks) {
 }
 #endif
 
-#endif
+#endif /* XTIMER_TICK_CONVERSION_H */
diff --git a/sys/libc/include/sys/uio.h b/sys/libc/include/sys/uio.h
index c3e4d8e23486f011d2bf4e13f3c6ecd33914aa66..ecf2327f0a0b85392e91665a4718df052f3b877c 100644
--- a/sys/libc/include/sys/uio.h
+++ b/sys/libc/include/sys/uio.h
@@ -17,8 +17,8 @@
  *
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef UIO_H
-#define UIO_H
+#ifndef SYS_UIO_H
+#define SYS_UIO_H
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -39,4 +39,4 @@ struct iovec {
 }
 #endif
 /** @} */
-#endif /* UIO_H */
+#endif /* SYS_UIO_H */
diff --git a/sys/log/log_printfnoformat/log_module.h b/sys/log/log_printfnoformat/log_module.h
index be286829ddf88aa6f34cbda615d3faaae826ed78..77cb88687dcb6ff55ca2c3acc491c9402193ae08 100644
--- a/sys/log/log_printfnoformat/log_module.h
+++ b/sys/log/log_printfnoformat/log_module.h
@@ -20,8 +20,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef LOG_FORMAT_H
-#define LOG_FORMAT_H
+#ifndef LOG_MODULE_H
+#define LOG_MODULE_H
 
 #include <stdio.h>
 
@@ -47,4 +47,4 @@ static inline void log_write(unsigned level, const char *format, ...) {
 }
 #endif
 /**@}*/
-#endif /* LOG_FORMAT_H */
+#endif /* LOG_MODULE_H */
diff --git a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
index c93bf58e5d9b8ebf6686e81fd08422eff0366433..2e56a1612564454d503db7acc7bd28565189aa6c 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 RBUF_H
+#define 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 /* 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 c2fc9c3f1e04e6c51f83c0ce1cbfe36abb84ba69..fa66537da2f4e19440936068fd6237d3bf631bbd 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 NETSTATS_H
+#define 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 /* 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 cb4e555ba08fc7bb6742fd9e167e5b53ab9bc37d..39031b8572a2b0786a437933eb14d031fd6dbc18 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 VALIDATION_H
+#define 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 /* VALIDATION_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/common.h b/sys/net/gnrc/transport_layer/tcp/internal/common.h
index 4b5954a9820d25c48e23c1cee7aa24a164858a73..8451be756ccc002c51bc8e2ff7450017619457b7 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/common.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/common.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_COMMON_H
-#define GNRC_TCP_INTERNAL_COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include <stdint.h>
 #include "assert.h"
@@ -136,5 +136,5 @@ extern mutex_t _list_tcb_lock;
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_COMMON_H */
+#endif /* COMMON_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/eventloop.h b/sys/net/gnrc/transport_layer/tcp/internal/eventloop.h
index cbded225c9ba364c80a0e138301f4363b9c584c0..c89189aa9ed86002da537e08e5320a9d81e309bf 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/eventloop.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/eventloop.h
@@ -19,8 +19,8 @@
 * @author       Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_EVENTLOOP_H
-#define GNRC_TCP_INTERNAL_EVENTLOOP_H
+#ifndef EVENTLOOP_H
+#define EVENTLOOP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,5 +39,5 @@ void *_event_loop(__attribute__((unused)) void *arg);
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_EVENTLOOP_H */
+#endif /* EVENTLOOP_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/fsm.h b/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
index f2ba7899b6a5f4497350e7bec453726fc77ca094..5a076f94696f6692164d96981f956add14294f21 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_FSM_H
-#define GNRC_TCP_INTERNAL_FSM_H
+#ifndef FSM_H
+#define FSM_H
 
 #include <stdint.h>
 #include "net/gnrc/pkt.h"
@@ -83,5 +83,5 @@ int _fsm(gnrc_tcp_tcb_t *tcb, fsm_event_t event, gnrc_pktsnip_t *in_pkt, void *b
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_FSM_H */
+#endif /* FSM_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/option.h b/sys/net/gnrc/transport_layer/tcp/internal/option.h
index 34bda4b8bfe008661ddd602c46086d75ae802bf4..2e611d9cdcbc854d74a4a73412cafc298ad5288d 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/option.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/option.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_OPTION_H
-#define GNRC_TCP_INTERNAL_OPTION_H
+#ifndef OPTION_H
+#define OPTION_H
 
 #include <stdint.h>
 #include "assert.h"
@@ -73,5 +73,5 @@ int _option_parse(gnrc_tcp_tcb_t *tcb, tcp_hdr_t *hdr);
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_OPTION_H*/
+#endif /* OPTION_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/pkt.h b/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
index a2f50fa7a943cf20f77d54a3cae99d0f9c50e771..e05397e9abbbc115b2f2c49f1e5033553101eba3 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_PKT_H
-#define GNRC_TCP_INTERNAL_PKT_H
+#ifndef PKT_H
+#define PKT_H
 
 #include <stdint.h>
 #include "net/gnrc/pkt.h"
@@ -148,5 +148,5 @@ uint16_t _pkt_calc_csum(const gnrc_pktsnip_t *hdr, const gnrc_pktsnip_t *pseudo_
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_PKT_H */
+#endif /* PKT_H */
 /** @} */
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/rcvbuf.h b/sys/net/gnrc/transport_layer/tcp/internal/rcvbuf.h
index c3b349bcade490a62436f09891b5d2fc225436da..0a603e401358218cc431081fce75ad3b0834ca72 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/rcvbuf.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/rcvbuf.h
@@ -19,8 +19,8 @@
  * @author      Simon Brummer <simon.brummer@posteo.de>
  */
 
-#ifndef GNRC_TCP_INTERNAL_RCVBUF_H
-#define GNRC_TCP_INTERNAL_RCVBUF_H
+#ifndef RCVBUF_H
+#define RCVBUF_H
 
 #include <stdint.h>
 #include "mutex.h"
@@ -73,5 +73,5 @@ void _rcvbuf_release_buffer(gnrc_tcp_tcb_t *tcb);
 }
 #endif
 
-#endif /* GNRC_TCP_INTERNAL_RCVBUF_H */
+#endif /* RCVBUF_H */
 /** @} */
diff --git a/sys/posix/include/netinet/in.h b/sys/posix/include/netinet/in.h
index bba7b7f01897cbb777d755447c48276ab872fb8e..7475b91a428b3d51c58d1a08766a788494f697b5 100644
--- a/sys/posix/include/netinet/in.h
+++ b/sys/posix/include/netinet/in.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef _NETINET_IN_H
-#define _NETINET_IN_H
+#ifndef NETINET_IN_H
+#define NETINET_IN_H
 
 #include <inttypes.h>
 #include <sys/socket.h>
@@ -271,4 +271,4 @@ extern const struct in6_addr in6addr_loopback;
 /**
  * @}
  */
-#endif /* _NETINET_IN_H */
+#endif /* NETINET_IN_H */
diff --git a/sys/posix/include/semaphore.h b/sys/posix/include/semaphore.h
index 91dcaed3df5ed77dc9917cdf3ed9e18c656cb99a..7205679dfa31eefc8dafc18ea98eff52887cffc9 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 SEMAPHORE_H
+#define SEMAPHORE_H
 
 #include <errno.h>
 #include <time.h>
@@ -294,5 +294,5 @@ static inline int sem_getvalue(sem_t *sem, int *sval)
 }
 #endif
 
-#endif  /* POSIX_SEMAPHORE_H */
+#endif /* SEMAPHORE_H */
 /** @} */
diff --git a/sys/posix/include/sys/bytes.h b/sys/posix/include/sys/bytes.h
index 6f9734a3f8e40cb62d64319ab1e76e57d9c3a669..92c386d9baf1979aae0ce92c8bc1b5f792f9d2f0 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 SYS_BYTES_H
+#define SYS_BYTES_H
 
 #include "byteorder.h"
 
@@ -32,5 +32,5 @@ typedef size_t socklen_t;           /**< socket address length */
 }
 #endif
 
-#endif /* BYTES_H */
+#endif /* SYS_BYTES_H */
 /** @} */
diff --git a/sys/posix/include/sys/socket.h b/sys/posix/include/sys/socket.h
index 1bd9ea8009b93c0a239b0b9432865525c4f72e67..8bac3ce55840c9271824acf3f6a828b8ccd13f04 100644
--- a/sys/posix/include/sys/socket.h
+++ b/sys/posix/include/sys/socket.h
@@ -26,8 +26,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef _SYS_SOCKET_H
-#define _SYS_SOCKET_H
+#ifndef SYS_SOCKET_H
+#define SYS_SOCKET_H
 
 #ifdef CPU_NATIVE
 /* Ignore Linux definitions in native */
diff --git a/sys/posix/include/sys/statvfs.h b/sys/posix/include/sys/statvfs.h
index c688aa10da4b534c937fa2548d934d9bed53c746..169901198136527f47f0d234ead3cde2d049c947 100644
--- a/sys/posix/include/sys/statvfs.h
+++ b/sys/posix/include/sys/statvfs.h
@@ -18,8 +18,8 @@
 /* without the GCC pragma above #include_next will trigger a pedantic error */
 #include_next <sys/statvfs.h>
 #else
-#ifndef SYS_STATVFS_H_
-#define SYS_STATVFS_H_
+#ifndef SYS_STATVFS_H
+#define SYS_STATVFS_H
 
 #include <sys/types.h> /* for fsblkcnt_t, fsfilcnt_t */
 /** @todo Remove ifdef __mips__ special case after
@@ -71,7 +71,7 @@ enum {
 }
 #endif
 
-#endif /* SYS_STATVFS_H_ */
+#endif /* SYS_STATVFS_H */
 
 #endif /* CPU_NATIVE */
 
diff --git a/sys/posix/pthread/include/pthread.h b/sys/posix/pthread/include/pthread.h
index daa6e3de3b5e2e2e353cdd50dfb8e8b313e3e143..b83a5b1448043f24cd391201ac9558c3d3959d46 100644
--- a/sys/posix/pthread/include/pthread.h
+++ b/sys/posix/pthread/include/pthread.h
@@ -17,8 +17,8 @@
  * @see     [The Open Group Base Specifications Issue 7: pthread.h - threads](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/pthread.h.html)
  */
 
-#ifndef SYS__POSIX__PTHREAD__H
-#define SYS__POSIX__PTHREAD__H
+#ifndef PTHREAD_H
+#define PTHREAD_H
 
 #include <time.h>
 
@@ -58,7 +58,7 @@ extern "C" {
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD__H */
+#endif /* PTHREAD_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_barrier.h b/sys/posix/pthread/include/pthread_barrier.h
index 59b3554d48a8a3b6f21d94a50bd069377f138756..292bbf233c541cd40bd38bae843af5a39e480c5c 100644
--- a/sys/posix/pthread/include/pthread_barrier.h
+++ b/sys/posix/pthread/include/pthread_barrier.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_BARRIER__H
-#define SYS__POSIX__PTHREAD_BARRIER__H
+#ifndef PTHREAD_BARRIER_H
+#define PTHREAD_BARRIER_H
 
 #include "mutex.h"
 
@@ -136,7 +136,7 @@ int pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_BARRIER__H */
+#endif /* PTHREAD_BARRIER_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_cancellation.h b/sys/posix/pthread/include/pthread_cancellation.h
index 896509820ce962da7d37079122753b99c32b2622..2f77e7a376533925248c72c715f6625845b23f08 100644
--- a/sys/posix/pthread/include/pthread_cancellation.h
+++ b/sys/posix/pthread/include/pthread_cancellation.h
@@ -15,8 +15,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_CANCELLCATION__H
-#define SYS__POSIX__PTHREAD_CANCELLCATION__H
+#ifndef PTHREAD_CANCELLATION_H
+#define PTHREAD_CANCELLATION_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,7 +69,7 @@ void pthread_testcancel(void);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_CANCELLCATION__H */
+#endif /* PTHREAD_CANCELLATION_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_cleanup.h b/sys/posix/pthread/include/pthread_cleanup.h
index 4c17334dab7c70e780ea5c002a058bbf428b8647..77245024a1f93535059318012077c8ef71822abb 100644
--- a/sys/posix/pthread/include/pthread_cleanup.h
+++ b/sys/posix/pthread/include/pthread_cleanup.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_CLEANUP__H
-#define SYS__POSIX__PTHREAD_CLEANUP__H
+#ifndef PTHREAD_CLEANUP_H
+#define PTHREAD_CLEANUP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -95,7 +95,7 @@ void __pthread_cleanup_pop(__pthread_cleanup_datum_t *datum, int execute);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_CLEANUP__H */
+#endif /* PTHREAD_CLEANUP_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_cond.h b/sys/posix/pthread/include/pthread_cond.h
index 5d34d50554c62f471052b1c4bf692a081e2701e0..a758a270c4f2494107dab057ea05e17af74b6001 100644
--- a/sys/posix/pthread/include/pthread_cond.h
+++ b/sys/posix/pthread/include/pthread_cond.h
@@ -14,8 +14,8 @@
  * @author      Martin Landsmann <martin.landsmann@haw-hamburg.de>
  */
 
-#ifndef SYS__POSIX__PTHREAD_COND__H
-#define SYS__POSIX__PTHREAD_COND__H
+#ifndef PTHREAD_COND_H
+#define PTHREAD_COND_H
 
 #include <time.h>
 #include "mutex.h"
@@ -150,7 +150,7 @@ int pthread_cond_broadcast(pthread_cond_t *cond);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_COND__H */
+#endif /* PTHREAD_COND_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_mutex.h b/sys/posix/pthread/include/pthread_mutex.h
index 6b4bc20d710e03906b98e0fcfea11f87ef58d7a3..66dea47a77f08083a09e606ff7ae96a585700ba5 100644
--- a/sys/posix/pthread/include/pthread_mutex.h
+++ b/sys/posix/pthread/include/pthread_mutex.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_MUTEX__H
-#define SYS__POSIX__PTHREAD_MUTEX__H
+#ifndef PTHREAD_MUTEX_H
+#define PTHREAD_MUTEX_H
 
 #include <time.h>
 
@@ -112,7 +112,7 @@ int pthread_mutex_setprioceiling(pthread_mutex_t *mutex, int prioceiling, int *o
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_MUTEX__H */
+#endif /* PTHREAD_MUTEX_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_mutex_attr.h b/sys/posix/pthread/include/pthread_mutex_attr.h
index e3e7be1c8d6643705c3a0124516b3b458eb352e4..5002c878c7441800b893455e1c9d4083bd293fb7 100644
--- a/sys/posix/pthread/include/pthread_mutex_attr.h
+++ b/sys/posix/pthread/include/pthread_mutex_attr.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_MUTEX_ATTR__H
-#define SYS__POSIX__PTHREAD_MUTEX_ATTR__H
+#ifndef PTHREAD_MUTEX_ATTR_H
+#define PTHREAD_MUTEX_ATTR_H
 
 #include <errno.h>
 
@@ -215,7 +215,7 @@ int pthread_mutexattr_setrobust(pthread_mutexattr_t *attr, int robustness);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_MUTEX_ATTR__H */
+#endif /* PTHREAD_MUTEX_ATTR_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_once.h b/sys/posix/pthread/include/pthread_once.h
index c59586d6ec4f44d10733f45a37533263dad46cfb..6c01a4a1759d9124b4b4ae40df07ce2f7d8036bd 100644
--- a/sys/posix/pthread/include/pthread_once.h
+++ b/sys/posix/pthread/include/pthread_once.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_ONCE__H
-#define SYS__POSIX__PTHREAD_ONCE__H
+#ifndef PTHREAD_ONCE_H
+#define PTHREAD_ONCE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,7 +48,7 @@ int pthread_once(pthread_once_t *once_control, void (*init_routine)(void));
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_ONCE__H */
+#endif /* PTHREAD_ONCE_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_rwlock.h b/sys/posix/pthread/include/pthread_rwlock.h
index 7c0c945a1d7728160662fa78b497f7153146aecf..d021c0af3a177db519f436c7ce4543714e2c5d0a 100644
--- a/sys/posix/pthread/include/pthread_rwlock.h
+++ b/sys/posix/pthread/include/pthread_rwlock.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_RWLOCK__H
-#define SYS__POSIX__PTHREAD_RWLOCK__H
+#ifndef PTHREAD_RWLOCK_H
+#define PTHREAD_RWLOCK_H
 
 #include "priority_queue.h"
 #include "thread.h"
@@ -176,7 +176,7 @@ bool __pthread_rwlock_blocked_writingly(const pthread_rwlock_t *rwlock);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_ONCE__H */
+#endif /* PTHREAD_RWLOCK_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_rwlock_attr.h b/sys/posix/pthread/include/pthread_rwlock_attr.h
index fc987a8e58acc6d90319a4cc3a95a05127891f1d..17723995d12d15d91500b90dc983dedac591e37d 100644
--- a/sys/posix/pthread/include/pthread_rwlock_attr.h
+++ b/sys/posix/pthread/include/pthread_rwlock_attr.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_RWLOCK_ATTR__H
-#define SYS__POSIX__PTHREAD_RWLOCK_ATTR__H
+#ifndef PTHREAD_RWLOCK_ATTR_H
+#define PTHREAD_RWLOCK_ATTR_H
 
 #include <errno.h>
 
@@ -80,7 +80,7 @@ int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *attr, int pshared);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_RWLOCK_ATTR__H */
+#endif /* PTHREAD_RWLOCK_ATTR_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_scheduling.h b/sys/posix/pthread/include/pthread_scheduling.h
index cd92ee49006666fc82503aaa689241e9aa0c5c10..569c7fe9c4c7650fc12d53a3e6e02e116271aab3 100644
--- a/sys/posix/pthread/include/pthread_scheduling.h
+++ b/sys/posix/pthread/include/pthread_scheduling.h
@@ -15,8 +15,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_SCHEDULING__H
-#define SYS__POSIX__PTHREAD_SCHEDULING__H
+#ifndef PTHREAD_SCHEDULING_H
+#define PTHREAD_SCHEDULING_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,7 +55,7 @@ int pthread_setschedprio(pthread_t target_thread, int prio);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_SCHEDULING__H */
+#endif /* PTHREAD_SCHEDULING_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_spin.h b/sys/posix/pthread/include/pthread_spin.h
index e744625e34ba632dde4553f24e5c728a2c791753..780494a5b63adb3652ce381175b665fae02cc332 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 PTHREAD_SPIN_H
+#define PTHREAD_SPIN_H
 
 #include <stdatomic.h>
 
@@ -91,7 +91,7 @@ int pthread_spin_unlock(pthread_spinlock_t *lock);
 }
 #endif
 
-#endif /* SYS_POSIX_PTHREAD_SPIN_H */
+#endif /* PTHREAD_SPIN_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_threading.h b/sys/posix/pthread/include/pthread_threading.h
index 456e2ec769e097123594b2724de9bfd9650e5892..1736f38d6a35110ad2ba32e65fb7c67e15a63dc5 100644
--- a/sys/posix/pthread/include/pthread_threading.h
+++ b/sys/posix/pthread/include/pthread_threading.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_THREADING__H
-#define SYS__POSIX__PTHREAD_THREADING__H
+#ifndef PTHREAD_THREADING_H
+#define PTHREAD_THREADING_H
 
 #include "kernel_defines.h"
 
@@ -107,7 +107,7 @@ static inline int pthread_equal(pthread_t thread1, pthread_t thread2)
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_THREADING__H */
+#endif /* PTHREAD_THREADING_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_threading_attr.h b/sys/posix/pthread/include/pthread_threading_attr.h
index 302c5e568569b07eeb522bee725bdbb623393b51..1e73f3ee96e406750b476cc91aaad446a968be11 100644
--- a/sys/posix/pthread/include/pthread_threading_attr.h
+++ b/sys/posix/pthread/include/pthread_threading_attr.h
@@ -14,8 +14,8 @@
  * @note    Do not include this header file directly, but pthread.h.
  */
 
-#ifndef SYS__POSIX__PTHREAD_THREADING_ATTR__H
-#define SYS__POSIX__PTHREAD_THREADING_ATTR__H
+#ifndef PTHREAD_THREADING_ATTR_H
+#define PTHREAD_THREADING_ATTR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -206,7 +206,7 @@ int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize);
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_THREADING_ATTR__H */
+#endif /* PTHREAD_THREADING_ATTR_H */
 
 /**
  * @}
diff --git a/sys/posix/pthread/include/pthread_tls.h b/sys/posix/pthread/include/pthread_tls.h
index 93b119767c52da09e8d86584e4fa8ba2730424c3..644c5c173e78c5613c91fc3eb3fe12eee754bcde 100644
--- a/sys/posix/pthread/include/pthread_tls.h
+++ b/sys/posix/pthread/include/pthread_tls.h
@@ -15,8 +15,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef SYS__POSIX__PTHREAD_TLS__H
-#define SYS__POSIX__PTHREAD_TLS__H
+#ifndef PTHREAD_TLS_H
+#define PTHREAD_TLS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,7 +87,7 @@ struct __pthread_tls_datum **__pthread_get_tls_head(int self_id) PURE;
 }
 #endif
 
-#endif /* SYS__POSIX__PTHREAD_TLS__H */
+#endif /* PTHREAD_TLS_H */
 
 /**
  * @}
diff --git a/sys/random/tinymt32/tinymt32.h b/sys/random/tinymt32/tinymt32.h
index 1b483fd99b7cea73a8bb4b34ee955089ef54de90..87881b39503ecdfa91aef3d1342bf4861f4a6e44 100644
--- a/sys/random/tinymt32/tinymt32.h
+++ b/sys/random/tinymt32/tinymt32.h
@@ -230,4 +230,4 @@ inline static double tinymt32_generate_32double(tinymt32_t *random)
 }
 #endif
 
-#endif
+#endif /* TINYMT32_H */
diff --git a/sys/ubjson/ubjson-internal.h b/sys/ubjson/ubjson-internal.h
index 641bd9bf643034f74b5ca0ab5c0754c7e6ca7eb8..01cdb564cafb4dc6639f1f29a1799b449465fe0b 100644
--- a/sys/ubjson/ubjson-internal.h
+++ b/sys/ubjson/ubjson-internal.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef UBJSON__INTERNAL_H__
-#define UBJSON__INTERNAL_H__
+#ifndef UBJSON_INTERNAL_H
+#define UBJSON_INTERNAL_H
 
 /* compare http://ubjson.org/type-reference/ */
 
@@ -59,4 +59,4 @@ typedef enum {
 }
 #endif
 
-#endif /* ifndef UBJSON__INTERNAL_H__ */
+#endif /* UBJSON_INTERNAL_H */
diff --git a/tests/emb6/common.h b/tests/emb6/common.h
index 8e873cd17a33d8acae8ace8d45f5cb38f39a5324..178aa5adb0885b5e80ca31ff627d5bef3ad3071f 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 COMMON_H
+#define COMMON_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -75,5 +75,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H */
+#endif /* COMMON_H */
 /** @} */
diff --git a/tests/lwip/common.h b/tests/lwip/common.h
index de2d4db240c0138affba8fc8357db581749b8580..4cea2573df01753568fc5b5de1b5be403ab45116 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 COMMON_H
+#define COMMON_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -90,5 +90,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H */
+#endif /* COMMON_H */
 /** @} */
diff --git a/tests/lwip_sock_tcp/constants.h b/tests/lwip_sock_tcp/constants.h
index 1d768d2e22b10c20819f391d0d51e790a86a9dcc..d6637689c03e692da7facb7860c5fda6175122e0 100644
--- a/tests/lwip_sock_tcp/constants.h
+++ b/tests/lwip_sock_tcp/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
@@ -45,5 +45,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/lwip_sock_tcp/stack.h b/tests/lwip_sock_tcp/stack.h
index 57221f65d6b97f92e29cde7779b2af4dcc2facf5..c3fccf8e22435ae412f53d8ef94ffd74b23c071e 100644
--- a/tests/lwip_sock_tcp/stack.h
+++ b/tests/lwip_sock_tcp/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
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,5 +33,5 @@ void _net_init(void);
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/lwip_sock_udp/constants.h b/tests/lwip_sock_udp/constants.h
index 86525107b7a353894e7e2c9a7518a08eebc89d15..f3e251766ecbfb73fd6ecc10a332793752114239 100644
--- a/tests/lwip_sock_udp/constants.h
+++ b/tests/lwip_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
@@ -45,5 +45,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/lwip_sock_udp/stack.h b/tests/lwip_sock_udp/stack.h
index 3f856f2a888ae8bcac55bbc0514055344789c563..c428faeb04de09032246a7726694b11b1b3d1062 100644
--- a/tests/lwip_sock_udp/stack.h
+++ b/tests/lwip_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>
@@ -129,5 +129,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/map.h b/tests/unittests/map.h
index 13bf1e107d3abc06127080340f2e7a2f1802941c..c9eaa167d0a861b4509a9f266df2045fe43e6e1c 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 MAP_H
+#define MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,4 +56,4 @@ extern "C" {
 }
 #endif
 
-#endif /* UNITTESTS_MAP_H */
+#endif /* MAP_H */
diff --git a/tests/unittests/tests-fib_sr/tests-fib_sr.h b/tests/unittests/tests-fib_sr/tests-fib_sr.h
index 21dab5d81db71614119cc39e6be6aea55fef493d..0d3e6d27f1461177120c16235ba72fd5b73920db 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_SR_H
+#define TESTS_FIB_SR_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_SR_H */
 /** @} */
diff --git a/tests/unittests/tests-flashpage/tests-flashpage.h b/tests/unittests/tests-flashpage/tests-flashpage.h
index 0db64906fa59863e61e4eece6a9c45ed60c54a31..94db92a9013f992a38d3a8eca3f35335ab5a0cb0 100644
--- a/tests/unittests/tests-flashpage/tests-flashpage.h
+++ b/tests/unittests/tests-flashpage/tests-flashpage.h
@@ -15,8 +15,8 @@
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
-#ifndef TESTS_FLASHPAGE_H_
-#define TESTS_FLASHPAGE_H_
+#ifndef TESTS_FLASHPAGE_H
+#define TESTS_FLASHPAGE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_flashpage(void);
 }
 #endif
 
-#endif /* TESTS_FLASHPAGE_H_ */
+#endif /* TESTS_FLASHPAGE_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 3ff0240d26b8bbe2ea42d9620872a1940fdad218..2a8feb22f457c1ce3758aa9d915deec7692e4aad 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_GNRC_MAC_INTERNAL_H
+#define TESTS_GNRC_MAC_INTERNAL_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_mac_internal(void);
 }
 #endif
 
-#endif /* TESTS_PRIORITY_PKTQUEUE_H */
+#endif /* TESTS_GNRC_MAC_INTERNAL_H */
 /** @} */
diff --git a/tests/unittests/tests-hashes/tests-hashes.h b/tests/unittests/tests-hashes/tests-hashes.h
index 3e5a35bdead83f41b3994ac6da55e8efdb5fc874..f72c4f944131fd6c115d4b4e965716079374a836 100644
--- a/tests/unittests/tests-hashes/tests-hashes.h
+++ b/tests/unittests/tests-hashes/tests-hashes.h
@@ -76,5 +76,5 @@ Test *tests_hashes_sha256_chain_tests(void);
 }
 #endif
 
-#endif /* TESTS_CRYPTO_H */
+#endif /* TESTS_HASHES_H */
 /** @} */