From 7ee7801c10b4868c45c299145ac0bfbdd703cddb Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Wed, 18 Jan 2017 13:00:05 +0100
Subject: [PATCH] *: remove trailing underscores from header guards

---
 boards/airfy-beacon/include/board.h           |   6 +++---
 boards/airfy-beacon/include/periph_conf.h     |   6 +++---
 boards/arduino-common/include/board.h         |   6 +++---
 boards/arduino-common/include/periph_conf.h   |   6 +++---
 boards/arduino-due/include/board.h            |   6 +++---
 boards/arduino-due/include/periph_conf.h      |   6 +++---
 boards/arduino-mega2560/include/board.h       |   6 +++---
 boards/arduino-mega2560/include/periph_conf.h |   6 +++---
 boards/arduino-zero/include/board.h           |   6 +++---
 boards/arduino-zero/include/periph_conf.h     |   6 +++---
 boards/avsextrem/include/board.h              |   6 +++---
 boards/avsextrem/include/periph_conf.h        |   6 +++---
 boards/avsextrem/include/smb380-board.h       |   6 +++---
 boards/avsextrem/include/ssp0-board.h         |   6 +++---
 boards/calliope-mini/include/mini.h           |   6 +++---
 boards/cc2538dk/include/board.h               |   6 +++---
 boards/cc2538dk/include/periph_conf.h         |   6 +++---
 boards/cc2650stk/include/board.h              |   6 +++---
 boards/cc2650stk/include/periph_conf.h        |   6 +++---
 boards/chronos/drivers/include/battery.h      |   4 ++--
 boards/chronos/drivers/include/buzzer.h       |   4 ++--
 boards/chronos/drivers/include/display.h      |   4 ++--
 .../chronos/drivers/include/display_putchar.h |   6 +++---
 boards/chronos/include/board.h                |   6 +++---
 boards/chronos/include/buttons.h              |   4 ++--
 boards/f4vi1/include/board.h                  |   6 +++---
 boards/f4vi1/include/periph_conf.h            |   6 +++---
 boards/fox/include/board.h                    |   6 +++---
 boards/fox/include/periph_conf.h              |   6 +++---
 boards/iotlab-a8-m3/include/board.h           |   6 +++---
 boards/iotlab-a8-m3/include/periph_conf.h     |   6 +++---
 boards/iotlab-common/include/board_common.h   |   6 +++---
 .../include/periph_conf_common.h              |   6 +++---
 boards/iotlab-m3/include/board.h              |   6 +++---
 boards/iotlab-m3/include/periph_conf.h        |   6 +++---
 boards/limifrog-v1/include/board.h            |   6 +++---
 boards/limifrog-v1/include/periph_conf.h      |   6 +++---
 boards/mbed_lpc1768/include/board.h           |   6 +++---
 boards/mbed_lpc1768/include/periph_conf.h     |   6 +++---
 .../drivers/include/sht11-board.h             |   6 +++---
 boards/msb-430-common/include/board_common.h  |   4 ++--
 boards/msb-430/include/board.h                |   6 +++---
 boards/msb-430h/include/board.h               |   6 +++---
 .../drivers/include/sht11-board.h             |   6 +++---
 boards/msba2-common/include/msba2_common.h    |   6 +++---
 boards/msba2-common/tools/src/control_2xxx.h  |   6 +++---
 boards/msba2-common/tools/src/lpc2k_pgm.h     |   4 ++--
 boards/msba2-common/tools/src/serial.h        |   6 +++---
 boards/msba2/include/board.h                  |   6 +++---
 boards/msba2/include/periph_conf.h            |   6 +++---
 boards/msbiot/include/board.h                 |   6 +++---
 boards/msbiot/include/periph_conf.h           |   6 +++---
 boards/mulle/include/board.h                  |   6 +++---
 boards/mulle/include/mulle-nvram.h            |   6 +++---
 boards/mulle/include/periph_conf.h            |   6 +++---
 boards/native/include/board.h                 |   6 +++---
 boards/native/include/board_internal.h        |   4 ++--
 boards/nucleo-f030/include/board.h            |   6 +++---
 boards/nucleo-f030/include/periph_conf.h      |   6 +++---
 boards/nucleo-f070/include/board.h            |   6 +++---
 boards/nucleo-f070/include/periph_conf.h      |   6 +++---
 boards/nucleo-f072/include/board.h            |   6 +++---
 boards/nucleo-f072/include/periph_conf.h      |   6 +++---
 boards/nucleo-f091/include/board.h            |   6 +++---
 boards/nucleo-f091/include/periph_conf.h      |   6 +++---
 boards/nucleo-f103/include/board.h            |   6 +++---
 boards/nucleo-f103/include/periph_conf.h      |   6 +++---
 boards/nucleo-f207/include/board.h            |   6 +++---
 boards/nucleo-f207/include/periph_conf.h      |   6 +++---
 boards/nucleo-f303/include/board.h            |   6 +++---
 boards/nucleo-f303/include/periph_conf.h      |   6 +++---
 boards/nucleo-f334/include/board.h            |   6 +++---
 boards/nucleo-f334/include/periph_conf.h      |   6 +++---
 boards/nucleo-f401/include/board.h            |   6 +++---
 boards/nucleo-f401/include/periph_conf.h      |   6 +++---
 boards/nucleo-f446/include/board.h            |   6 +++---
 boards/nucleo-f446/include/periph_conf.h      |   6 +++---
 boards/nucleo-l1/include/board.h              |   6 +++---
 boards/nucleo-l1/include/periph_conf.h        |   6 +++---
 boards/nucleo32-f042/include/board.h          |   6 +++---
 boards/nucleo32-f042/include/periph_conf.h    |   6 +++---
 boards/openmote-cc2538/include/board.h        |   6 +++---
 boards/openmote-cc2538/include/periph_conf.h  |   6 +++---
 boards/pba-d-01-kw2x/include/board.h          |   4 ++--
 boards/pba-d-01-kw2x/include/kw2xrf_params.h  |   4 ++--
 boards/pba-d-01-kw2x/include/periph_conf.h    |   4 ++--
 boards/pca10000/include/periph_conf.h         |   6 +++---
 boards/pca10005/include/board.h               |   6 +++---
 boards/pca10005/include/periph_conf.h         |   6 +++---
 boards/qemu-i386/include/board.h              |   4 ++--
 boards/qemu-i386/include/cpu_conf.h           |   4 ++--
 boards/remote-common/include/fancy_leds.h     |   6 +++---
 boards/remote-common/include/periph_common.h  |   6 +++---
 boards/remote-pa/include/board.h              |   6 +++---
 boards/remote-pa/include/periph_conf.h        |   6 +++---
 boards/remote-reva/include/board.h            |   6 +++---
 boards/remote-reva/include/periph_conf.h      |   6 +++---
 boards/remote-revb/include/board.h            |   6 +++---
 boards/remote-revb/include/periph_conf.h      |   6 +++---
 boards/samr21-xpro/include/board.h            |   6 +++---
 boards/samr21-xpro/include/periph_conf.h      |   6 +++---
 boards/seeeduino_arch-pro/include/board.h     |   6 +++---
 .../seeeduino_arch-pro/include/periph_conf.h  |   6 +++---
 boards/sodaq-autonomo/include/board.h         |   6 +++---
 boards/sodaq-autonomo/include/periph_conf.h   |   6 +++---
 boards/spark-core/include/board.h             |   6 +++---
 boards/spark-core/include/periph_conf.h       |   6 +++---
 boards/stm32f0discovery/include/board.h       |   6 +++---
 boards/stm32f0discovery/include/periph_conf.h |   6 +++---
 boards/stm32f3discovery/include/board.h       |   6 +++---
 boards/stm32f3discovery/include/periph_conf.h |   6 +++---
 boards/stm32f4discovery/include/board.h       |   6 +++---
 boards/stm32f4discovery/include/periph_conf.h |   6 +++---
 boards/telosb/include/board-conf.h            |   4 ++--
 boards/telosb/include/board.h                 |   6 +++---
 boards/udoo/include/board.h                   |   6 +++---
 boards/udoo/include/periph_conf.h             |   6 +++---
 boards/waspmote-pro/include/board.h           |   6 +++---
 boards/waspmote-pro/include/periph_conf.h     |   6 +++---
 boards/weio/include/board.h                   |   6 +++---
 boards/weio/include/periph_conf.h             |   6 +++---
 boards/wsn430-common/include/board_common.h   |   6 +++---
 boards/wsn430-v1_3b/include/board.h           |   6 +++---
 boards/wsn430-v1_4/include/board.h            |   6 +++---
 .../x86-multiboot-common/include/multiboot.h  |   6 +++---
 boards/yunjia-nrf51822/include/board.h        |   6 +++---
 boards/yunjia-nrf51822/include/periph_conf.h  |   6 +++---
 boards/z1/include/board-conf.h                |   4 ++--
 boards/z1/include/board.h                     |   6 +++---
 core/include/atomic.h                         |   6 +++---
 core/include/bitarithm.h                      |   6 +++---
 core/include/byteorder.h                      |   6 +++---
 core/include/irq.h                            |   6 +++---
 core/include/kernel_defines.h                 |   6 +++---
 core/include/lifo.h                           |   6 +++---
 core/include/msg.h                            |   6 +++---
 core/include/mutex.h                          |   6 +++---
 cpu/arm7_common/include/VIC.h                 |   4 ++--
 cpu/arm7_common/include/arm7_common.h         |   6 +++---
 cpu/arm7_common/include/arm_cpu.h             |   6 +++---
 cpu/arm7_common/include/iap.h                 |   4 ++--
 cpu/atmega1281/include/periph_cpu.h           |   6 +++---
 cpu/atmega2560/include/periph_cpu.h           |   6 +++---
 cpu/atmega328p/include/periph_cpu.h           |   6 +++---
 cpu/atmega_common/avr-libc-extra/errno.h      |   4 ++--
 cpu/atmega_common/avr-libc-extra/inttypes.h   |   6 +++---
 cpu/atmega_common/avr-libc-extra/unistd.h     |   6 +++---
 cpu/atmega_common/include/periph_cpu_common.h |   6 +++---
 cpu/cc2538/include/cc2538_ioc.h               |   6 +++---
 cpu/cc2538/include/cc2538_rf_internal.h       |   6 +++---
 cpu/cc2538/include/cc2538_rf_netdev.h         |   6 +++---
 cpu/cc2538/include/periph_cpu.h               |   6 +++---
 cpu/cc26x0/include/periph_cpu.h               |   6 +++---
 cpu/cc430/include/periph_cpu.h                |   6 +++---
 cpu/cortexm_common/include/cpu.h              |   6 +++---
 cpu/cortexm_common/include/cpu_conf_common.h  |   6 +++---
 cpu/cortexm_common/include/mpu.h              |   6 +++---
 cpu/cortexm_common/include/vectors_cortexm.h  |   6 +++---
 cpu/ezr32wg/include/periph_cpu.h              |   6 +++---
 cpu/k60/include/MK60-comp.h                   |   6 +++---
 cpu/k60/include/cpu_conf.h                    |   6 +++---
 cpu/k60/include/system_MK60D10.h              |   4 ++--
 cpu/kinetis_common/include/periph_cpu.h       |   6 +++---
 cpu/lm4f120/include/periph_cpu.h              |   6 +++---
 cpu/lpc11u34/include/periph_cpu.h             |   6 +++---
 cpu/lpc1768/include/periph_cpu.h              |   6 +++---
 cpu/lpc2387/include/cpu_conf.h                |   6 +++---
 cpu/lpc2387/include/lpc2387-adc.h             |   6 +++---
 cpu/lpc2387/include/periph_cpu.h              |   6 +++---
 cpu/msp430_common/include/cpu.h               |   6 +++---
 cpu/msp430_common/include/cpu_conf.h          |   6 +++---
 cpu/msp430_common/include/stdio.h             |   6 +++---
 cpu/msp430_common/include/stdlib.h            |   6 +++---
 cpu/msp430_common/include/sys/types.h         |   6 +++---
 cpu/msp430_common/include/unistd.h            |   6 +++---
 cpu/msp430fxyz/include/periph_cpu.h           |   6 +++---
 cpu/native/include/cpu_conf.h                 |   6 +++---
 cpu/native/include/periph_cpu.h               |   6 +++---
 cpu/nrf5x_common/include/nrfmin.h             |   6 +++---
 cpu/nrf5x_common/include/nrfmin_gnrc.h        |   6 +++---
 cpu/nrf5x_common/include/periph_cpu_common.h  |   6 +++---
 cpu/stellaris_common/include/cortex-m4-def.h  |   6 +++---
 cpu/stellaris_common/include/hw_adc.h         |   6 +++---
 cpu/stellaris_common/include/hw_gpio.h        |   6 +++---
 cpu/stellaris_common/include/hw_hibernate.h   |   6 +++---
 cpu/stellaris_common/include/hw_i2c.h         |   6 +++---
 cpu/stellaris_common/include/hw_ints.h        |   6 +++---
 cpu/stellaris_common/include/hw_memmap.h      |   6 +++---
 cpu/stellaris_common/include/hw_nvic.h        |   6 +++---
 cpu/stellaris_common/include/hw_pwm.h         |   6 +++---
 cpu/stellaris_common/include/hw_ssi.h         |   6 +++---
 cpu/stellaris_common/include/hw_sysctl.h      |   6 +++---
 cpu/stellaris_common/include/hw_sysexc.h      |   6 +++---
 cpu/stellaris_common/include/hw_timer.h       |   6 +++---
 cpu/stellaris_common/include/hw_types.h       |   6 +++---
 cpu/stellaris_common/include/hw_uart.h        |   6 +++---
 cpu/stellaris_common/include/hw_watchdog.h    |   6 +++---
 .../include/stellaris_periph/adc.h            |   6 +++---
 .../include/stellaris_periph/comp.h           |   6 +++---
 .../include/stellaris_periph/cpu.h            |   6 +++---
 .../include/stellaris_periph/fpu.h            |   6 +++---
 .../include/stellaris_periph/gpio.h           |   6 +++---
 .../include/stellaris_periph/hibernate.h      |   6 +++---
 .../include/stellaris_periph/i2c.h            |   6 +++---
 .../include/stellaris_periph/interrupt.h      |   6 +++---
 .../include/stellaris_periph/pin_map.h        |   6 +++---
 .../include/stellaris_periph/pwm.h            |   6 +++---
 .../include/stellaris_periph/rom.h            |   6 +++---
 .../include/stellaris_periph/rom_map.h        |   6 +++---
 .../include/stellaris_periph/ssi.h            |   6 +++---
 .../include/stellaris_periph/sysctl.h         |   6 +++---
 .../include/stellaris_periph/sysexc.h         |   6 +++---
 .../include/stellaris_periph/systick.h        |   6 +++---
 .../include/stellaris_periph/timer.h          |   6 +++---
 .../include/stellaris_periph/uart.h           |   6 +++---
 .../include/stellaris_periph/watchdog.h       |   6 +++---
 cpu/stm32f1/include/periph_cpu.h              |   2 +-
 cpu/stm32f3/include/periph_cpu.h              |   2 +-
 cpu/stm32l1/include/cpu_conf.h                |   4 ++--
 cpu/x86/include/cpu.h                         |   4 ++--
 .../newlib-2.1.0-RIOT-i586-none-elf.patch     | Bin 12087 -> 12086 bytes
 ...ib-2.2.0.20150623-RIOT-i586-none-elf.patch | Bin 12779 -> 12778 bytes
 .../at86rf2xx/include/at86rf2xx_internal.h    |   6 +++---
 drivers/at86rf2xx/include/at86rf2xx_netdev.h  |   6 +++---
 .../at86rf2xx/include/at86rf2xx_registers.h   |   6 +++---
 drivers/bmp180/include/bmp180_internals.h     |   6 +++---
 drivers/cc2420/include/cc2420_internal.h      |   2 +-
 drivers/cc2420/include/cc2420_netdev.h        |   6 +++---
 drivers/cc2420/include/cc2420_registers.h     |   6 +++---
 drivers/hdc1000/include/hdc1000_regs.h        |   6 +++---
 drivers/include/adt7310.h                     |   6 +++---
 drivers/include/at30tse75x.h                  |   6 +++---
 drivers/include/at86rf2xx.h                   |   6 +++---
 drivers/include/bmp180.h                      |   6 +++---
 drivers/include/diskio.h                      |   6 +++---
 drivers/include/gpioint.h                     |   6 +++---
 drivers/include/hih6130.h                     |   6 +++---
 drivers/include/io1_xplained.h                |   6 +++---
 drivers/include/jc42.h                        |   6 +++---
 drivers/include/kw2xrf.h                      |   4 ++--
 drivers/include/led.h                         |   6 +++---
 drivers/include/lis3dh.h                      |   6 +++---
 drivers/include/lm75a-temp-sensor.h           |   6 +++---
 drivers/include/mpu9150.h                     |   6 +++---
 drivers/include/net/netdev2/ieee802154.h      |   6 +++---
 drivers/include/nvram-spi.h                   |   6 +++---
 drivers/include/nvram.h                       |   6 +++---
 drivers/include/periph/cpuid.h                |   6 +++---
 drivers/include/periph/dev_enums.h            |   6 +++---
 drivers/include/periph/pm.h                   |   6 +++---
 drivers/include/pn532.h                       |   6 +++---
 drivers/include/sht11.h                       |   4 ++--
 drivers/include/si70xx.h                      |   6 +++---
 drivers/include/srf02.h                       |   6 +++---
 drivers/include/srf08.h                       |   6 +++---
 drivers/include/xbee.h                        |   6 +++---
 .../include/io1_xplained_internals.h          |   6 +++---
 drivers/jc42/include/jc42_internal.h          |   6 +++---
 drivers/mpu9150/include/mpu9150-regs.h        |   6 +++---
 examples/riot_and_cpp/c_functions.h           |   4 ++--
 examples/riot_and_cpp/cpp_class.hpp           |   4 ++--
 pkg/emb6/include/board_conf.h                 |   6 +++---
 pkg/emb6/include/emb6/conn/udp.h              |   6 +++---
 pkg/emb6/include/emb6/netdev2.h               |   6 +++---
 pkg/lwip/include/lwip.h                       |   6 +++---
 pkg/lwip/include/lwip/conn.h                  |   6 +++---
 pkg/lwip/include/lwip/netif/netdev2.h         |   6 +++---
 pkg/lwip/include/lwip/sock_internal.h         |   6 +++---
 pkg/lwip/include/lwipopts.h                   |   6 +++---
 pkg/lwip/include/sock_types.h                 |   6 +++---
 pkg/nordic_softdevice_ble/src/ble-core.h      |   6 +++---
 sys/embunit/ColorTextColors.h                 |   6 +++---
 sys/include/base64.h                          |   6 +++---
 sys/include/checksum/ucrc16.h                 |   6 +++---
 sys/include/crypto/3des.h                     |   6 +++---
 sys/include/crypto/cbcmode.h                  |   6 +++---
 sys/include/crypto/chacha.h                   |   6 +++---
 sys/include/crypto/ciphers.h                  |   6 +++---
 sys/include/crypto/helper.h                   |   6 +++---
 sys/include/crypto/modes/cbc.h                |   6 +++---
 sys/include/crypto/modes/ccm.h                |   6 +++---
 sys/include/crypto/modes/ctr.h                |   4 ++--
 sys/include/crypto/modes/ecb.h                |   4 ++--
 sys/include/embUnit/AssertImpl.h              |   6 +++---
 sys/include/embUnit/ColorOutputter.h          |   6 +++---
 sys/include/embUnit/ColorTextOutputter.h      |   6 +++---
 sys/include/embUnit/CompilerOutputter.h       |   6 +++---
 sys/include/embUnit/HelperMacro.h             |   6 +++---
 sys/include/embUnit/Outputter.h               |   6 +++---
 sys/include/embUnit/RepeatedTest.h            |   6 +++---
 sys/include/embUnit/Test.h                    |   6 +++---
 sys/include/embUnit/TestCaller.h              |   6 +++---
 sys/include/embUnit/TestCase.h                |   6 +++---
 sys/include/embUnit/TestListener.h            |   6 +++---
 sys/include/embUnit/TestResult.h              |   6 +++---
 sys/include/embUnit/TestRunner.h              |   6 +++---
 sys/include/embUnit/TestSuite.h               |   6 +++---
 sys/include/embUnit/TextOutputter.h           |   6 +++---
 sys/include/embUnit/TextUIRunner.h            |   6 +++---
 sys/include/embUnit/XMLOutputter.h            |   6 +++---
 sys/include/embUnit/embUnit.h                 |   6 +++---
 sys/include/embUnit/embUnit_config.h          |   6 +++---
 sys/include/embUnit/stdImpl.h                 |   6 +++---
 sys/include/fmt.h                             |   6 +++---
 sys/include/hashes.h                          |   6 +++---
 sys/include/hashes/sha256.h                   |   6 +++---
 sys/include/mineplex.h                        |   6 +++---
 sys/include/net/af.h                          |   6 +++---
 sys/include/net/conn.h                        |   6 +++---
 sys/include/net/conn/ip.h                     |   6 +++---
 sys/include/net/conn/tcp.h                    |   6 +++---
 sys/include/net/conn/udp.h                    |   6 +++---
 sys/include/net/csma_sender.h                 |   6 +++---
 sys/include/net/ethernet.h                    |   6 +++---
 sys/include/net/ethernet/hdr.h                |   6 +++---
 sys/include/net/ethertype.h                   |   6 +++---
 sys/include/net/eui64.h                       |   6 +++---
 sys/include/net/fib.h                         |   6 +++---
 sys/include/net/fib/table.h                   |   6 +++---
 sys/include/net/gnrc.h                        |   6 +++---
 sys/include/net/gnrc/coap.h                   |   6 +++---
 sys/include/net/gnrc/conn.h                   |   6 +++---
 sys/include/net/gnrc/icmpv6.h                 |   6 +++---
 sys/include/net/gnrc/icmpv6/echo.h            |   6 +++---
 sys/include/net/gnrc/icmpv6/error.h           |   6 +++---
 sys/include/net/gnrc/ipv6.h                   |   6 +++---
 sys/include/net/gnrc/ipv6/blacklist.h         |   6 +++---
 sys/include/net/gnrc/ipv6/ext.h               |   6 +++---
 sys/include/net/gnrc/ipv6/hdr.h               |   6 +++---
 sys/include/net/gnrc/ipv6/nc.h                |   6 +++---
 sys/include/net/gnrc/ipv6/netif.h             |   6 +++---
 sys/include/net/gnrc/ipv6/whitelist.h         |   6 +++---
 sys/include/net/gnrc/mac/internal.h           |   6 +++---
 sys/include/net/gnrc/mac/types.h              |   6 +++---
 sys/include/net/gnrc/ndp.h                    |   6 +++---
 sys/include/net/gnrc/ndp/host.h               |   6 +++---
 sys/include/net/gnrc/ndp/internal.h           |   6 +++---
 sys/include/net/gnrc/ndp/node.h               |   6 +++---
 sys/include/net/gnrc/ndp/router.h             |   6 +++---
 sys/include/net/gnrc/netapi.h                 |   6 +++---
 sys/include/net/gnrc/netdev.h                 |   6 +++---
 sys/include/net/gnrc/netdev2/ieee802154.h     |   6 +++---
 sys/include/net/gnrc/netdev2/xbee_adpt.h      |   6 +++---
 sys/include/net/gnrc/neterr.h                 |   6 +++---
 sys/include/net/gnrc/netif.h                  |   6 +++---
 sys/include/net/gnrc/netif/hdr.h              |   6 +++---
 sys/include/net/gnrc/netreg.h                 |   6 +++---
 sys/include/net/gnrc/nettest.h                |   6 +++---
 sys/include/net/gnrc/nettype.h                |   6 +++---
 sys/include/net/gnrc/nomac.h                  |   6 +++---
 sys/include/net/gnrc/pkt.h                    |   6 +++---
 sys/include/net/gnrc/pktbuf.h                 |   6 +++---
 sys/include/net/gnrc/pktdump.h                |   6 +++---
 sys/include/net/gnrc/pktqueue.h               |   6 +++---
 sys/include/net/gnrc/rpl.h                    |   6 +++---
 sys/include/net/gnrc/rpl/dodag.h              |   6 +++---
 sys/include/net/gnrc/rpl/p2p.h                |   6 +++---
 sys/include/net/gnrc/rpl/p2p_dodag.h          |   6 +++---
 sys/include/net/gnrc/rpl/p2p_structs.h        |   6 +++---
 sys/include/net/gnrc/rpl/srh.h                |   6 +++---
 sys/include/net/gnrc/rpl/structs.h            |   6 +++---
 sys/include/net/gnrc/sixlowpan.h              |   6 +++---
 sys/include/net/gnrc/sixlowpan/ctx.h          |   6 +++---
 sys/include/net/gnrc/sixlowpan/frag.h         |   6 +++---
 sys/include/net/gnrc/sixlowpan/iphc.h         |   6 +++---
 sys/include/net/gnrc/sixlowpan/nd.h           |   6 +++---
 .../net/gnrc/sixlowpan/nd/border_router.h     |   6 +++---
 sys/include/net/gnrc/sixlowpan/nd/router.h    |   6 +++---
 sys/include/net/gnrc/sixlowpan/netif.h        |   6 +++---
 sys/include/net/gnrc/slip.h                   |   6 +++---
 sys/include/net/gnrc/tftp.h                   |   6 +++---
 sys/include/net/gnrc/udp.h                    |   6 +++---
 sys/include/net/gnrc/zep.h                    |   6 +++---
 sys/include/net/iana/portrange.h              |   6 +++---
 sys/include/net/icmp.h                        |   6 +++---
 sys/include/net/icmpv6.h                      |   6 +++---
 sys/include/net/ieee802154.h                  |   6 +++---
 sys/include/net/inet_csum.h                   |   6 +++---
 sys/include/net/ipv4.h                        |   6 +++---
 sys/include/net/ipv4/addr.h                   |   6 +++---
 sys/include/net/ipv6.h                        |   6 +++---
 sys/include/net/ipv6/addr.h                   |   6 +++---
 sys/include/net/ipv6/ext.h                    |   6 +++---
 sys/include/net/ipv6/ext/rh.h                 |   6 +++---
 sys/include/net/ipv6/hdr.h                    |   6 +++---
 sys/include/net/ndp.h                         |   6 +++---
 sys/include/net/netdev2_test.h                |   6 +++---
 sys/include/net/netopt.h                      |   6 +++---
 sys/include/net/ntp_packet.h                  |   6 +++---
 sys/include/net/ppp/hdr.h                     |   6 +++---
 sys/include/net/ppptype.h                     |   6 +++---
 sys/include/net/protnum.h                     |   6 +++---
 sys/include/net/sixlowpan.h                   |   6 +++---
 sys/include/net/sixlowpan/nd.h                |   6 +++---
 sys/include/net/sntp.h                        |   6 +++---
 sys/include/net/sock.h                        |   6 +++---
 sys/include/net/sock/ip.h                     |   6 +++---
 sys/include/net/sock/tcp.h                    |   6 +++---
 sys/include/net/sock/udp.h                    |   6 +++---
 sys/include/net/udp.h                         |   6 +++---
 sys/include/pm_layered.h                      |   6 +++---
 sys/include/universal_address.h               |   6 +++---
 sys/include/xtimer/implementation.h           |   4 ++--
 .../gnrc/network_layer/sixlowpan/frag/rbuf.h  |   6 +++---
 .../routing/rpl/gnrc_rpl_internal/netstats.h  |   6 +++---
 .../rpl/gnrc_rpl_internal/validation.h        |   6 +++---
 .../gnrc/sock/include/gnrc_sock_internal.h    |   6 +++---
 sys/net/gnrc/sock/include/sock_types.h        |   6 +++---
 sys/net/routing/nhdp/iib_table.h              |   6 +++---
 sys/net/routing/nhdp/lib_table.h              |   6 +++---
 sys/net/routing/nhdp/nhdp.h                   |   6 +++---
 sys/net/routing/nhdp/nhdp_address.h           |   6 +++---
 sys/net/routing/nhdp/nhdp_metric.h            |   6 +++---
 sys/net/routing/nhdp/nhdp_reader.h            |   6 +++---
 sys/net/routing/nhdp/nhdp_writer.h            |   6 +++---
 sys/net/routing/nhdp/nib_table.h              |   6 +++---
 sys/posix/include/semaphore.h                 |   6 +++---
 sys/posix/include/sys/bytes.h                 |   6 +++---
 sys/posix/pthread/include/pthread_spin.h      |   4 ++--
 tests/driver_at86rf2xx/common.h               |   6 +++---
 tests/emb6/common.h                           |   6 +++---
 tests/gnrc_sock_ip/constants.h                |   6 +++---
 tests/gnrc_sock_ip/stack.h                    |   6 +++---
 tests/gnrc_sock_udp/constants.h               |   6 +++---
 tests/gnrc_sock_udp/stack.h                   |   6 +++---
 tests/lwip/common.h                           |   6 +++---
 tests/lwip_sock_ip/constants.h                |   6 +++---
 tests/lwip_sock_ip/stack.h                    |   6 +++---
 tests/unittests/README.md                     |   6 +++---
 tests/unittests/common/unittests-constants.h  |   6 +++---
 tests/unittests/map.h                         |   6 +++---
 tests/unittests/tests-base64/tests-base64.h   |   6 +++---
 .../unittests/tests-bloom/tests-bloom-sets.h  |   6 +++---
 tests/unittests/tests-bloom/tests-bloom.h     |   6 +++---
 tests/unittests/tests-core/tests-core.h       |   6 +++---
 tests/unittests/tests-crypto/tests-crypto.h   |   6 +++---
 tests/unittests/tests-div/tests-div.h         |   6 +++---
 tests/unittests/tests-fib/tests-fib.h         |   6 +++---
 tests/unittests/tests-fib_sr/tests-fib_sr.h   |   6 +++---
 tests/unittests/tests-fmt/tests-fmt.h         |   6 +++---
 tests/unittests/tests-gcoap/tests-gcoap.h     |   6 +++---
 .../tests-gnrc_ipv6/tests-gnrc_ipv6.h         |   6 +++---
 .../tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h |   6 +++---
 .../tests-gnrc_mac_internal.h                 |   6 +++---
 .../tests-gnrc_netif/tests-gnrc_netif.h       |   6 +++---
 .../unittests/tests-gnrc_udp/tests-gnrc_udp.h |   6 +++---
 tests/unittests/tests-hashes/tests-hashes.h   |   6 +++---
 .../tests-ieee802154/tests-ieee802154.h       |   6 +++---
 .../tests-inet_csum/tests-inet_csum.h         |   6 +++---
 .../tests-ipv4_addr/tests-ipv4_addr.h         |   6 +++---
 .../tests-ipv6_addr/tests-ipv6_addr.h         |   6 +++---
 .../unittests/tests-ipv6_hdr/tests-ipv6_hdr.h |   6 +++---
 tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h |   6 +++---
 .../tests-ipv6_netif/tests-ipv6_netif.h       |   6 +++---
 tests/unittests/tests-netopt/tests-netopt.h   |   6 +++---
 tests/unittests/tests-netreg/tests-netreg.h   |   6 +++---
 tests/unittests/tests-pkt/tests-pkt.h         |   6 +++---
 tests/unittests/tests-pktbuf/tests-pktbuf.h   |   6 +++---
 .../unittests/tests-pktqueue/tests-pktqueue.h |   6 +++---
 .../tests-printf_float/tests-printf_float.h   |   6 +++---
 .../tests-priority_pktqueue.h                 |   6 +++---
 tests/unittests/tests-rpl_srh/tests-rpl_srh.h |   6 +++---
 .../unittests/tests-saul_reg/tests-saul_reg.h |   6 +++---
 tests/unittests/tests-seq/tests-seq.h         |   6 +++---
 .../tests-sixlowpan/tests-sixlowpan.h         |   6 +++---
 .../tests-sixlowpan_ctx/tests-sixlowpan_ctx.h |   6 +++---
 tests/unittests/tests-timex/tests-timex.h     |   6 +++---
 tests/unittests/tests-ubjson/tests-ubjson.h   |   6 +++---
 468 files changed, 1364 insertions(+), 1364 deletions(-)

diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h
index 0f6aa8c577..1e0687742a 100644
--- a/boards/airfy-beacon/include/board.h
+++ b/boards/airfy-beacon/include/board.h
@@ -18,8 +18,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -46,5 +46,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/airfy-beacon/include/periph_conf.h b/boards/airfy-beacon/include/periph_conf.h
index f2d2f651cb..bc7d1a0090 100644
--- a/boards/airfy-beacon/include/periph_conf.h
+++ b/boards/airfy-beacon/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -140,4 +140,4 @@ static const i2c_conf_t i2c_config[] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/arduino-common/include/board.h b/boards/arduino-common/include/board.h
index c908082c76..72f7fa933a 100644
--- a/boards/arduino-common/include/board.h
+++ b/boards/arduino-common/include/board.h
@@ -22,8 +22,8 @@
  * @author      Laurent Navet <laurent.navet@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "arduino_pinmap.h"
@@ -86,5 +86,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-common/include/periph_conf.h b/boards/arduino-common/include/periph_conf.h
index 750fb69cdf..a0331f42a4 100644
--- a/boards/arduino-common/include/periph_conf.h
+++ b/boards/arduino-common/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Laurent Navet <laurent.navet@gmail.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,4 +87,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/arduino-due/include/board.h b/boards/arduino-due/include/board.h
index 20d1c9708d..05f306e749 100644
--- a/boards/arduino-due/include/board.h
+++ b/boards/arduino-due/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "arduino_pinmap.h"
@@ -48,5 +48,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-due/include/periph_conf.h b/boards/arduino-due/include/periph_conf.h
index bfdfa13945..d6e603c75d 100644
--- a/boards/arduino-due/include/periph_conf.h
+++ b/boards/arduino-due/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Andreas "Paul" Pauli <andreas.pauli@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -130,5 +130,5 @@ static const pwm_chan_conf_t pwm_chan[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/arduino-mega2560/include/board.h b/boards/arduino-mega2560/include/board.h
index da03bcac1f..1aee0c2cc8 100644
--- a/boards/arduino-mega2560/include/board.h
+++ b/boards/arduino-mega2560/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "arduino_pinmap.h"
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-mega2560/include/periph_conf.h b/boards/arduino-mega2560/include/periph_conf.h
index a835e09c38..c67c0d88e9 100644
--- a/boards/arduino-mega2560/include/periph_conf.h
+++ b/boards/arduino-mega2560/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,4 +104,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/arduino-zero/include/board.h b/boards/arduino-zero/include/board.h
index 047d8cef86..753ca5c1be 100644
--- a/boards/arduino-zero/include/board.h
+++ b/boards/arduino-zero/include/board.h
@@ -19,8 +19,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -62,5 +62,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/arduino-zero/include/periph_conf.h b/boards/arduino-zero/include/periph_conf.h
index f2dc120933..177882619b 100644
--- a/boards/arduino-zero/include/periph_conf.h
+++ b/boards/arduino-zero/include/periph_conf.h
@@ -20,8 +20,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include <stdint.h>
 
@@ -250,5 +250,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
index 802d3fb4e5..3fe0fe6bfd 100644
--- a/boards/avsextrem/include/board.h
+++ b/boards/avsextrem/include/board.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef BOARDCONF_H_
-#define BOARDCONF_H_
+#ifndef BOARDCONF_H
+#define BOARDCONF_H
 #include "bitarithm.h"
 #include "msba2_common.h"
 
@@ -60,4 +60,4 @@ void init_clks1(void);
 #endif
 
 /** @} */
-#endif /* BOARDCONF_H_ */
+#endif /* BOARDCONF_H */
diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index ae50a27529..d0806d24b3 100644
--- a/boards/avsextrem/include/periph_conf.h
+++ b/boards/avsextrem/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "lpc2387.h"
 
@@ -62,5 +62,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h
index 6e5a9f1249..95924735f9 100644
--- a/boards/avsextrem/include/smb380-board.h
+++ b/boards/avsextrem/include/smb380-board.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef SMB380_H_
-#define SMB380_H_
+#ifndef SMB380_H
+#define SMB380_H
 #include <stdint.h>
 #include "bitarithm.h"
 
@@ -255,4 +255,4 @@ void SMB380_Selftest_1(void);
 }
 #endif
 
-#endif   /* SMB380_H_ */
+#endif   /* SMB380_H */
diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h
index d48c1b5b51..debe157fcf 100644
--- a/boards/avsextrem/include/ssp0-board.h
+++ b/boards/avsextrem/include/ssp0-board.h
@@ -19,8 +19,8 @@
  *
  * @note        $Id:  avsextrem-ssp0.c  3854 2010-01-18 15:27:01Z zkasmi $
  */
-#ifndef SSP_H_
-#define SSP_H_
+#ifndef SSP_H
+#define SSP_H
 
 #include "stdint.h"
 
@@ -122,4 +122,4 @@ void SSP0Handler(void);
 }
 #endif
 
-#endif  /* SSP_H_ */
+#endif  /* SSP_H */
diff --git a/boards/calliope-mini/include/mini.h b/boards/calliope-mini/include/mini.h
index 1333bcaf10..33a5570265 100644
--- a/boards/calliope-mini/include/mini.h
+++ b/boards/calliope-mini/include/mini.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MINI_H_
-#define MINI_H_
+#ifndef MINI_H
+#define MINI_H
 
 #include <stdint.h>
 
@@ -86,5 +86,5 @@ void mini_matrix_shift_str(const char *str, uint32_t delay);
 }
 #endif
 
-#endif /* MINI_H_ */
+#endif /* MINI_H */
 /** @} */
diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h
index 6bd13ac5d0..1c534d3622 100644
--- a/boards/cc2538dk/include/board.h
+++ b/boards/cc2538dk/include/board.h
@@ -17,8 +17,8 @@
  * @author      Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -95,5 +95,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/cc2538dk/include/periph_conf.h b/boards/cc2538dk/include/periph_conf.h
index 881ec9a158..55222f9dfa 100644
--- a/boards/cc2538dk/include/periph_conf.h
+++ b/boards/cc2538dk/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Ian Martin <ian@locicontrols.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cpu.h"
 #include "periph_cpu.h"
@@ -141,5 +141,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/cc2650stk/include/board.h b/boards/cc2650stk/include/board.h
index 84d4d8980b..92be45b500 100644
--- a/boards/cc2650stk/include/board.h
+++ b/boards/cc2650stk/include/board.h
@@ -18,8 +18,8 @@
  * @author      Leon M. George <leon@georgemail.eu>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "periph/gpio.h"
 
@@ -67,5 +67,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/cc2650stk/include/periph_conf.h b/boards/cc2650stk/include/periph_conf.h
index 89a18186e5..9c9b5d729a 100644
--- a/boards/cc2650stk/include/periph_conf.h
+++ b/boards/cc2650stk/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Leon M. George <leon@georgemail.eu>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -73,5 +73,5 @@ static const timer_conf_t timer_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/chronos/drivers/include/battery.h b/boards/chronos/drivers/include/battery.h
index 34bb37b0b3..5bf58dd9c4 100644
--- a/boards/chronos/drivers/include/battery.h
+++ b/boards/chronos/drivers/include/battery.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BATTERY_H_
-#define BATTERY_H_
+#ifndef BATTERY_H
+#define BATTERY_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/chronos/drivers/include/buzzer.h b/boards/chronos/drivers/include/buzzer.h
index 5d7f09ab62..5a323d5853 100644
--- a/boards/chronos/drivers/include/buzzer.h
+++ b/boards/chronos/drivers/include/buzzer.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BUZZER_H_
-#define BUZZER_H_
+#ifndef BUZZER_H
+#define BUZZER_H
 
 #include <stdint.h>
 
diff --git a/boards/chronos/drivers/include/display.h b/boards/chronos/drivers/include/display.h
index bd726f63e8..5c1c73c65d 100644
--- a/boards/chronos/drivers/include/display.h
+++ b/boards/chronos/drivers/include/display.h
@@ -35,8 +35,8 @@
  * Basic display functions.
  * ************************************************************************************************/
 
-#ifndef DISPLAY_H_
-#define DISPLAY_H_
+#ifndef DISPLAY_H
+#define DISPLAY_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/chronos/drivers/include/display_putchar.h b/boards/chronos/drivers/include/display_putchar.h
index b5194d0ab9..e4e347c0a2 100644
--- a/boards/chronos/drivers/include/display_putchar.h
+++ b/boards/chronos/drivers/include/display_putchar.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef DISPLAY_PUTCHAR_H_
-#define DISPLAY_PUTCHAR_H_
+#ifndef DISPLAY_PUTCHAR_H
+#define DISPLAY_PUTCHAR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,4 +19,4 @@ void init_display_putchar(void);
 }
 #endif
 
-#endif /* DISPLAY_PUTCHAR_H_ */
+#endif /* DISPLAY_PUTCHAR_H */
diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
index 25a5ee2ced..01cb494de6 100644
--- a/boards/chronos/include/board.h
+++ b/boards/chronos/include/board.h
@@ -18,8 +18,8 @@
  * @author      unknwon
  */
 
-#ifndef CHRONOS_BOARD_H_
-#define CHRONOS_BOARD_H_
+#ifndef CHRONOS_BOARD_H
+#define CHRONOS_BOARD_H
 
 #include <stdint.h>
 
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* _CHRONOS_BOARD_H_ */
+#endif /* _CHRONOS_BOARD_H */
 /** @} */
diff --git a/boards/chronos/include/buttons.h b/boards/chronos/include/buttons.h
index 9bd68173bd..592f2ad0bc 100644
--- a/boards/chronos/include/buttons.h
+++ b/boards/chronos/include/buttons.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BUTTONS_H_
-#define BUTTONS_H_
+#ifndef BUTTONS_H
+#define BUTTONS_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/f4vi1/include/board.h b/boards/f4vi1/include/board.h
index 0588a27bcf..2382124229 100644
--- a/boards/f4vi1/include/board.h
+++ b/boards/f4vi1/include/board.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -64,5 +64,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/f4vi1/include/periph_conf.h b/boards/f4vi1/include/periph_conf.h
index 1cc77da0cb..3c3fb739ee 100644
--- a/boards/f4vi1/include/periph_conf.h
+++ b/boards/f4vi1/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -122,5 +122,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/fox/include/board.h b/boards/fox/include/board.h
index 51540e1ab5..24316d18ef 100644
--- a/boards/fox/include/board.h
+++ b/boards/fox/include/board.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -108,5 +108,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h
index b1218e3354..13565ad619 100644
--- a/boards/fox/include/periph_conf.h
+++ b/boards/fox/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -173,5 +173,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/iotlab-a8-m3/include/board.h b/boards/iotlab-a8-m3/include/board.h
index 6f93d3c70c..c6493f8985 100644
--- a/boards/iotlab-a8-m3/include/board.h
+++ b/boards/iotlab-a8-m3/include/board.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -56,5 +56,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/iotlab-a8-m3/include/periph_conf.h b/boards/iotlab-a8-m3/include/periph_conf.h
index 938525b486..8b4db8ecbc 100644
--- a/boards/iotlab-a8-m3/include/periph_conf.h
+++ b/boards/iotlab-a8-m3/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 #include "periph_conf_common.h"
@@ -49,5 +49,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/iotlab-common/include/board_common.h b/boards/iotlab-common/include/board_common.h
index 1ecbf33706..ed9b988378 100644
--- a/boards/iotlab-common/include/board_common.h
+++ b/boards/iotlab-common/include/board_common.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #include <stdint.h>
 
@@ -102,5 +102,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_COMMON_H_ */
+#endif /* BOARD_COMMON_H */
 /** @} */
diff --git a/boards/iotlab-common/include/periph_conf_common.h b/boards/iotlab-common/include/periph_conf_common.h
index a8131ddb54..3e1aa028ba 100644
--- a/boards/iotlab-common/include/periph_conf_common.h
+++ b/boards/iotlab-common/include/periph_conf_common.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_COMMON_H_
-#define PERIPH_CONF_COMMON_H_
+#ifndef PERIPH_CONF_COMMON_H
+#define PERIPH_CONF_COMMON_H
 
 #include "periph_cpu.h"
 
@@ -163,5 +163,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_COMMON_H_ */
+#endif /* PERIPH_CONF_COMMON_H */
 /** @} */
diff --git a/boards/iotlab-m3/include/board.h b/boards/iotlab-m3/include/board.h
index 8669222805..a88fca79a6 100644
--- a/boards/iotlab-m3/include/board.h
+++ b/boards/iotlab-m3/include/board.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -86,5 +86,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/iotlab-m3/include/periph_conf.h b/boards/iotlab-m3/include/periph_conf.h
index fd3dc46518..ae7d37b4b0 100644
--- a/boards/iotlab-m3/include/periph_conf.h
+++ b/boards/iotlab-m3/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 #include "periph_conf_common.h"
@@ -49,5 +49,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/limifrog-v1/include/board.h b/boards/limifrog-v1/include/board.h
index 597e5a48bf..ae0c3810b1 100644
--- a/boards/limifrog-v1/include/board.h
+++ b/boards/limifrog-v1/include/board.h
@@ -18,8 +18,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -53,5 +53,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/limifrog-v1/include/periph_conf.h b/boards/limifrog-v1/include/periph_conf.h
index e41a01c7d8..457ec3580f 100644
--- a/boards/limifrog-v1/include/periph_conf.h
+++ b/boards/limifrog-v1/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -177,5 +177,5 @@ static const i2c_conf_t i2c_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/mbed_lpc1768/include/board.h b/boards/mbed_lpc1768/include/board.h
index e494181626..3cd14468c7 100644
--- a/boards/mbed_lpc1768/include/board.h
+++ b/boards/mbed_lpc1768/include/board.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -70,5 +70,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/mbed_lpc1768/include/periph_conf.h b/boards/mbed_lpc1768/include/periph_conf.h
index 217ae8b537..90dd621fdc 100644
--- a/boards/mbed_lpc1768/include/periph_conf.h
+++ b/boards/mbed_lpc1768/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,5 +89,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/msb-430-common/drivers/include/sht11-board.h b/boards/msb-430-common/drivers/include/sht11-board.h
index b1ddd0fa58..4e46416569 100644
--- a/boards/msb-430-common/drivers/include/sht11-board.h
+++ b/boards/msb-430-common/drivers/include/sht11-board.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11BOARD_H_
-#define SHT11BOARD_H_
+#ifndef SHT11BOARD_H
+#define SHT11BOARD_H
 
 /**
  * @ingroup     msb_430h
@@ -46,4 +46,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H_ */
+#endif /* SHT11BOARD_H */
diff --git a/boards/msb-430-common/include/board_common.h b/boards/msb-430-common/include/board_common.h
index 0ad4a05ae1..9bf576ee2e 100644
--- a/boards/msb-430-common/include/board_common.h
+++ b/boards/msb-430-common/include/board_common.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #include "cpu.h"
 
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index 6e6f351e1e..a2e6a9b3cc 100644
--- a/boards/msb-430/include/board.h
+++ b/boards/msb-430/include/board.h
@@ -31,8 +31,8 @@
  * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
  */
 
-#ifndef MSB_BOARD_H_
-#define MSB_BOARD_H_
+#ifndef MSB_BOARD_H
+#define MSB_BOARD_H
 
 #include "board_common.h"
 
@@ -65,4 +65,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  MSB_BOARD_H_ */
+#endif /*  MSB_BOARD_H */
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index d2c42c4dd9..72ea980dc6 100644
--- a/boards/msb-430h/include/board.h
+++ b/boards/msb-430h/include/board.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MSB_BOARD_H_
-#define MSB_BOARD_H_
+#ifndef MSB_BOARD_H
+#define MSB_BOARD_H
 
 #include "board_common.h"
 
@@ -53,4 +53,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* MSB_BOARD_H_ */
+#endif /* MSB_BOARD_H */
diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h
index 58451de622..efa726a429 100644
--- a/boards/msba2-common/drivers/include/sht11-board.h
+++ b/boards/msba2-common/drivers/include/sht11-board.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11BOARD_H_
-#define SHT11BOARD_H_
+#ifndef SHT11BOARD_H
+#define SHT11BOARD_H
 
 /**
  * @ingroup     lpc2387
@@ -53,4 +53,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* SHT11BOARD_H_ */
+#endif /* SHT11BOARD_H */
diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h
index 9b8d3fada2..84ef700dff 100644
--- a/boards/msba2-common/include/msba2_common.h
+++ b/boards/msba2-common/include/msba2_common.h
@@ -17,8 +17,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef MSBA2_COMMON_H_
-#define MSBA2_COMMON_H_
+#ifndef MSBA2_COMMON_H
+#define MSBA2_COMMON_H
 
 
 #include <stdint.h>
@@ -41,4 +41,4 @@ static inline void pllfeed(void)
 #endif
 
 /** @} */
-#endif /*  MSBA2_COMMON_H_ */
+#endif /*  MSBA2_COMMON_H */
diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h
index d27d319748..8ccd9a72db 100644
--- a/boards/msba2-common/tools/src/control_2xxx.h
+++ b/boards/msba2-common/tools/src/control_2xxx.h
@@ -16,10 +16,10 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef CONTROL_2XXX_H_
-#define CONTROL_2XXX_H_
+#ifndef CONTROL_2XXX_H
+#define CONTROL_2XXX_H
 
 void hard_reset_to_bootloader(void);
 void hard_reset_to_user_code(void);
 
-#endif /*  CONTROL_2XXX_H_ */
+#endif /*  CONTROL_2XXX_H */
diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.h b/boards/msba2-common/tools/src/lpc2k_pgm.h
index 68b574489e..dd6d26ba4e 100644
--- a/boards/msba2-common/tools/src/lpc2k_pgm.h
+++ b/boards/msba2-common/tools/src/lpc2k_pgm.h
@@ -16,7 +16,7 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef LPC2K_PGM_H_
+#ifndef LPC2K_PGM_H
 #define LPC2K_PGM_H
 
 /* gets a name like "115200", sets baudrate accordingly. */
@@ -27,4 +27,4 @@ void change_baud(const char *baud_name);
 */
 void signal_terminal(void);
 
-#endif /*  LPC2K_PGM_H_ */
+#endif /*  LPC2K_PGM_H */
diff --git a/boards/msba2-common/tools/src/serial.h b/boards/msba2-common/tools/src/serial.h
index dc50afad6d..e5f1a3b67a 100644
--- a/boards/msba2-common/tools/src/serial.h
+++ b/boards/msba2-common/tools/src/serial.h
@@ -16,8 +16,8 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef SERIAL_H_
-#define SERIAL_H_
+#ifndef SERIAL_H
+#define SERIAL_H
 
 extern char *baud_rate;
 
@@ -34,4 +34,4 @@ void set_rts(int val);
 void set_dtr(int val);
 void change_baud(const char *baud_name);
 
-#endif /*  SERIAL_H_ */
+#endif /*  SERIAL_H */
diff --git a/boards/msba2/include/board.h b/boards/msba2/include/board.h
index 09b968936b..5f3840ba41 100644
--- a/boards/msba2/include/board.h
+++ b/boards/msba2/include/board.h
@@ -18,8 +18,8 @@
  * @author      unknown
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "msba2_common.h"
 #include "bitarithm.h"
@@ -64,5 +64,5 @@ void init_clks1(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h
index a1abbf21e5..062da79bac 100644
--- a/boards/msba2/include/periph_conf.h
+++ b/boards/msba2/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "lpc2387.h"
 
@@ -92,5 +92,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h
index 812a5bfdab..5199702afb 100644
--- a/boards/msbiot/include/board.h
+++ b/boards/msbiot/include/board.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -83,5 +83,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h
index c7d23ebf08..acfb0caf49 100644
--- a/boards/msbiot/include/periph_conf.h
+++ b/boards/msbiot/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -248,5 +248,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/mulle/include/board.h b/boards/mulle/include/board.h
index f9374e7090..80b24c8856 100644
--- a/boards/mulle/include/board.h
+++ b/boards/mulle/include/board.h
@@ -18,8 +18,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -182,5 +182,5 @@ void board_init(void);
 
 /** @} */
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/mulle/include/mulle-nvram.h b/boards/mulle/include/mulle-nvram.h
index 36efba21d5..ea63d8586d 100644
--- a/boards/mulle/include/mulle-nvram.h
+++ b/boards/mulle/include/mulle-nvram.h
@@ -6,8 +6,8 @@
  * details.
  */
 
-#ifndef MULLE_NVRAM_H_
-#define MULLE_NVRAM_H_
+#ifndef MULLE_NVRAM_H
+#define MULLE_NVRAM_H
 
 #include "nvram.h"
 
@@ -42,4 +42,4 @@ extern nvram_t *mulle_nvram;
 }
 #endif
 
-#endif /* MULLE_NVRAM_H_ */
+#endif /* MULLE_NVRAM_H */
diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index dcb1c2652e..f51b9f13b7 100644
--- a/boards/mulle/include/periph_conf.h
+++ b/boards/mulle/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MULLE_PERIPH_CONF_H_
-#define MULLE_PERIPH_CONF_H_
+#ifndef MULLE_PERIPH_CONF_H
+#define MULLE_PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -456,5 +456,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* MULLE_PERIPH_CONF_H_ */
+#endif /* MULLE_PERIPH_CONF_H */
 /** @} */
diff --git a/boards/native/include/board.h b/boards/native/include/board.h
index 1062e642ce..a40493370e 100644
--- a/boards/native/include/board.h
+++ b/boards/native/include/board.h
@@ -21,8 +21,8 @@
  * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -54,4 +54,4 @@ void _native_LED_RED_TOGGLE(void);
 #endif
 
 /** @} */
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
diff --git a/boards/native/include/board_internal.h b/boards/native/include/board_internal.h
index 2baf7f9acb..28e26320ce 100644
--- a/boards/native/include/board_internal.h
+++ b/boards/native/include/board_internal.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_INTERNAL_H_
-#define BOARD_INTERNAL_H_
+#ifndef BOARD_INTERNAL_H
+#define BOARD_INTERNAL_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/nucleo-f030/include/board.h b/boards/nucleo-f030/include/board.h
index 23b2628ceb..6b4e81864d 100644
--- a/boards/nucleo-f030/include/board.h
+++ b/boards/nucleo-f030/include/board.h
@@ -21,8 +21,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -52,5 +52,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f030/include/periph_conf.h b/boards/nucleo-f030/include/periph_conf.h
index 256fd73e5d..909acbf554 100644
--- a/boards/nucleo-f030/include/periph_conf.h
+++ b/boards/nucleo-f030/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -180,5 +180,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f070/include/board.h b/boards/nucleo-f070/include/board.h
index ac10535576..7d4b915499 100644
--- a/boards/nucleo-f070/include/board.h
+++ b/boards/nucleo-f070/include/board.h
@@ -22,8 +22,8 @@
  * @author      Alexandre Aabdie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -45,5 +45,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f070/include/periph_conf.h b/boards/nucleo-f070/include/periph_conf.h
index 8b68825eb0..659a19e38d 100644
--- a/boards/nucleo-f070/include/periph_conf.h
+++ b/boards/nucleo-f070/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Aabdie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -192,5 +192,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f072/include/board.h b/boards/nucleo-f072/include/board.h
index 5caf4ded02..ad2158289b 100644
--- a/boards/nucleo-f072/include/board.h
+++ b/boards/nucleo-f072/include/board.h
@@ -20,8 +20,8 @@
  * @author      José Alamos <jialamos@uc.cl>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 #include "board_common.h"
@@ -43,5 +43,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f072/include/periph_conf.h b/boards/nucleo-f072/include/periph_conf.h
index 8b704dc51f..033c9f3cca 100644
--- a/boards/nucleo-f072/include/periph_conf.h
+++ b/boards/nucleo-f072/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      José Ignacio Alamos <jialamos@uc.cl>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -135,5 +135,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f091/include/board.h b/boards/nucleo-f091/include/board.h
index 470af2dee2..c59c61d3a5 100644
--- a/boards/nucleo-f091/include/board.h
+++ b/boards/nucleo-f091/include/board.h
@@ -19,8 +19,8 @@
  * @author      Mohmmad Ayman <mohmmad.khzrag@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -32,5 +32,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f091/include/periph_conf.h b/boards/nucleo-f091/include/periph_conf.h
index d0c3545d3d..f3332c4a13 100644
--- a/boards/nucleo-f091/include/periph_conf.h
+++ b/boards/nucleo-f091/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -123,5 +123,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f103/include/board.h b/boards/nucleo-f103/include/board.h
index c0c3cf2ebb..753596069e 100755
--- a/boards/nucleo-f103/include/board.h
+++ b/boards/nucleo-f103/include/board.h
@@ -18,8 +18,8 @@
  * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -38,5 +38,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f103/include/periph_conf.h b/boards/nucleo-f103/include/periph_conf.h
index 95073c0b7c..335c15ffe2 100644
--- a/boards/nucleo-f103/include/periph_conf.h
+++ b/boards/nucleo-f103/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -198,4 +198,4 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nucleo-f207/include/board.h b/boards/nucleo-f207/include/board.h
index b9d0c68ea6..0d59473102 100644
--- a/boards/nucleo-f207/include/board.h
+++ b/boards/nucleo-f207/include/board.h
@@ -19,8 +19,8 @@
  * @author      Toon Stegen <toon.stegen@altran.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -66,5 +66,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f207/include/periph_conf.h b/boards/nucleo-f207/include/periph_conf.h
index cfe40c3223..664f183fd5 100644
--- a/boards/nucleo-f207/include/periph_conf.h
+++ b/boards/nucleo-f207/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Toon Stegen <toon.stegen@altran.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -282,5 +282,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f303/include/board.h b/boards/nucleo-f303/include/board.h
index b756fb97fd..80bd0cfa64 100755
--- a/boards/nucleo-f303/include/board.h
+++ b/boards/nucleo-f303/include/board.h
@@ -20,8 +20,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -33,5 +33,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f303/include/periph_conf.h b/boards/nucleo-f303/include/periph_conf.h
index be66076729..5b81d5b5c9 100755
--- a/boards/nucleo-f303/include/periph_conf.h
+++ b/boards/nucleo-f303/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Katja Kirstein <katja.kirstein@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -238,4 +238,4 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/nucleo-f334/include/board.h b/boards/nucleo-f334/include/board.h
index ffaefa782b..5bc8846ed3 100644
--- a/boards/nucleo-f334/include/board.h
+++ b/boards/nucleo-f334/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f334/include/periph_conf.h b/boards/nucleo-f334/include/periph_conf.h
index e2cf5a9335..d7b602d0ba 100644
--- a/boards/nucleo-f334/include/periph_conf.h
+++ b/boards/nucleo-f334/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -154,5 +154,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h
index 6e2be0642a..564cfc6f87 100644
--- a/boards/nucleo-f401/include/board.h
+++ b/boards/nucleo-f401/include/board.h
@@ -18,8 +18,8 @@
  * @author      Lari Lehtomäki <lari@lehtomaki.fi>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f401/include/periph_conf.h b/boards/nucleo-f401/include/periph_conf.h
index 9d92ef8f26..5ff2e339c8 100644
--- a/boards/nucleo-f401/include/periph_conf.h
+++ b/boards/nucleo-f401/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Lari Lehtomäki <lari@lehtomaki.fi>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -217,5 +217,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-f446/include/board.h b/boards/nucleo-f446/include/board.h
index 1c9143a094..8b1b0ae16f 100644
--- a/boards/nucleo-f446/include/board.h
+++ b/boards/nucleo-f446/include/board.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-f446/include/periph_conf.h b/boards/nucleo-f446/include/periph_conf.h
index 31208df865..b6738f5941 100644
--- a/boards/nucleo-f446/include/periph_conf.h
+++ b/boards/nucleo-f446/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -243,5 +243,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h
index d956b8a2b3..7d061fd804 100644
--- a/boards/nucleo-l1/include/board.h
+++ b/boards/nucleo-l1/include/board.h
@@ -18,8 +18,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "board_common.h"
 
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo-l1/include/periph_conf.h b/boards/nucleo-l1/include/periph_conf.h
index e9e7ceaf24..03dfc14740 100644
--- a/boards/nucleo-l1/include/periph_conf.h
+++ b/boards/nucleo-l1/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -157,5 +157,5 @@ static const i2c_conf_t i2c_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nucleo32-f042/include/board.h b/boards/nucleo32-f042/include/board.h
index 4dc207203e..516acc0a04 100644
--- a/boards/nucleo32-f042/include/board.h
+++ b/boards/nucleo32-f042/include/board.h
@@ -18,8 +18,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,5 +42,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/nucleo32-f042/include/periph_conf.h b/boards/nucleo32-f042/include/periph_conf.h
index b0bed0938e..ea0ec392ca 100644
--- a/boards/nucleo32-f042/include/periph_conf.h
+++ b/boards/nucleo32-f042/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -111,5 +111,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/openmote-cc2538/include/board.h b/boards/openmote-cc2538/include/board.h
index cfdbc60c01..ce3de04cec 100644
--- a/boards/openmote-cc2538/include/board.h
+++ b/boards/openmote-cc2538/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -95,5 +95,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/openmote-cc2538/include/periph_conf.h b/boards/openmote-cc2538/include/periph_conf.h
index bf0fde9221..845487b02d 100644
--- a/boards/openmote-cc2538/include/periph_conf.h
+++ b/boards/openmote-cc2538/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -133,5 +133,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index 8a2973cea8..190ec28f0c 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -19,8 +19,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
diff --git a/boards/pba-d-01-kw2x/include/kw2xrf_params.h b/boards/pba-d-01-kw2x/include/kw2xrf_params.h
index ca9c318519..d0b9bd8813 100644
--- a/boards/pba-d-01-kw2x/include/kw2xrf_params.h
+++ b/boards/pba-d-01-kw2x/include/kw2xrf_params.h
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-#ifndef KW2XRF_PARAMS_H_
-#define KW2XRF_PARAMS_H_
+#ifndef KW2XRF_PARAMS_H
+#define KW2XRF_PARAMS_H
 
 /**
  * @name KW2XRF configuration
diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h
index d802089e87..3cb9f64600 100644
--- a/boards/pba-d-01-kw2x/include/periph_conf.h
+++ b/boards/pba-d-01-kw2x/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Jonas Remmert <j.remmert@phytec.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h
index 08cfd5b789..57b33b39b4 100644
--- a/boards/pca10000/include/periph_conf.h
+++ b/boards/pca10000/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -105,4 +105,4 @@ static const timer_conf_t timer_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h
index 4805f5597f..b65a0711bb 100644
--- a/boards/pca10005/include/board.h
+++ b/boards/pca10005/include/board.h
@@ -19,8 +19,8 @@
  * @author      Timo Ziegler <timo.ziegler@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -47,5 +47,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/pca10005/include/periph_conf.h b/boards/pca10005/include/periph_conf.h
index f4db32da4f..de0ebb2cf5 100644
--- a/boards/pca10005/include/periph_conf.h
+++ b/boards/pca10005/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -125,4 +125,4 @@ static const timer_conf_t timer_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h
index 78764a33ac..dac8cef99c 100644
--- a/boards/qemu-i386/include/board.h
+++ b/boards/qemu-i386/include/board.h
@@ -18,8 +18,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef QEMU_I386_BOARD_H_
-#define QEMU_I386_BOARD_H_
+#ifndef QEMU_I386_BOARD_H
+#define QEMU_I386_BOARD_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h
index 69959d5d70..cb89aea39c 100644
--- a/boards/qemu-i386/include/cpu_conf.h
+++ b/boards/qemu-i386/include/cpu_conf.h
@@ -16,8 +16,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef QEMU_I386_CPU_CONF_H_
-#define QEMU_I386_CPU_CONF_H_
+#ifndef QEMU_I386_CPU_CONF_H
+#define QEMU_I386_CPU_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/remote-common/include/fancy_leds.h b/boards/remote-common/include/fancy_leds.h
index 4cc0752802..3fa9c83fef 100644
--- a/boards/remote-common/include/fancy_leds.h
+++ b/boards/remote-common/include/fancy_leds.h
@@ -18,8 +18,8 @@
  * @author      Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef FANCY_LEDS_H_
-#define FANCY_LEDS_H_
+#ifndef FANCY_LEDS_H
+#define FANCY_LEDS_H
 
 #include "board_common.h"
 
@@ -63,5 +63,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* FANCY_LEDS_H_ */
+#endif /* FANCY_LEDS_H */
 /** @} */
diff --git a/boards/remote-common/include/periph_common.h b/boards/remote-common/include/periph_common.h
index 2a83f262bd..5a018d2519 100644
--- a/boards/remote-common/include/periph_common.h
+++ b/boards/remote-common/include/periph_common.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_COMMON_H_
-#define PERIPH_COMMON_H_
+#ifndef PERIPH_COMMON_H
+#define PERIPH_COMMON_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -78,5 +78,5 @@ static const timer_conf_t timer_config[] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_COMMON_H_ */
+#endif /* PERIPH_COMMON_H */
 /** @} */
diff --git a/boards/remote-pa/include/board.h b/boards/remote-pa/include/board.h
index 678cc195c6..59ff1d90d1 100644
--- a/boards/remote-pa/include/board.h
+++ b/boards/remote-pa/include/board.h
@@ -20,8 +20,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -77,5 +77,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-pa/include/periph_conf.h b/boards/remote-pa/include/periph_conf.h
index 1d7e35ad05..ee753928d4 100644
--- a/boards/remote-pa/include/periph_conf.h
+++ b/boards/remote-pa/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -99,5 +99,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/remote-reva/include/board.h b/boards/remote-reva/include/board.h
index af1cf6fe35..b93dd9f8f5 100644
--- a/boards/remote-reva/include/board.h
+++ b/boards/remote-reva/include/board.h
@@ -19,8 +19,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -114,5 +114,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h
index 8205fc5b37..2dfd7b1b2e 100644
--- a/boards/remote-reva/include/periph_conf.h
+++ b/boards/remote-reva/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -100,5 +100,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/remote-revb/include/board.h b/boards/remote-revb/include/board.h
index 09d5264f75..619861cda7 100644
--- a/boards/remote-revb/include/board.h
+++ b/boards/remote-revb/include/board.h
@@ -19,8 +19,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph/gpio.h"
@@ -113,5 +113,5 @@
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/remote-revb/include/periph_conf.h b/boards/remote-revb/include/periph_conf.h
index d83727cafb..4890135cce 100644
--- a/boards/remote-revb/include/periph_conf.h
+++ b/boards/remote-revb/include/periph_conf.h
@@ -18,8 +18,8 @@
  *              Antonio Lignan <alinan@zolertia.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cc2538_gpio.h"
 #include "periph_cpu.h"
@@ -100,5 +100,5 @@ static const periph_spi_conf_t spi_config[SPI_NUMOF] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index d59f053ce4..418a4f726d 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -19,8 +19,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -82,5 +82,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index 265484b85b..9834707849 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include <stdint.h>
 
@@ -249,5 +249,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/seeeduino_arch-pro/include/board.h b/boards/seeeduino_arch-pro/include/board.h
index 2a3695eab0..95600fb5b8 100644
--- a/boards/seeeduino_arch-pro/include/board.h
+++ b/boards/seeeduino_arch-pro/include/board.h
@@ -21,8 +21,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -71,5 +71,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/seeeduino_arch-pro/include/periph_conf.h b/boards/seeeduino_arch-pro/include/periph_conf.h
index 80922a0f8a..568f60ae70 100644
--- a/boards/seeeduino_arch-pro/include/periph_conf.h
+++ b/boards/seeeduino_arch-pro/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -90,5 +90,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/sodaq-autonomo/include/board.h b/boards/sodaq-autonomo/include/board.h
index a0f6e52d6e..eff9e336cf 100644
--- a/boards/sodaq-autonomo/include/board.h
+++ b/boards/sodaq-autonomo/include/board.h
@@ -18,8 +18,8 @@
  * @author      Kees Bakker <kees@sodaq.com>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -60,5 +60,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/sodaq-autonomo/include/periph_conf.h b/boards/sodaq-autonomo/include/periph_conf.h
index 826e1d48ca..a5793881e1 100644
--- a/boards/sodaq-autonomo/include/periph_conf.h
+++ b/boards/sodaq-autonomo/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Kees Bakker <kees@sodaq.com>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include <stdint.h>
 
@@ -255,5 +255,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/spark-core/include/board.h b/boards/spark-core/include/board.h
index 3909af7abf..0d46ed3e5d 100644
--- a/boards/spark-core/include/board.h
+++ b/boards/spark-core/include/board.h
@@ -18,8 +18,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -104,5 +104,5 @@ void board_init(void);
 } /* end extern "C" */
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/spark-core/include/periph_conf.h b/boards/spark-core/include/periph_conf.h
index 4da0bbcbba..77697481e3 100644
--- a/boards/spark-core/include/periph_conf.h
+++ b/boards/spark-core/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -127,5 +127,5 @@ static const uart_conf_t uart_config[] = {
 } /* end extern "C" */
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h
index e677d90020..0ee41267a6 100644
--- a/boards/stm32f0discovery/include/board.h
+++ b/boards/stm32f0discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -61,5 +61,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/stm32f0discovery/include/periph_conf.h b/boards/stm32f0discovery/include/periph_conf.h
index 045913fb86..cb2f3c72e0 100644
--- a/boards/stm32f0discovery/include/periph_conf.h
+++ b/boards/stm32f0discovery/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -161,4 +161,4 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h
index d54dcaf45d..6c634f371a 100644
--- a/boards/stm32f3discovery/include/board.h
+++ b/boards/stm32f3discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -97,5 +97,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/stm32f3discovery/include/periph_conf.h b/boards/stm32f3discovery/include/periph_conf.h
index 28c703c1b6..fda093ae63 100644
--- a/boards/stm32f3discovery/include/periph_conf.h
+++ b/boards/stm32f3discovery/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -250,4 +250,4 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h
index 98c95f1148..117bf15b37 100644
--- a/boards/stm32f4discovery/include/board.h
+++ b/boards/stm32f4discovery/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -90,5 +90,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h
index 4b0b9366bb..0263c03ee1 100644
--- a/boards/stm32f4discovery/include/periph_conf.h
+++ b/boards/stm32f4discovery/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -265,5 +265,5 @@ static const pwm_conf_t pwm_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/telosb/include/board-conf.h b/boards/telosb/include/board-conf.h
index aa24dffec7..bdf1dc6198 100644
--- a/boards/telosb/include/board-conf.h
+++ b/boards/telosb/include/board-conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_CONF_H_
-#define BOARD_CONF_H_
+#ifndef BOARD_CONF_H
+#define BOARD_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h
index 332ef52ef4..b84ffc2ab8 100644
--- a/boards/telosb/include/board.h
+++ b/boards/telosb/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TELOSB_BOARD_H_
-#define TELOSB_BOARD_H_
+#ifndef TELOSB_BOARD_H
+#define TELOSB_BOARD_H
 
 #include "cpu.h"
 
@@ -117,4 +117,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  TELOSB_BOARD_H_ */
+#endif /*  TELOSB_BOARD_H */
diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h
index 5978b4e19e..26f247b9c9 100644
--- a/boards/udoo/include/board.h
+++ b/boards/udoo/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "cpu_conf.h"
@@ -51,5 +51,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/udoo/include/periph_conf.h b/boards/udoo/include/periph_conf.h
index c60d0f9991..1514e2d143 100644
--- a/boards/udoo/include/periph_conf.h
+++ b/boards/udoo/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -115,5 +115,5 @@ static const uart_conf_t uart_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/waspmote-pro/include/board.h b/boards/waspmote-pro/include/board.h
index 1b3b9f9754..84c497ad53 100644
--- a/boards/waspmote-pro/include/board.h
+++ b/boards/waspmote-pro/include/board.h
@@ -19,8 +19,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "waspmote_pinmap.h"
@@ -182,5 +182,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/waspmote-pro/include/periph_conf.h b/boards/waspmote-pro/include/periph_conf.h
index 22f7231fca..614967c94d 100644
--- a/boards/waspmote-pro/include/periph_conf.h
+++ b/boards/waspmote-pro/include/periph_conf.h
@@ -18,8 +18,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -111,4 +111,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/weio/include/board.h b/boards/weio/include/board.h
index 6dc51ac8b9..c60da66986 100644
--- a/boards/weio/include/board.h
+++ b/boards/weio/include/board.h
@@ -18,8 +18,8 @@
  * @author      Paul RATHGEB <paul.rathgeb@skynet.be>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include <stdint.h>
 
@@ -65,5 +65,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/weio/include/periph_conf.h b/boards/weio/include/periph_conf.h
index 732dbb56c9..8c78669055 100644
--- a/boards/weio/include/periph_conf.h
+++ b/boards/weio/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Paul RATHGEB <paul.rathgeb@skynet.be>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -132,5 +132,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/wsn430-common/include/board_common.h b/boards/wsn430-common/include/board_common.h
index 53cb6bfe9e..ab800b49d5 100644
--- a/boards/wsn430-common/include/board_common.h
+++ b/boards/wsn430-common/include/board_common.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef BOARD_COMMON_H_
-#define BOARD_COMMON_H_
+#ifndef BOARD_COMMON_H
+#define BOARD_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,5 +73,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD_COMMON_H_ */
+#endif /* BOARD_COMMON_H */
 /** @} */
diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
index 49478dadd2..b779f45481 100644
--- a/boards/wsn430-v1_3b/include/board.h
+++ b/boards/wsn430-v1_3b/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef WSN_BOARD_H_
-#define WSN_BOARD_H_
+#ifndef WSN_BOARD_H
+#define WSN_BOARD_H
 
 #include "board_common.h"
 
@@ -61,4 +61,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#endif /* WSN_BOARD_H_ */
+#endif /* WSN_BOARD_H */
diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
index 537c62ea73..c3df1c46ab 100644
--- a/boards/wsn430-v1_4/include/board.h
+++ b/boards/wsn430-v1_4/include/board.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef WSN_BOARD_H_
-#define WSN_BOARD_H_
+#ifndef WSN_BOARD_H
+#define WSN_BOARD_H
 
 #include "board_common.h"
 
@@ -61,4 +61,4 @@ extern "C" {
 #include <msp430x16x.h>
 
 /** @} */
-#endif /*  WSN_BOARD_H_ */
+#endif /*  WSN_BOARD_H */
diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h
index 54894f06a9..4a95a73591 100644
--- a/boards/x86-multiboot-common/include/multiboot.h
+++ b/boards/x86-multiboot-common/include/multiboot.h
@@ -29,8 +29,8 @@
  * @brief       Architecture specific definitions for multiboot enabled kernels
  */
 
-#ifndef MULTIBOOT_H_
-#define MULTIBOOT_H_
+#ifndef MULTIBOOT_H
+#define MULTIBOOT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -234,5 +234,5 @@ typedef struct multiboot_mod_list multiboot_module_t;
 }
 #endif
 
-#endif  /** ! MULTIBOOT_H_ */
+#endif  /** ! MULTIBOOT_H */
 /** @} */
diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h
index 610a00ede6..42fad7f4fd 100644
--- a/boards/yunjia-nrf51822/include/board.h
+++ b/boards/yunjia-nrf51822/include/board.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -46,5 +46,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* BOARD_H_ */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/yunjia-nrf51822/include/periph_conf.h b/boards/yunjia-nrf51822/include/periph_conf.h
index fe0e2c9aaf..2e67cc9b36 100644
--- a/boards/yunjia-nrf51822/include/periph_conf.h
+++ b/boards/yunjia-nrf51822/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "periph_cpu.h"
 
@@ -139,4 +139,4 @@ static const i2c_conf_t i2c_config[] = {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */
diff --git a/boards/z1/include/board-conf.h b/boards/z1/include/board-conf.h
index 0a97ea2215..3031846d7a 100644
--- a/boards/z1/include/board-conf.h
+++ b/boards/z1/include/board-conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef BOARD_CONF_H_
-#define BOARD_CONF_H_
+#ifndef BOARD_CONF_H
+#define BOARD_CONF_H
 
 /**
  * @ingroup     boards_z1
diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h
index b5e22f159a..d3c1bc7993 100644
--- a/boards/z1/include/board.h
+++ b/boards/z1/include/board.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef Z1_BOARD_H_
-#define Z1_BOARD_H_
+#ifndef Z1_BOARD_H
+#define Z1_BOARD_H
 
 /**
  * @defgroup    boards_z1 Zolertia Z1
@@ -125,4 +125,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /*  Z1_BOARD_H_ */
+#endif /*  Z1_BOARD_H */
diff --git a/core/include/atomic.h b/core/include/atomic.h
index 80c2b6db5f..615b1571d6 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -18,8 +18,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef ATOMIC_H_
-#define ATOMIC_H_
+#ifndef ATOMIC_H
+#define ATOMIC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -149,5 +149,5 @@ static inline int atomic_set_to_zero(atomic_int_t *var)
 }
 #endif
 
-#endif /* ATOMIC_H_ */
+#endif /* ATOMIC_H */
 /** @} */
diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h
index 6a8521c0fb..bd2c6e5f14 100644
--- a/core/include/bitarithm.h
+++ b/core/include/bitarithm.h
@@ -17,8 +17,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef BITARITHM_H_
-#define BITARITHM_H_
+#ifndef BITARITHM_H
+#define BITARITHM_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -122,5 +122,5 @@ unsigned bitarithm_bits_set(unsigned v);
 }
 #endif
 
-#endif /* BITARITHM_H_ */
+#endif /* BITARITHM_H */
 /** @} */
diff --git a/core/include/byteorder.h b/core/include/byteorder.h
index b081179472..fc07c0e16c 100644
--- a/core/include/byteorder.h
+++ b/core/include/byteorder.h
@@ -16,8 +16,8 @@
  * @author         René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef BYTEORDER_H_
-#define BYTEORDER_H_
+#ifndef BYTEORDER_H
+#define BYTEORDER_H
 
 #include <stdint.h>
 
@@ -422,5 +422,5 @@ static inline uint64_t NTOHLL(uint64_t v)
 }
 #endif
 
-#endif /* BYTEORDER_H_ */
+#endif /* BYTEORDER_H */
 /** @} */
diff --git a/core/include/irq.h b/core/include/irq.h
index bea97aefd7..048a9ed472 100644
--- a/core/include/irq.h
+++ b/core/include/irq.h
@@ -18,8 +18,8 @@
  * @author      Freie Universität Berlin, Computer Systems & Telematics
  */
 
-#ifndef IRQ_H_
-#define IRQ_H_
+#ifndef IRQ_H
+#define IRQ_H
 
 #include <stdbool.h>
 #include "arch/irq_arch.h"
@@ -71,5 +71,5 @@ int irq_is_in(void);
 }
 #endif
 
-#endif /* IRQ_H_ */
+#endif /* IRQ_H */
 /** @} */
diff --git a/core/include/kernel_defines.h b/core/include/kernel_defines.h
index 7b19d138fa..6584935d88 100644
--- a/core/include/kernel_defines.h
+++ b/core/include/kernel_defines.h
@@ -16,8 +16,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef KERNEL_DEFINES_H_
-#define KERNEL_DEFINES_H_
+#ifndef KERNEL_DEFINES_H
+#define KERNEL_DEFINES_H
 
 #include <stddef.h>
 
@@ -118,5 +118,5 @@
 }
 #endif
 
-#endif /* KERNEL_DEFINES_H_ */
+#endif /* KERNEL_DEFINES_H */
 /** @} */
diff --git a/core/include/lifo.h b/core/include/lifo.h
index 93ba541109..d6c9b8d9e3 100644
--- a/core/include/lifo.h
+++ b/core/include/lifo.h
@@ -20,8 +20,8 @@
  *          If you insert a value twice the LIFO will break.
  */
 
-#ifndef LIFO_H_
-#define LIFO_H_
+#ifndef LIFO_H
+#define LIFO_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -70,5 +70,5 @@ int lifo_get(int *array);
 }
 #endif
 
-#endif /* LIFO_H_ */
+#endif /* LIFO_H */
 /** @} */
diff --git a/core/include/msg.h b/core/include/msg.h
index fde9c6b993..5d55a7147c 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -162,8 +162,8 @@
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
 
-#ifndef MSG_H_
-#define MSG_H_
+#ifndef MSG_H
+#define MSG_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -383,5 +383,5 @@ void msg_queue_print(void);
 }
 #endif
 
-#endif /* MSG_H_ */
+#endif /* MSG_H */
 /** @} */
diff --git a/core/include/mutex.h b/core/include/mutex.h
index f2062629ee..9f19967d06 100644
--- a/core/include/mutex.h
+++ b/core/include/mutex.h
@@ -19,8 +19,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef MUTEX_H_
-#define MUTEX_H_
+#ifndef MUTEX_H
+#define MUTEX_H
 
 #include <stddef.h>
 
@@ -132,5 +132,5 @@ void mutex_unlock_and_sleep(mutex_t *mutex);
 }
 #endif
 
-#endif /* MUTEX_H_ */
+#endif /* MUTEX_H */
 /** @} */
diff --git a/cpu/arm7_common/include/VIC.h b/cpu/arm7_common/include/VIC.h
index ad0a872466..b35c9d639b 100644
--- a/cpu/arm7_common/include/VIC.h
+++ b/cpu/arm7_common/include/VIC.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef VIC_H_
-#define VIC_H_
+#ifndef VIC_H
+#define VIC_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpu/arm7_common/include/arm7_common.h b/cpu/arm7_common/include/arm7_common.h
index 8377c079db..983b5277da 100644
--- a/cpu/arm7_common/include/arm7_common.h
+++ b/cpu/arm7_common/include/arm7_common.h
@@ -6,8 +6,8 @@
  * more details.
  */
 
-#ifndef ARM7_COMMON_H_
-#define ARM7_COMMON_H_
+#ifndef ARM7_COMMON_H
+#define ARM7_COMMON_H
 
 /**
  * @defgroup    cpu_arm7_common ARM7 CPU common
@@ -100,4 +100,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* ARM7_COMMON_H_ */
+#endif /* ARM7_COMMON_H */
diff --git a/cpu/arm7_common/include/arm_cpu.h b/cpu/arm7_common/include/arm_cpu.h
index b196e69875..c0051411f0 100644
--- a/cpu/arm7_common/include/arm_cpu.h
+++ b/cpu/arm7_common/include/arm_cpu.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef ARM_CPU_H_
-#define ARM_CPU_H_
+#ifndef ARM_CPU_H
+#define ARM_CPU_H
 
 #include <stdint.h>
 #include "VIC.h"
@@ -29,4 +29,4 @@ void arm_reset(void);
 }
 #endif
 
-#endif /* ARM_CPU_H_ */
+#endif /* ARM_CPU_H */
diff --git a/cpu/arm7_common/include/iap.h b/cpu/arm7_common/include/iap.h
index 0995908dae..84c2086dc2 100644
--- a/cpu/arm7_common/include/iap.h
+++ b/cpu/arm7_common/include/iap.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef IAP_H_
-#define IAP_H_
+#ifndef IAP_H
+#define IAP_H
 
 #include <stdint.h>
 
diff --git a/cpu/atmega1281/include/periph_cpu.h b/cpu/atmega1281/include/periph_cpu.h
index 223da18738..3d7c73861e 100644
--- a/cpu/atmega1281/include/periph_cpu.h
+++ b/cpu/atmega1281/include/periph_cpu.h
@@ -20,8 +20,8 @@
  * @author          Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,5 +46,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega2560/include/periph_cpu.h b/cpu/atmega2560/include/periph_cpu.h
index 9f08ffdaee..719eb9a7c0 100644
--- a/cpu/atmega2560/include/periph_cpu.h
+++ b/cpu/atmega2560/include/periph_cpu.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -48,5 +48,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega328p/include/periph_cpu.h b/cpu/atmega328p/include/periph_cpu.h
index e7f67a2af9..2a7ff88f9f 100644
--- a/cpu/atmega328p/include/periph_cpu.h
+++ b/cpu/atmega328p/include/periph_cpu.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph_cpu_common.h"
 
@@ -45,5 +45,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/atmega_common/avr-libc-extra/errno.h b/cpu/atmega_common/avr-libc-extra/errno.h
index 7681c95b5b..1dcf5aab86 100644
--- a/cpu/atmega_common/avr-libc-extra/errno.h
+++ b/cpu/atmega_common/avr-libc-extra/errno.h
@@ -29,7 +29,7 @@
   POSSIBILITY OF SUCH DAMAGE. */
 
 
-#ifndef ERRNO_H_
+#ifndef ERRNO_H
 #define ERRNO_H_ 1
 
 /**
@@ -150,4 +150,4 @@ extern int errno;
 
 /** @} */
 
-#endif /* ERRNO_H_ */
+#endif /* ERRNO_H */
diff --git a/cpu/atmega_common/avr-libc-extra/inttypes.h b/cpu/atmega_common/avr-libc-extra/inttypes.h
index 751fd025f9..9c93b54535 100644
--- a/cpu/atmega_common/avr-libc-extra/inttypes.h
+++ b/cpu/atmega_common/avr-libc-extra/inttypes.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef RIOT_INTTYPES_H_
-#define RIOT_INTTYPES_H_
+#ifndef RIOT_INTTYPES_H
+#define RIOT_INTTYPES_H
 
 #include_next <inttypes.h>
 
@@ -33,5 +33,5 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_INTTYPES_H_ */
+#endif /* RIOT_INTTYPES_H */
 /** @} */
diff --git a/cpu/atmega_common/avr-libc-extra/unistd.h b/cpu/atmega_common/avr-libc-extra/unistd.h
index a207def04b..7d9153f93e 100644
--- a/cpu/atmega_common/avr-libc-extra/unistd.h
+++ b/cpu/atmega_common/avr-libc-extra/unistd.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNISTD_H_
-#define UNISTD_H_
+#ifndef UNISTD_H
+#define UNISTD_H
 
 #include <stdint.h>
 
@@ -29,4 +29,4 @@ unsigned int sleep(unsigned int seconds);
 }
 #endif
 
-#endif /* UNISTD_H_ */
+#endif /* UNISTD_H */
diff --git a/cpu/atmega_common/include/periph_cpu_common.h b/cpu/atmega_common/include/periph_cpu_common.h
index 7f005ddca7..62d3e200d2 100644
--- a/cpu/atmega_common/include/periph_cpu_common.h
+++ b/cpu/atmega_common/include/periph_cpu_common.h
@@ -20,8 +20,8 @@
  * @author          Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef PERIPH_CPU_COMMON_H_
-#define PERIPH_CPU_COMMON_H_
+#ifndef PERIPH_CPU_COMMON_H
+#define PERIPH_CPU_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,5 +84,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_COMMON_H_ */
+#endif /* PERIPH_CPU_COMMON_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_ioc.h b/cpu/cc2538/include/cc2538_ioc.h
index 58abceea04..ed170fcc6f 100644
--- a/cpu/cc2538/include/cc2538_ioc.h
+++ b/cpu/cc2538/include/cc2538_ioc.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef CC2538_IOC_H_
-#define CC2538_IOC_H_
+#ifndef CC2538_IOC_H
+#define CC2538_IOC_H
 
 #include <stdint.h>
 
@@ -82,5 +82,5 @@ enum {
 } /* end extern "C" */
 #endif
 
-#endif /* CC2538_IOC_H_ */
+#endif /* CC2538_IOC_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_rf_internal.h b/cpu/cc2538/include/cc2538_rf_internal.h
index 9fd5e4df5a..6f1430ed5a 100644
--- a/cpu/cc2538/include/cc2538_rf_internal.h
+++ b/cpu/cc2538/include/cc2538_rf_internal.h
@@ -17,8 +17,8 @@
  * @author      Aaron Sowry <aaron@mutex.nz>
  */
 
-#ifndef CC2538_RF_INTERNAL_H_
-#define CC2538_RF_INTERNAL_H_
+#ifndef CC2538_RF_INTERNAL_H
+#define CC2538_RF_INTERNAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,5 +100,5 @@ bool RFCORE_ASSERT_failure(const char *expr, const char *func, int line);
 }
 #endif
 
-#endif /* CC2538_RF_INTERNAL_H_ */
+#endif /* CC2538_RF_INTERNAL_H */
 /** @} */
diff --git a/cpu/cc2538/include/cc2538_rf_netdev.h b/cpu/cc2538/include/cc2538_rf_netdev.h
index 3ab7768cbc..fc0fc05554 100644
--- a/cpu/cc2538/include/cc2538_rf_netdev.h
+++ b/cpu/cc2538/include/cc2538_rf_netdev.h
@@ -17,8 +17,8 @@
  * @author      Aaron Sowry <aaron@mutex.nz>
  */
 
-#ifndef CC2538_RF_NETDEV_H_
-#define CC2538_RF_NETDEV_H_
+#ifndef CC2538_RF_NETDEV_H
+#define CC2538_RF_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -35,5 +35,5 @@ extern const netdev2_driver_t cc2538_rf_driver;
 }
 #endif
 
-#endif /* CC2538_RF_NETDEV_H_ */
+#endif /* CC2538_RF_NETDEV_H */
 /** @} */
diff --git a/cpu/cc2538/include/periph_cpu.h b/cpu/cc2538/include/periph_cpu.h
index 1b859fb910..3892a5d73c 100644
--- a/cpu/cc2538/include/periph_cpu.h
+++ b/cpu/cc2538/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 
@@ -109,5 +109,5 @@ typedef struct {
 
 #include "periph/dev_enums.h"
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/cc26x0/include/periph_cpu.h b/cpu/cc26x0/include/periph_cpu.h
index 0b87dfb526..705434bc13 100644
--- a/cpu/cc26x0/include/periph_cpu.h
+++ b/cpu/cc26x0/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Leon M. George <leon@georgemail.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 
@@ -68,5 +68,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/cc430/include/periph_cpu.h b/cpu/cc430/include/periph_cpu.h
index 8fc0270b53..dfd69849c7 100644
--- a/cpu/cc430/include/periph_cpu.h
+++ b/cpu/cc430/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 #include "cc430_regs.h"
@@ -32,5 +32,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index 5294a3287a..982f8fc38f 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -27,8 +27,8 @@
  * @todo        remove include irq.h once core was adjusted
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 #include <stdio.h>
 
@@ -125,5 +125,5 @@ static inline void cortexm_isr_end(void)
 }
 #endif
 
-#endif /* CPU_H_ */
+#endif /* CPU_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/cpu_conf_common.h b/cpu/cortexm_common/include/cpu_conf_common.h
index 27a32ddd51..8d2d17744e 100644
--- a/cpu/cortexm_common/include/cpu_conf_common.h
+++ b/cpu/cortexm_common/include/cpu_conf_common.h
@@ -16,8 +16,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef CPU_CONF_COMMON_H_
-#define CPU_CONF_COMMON_H_
+#ifndef CPU_CONF_COMMON_H
+#define CPU_CONF_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,5 +61,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_CONF_COMMON_H_ */
+#endif /* CPU_CONF_COMMON_H */
 /** @} */
diff --git a/cpu/cortexm_common/include/mpu.h b/cpu/cortexm_common/include/mpu.h
index 3506a2840d..b93f22d49b 100644
--- a/cpu/cortexm_common/include/mpu.h
+++ b/cpu/cortexm_common/include/mpu.h
@@ -18,8 +18,8 @@
  * @}
  */
 
-#ifndef MPU_H_
-#define MPU_H_
+#ifndef MPU_H
+#define MPU_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -160,4 +160,4 @@ int mpu_configure(uint_fast8_t region, uintptr_t base, uint_fast32_t attr);
 }
 #endif
 
-#endif /* MPU_H_ */
+#endif /* MPU_H */
diff --git a/cpu/cortexm_common/include/vectors_cortexm.h b/cpu/cortexm_common/include/vectors_cortexm.h
index f47957ccb9..bbbe2908c1 100644
--- a/cpu/cortexm_common/include/vectors_cortexm.h
+++ b/cpu/cortexm_common/include/vectors_cortexm.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef VECTORS_DEFAULT_H_
-#define VECTORS_DEFAULT_H_
+#ifndef VECTORS_DEFAULT_H
+#define VECTORS_DEFAULT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,5 +114,5 @@ void dummy_handler_default(void);
 }
 #endif
 
-#endif /* VECTORS_DEFAULT_H_ */
+#endif /* VECTORS_DEFAULT_H */
 /** @} */
diff --git a/cpu/ezr32wg/include/periph_cpu.h b/cpu/ezr32wg/include/periph_cpu.h
index 9fa7637818..f8a783de3f 100644
--- a/cpu/ezr32wg/include/periph_cpu.h
+++ b/cpu/ezr32wg/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 
@@ -133,5 +133,5 @@ typedef struct {
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/k60/include/MK60-comp.h b/cpu/k60/include/MK60-comp.h
index e4d61a115c..54b52469ce 100644
--- a/cpu/k60/include/MK60-comp.h
+++ b/cpu/k60/include/MK60-comp.h
@@ -16,8 +16,8 @@
  * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef MK60_COMP_H_
-#define MK60_COMP_H_
+#ifndef MK60_COMP_H
+#define MK60_COMP_H
 
 #ifdef __cplusplus
 extern "C"
@@ -65,5 +65,5 @@ extern "C"
 #endif
 
 
-#endif /* MK60_COMP_H_ */
+#endif /* MK60_COMP_H */
 /** @} */
diff --git a/cpu/k60/include/cpu_conf.h b/cpu/k60/include/cpu_conf.h
index e1e5dda7e7..47ac0acbfe 100644
--- a/cpu/k60/include/cpu_conf.h
+++ b/cpu/k60/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef CPU_CONF_H_
-#define CPU_CONF_H_
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -291,5 +291,5 @@ typedef enum llwu_wakeup_pin {
 }
 #endif
 
-#endif /* CPU_CONF_H_ */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/k60/include/system_MK60D10.h b/cpu/k60/include/system_MK60D10.h
index 386b566057..0d25d84997 100644
--- a/cpu/k60/include/system_MK60D10.h
+++ b/cpu/k60/include/system_MK60D10.h
@@ -6,8 +6,8 @@
  * details.
  */
 
-#ifndef SYSTEM_MK60D10_H_
-#define SYSTEM_MK60D10_H_
+#ifndef SYSTEM_MK60D10_H
+#define SYSTEM_MK60D10_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpu/kinetis_common/include/periph_cpu.h b/cpu/kinetis_common/include/periph_cpu.h
index e04886c975..19a5c496ad 100644
--- a/cpu/kinetis_common/include/periph_cpu.h
+++ b/cpu/kinetis_common/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 
@@ -248,5 +248,5 @@ void gpio_init_port(gpio_t pin, uint32_t pcr);
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lm4f120/include/periph_cpu.h b/cpu/lm4f120/include/periph_cpu.h
index d9838ff15a..05e1ac5b69 100644
--- a/cpu/lm4f120/include/periph_cpu.h
+++ b/cpu/lm4f120/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Rakendra Thapa <rakendrathapa@gmail.com>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 #include "cpu_conf.h"
@@ -125,5 +125,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc11u34/include/periph_cpu.h b/cpu/lpc11u34/include/periph_cpu.h
index e44fb4ae55..f11b8edbba 100644
--- a/cpu/lpc11u34/include/periph_cpu.h
+++ b/cpu/lpc11u34/include/periph_cpu.h
@@ -17,8 +17,8 @@
  * @author          Hauke Petersen<hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include <stdint.h>
 #include "periph/dev_enums.h"
@@ -103,5 +103,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc1768/include/periph_cpu.h b/cpu/lpc1768/include/periph_cpu.h
index 0504214316..a40a3734d8 100644
--- a/cpu/lpc1768/include/periph_cpu.h
+++ b/cpu/lpc1768/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 
@@ -31,5 +31,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/lpc2387/include/cpu_conf.h b/cpu/lpc2387/include/cpu_conf.h
index b61f072d7f..f6e84f4db9 100644
--- a/cpu/lpc2387/include/cpu_conf.h
+++ b/cpu/lpc2387/include/cpu_conf.h
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h
index 7c289d5cef..4eb0ca2f37 100644
--- a/cpu/lpc2387/include/lpc2387-adc.h
+++ b/cpu/lpc2387/include/lpc2387-adc.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef LPC2387ADC_H_
-#define LPC2387ADC_H_
+#ifndef LPC2387ADC_H
+#define LPC2387ADC_H
 
 /**
  * @defgroup    lpc2387_adc     LPC2387 ADC
@@ -51,4 +51,4 @@ void adc_init_2(void);
 #endif
 
 /** @} */
-#endif /* LPC2387ADC_H_ */
+#endif /* LPC2387ADC_H */
diff --git a/cpu/lpc2387/include/periph_cpu.h b/cpu/lpc2387/include/periph_cpu.h
index 5fbec237be..dbb757ffdb 100644
--- a/cpu/lpc2387/include/periph_cpu.h
+++ b/cpu/lpc2387/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "cpu.h"
 #include "periph/dev_enums.h"
@@ -84,5 +84,5 @@ typedef enum {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/msp430_common/include/cpu.h b/cpu/msp430_common/include/cpu.h
index 18b245af8c..88a1aac846 100644
--- a/cpu/msp430_common/include/cpu.h
+++ b/cpu/msp430_common/include/cpu.h
@@ -7,8 +7,8 @@
  * directory for more details.
  */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef CPU_H
+#define CPU_H
 
 /**
  * @defgroup    cpu_msp430_common TI MSP430
@@ -164,4 +164,4 @@ static inline void cpu_print_last_instruction(void)
 #endif
 
 /** @} */
-#endif /* CPU_H_ */
+#endif /* CPU_H */
diff --git a/cpu/msp430_common/include/cpu_conf.h b/cpu/msp430_common/include/cpu_conf.h
index edd54020b5..00b80740e2 100644
--- a/cpu/msp430_common/include/cpu_conf.h
+++ b/cpu/msp430_common/include/cpu_conf.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/msp430_common/include/stdio.h b/cpu/msp430_common/include/stdio.h
index 2ac0b7b069..145cdb79cc 100644
--- a/cpu/msp430_common/include/stdio.h
+++ b/cpu/msp430_common/include/stdio.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
-#ifndef RIOT_MSP430_STDIO_H_
-#define RIOT_MSP430_STDIO_H_
+#ifndef RIOT_MSP430_STDIO_H
+#define RIOT_MSP430_STDIO_H
 
 /*
  * The MSP430 toolchain does not provide getchar in stdio.h.
@@ -37,4 +37,4 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_MSP430_STDIO_H_ */
+#endif /* RIOT_MSP430_STDIO_H */
diff --git a/cpu/msp430_common/include/stdlib.h b/cpu/msp430_common/include/stdlib.h
index 5e56eeaebe..615f16833e 100644
--- a/cpu/msp430_common/include/stdlib.h
+++ b/cpu/msp430_common/include/stdlib.h
@@ -17,8 +17,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
-#ifndef RIOT_MSP430_STDLIB_H_
-#define RIOT_MSP430_STDLIB_H_
+#ifndef RIOT_MSP430_STDLIB_H
+#define RIOT_MSP430_STDLIB_H
 
 /*
  * The MSP430 toolchain does not provide malloc, free, calloc etc. in stdlib.h.
@@ -37,4 +37,4 @@ extern "C" {
 }
 #endif
 
-#endif /* RIOT_MSP430_STDLIB_H_ */
+#endif /* RIOT_MSP430_STDLIB_H */
diff --git a/cpu/msp430_common/include/sys/types.h b/cpu/msp430_common/include/sys/types.h
index d50105720c..b6ae952372 100644
--- a/cpu/msp430_common/include/sys/types.h
+++ b/cpu/msp430_common/include/sys/types.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SYS_TYPES_H_
-#define SYS_TYPES_H_
+#ifndef SYS_TYPES_H
+#define SYS_TYPES_H
 
 #include "msp430_types.h"
 
@@ -19,4 +19,4 @@ extern "C" {
 }
 #endif
 
-#endif /* SYS_TYPES_H_ */
+#endif /* SYS_TYPES_H */
diff --git a/cpu/msp430_common/include/unistd.h b/cpu/msp430_common/include/unistd.h
index d7f05053f9..234c89bb14 100644
--- a/cpu/msp430_common/include/unistd.h
+++ b/cpu/msp430_common/include/unistd.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNISTD_H_
-#define UNISTD_H_
+#ifndef UNISTD_H
+#define UNISTD_H
 
 #include <stdint.h>
 
@@ -31,4 +31,4 @@ unsigned int sleep(unsigned int seconds);
 }
 #endif
 
-#endif /* UNISTD_H_ */
+#endif /* UNISTD_H */
diff --git a/cpu/msp430fxyz/include/periph_cpu.h b/cpu/msp430fxyz/include/periph_cpu.h
index 2ed44482be..ec0f566730 100644
--- a/cpu/msp430fxyz/include/periph_cpu.h
+++ b/cpu/msp430fxyz/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef CPU_PERIPH_H_
-#define CPU_PERIPH_H_
+#ifndef CPU_PERIPH_H
+#define CPU_PERIPH_H
 
 #include "cpu.h"
 #include "msp430_regs.h"
@@ -92,5 +92,5 @@ void gpio_periph_mode(gpio_t pin, bool enable);
 }
 #endif
 
-#endif /* CPU_PERIPH_H_ */
+#endif /* CPU_PERIPH_H */
 /** @} */
diff --git a/cpu/native/include/cpu_conf.h b/cpu/native/include/cpu_conf.h
index 88c71d9c1e..08dd88225e 100644
--- a/cpu/native/include/cpu_conf.h
+++ b/cpu/native/include/cpu_conf.h
@@ -13,8 +13,8 @@
  * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif /* CPUCONF_H_ */
+#endif /* CPUCONF_H */
diff --git a/cpu/native/include/periph_cpu.h b/cpu/native/include/periph_cpu.h
index 64e47da35a..0b2c3766d4 100644
--- a/cpu/native/include/periph_cpu.h
+++ b/cpu/native/include/periph_cpu.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_H_
-#define PERIPH_CPU_H_
+#ifndef PERIPH_CPU_H
+#define PERIPH_CPU_H
 
 #include "periph/dev_enums.h"
 
@@ -36,5 +36,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/nrfmin.h b/cpu/nrf5x_common/include/nrfmin.h
index e43800514c..32c88cdc5d 100644
--- a/cpu/nrf5x_common/include/nrfmin.h
+++ b/cpu/nrf5x_common/include/nrfmin.h
@@ -69,8 +69,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NRFMIN_H_
-#define NRFMIN_H_
+#ifndef NRFMIN_H
+#define NRFMIN_H
 
 #include "net/netdev2.h"
 
@@ -233,5 +233,5 @@ void nrfmin_set_txpower(int16_t power);
 }
 #endif
 
-#endif /* NRFMIN_H_ */
+#endif /* NRFMIN_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/nrfmin_gnrc.h b/cpu/nrf5x_common/include/nrfmin_gnrc.h
index dc1a971a40..4b62af6e2f 100644
--- a/cpu/nrf5x_common/include/nrfmin_gnrc.h
+++ b/cpu/nrf5x_common/include/nrfmin_gnrc.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NRFMIN_GNRC_H_
-#define NRFMIN_GNRC_H_
+#ifndef NRFMIN_GNRC_H
+#define NRFMIN_GNRC_H
 
 #include "nrfmin.h"
 
@@ -44,5 +44,5 @@ void gnrc_netdev2_nrfmin_init(void);
 }
 #endif
 
-#endif /* NRFMIN_GNRC_H_ */
+#endif /* NRFMIN_GNRC_H */
 /** @} */
diff --git a/cpu/nrf5x_common/include/periph_cpu_common.h b/cpu/nrf5x_common/include/periph_cpu_common.h
index 32fce39c29..c34a24537b 100644
--- a/cpu/nrf5x_common/include/periph_cpu_common.h
+++ b/cpu/nrf5x_common/include/periph_cpu_common.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef PERIPH_CPU_COMMON_H_
-#define PERIPH_CPU_COMMON_H_
+#ifndef PERIPH_CPU_COMMON_H
+#define PERIPH_CPU_COMMON_H
 
 #include "cpu.h"
 
@@ -110,5 +110,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_COMMON_H_ */
+#endif /* PERIPH_CPU_COMMON_H */
 /** @} */
diff --git a/cpu/stellaris_common/include/cortex-m4-def.h b/cpu/stellaris_common/include/cortex-m4-def.h
index 7f4c19e9a8..a01aab04af 100644
--- a/cpu/stellaris_common/include/cortex-m4-def.h
+++ b/cpu/stellaris_common/include/cortex-m4-def.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_CORTEX_M4_DEF_H_
-#define STELLARIS_CORTEX_M4_DEF_H_
+#ifndef STELLARIS_CORTEX_M4_DEF_H
+#define STELLARIS_CORTEX_M4_DEF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -10062,4 +10062,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_CORTEX_M4_DEF_H_ */
+#endif /* STELLARIS_CORTEX_M4_DEF_H */
diff --git a/cpu/stellaris_common/include/hw_adc.h b/cpu/stellaris_common/include/hw_adc.h
index bb9af580f9..e5f784c527 100644
--- a/cpu/stellaris_common/include/hw_adc.h
+++ b/cpu/stellaris_common/include/hw_adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_ADC_H_
-#define STELLARIS_HW_ADC_H_
+#ifndef STELLARIS_HW_ADC_H
+#define STELLARIS_HW_ADC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1357,4 +1357,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_ADC_H_ */
+#endif /* STELLARIS_HW_ADC_H */
diff --git a/cpu/stellaris_common/include/hw_gpio.h b/cpu/stellaris_common/include/hw_gpio.h
index 5c547fad30..38d62f966f 100644
--- a/cpu/stellaris_common/include/hw_gpio.h
+++ b/cpu/stellaris_common/include/hw_gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_GPIO_H_
-#define STELLARIS_HW_GPIO_H_
+#ifndef STELLARIS_HW_GPIO_H
+#define STELLARIS_HW_GPIO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,4 +197,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_GPIO_H_ */
+#endif /* STELLARIS_HW_GPIO_H */
diff --git a/cpu/stellaris_common/include/hw_hibernate.h b/cpu/stellaris_common/include/hw_hibernate.h
index 4b74800974..3c6416f831 100644
--- a/cpu/stellaris_common/include/hw_hibernate.h
+++ b/cpu/stellaris_common/include/hw_hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_HIBERNATE_H_
-#define STELLARIS_HW_HIBERNATE_H_
+#ifndef STELLARIS_HW_HIBERNATE_H
+#define STELLARIS_HW_HIBERNATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -291,4 +291,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_HIBERNATE_H_ */
+#endif /* STELLARIS_HW_HIBERNATE_H */
diff --git a/cpu/stellaris_common/include/hw_i2c.h b/cpu/stellaris_common/include/hw_i2c.h
index 30fcd0f5d7..8c91b53478 100644
--- a/cpu/stellaris_common/include/hw_i2c.h
+++ b/cpu/stellaris_common/include/hw_i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_I2C_H_
-#define STELLARIS_HW_I2C_H_
+#ifndef STELLARIS_HW_I2C_H
+#define STELLARIS_HW_I2C_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -494,4 +494,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_I2C_H_ */
+#endif /* STELLARIS_HW_I2C_H */
diff --git a/cpu/stellaris_common/include/hw_ints.h b/cpu/stellaris_common/include/hw_ints.h
index 14c77782ed..2f449dc71c 100644
--- a/cpu/stellaris_common/include/hw_ints.h
+++ b/cpu/stellaris_common/include/hw_ints.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_INTS_H_
-#define STELLARIS_HW_INTS_H_
+#ifndef STELLARIS_HW_INTS_H
+#define STELLARIS_HW_INTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,4 +222,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_INTS_H_ */
+#endif /* STELLARIS_HW_INTS_H */
diff --git a/cpu/stellaris_common/include/hw_memmap.h b/cpu/stellaris_common/include/hw_memmap.h
index 8dccea6c65..2fcfd71b8e 100644
--- a/cpu/stellaris_common/include/hw_memmap.h
+++ b/cpu/stellaris_common/include/hw_memmap.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_MEMMAP_H_
-#define STELLARIS_HW_MEMMAP_H_
+#ifndef STELLARIS_HW_MEMMAP_H
+#define STELLARIS_HW_MEMMAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_MEMMAP_H_ */
+#endif /* STELLARIS_HW_MEMMAP_H */
diff --git a/cpu/stellaris_common/include/hw_nvic.h b/cpu/stellaris_common/include/hw_nvic.h
index a472561e25..614929704b 100644
--- a/cpu/stellaris_common/include/hw_nvic.h
+++ b/cpu/stellaris_common/include/hw_nvic.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_NVIC_H_
-#define STELLARIS_HW_NVIC_H_
+#ifndef STELLARIS_HW_NVIC_H
+#define STELLARIS_HW_NVIC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1722,4 +1722,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_NVIC_H_ */
+#endif /* STELLARIS_HW_NVIC_H */
diff --git a/cpu/stellaris_common/include/hw_pwm.h b/cpu/stellaris_common/include/hw_pwm.h
index e8c0368ee6..4a195eb0cd 100644
--- a/cpu/stellaris_common/include/hw_pwm.h
+++ b/cpu/stellaris_common/include/hw_pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_PWM_H_
-#define STELLARIS_HW_PWM_H_
+#ifndef STELLARIS_HW_PWM_H
+#define STELLARIS_HW_PWM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -2025,4 +2025,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_PWM_H_ */
+#endif /* STELLARIS_HW_PWM_H */
diff --git a/cpu/stellaris_common/include/hw_ssi.h b/cpu/stellaris_common/include/hw_ssi.h
index 41bf1cc112..19386a65cd 100644
--- a/cpu/stellaris_common/include/hw_ssi.h
+++ b/cpu/stellaris_common/include/hw_ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SSI_H_
-#define STELLARIS_HW_SSI_H_
+#ifndef STELLARIS_HW_SSI_H
+#define STELLARIS_HW_SSI_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -249,4 +249,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SSI_H_ */
+#endif /* STELLARIS_HW_SSI_H */
diff --git a/cpu/stellaris_common/include/hw_sysctl.h b/cpu/stellaris_common/include/hw_sysctl.h
index 097071a06b..7b73a40408 100644
--- a/cpu/stellaris_common/include/hw_sysctl.h
+++ b/cpu/stellaris_common/include/hw_sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SYSCTL_H_
-#define STELLARIS_HW_SYSCTL_H_
+#ifndef STELLARIS_HW_SYSCTL_H
+#define STELLARIS_HW_SYSCTL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -3681,4 +3681,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SYSCTL_H_ */
+#endif /* STELLARIS_HW_SYSCTL_H */
diff --git a/cpu/stellaris_common/include/hw_sysexc.h b/cpu/stellaris_common/include/hw_sysexc.h
index 999a328e67..6eec943f76 100644
--- a/cpu/stellaris_common/include/hw_sysexc.h
+++ b/cpu/stellaris_common/include/hw_sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_SYSEXC_H_
-#define STELLARIS_HW_SYSEXC_H_
+#ifndef STELLARIS_HW_SYSEXC_H
+#define STELLARIS_HW_SYSEXC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_SYSEXC_H_ */
+#endif /* STELLARIS_HW_SYSEXC_H */
diff --git a/cpu/stellaris_common/include/hw_timer.h b/cpu/stellaris_common/include/hw_timer.h
index 949990e28e..1945bdccde 100644
--- a/cpu/stellaris_common/include/hw_timer.h
+++ b/cpu/stellaris_common/include/hw_timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_TIMER_H_
-#define STELLARIS_HW_TIMER_H_
+#ifndef STELLARIS_HW_TIMER_H
+#define STELLARIS_HW_TIMER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -764,4 +764,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_TIMER_H_ */
+#endif /* STELLARIS_HW_TIMER_H */
diff --git a/cpu/stellaris_common/include/hw_types.h b/cpu/stellaris_common/include/hw_types.h
index c6aec30b07..aa9025918e 100644
--- a/cpu/stellaris_common/include/hw_types.h
+++ b/cpu/stellaris_common/include/hw_types.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_TYPES_H_
-#define STELLARIS_HW_TYPES_H_
+#ifndef STELLARIS_HW_TYPES_H
+#define STELLARIS_HW_TYPES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,4 +223,4 @@ typedef unsigned char tBoolean;
 }
 #endif
 
-#endif /* STELLARIS_HW_TYPES_H_ */
+#endif /* STELLARIS_HW_TYPES_H */
diff --git a/cpu/stellaris_common/include/hw_uart.h b/cpu/stellaris_common/include/hw_uart.h
index 18986fc422..eb786ca020 100644
--- a/cpu/stellaris_common/include/hw_uart.h
+++ b/cpu/stellaris_common/include/hw_uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_UART_H_
-#define STELLARIS_HW_UART_H_
+#ifndef STELLARIS_HW_UART_H
+#define STELLARIS_HW_UART_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -527,4 +527,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_UART_H_ */
+#endif /* STELLARIS_HW_UART_H */
diff --git a/cpu/stellaris_common/include/hw_watchdog.h b/cpu/stellaris_common/include/hw_watchdog.h
index 2bc65a02ac..d63fdc92ff 100644
--- a/cpu/stellaris_common/include/hw_watchdog.h
+++ b/cpu/stellaris_common/include/hw_watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HW_WATCHDOG_H_
-#define STELLARIS_HW_WATCHDOG_H_
+#ifndef STELLARIS_HW_WATCHDOG_H
+#define STELLARIS_HW_WATCHDOG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,4 +196,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_HW_WATCHDOG_H_ */
+#endif /* STELLARIS_HW_WATCHDOG_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/adc.h b/cpu/stellaris_common/include/stellaris_periph/adc.h
index 7446e651e6..b5e3a04aa9 100644
--- a/cpu/stellaris_common/include/stellaris_periph/adc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ADC_H_
-#define STELLARIS_ADC_H_
+#ifndef STELLARIS_ADC_H
+#define STELLARIS_ADC_H
 
 //*****************************************************************************
 //
@@ -308,4 +308,4 @@ extern unsigned long ADCPhaseDelayGet(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_ADC_H_ */
+#endif /* STELLARIS_ADC_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/comp.h b/cpu/stellaris_common/include/stellaris_periph/comp.h
index e6e204475f..3c6c7e2bfb 100644
--- a/cpu/stellaris_common/include/stellaris_periph/comp.h
+++ b/cpu/stellaris_common/include/stellaris_periph/comp.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_COMP_H_
-#define STELLARIS_COMP_H_
+#ifndef STELLARIS_COMP_H
+#define STELLARIS_COMP_H
 
 //*****************************************************************************
 //
@@ -142,4 +142,4 @@ extern void ComparatorIntClear(unsigned long ulBase, unsigned long ulComp);
 }
 #endif
 
-#endif /* STELLARIS_COMP_H_ */
+#endif /* STELLARIS_COMP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/cpu.h b/cpu/stellaris_common/include/stellaris_periph/cpu.h
index b0d8468e6b..6f5898db79 100644
--- a/cpu/stellaris_common/include/stellaris_periph/cpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/cpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_CPU_H_
-#define STELLARIS_CPU_H_
+#ifndef STELLARIS_CPU_H
+#define STELLARIS_CPU_H
 
 //*****************************************************************************
 //
@@ -72,4 +72,4 @@ extern void CPUbasepriSet(unsigned long ulNewBasepri);
 }
 #endif
 
-#endif /* STELLARIS_CPU_H_ */
+#endif /* STELLARIS_CPU_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/fpu.h b/cpu/stellaris_common/include/stellaris_periph/fpu.h
index 3c486b3558..528bebe857 100644
--- a/cpu/stellaris_common/include/stellaris_periph/fpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/fpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_FPU_H_
-#define STELLARIS_FPU_H_
+#ifndef STELLARIS_FPU_H
+#define STELLARIS_FPU_H
 
 //*****************************************************************************
 //
@@ -109,4 +109,4 @@ extern void FPURoundingModeSet(unsigned long ulMode);
 }
 #endif
 
-#endif /* STELLARIS_FPU_H_ */
+#endif /* STELLARIS_FPU_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/gpio.h b/cpu/stellaris_common/include/stellaris_periph/gpio.h
index 32454b81f5..7537b11f9b 100644
--- a/cpu/stellaris_common/include/stellaris_periph/gpio.h
+++ b/cpu/stellaris_common/include/stellaris_periph/gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_GPIO_H_
-#define STELLARIS_GPIO_H_
+#ifndef STELLARIS_GPIO_H
+#define STELLARIS_GPIO_H
 
 //*****************************************************************************
 //
@@ -196,4 +196,4 @@ extern void GPIOADCTriggerDisable(unsigned long ulPort, unsigned char ucPins);
 }
 #endif
 
-#endif /* STELLARIS_GPIO_H_ */
+#endif /* STELLARIS_GPIO_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/hibernate.h b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
index 589028d116..82d83a8295 100644
--- a/cpu/stellaris_common/include/stellaris_periph/hibernate.h
+++ b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_HIBERNATE_H_
-#define STELLARIS_HIBERNATE_H_
+#ifndef STELLARIS_HIBERNATE_H
+#define STELLARIS_HIBERNATE_H
 
 //*****************************************************************************
 //
@@ -164,4 +164,4 @@ extern unsigned long HibernateBatCheckDone(void);
 }
 #endif
 
-#endif  /* STELLARIS_HIBERNATE_H_ */
+#endif  /* STELLARIS_HIBERNATE_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/i2c.h b/cpu/stellaris_common/include/stellaris_periph/i2c.h
index 1b45a3366b..1e65ebf7f9 100644
--- a/cpu/stellaris_common/include/stellaris_periph/i2c.h
+++ b/cpu/stellaris_common/include/stellaris_periph/i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_I2C_H_
-#define STELLARIS_I2C_H_
+#ifndef STELLARIS_I2C_H
+#define STELLARIS_I2C_H
 
 //*****************************************************************************
 //
@@ -221,4 +221,4 @@ extern unsigned long I2CSlaveStatus(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_I2C_H_ */
+#endif /* STELLARIS_I2C_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/interrupt.h b/cpu/stellaris_common/include/stellaris_periph/interrupt.h
index f7d23c17d4..5d25dba50b 100644
--- a/cpu/stellaris_common/include/stellaris_periph/interrupt.h
+++ b/cpu/stellaris_common/include/stellaris_periph/interrupt.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_INTERRUPT_H_
-#define STELLARIS_INTERRUPT_H_
+#ifndef STELLARIS_INTERRUPT_H
+#define STELLARIS_INTERRUPT_H
 
 //*****************************************************************************
 //
@@ -90,4 +90,4 @@ extern unsigned long IntPriorityMaskGet(void);
 }
 #endif
 
-#endif /* STELLARIS_INTERRUPT_H_ */
+#endif /* STELLARIS_INTERRUPT_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/pin_map.h b/cpu/stellaris_common/include/stellaris_periph/pin_map.h
index 8bd33a4aad..389a664bf3 100644
--- a/cpu/stellaris_common/include/stellaris_periph/pin_map.h
+++ b/cpu/stellaris_common/include/stellaris_periph/pin_map.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_PIN_MAP_H_
-#define STELLARIS_PIN_MAP_H_
+#ifndef STELLARIS_PIN_MAP_H
+#define STELLARIS_PIN_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -454,4 +454,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_PIN_MAP_H_ */
+#endif /* STELLARIS_PIN_MAP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/pwm.h b/cpu/stellaris_common/include/stellaris_periph/pwm.h
index 7692d624c1..4e529d7df1 100644
--- a/cpu/stellaris_common/include/stellaris_periph/pwm.h
+++ b/cpu/stellaris_common/include/stellaris_periph/pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_PWM_H_
-#define STELLARIS_PWM_H_
+#ifndef STELLARIS_PWM_H
+#define STELLARIS_PWM_H
 
 //*****************************************************************************
 //
@@ -295,4 +295,4 @@ extern void PWMGenFaultClear(unsigned long ulBase, unsigned long ulGen,
 }
 #endif
 
-#endif /* STELLARIS_PWM_H_ */
+#endif /* STELLARIS_PWM_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/rom.h b/cpu/stellaris_common/include/stellaris_periph/rom.h
index aa92d03b83..d747a485fd 100644
--- a/cpu/stellaris_common/include/stellaris_periph/rom.h
+++ b/cpu/stellaris_common/include/stellaris_periph/rom.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ROM_H_
-#define STELLARIS_ROM_H_
+#ifndef STELLARIS_ROM_H
+#define STELLARIS_ROM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -6749,4 +6749,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_ROM_H_ */
+#endif /* STELLARIS_ROM_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/rom_map.h b/cpu/stellaris_common/include/stellaris_periph/rom_map.h
index c48269eb3c..c618d6cc0e 100644
--- a/cpu/stellaris_common/include/stellaris_periph/rom_map.h
+++ b/cpu/stellaris_common/include/stellaris_periph/rom_map.h
@@ -38,8 +38,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_ROM_MAP_H_
-#define STELLARIS_ROM_MAP_H_
+#ifndef STELLARIS_ROM_MAP_H
+#define STELLARIS_ROM_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -5080,4 +5080,4 @@ extern "C" {
 }
 #endif
 
-#endif /* STELLARIS_ROM_MAP_H_ */
+#endif /* STELLARIS_ROM_MAP_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/ssi.h b/cpu/stellaris_common/include/stellaris_periph/ssi.h
index 00dbe38e69..259932e1a2 100644
--- a/cpu/stellaris_common/include/stellaris_periph/ssi.h
+++ b/cpu/stellaris_common/include/stellaris_periph/ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SSI_H_
-#define STELLARIS_SSI_H_
+#ifndef STELLARIS_SSI_H
+#define STELLARIS_SSI_H
 
 //*****************************************************************************
 //
@@ -148,4 +148,4 @@ extern unsigned long SSIClockSourceGet(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_SSI_H_ */
+#endif /* STELLARIS_SSI_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/sysctl.h b/cpu/stellaris_common/include/stellaris_periph/sysctl.h
index 21dd874188..e91d169562 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysctl.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSCTL_H_
-#define STELLARIS_SYSCTL_H_
+#ifndef STELLARIS_SYSCTL_H
+#define STELLARIS_SYSCTL_H
 
 //*****************************************************************************
 //
@@ -639,4 +639,4 @@ extern unsigned long SysCtlI2SMClkSet(unsigned long ulInputClock,
 }
 #endif
 
-#endif /* STELLARIS_SYSCTL_H_ */
+#endif /* STELLARIS_SYSCTL_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/sysexc.h b/cpu/stellaris_common/include/stellaris_periph/sysexc.h
index e61422baf6..e2015db688 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysexc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSEXC_H_
-#define STELLARIS_SYSEXC_H_
+#ifndef STELLARIS_SYSEXC_H
+#define STELLARIS_SYSEXC_H
 
 //*****************************************************************************
 //
@@ -86,4 +86,4 @@ extern void SysExcIntClear(unsigned long ulIntFlags);
 }
 #endif
 
-#endif /* STELLARIS_SYSEXC_H_ */
+#endif /* STELLARIS_SYSEXC_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/systick.h b/cpu/stellaris_common/include/stellaris_periph/systick.h
index 399c848515..890f9701f3 100644
--- a/cpu/stellaris_common/include/stellaris_periph/systick.h
+++ b/cpu/stellaris_common/include/stellaris_periph/systick.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_SYSTICK_H_
-#define STELLARIS_SYSTICK_H_
+#ifndef STELLARIS_SYSTICK_H
+#define STELLARIS_SYSTICK_H
 
 //*****************************************************************************
 //
@@ -75,4 +75,4 @@ extern unsigned long SysTickValueGet(void);
 }
 #endif
 
-#endif /* STELLARIS_SYSTICK_H_ */
+#endif /* STELLARIS_SYSTICK_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/timer.h b/cpu/stellaris_common/include/stellaris_periph/timer.h
index 2db3c64380..4df1ebd8f0 100644
--- a/cpu/stellaris_common/include/stellaris_periph/timer.h
+++ b/cpu/stellaris_common/include/stellaris_periph/timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_TIMER_H_
-#define STELLARIS_TIMER_H_
+#ifndef STELLARIS_TIMER_H
+#define STELLARIS_TIMER_H
 
 //*****************************************************************************
 //
@@ -233,4 +233,4 @@ extern void TimerQuiesce(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_TIMER_H_ */
+#endif /* STELLARIS_TIMER_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/uart.h b/cpu/stellaris_common/include/stellaris_periph/uart.h
index de0649784b..d96a09b248 100644
--- a/cpu/stellaris_common/include/stellaris_periph/uart.h
+++ b/cpu/stellaris_common/include/stellaris_periph/uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_UART_H_
-#define STELLARIS_UART_H_
+#ifndef STELLARIS_UART_H
+#define STELLARIS_UART_H
 
 //*****************************************************************************
 //
@@ -272,4 +272,4 @@ extern void UART9BitAddrSend(unsigned long ulBase, unsigned char ucAddr);
 }
 #endif
 
-#endif /*  STELLARIS_UART_H_ */
+#endif /*  STELLARIS_UART_H */
diff --git a/cpu/stellaris_common/include/stellaris_periph/watchdog.h b/cpu/stellaris_common/include/stellaris_periph/watchdog.h
index 2a332479b3..bdca4ddc74 100644
--- a/cpu/stellaris_common/include/stellaris_periph/watchdog.h
+++ b/cpu/stellaris_common/include/stellaris_periph/watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef STELLARIS_WATCHDOG_H_
-#define STELLARIS_WATCHDOG_H_
+#ifndef STELLARIS_WATCHDOG_H
+#define STELLARIS_WATCHDOG_H
 
 //*****************************************************************************
 //
@@ -92,4 +92,4 @@ extern void WatchdogStallDisable(unsigned long ulBase);
 }
 #endif
 
-#endif /* STELLARIS_WATCHDOG_H_ */
+#endif /* STELLARIS_WATCHDOG_H */
diff --git a/cpu/stm32f1/include/periph_cpu.h b/cpu/stm32f1/include/periph_cpu.h
index e27571ec8b..9b814bce02 100644
--- a/cpu/stm32f1/include/periph_cpu.h
+++ b/cpu/stm32f1/include/periph_cpu.h
@@ -129,5 +129,5 @@ typedef struct {
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/stm32f3/include/periph_cpu.h b/cpu/stm32f3/include/periph_cpu.h
index c6f014ed85..47f2260fff 100644
--- a/cpu/stm32f3/include/periph_cpu.h
+++ b/cpu/stm32f3/include/periph_cpu.h
@@ -87,5 +87,5 @@ void gpio_init_af(gpio_t pin, gpio_af_t af);
 }
 #endif
 
-#endif /* PERIPH_CPU_H_ */
+#endif /* PERIPH_CPU_H */
 /** @} */
diff --git a/cpu/stm32l1/include/cpu_conf.h b/cpu/stm32l1/include/cpu_conf.h
index 3214ccce8c..18fef4e246 100644
--- a/cpu/stm32l1/include/cpu_conf.h
+++ b/cpu/stm32l1/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef CPUCONF_H_
-#define CPUCONF_H_
+#ifndef CPUCONF_H
+#define CPUCONF_H
 
 #include "cpu_conf_common.h"
 
diff --git a/cpu/x86/include/cpu.h b/cpu/x86/include/cpu.h
index 754788403f..b7919adddf 100644
--- a/cpu/x86/include/cpu.h
+++ b/cpu/x86/include/cpu.h
@@ -26,8 +26,8 @@
  * @author  René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CPU_X86_CPU_H_
-#define CPU_X86_CPU_H_
+#ifndef CPU_X86_CPU_H
+#define CPU_X86_CPU_H
 
 #include "kernel_defines.h"
 #include "irq.h"
diff --git a/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch b/dist/tools/toolchains/patches/newlib-2.1.0-RIOT-i586-none-elf.patch
index a9c9ba423901fd13c329e437a8ab2793deeb4406..ba16def9e547e6825ddeb0e67c68f5af9cfaa538 100644
GIT binary patch
delta 24
gcmdlUw=HhNLvCgTE&a*sbY&;Y@^EhE=Fw3G0Cg7!s{jB1

delta 14
VcmdlMw>@sdLvF_S%@4Ull>s!l20Z`(

diff --git a/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch b/dist/tools/toolchains/patches/newlib-2.2.0.20150623-RIOT-i586-none-elf.patch
index 067b754dc256561cf6fcc9ef715319292e0bec2a..4500d66b435e86ecca406d217555ad411a52ff56 100644
GIT binary patch
delta 12
TcmaEz{3>}vFYo3)-dGg?EL8=y

delta 14
VcmaEr{5p9<FE3;K=3d@d6#zC|1{44Q

diff --git a/drivers/at86rf2xx/include/at86rf2xx_internal.h b/drivers/at86rf2xx/include/at86rf2xx_internal.h
index 0979285c07..9ced61ecdd 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_internal.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_internal.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef AT86RF2XX_INTERNAL_H_
-#define AT86RF2XX_INTERNAL_H_
+#ifndef AT86RF2XX_INTERNAL_H
+#define AT86RF2XX_INTERNAL_H
 
 #include <stdint.h>
 
@@ -179,5 +179,5 @@ void at86rf2xx_get_random(at86rf2xx_t *dev, uint8_t *data, const size_t len);
 }
 #endif
 
-#endif /* AT86RF2XX_INTERNAL_H_ */
+#endif /* AT86RF2XX_INTERNAL_H */
 /** @} */
diff --git a/drivers/at86rf2xx/include/at86rf2xx_netdev.h b/drivers/at86rf2xx/include/at86rf2xx_netdev.h
index 7b6e1f18a3..cb4a844c41 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_netdev.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_netdev.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef AT86RF2XX_NETDEV_H_
-#define AT86RF2XX_NETDEV_H_
+#ifndef AT86RF2XX_NETDEV_H
+#define AT86RF2XX_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -34,5 +34,5 @@ extern const netdev2_driver_t at86rf2xx_driver;
 }
 #endif
 
-#endif /* AT86RF2XX_NETDEV_H_ */
+#endif /* AT86RF2XX_NETDEV_H */
 /** @} */
diff --git a/drivers/at86rf2xx/include/at86rf2xx_registers.h b/drivers/at86rf2xx/include/at86rf2xx_registers.h
index ae2cb336b6..7359e68c18 100644
--- a/drivers/at86rf2xx/include/at86rf2xx_registers.h
+++ b/drivers/at86rf2xx/include/at86rf2xx_registers.h
@@ -21,8 +21,8 @@
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  */
 
-#ifndef AT86RF2XX_REGISTERS_H_
-#define AT86RF2XX_REGISTERS_H_
+#ifndef AT86RF2XX_REGISTERS_H
+#define AT86RF2XX_REGISTERS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -348,5 +348,5 @@ extern "C" {
 }
 #endif
 
-#endif /* AT86RF2XX_REGISTERS_H_ */
+#endif /* AT86RF2XX_REGISTERS_H */
 /** @} */
diff --git a/drivers/bmp180/include/bmp180_internals.h b/drivers/bmp180/include/bmp180_internals.h
index 5bdf79abcb..aea428816a 100644
--- a/drivers/bmp180/include/bmp180_internals.h
+++ b/drivers/bmp180/include/bmp180_internals.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BMP180_REGS_H_
-#define BMP180_REGS_H_
+#ifndef BMP180_REGS_H
+#define BMP180_REGS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,5 +58,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BMP180_REGS_H_ */
+#endif /* BMP180_REGS_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_internal.h b/drivers/cc2420/include/cc2420_internal.h
index ebb7a4eb50..3fc61813d0 100644
--- a/drivers/cc2420/include/cc2420_internal.h
+++ b/drivers/cc2420/include/cc2420_internal.h
@@ -122,5 +122,5 @@ void cc2420_en_xosc(cc2420_t *dev);
 }
 #endif
 
-#endif /* CC2420_INTERNAL_H_ */
+#endif /* CC2420_INTERNAL_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_netdev.h b/drivers/cc2420/include/cc2420_netdev.h
index 2b260938ed..fb4a5eb8ac 100644
--- a/drivers/cc2420/include/cc2420_netdev.h
+++ b/drivers/cc2420/include/cc2420_netdev.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef CC2420_NETDEV_H_
-#define CC2420_NETDEV_H_
+#ifndef CC2420_NETDEV_H
+#define CC2420_NETDEV_H
 
 #include "net/netdev2.h"
 
@@ -37,5 +37,5 @@ extern const netdev2_driver_t cc2420_driver;
 }
 #endif
 
-#endif /* CC2420_NETDEV_H_ */
+#endif /* CC2420_NETDEV_H */
 /** @} */
diff --git a/drivers/cc2420/include/cc2420_registers.h b/drivers/cc2420/include/cc2420_registers.h
index c4a318c593..d84bc5976c 100644
--- a/drivers/cc2420/include/cc2420_registers.h
+++ b/drivers/cc2420/include/cc2420_registers.h
@@ -18,8 +18,8 @@
  * @author      Francisco Acosta <francisco.acosta@inria.fr>
  */
 
-#ifndef CC2420_REGISTERS_H_
-#define CC2420_REGISTERS_H_
+#ifndef CC2420_REGISTERS_H
+#define CC2420_REGISTERS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -238,4 +238,4 @@ enum {
 }
 #endif
 
-#endif /* CC2420_REGISTERS_H_ */
+#endif /* CC2420_REGISTERS_H */
diff --git a/drivers/hdc1000/include/hdc1000_regs.h b/drivers/hdc1000/include/hdc1000_regs.h
index c6a95b6263..4e9e3fac2d 100644
--- a/drivers/hdc1000/include/hdc1000_regs.h
+++ b/drivers/hdc1000/include/hdc1000_regs.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef HDC1000_REGS_H_
-#define HDC1000_REGS_H_
+#ifndef HDC1000_REGS_H
+#define HDC1000_REGS_H
 
 #ifdef __cplusplus
 extern "C"
@@ -69,5 +69,5 @@ extern "C"
 }
 #endif
 
-#endif /* HDC1000_REGS_H_ */
+#endif /* HDC1000_REGS_H */
 /** @} */
diff --git a/drivers/include/adt7310.h b/drivers/include/adt7310.h
index a9876da9d2..2cf37fb190 100644
--- a/drivers/include/adt7310.h
+++ b/drivers/include/adt7310.h
@@ -47,8 +47,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef ADT7310_H_
-#define ADT7310_H_
+#ifndef ADT7310_H
+#define ADT7310_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -165,5 +165,5 @@ float adt7310_read_float(adt7310_t *dev);
 }
 #endif
 
-#endif /* ADT7310_H_ */
+#endif /* ADT7310_H */
 /** @} */
diff --git a/drivers/include/at30tse75x.h b/drivers/include/at30tse75x.h
index adccd607a3..3b7b684023 100644
--- a/drivers/include/at30tse75x.h
+++ b/drivers/include/at30tse75x.h
@@ -22,8 +22,8 @@
  * @author      Daniel Krebs <github@daniel-krebs.net>
  */
 
-#ifndef AT30TSE75X_H_
-#define AT30TSE75X_H_
+#ifndef AT30TSE75X_H
+#define AT30TSE75X_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -309,4 +309,4 @@ int at30tse75x_get_temperature(at30tse75x_t* dev, float* temperature);
 #endif
 
 /** @} */
-#endif /* AT30TSE75X_H_ */
+#endif /* AT30TSE75X_H */
diff --git a/drivers/include/at86rf2xx.h b/drivers/include/at86rf2xx.h
index 627e7d6368..74a9630836 100644
--- a/drivers/include/at86rf2xx.h
+++ b/drivers/include/at86rf2xx.h
@@ -26,8 +26,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef AT86RF2XX_H_
-#define AT86RF2XX_H_
+#ifndef AT86RF2XX_H
+#define AT86RF2XX_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -447,5 +447,5 @@ void at86rf2xx_tx_exec(at86rf2xx_t *dev);
 }
 #endif
 
-#endif /* AT86RF2XX_H_ */
+#endif /* AT86RF2XX_H */
 /** @} */
diff --git a/drivers/include/bmp180.h b/drivers/include/bmp180.h
index 22c7869575..830a2b36c9 100644
--- a/drivers/include/bmp180.h
+++ b/drivers/include/bmp180.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef BMP180_H_
-#define BMP180_H_
+#ifndef BMP180_H
+#define BMP180_H
 
 #include "saul.h"
 #include "periph/i2c.h"
@@ -143,5 +143,5 @@ int bmp180_sealevel_pressure(bmp180_t *dev, int32_t altitude, int32_t *pressure_
 }
 #endif
 
-#endif /* BMP180_H_ */
+#endif /* BMP180_H */
 /** @} */
diff --git a/drivers/include/diskio.h b/drivers/include/diskio.h
index 245bc36547..35e9e27764 100644
--- a/drivers/include/diskio.h
+++ b/drivers/include/diskio.h
@@ -21,8 +21,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef DISKIO_H_
-#define DISKIO_H_
+#ifndef DISKIO_H
+#define DISKIO_H
 
 #include <stdint.h>
 
@@ -165,4 +165,4 @@ diskio_result_t mci_ioctl(unsigned char ctrl, void *buff);
 #endif
 
 /** @} */
-#endif /* DISKIO_H_ */
+#endif /* DISKIO_H */
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 6070ee6bbf..0faa924120 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -21,8 +21,8 @@
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  */
 
-#ifndef GPIOINT_H_
-#define GPIOINT_H_
+#ifndef GPIOINT_H
+#define GPIOINT_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -74,4 +74,4 @@ void gpioint_init(void);
 #endif
 
 /** @} */
-#endif /* GPIOINT_H_ */
+#endif /* GPIOINT_H */
diff --git a/drivers/include/hih6130.h b/drivers/include/hih6130.h
index 3d3712e802..9502f3ee24 100644
--- a/drivers/include/hih6130.h
+++ b/drivers/include/hih6130.h
@@ -20,8 +20,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef HIH6130_H_
-#define HIH6130_H_
+#ifndef HIH6130_H
+#define HIH6130_H
 
 #include <stdint.h>
 
@@ -66,5 +66,5 @@ int hih6130_get_humidity_temperature_float(hih6130_t *dev,
 }
 #endif
 
-#endif /* HIH6130_H_ */
+#endif /* HIH6130_H */
 /** @} */
diff --git a/drivers/include/io1_xplained.h b/drivers/include/io1_xplained.h
index 16b51b8f69..c45157e694 100644
--- a/drivers/include/io1_xplained.h
+++ b/drivers/include/io1_xplained.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef IO1_XPLAINED_H_
-#define IO1_XPLAINED_H_
+#ifndef IO1_XPLAINED_H
+#define IO1_XPLAINED_H
 
 #include "saul.h"
 #include "at30tse75x.h"
@@ -105,5 +105,5 @@ int io1_xplained_toggle_led(void);
 }
 #endif
 
-#endif /* IO1_XPLAINED_H_ */
+#endif /* IO1_XPLAINED_H */
 /** @} */
diff --git a/drivers/include/jc42.h b/drivers/include/jc42.h
index a11384b3a9..8ba08854c1 100644
--- a/drivers/include/jc42.h
+++ b/drivers/include/jc42.h
@@ -28,8 +28,8 @@
  * @author      Koen Zandberg <koen@bergzand.net>
  */
 
-#ifndef JC42_TEMP_H_
-#define JC42_TEMP_H_
+#ifndef JC42_TEMP_H
+#define JC42_TEMP_H
 
 #include "periph/i2c.h"
 #include "saul.h"
@@ -122,4 +122,4 @@ int jc42_get_temperature(jc42_t* dev, int16_t* temperature);
 #endif
 
 /** @} */
-#endif /* JC42_TEMP_H_ */
+#endif /* JC42_TEMP_H */
diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h
index f37ea2688e..4af9faf2a1 100644
--- a/drivers/include/kw2xrf.h
+++ b/drivers/include/kw2xrf.h
@@ -19,8 +19,8 @@
  * @author      Jonas Remmert <j.remmert@phytec.de>
  */
 
-#ifndef MKW2XDRF_H_
-#define MKW2XDRF_H_
+#ifndef MKW2XDRF_H
+#define MKW2XDRF_H
 
 #include <stdint.h>
 
diff --git a/drivers/include/led.h b/drivers/include/led.h
index 7415a39e54..09fa19f7d6 100644
--- a/drivers/include/led.h
+++ b/drivers/include/led.h
@@ -29,8 +29,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef LED_H_
-#define LED_H_
+#ifndef LED_H
+#define LED_H
 
 #include "board.h"
 
@@ -104,5 +104,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LED_H_ */
+#endif /* LED_H */
 /** @} */
diff --git a/drivers/include/lis3dh.h b/drivers/include/lis3dh.h
index 4e8377f813..ec4bfb8298 100644
--- a/drivers/include/lis3dh.h
+++ b/drivers/include/lis3dh.h
@@ -19,8 +19,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef LIS3DH_H_
-#define LIS3DH_H_
+#ifndef LIS3DH_H
+#define LIS3DH_H
 
 #include <stdint.h>
 
@@ -859,5 +859,5 @@ int lis3dh_get_fifo_level(lis3dh_t *dev);
 }
 #endif
 
-#endif /* LIS3DH_H_ */
+#endif /* LIS3DH_H */
 /** @} */
diff --git a/drivers/include/lm75a-temp-sensor.h b/drivers/include/lm75a-temp-sensor.h
index 560edca24b..d99452927b 100644
--- a/drivers/include/lm75a-temp-sensor.h
+++ b/drivers/include/lm75a-temp-sensor.h
@@ -24,8 +24,8 @@
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
  */
 
-#ifndef LM75A_H_
-#define LM75A_H_
+#ifndef LM75A_H
+#define LM75A_H
 
 #include <stdint.h>
 #include <math.h>
@@ -275,4 +275,4 @@ void lm75A_set_in_alarm(bool b);
 #endif
 
 /** @} */
-#endif /* LM75A_H_ */
+#endif /* LM75A_H */
diff --git a/drivers/include/mpu9150.h b/drivers/include/mpu9150.h
index c12ee75ce7..2ef93b85f6 100644
--- a/drivers/include/mpu9150.h
+++ b/drivers/include/mpu9150.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef MPU9150_H_
-#define MPU9150_H_
+#ifndef MPU9150_H
+#define MPU9150_H
 
 #include "periph/i2c.h"
 
@@ -336,5 +336,5 @@ int mpu9150_set_compass_sample_rate(mpu9150_t *dev, uint8_t rate);
 }
 #endif
 
-#endif /* MPU9150_H_ */
+#endif /* MPU9150_H */
 /** @} */
diff --git a/drivers/include/net/netdev2/ieee802154.h b/drivers/include/net/netdev2/ieee802154.h
index b94a7f9d54..96bfc0ccca 100644
--- a/drivers/include/net/netdev2/ieee802154.h
+++ b/drivers/include/net/netdev2/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_IEEE802154_H_
-#define NETDEV2_IEEE802154_H_
+#ifndef NETDEV2_IEEE802154_H
+#define NETDEV2_IEEE802154_H
 
 #include "net/ieee802154.h"
 #include "net/gnrc/nettype.h"
@@ -164,5 +164,5 @@ int netdev2_ieee802154_set(netdev2_ieee802154_t *dev, netopt_t opt, void *value,
 }
 #endif
 
-#endif /* NETDEV2_IEEE802154_H_ */
+#endif /* NETDEV2_IEEE802154_H */
 /** @} */
diff --git a/drivers/include/nvram-spi.h b/drivers/include/nvram-spi.h
index 45a8e77c35..c03a163106 100644
--- a/drivers/include/nvram-spi.h
+++ b/drivers/include/nvram-spi.h
@@ -20,8 +20,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef DRIVERS_NVRAM_SPI_H_
-#define DRIVERS_NVRAM_SPI_H_
+#ifndef DRIVERS_NVRAM_SPI_H
+#define DRIVERS_NVRAM_SPI_H
 
 #include <stdint.h>
 #include "nvram.h"
@@ -62,5 +62,5 @@ int nvram_spi_init(nvram_t *dev, nvram_spi_params_t *spi_params, size_t size);
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_SPI_H_ */
+#endif /* DRIVERS_NVRAM_SPI_H */
 /** @} */
diff --git a/drivers/include/nvram.h b/drivers/include/nvram.h
index b2db5cfec4..2ad3d9f135 100644
--- a/drivers/include/nvram.h
+++ b/drivers/include/nvram.h
@@ -24,8 +24,8 @@
  * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
-#ifndef DRIVERS_NVRAM_H_
-#define DRIVERS_NVRAM_H_
+#ifndef DRIVERS_NVRAM_H
+#define DRIVERS_NVRAM_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -83,5 +83,5 @@ typedef struct nvram {
 }
 #endif
 
-#endif /* DRIVERS_NVRAM_H_ */
+#endif /* DRIVERS_NVRAM_H */
 /** @} */
diff --git a/drivers/include/periph/cpuid.h b/drivers/include/periph/cpuid.h
index e673c30bcb..eca8142d67 100644
--- a/drivers/include/periph/cpuid.h
+++ b/drivers/include/periph/cpuid.h
@@ -20,8 +20,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef PERIPH_CPUID_H_
-#define PERIPH_CPUID_H_
+#ifndef PERIPH_CPUID_H
+#define PERIPH_CPUID_H
 
 #include "periph_cpu.h"
 
@@ -51,7 +51,7 @@ void cpuid_get(void *id);
 }
 #endif
 
-#endif /* PERIPH_CPUID_H_ */
+#endif /* PERIPH_CPUID_H */
 /**
  * @}
  */
diff --git a/drivers/include/periph/dev_enums.h b/drivers/include/periph/dev_enums.h
index 3079719a11..0fa4524be6 100644
--- a/drivers/include/periph/dev_enums.h
+++ b/drivers/include/periph/dev_enums.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_COMPAT_H_
-#define PERIPH_COMPAT_H_
+#ifndef PERIPH_COMPAT_H
+#define PERIPH_COMPAT_H
 
 #include "periph_conf.h"
 
@@ -118,5 +118,5 @@ enum {
 }
 #endif
 
-#endif /* PERIPH_COMPAT_H_ */
+#endif /* PERIPH_COMPAT_H */
 /** @} */
diff --git a/drivers/include/periph/pm.h b/drivers/include/periph/pm.h
index ff3f355308..bd6a1e72e3 100644
--- a/drivers/include/periph/pm.h
+++ b/drivers/include/periph/pm.h
@@ -23,8 +23,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PM_H_
-#define PM_H_
+#ifndef PM_H
+#define PM_H
 
 #include "assert.h"
 #include "periph_cpu.h"
@@ -54,5 +54,5 @@ void pm_set_lowest(void);
 }
 #endif
 
-#endif /* __PM_H_ */
+#endif /* __PM_H */
 /** @} */
diff --git a/drivers/include/pn532.h b/drivers/include/pn532.h
index a9c4e80eb8..73dc57dec2 100644
--- a/drivers/include/pn532.h
+++ b/drivers/include/pn532.h
@@ -16,8 +16,8 @@
  * @author  Víctor Ariño <victor.arino@triagnosys.com>
  */
 
-#ifndef NFC_READER_INCLUDE_PN532_H_
-#define NFC_READER_INCLUDE_PN532_H_
+#ifndef NFC_READER_INCLUDE_PN532_H
+#define NFC_READER_INCLUDE_PN532_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -381,5 +381,5 @@ void pn532_release_passive(pn532_t *dev, unsigned target_id);
 }
 #endif
 
-#endif /* NFC_READER_INCLUDE_PN532_H_ */
+#endif /* NFC_READER_INCLUDE_PN532_H */
 /** @} */
diff --git a/drivers/include/sht11.h b/drivers/include/sht11.h
index 82df5e8ea3..ae3b7c4647 100644
--- a/drivers/include/sht11.h
+++ b/drivers/include/sht11.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef SHT11_H_
-#define SHT11_H_
+#ifndef SHT11_H
+#define SHT11_H
 
 /**
  * @defgroup    drivers_sht11   SHT11
diff --git a/drivers/include/si70xx.h b/drivers/include/si70xx.h
index bc281c60bf..0a2eee6803 100644
--- a/drivers/include/si70xx.h
+++ b/drivers/include/si70xx.h
@@ -18,8 +18,8 @@
  * @author      Bas Stottelaar <basstottelaar@gmail.com>
  */
 
-#ifndef SI70XX_H_
-#define SI70XX_H_
+#ifndef SI70XX_H
+#define SI70XX_H
 
 #include "periph/i2c.h"
 
@@ -162,5 +162,5 @@ uint8_t si70xx_get_revision(si70xx_t *dev);
 }
 #endif
 
-#endif /* SI70XX_H_ */
+#endif /* SI70XX_H */
 /** @} */
diff --git a/drivers/include/srf02.h b/drivers/include/srf02.h
index 055f855be4..0456face2f 100644
--- a/drivers/include/srf02.h
+++ b/drivers/include/srf02.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef SRF02_H_
-#define SRF02_H_
+#ifndef SRF02_H
+#define SRF02_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -129,5 +129,5 @@ void srf02_set_addr(srf02_t *dev, uint8_t new_addr);
 }
 #endif
 
-#endif /* SRF02_H_ */
+#endif /* SRF02_H */
 /** @} */
diff --git a/drivers/include/srf08.h b/drivers/include/srf08.h
index 4f41ac64eb..087121c40f 100644
--- a/drivers/include/srf08.h
+++ b/drivers/include/srf08.h
@@ -24,8 +24,8 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
 
-#ifndef SRF08_H_
-#define SRF08_H_
+#ifndef SRF08_H
+#define SRF08_H
 
 #include <stdint.h>
 #include "periph/i2c.h"
@@ -161,4 +161,4 @@ int srf08_get_distances(srf08_t *dev, uint16_t *range_array, int num_echos, srf0
 #endif
 
 /** @} */
-#endif /* SRF08_H_ */
+#endif /* SRF08_H */
diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h
index d0f993dca4..a88398bbc8 100644
--- a/drivers/include/xbee.h
+++ b/drivers/include/xbee.h
@@ -20,8 +20,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef XBEE_H_
-#define XBEE_H_
+#ifndef XBEE_H
+#define XBEE_H
 
 #include <stdint.h>
 
@@ -222,5 +222,5 @@ int xbee_parse_hdr(xbee_t *dev, const uint8_t *xhdr, xbee_l2hdr_t *l2hdr);
 }
 #endif
 
-#endif /* XBEE_H_ */
+#endif /* XBEE_H */
 /** @} */
diff --git a/drivers/io1_xplained/include/io1_xplained_internals.h b/drivers/io1_xplained/include/io1_xplained_internals.h
index e3c929c3bf..3fb6a5ce68 100644
--- a/drivers/io1_xplained/include/io1_xplained_internals.h
+++ b/drivers/io1_xplained/include/io1_xplained_internals.h
@@ -18,8 +18,8 @@
  * @author      Alexandre Abadie <alexandre.abadie@inria.fr>
  */
 
-#ifndef IO1_XPLAINED_INTERNALS_H_
-#define IO1_XPLAINED_INTERNALS_H_
+#ifndef IO1_XPLAINED_INTERNALS_H
+#define IO1_XPLAINED_INTERNALS_H
 
 #include "cpu.h"
 #include "periph_cpu.h"
@@ -56,5 +56,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IO1_XPLAINED_INTERNALS_H_ */
+#endif /* IO1_XPLAINED_INTERNALS_H */
 /** @} */
diff --git a/drivers/jc42/include/jc42_internal.h b/drivers/jc42/include/jc42_internal.h
index dbafae7028..ec46507d27 100644
--- a/drivers/jc42/include/jc42_internal.h
+++ b/drivers/jc42/include/jc42_internal.h
@@ -16,8 +16,8 @@
  * @author      Koen Zandberg <koen@bergzand.net>
  */
 
-#ifndef JC42_INTERNAL_H_
-#define JC42_INTERNAL_H_
+#ifndef JC42_INTERNAL_H
+#define JC42_INTERNAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ extern "C" {
 /** @} */
 
 
-#endif /* JC42_INTERNAL_H_ */
+#endif /* JC42_INTERNAL_H */
diff --git a/drivers/mpu9150/include/mpu9150-regs.h b/drivers/mpu9150/include/mpu9150-regs.h
index 9dd6e59f60..e5ecb8da12 100644
--- a/drivers/mpu9150/include/mpu9150-regs.h
+++ b/drivers/mpu9150/include/mpu9150-regs.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef MPU9150_REGS_H_
-#define MPU9150_REGS_H_
+#ifndef MPU9150_REGS_H
+#define MPU9150_REGS_H
 
 
 #ifdef __cplusplus
@@ -99,5 +99,5 @@
 }
 #endif
 
-#endif /* MPU9150_REGS_H_ */
+#endif /* MPU9150_REGS_H */
 /** @} */
diff --git a/examples/riot_and_cpp/c_functions.h b/examples/riot_and_cpp/c_functions.h
index 068251b339..9d3ee18a8d 100644
--- a/examples/riot_and_cpp/c_functions.h
+++ b/examples/riot_and_cpp/c_functions.h
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 
-#ifndef C_FUNCTIONS_H_
-#define C_FUNCTIONS_H_
+#ifndef C_FUNCTIONS_H
+#define C_FUNCTIONS_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/examples/riot_and_cpp/cpp_class.hpp b/examples/riot_and_cpp/cpp_class.hpp
index 81dc07e385..19f0c075f9 100644
--- a/examples/riot_and_cpp/cpp_class.hpp
+++ b/examples/riot_and_cpp/cpp_class.hpp
@@ -20,8 +20,8 @@
  * @author      DangNhat Pham-Huu <51002279@stu.hcmut.edu.vn>
  */
 
-#ifndef CPP_CLASS_H_
-#define CPP_CLASS_H_
+#ifndef CPP_CLASS_H
+#define CPP_CLASS_H
 
 #include <cstdio>
 
diff --git a/pkg/emb6/include/board_conf.h b/pkg/emb6/include/board_conf.h
index 56c7656188..4cd41308e4 100644
--- a/pkg/emb6/include/board_conf.h
+++ b/pkg/emb6/include/board_conf.h
@@ -18,8 +18,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef EMB6_BOARD_CONF_H_
-#define EMB6_BOARD_CONF_H_
+#ifndef EMB6_BOARD_CONF_H
+#define EMB6_BOARD_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,6 +41,6 @@ uint8_t board_conf(s_ns_t *ps_nStack);
 }
 #endif
 
-#endif /* EMB6_BOARD_CONF_H_ */
+#endif /* EMB6_BOARD_CONF_H */
 /** @} */
 /** @} */
diff --git a/pkg/emb6/include/emb6/conn/udp.h b/pkg/emb6/include/emb6/conn/udp.h
index dc835ca06b..07386f59f8 100644
--- a/pkg/emb6/include/emb6/conn/udp.h
+++ b/pkg/emb6/include/emb6/conn/udp.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef EMB6_CONN_UDP_H_
-#define EMB6_CONN_UDP_H_
+#ifndef EMB6_CONN_UDP_H
+#define EMB6_CONN_UDP_H
 
 #include <stdint.h>
 
@@ -58,5 +58,5 @@ struct conn_udp {
 }
 #endif
 
-#endif /* EMB6_CONN_UDP_H_ */
+#endif /* EMB6_CONN_UDP_H */
 /** @} */
diff --git a/pkg/emb6/include/emb6/netdev2.h b/pkg/emb6/include/emb6/netdev2.h
index 3076603ffc..ca85fd8087 100644
--- a/pkg/emb6/include/emb6/netdev2.h
+++ b/pkg/emb6/include/emb6/netdev2.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef EMB6_NETDEV2_H_
-#define EMB6_NETDEV2_H_
+#ifndef EMB6_NETDEV2_H
+#define EMB6_NETDEV2_H
 
 #include "net/netdev2.h"
 
@@ -52,5 +52,5 @@ int emb6_netdev2_setup(netdev2_t *dev);
 }
 #endif
 
-#endif /* EMB6_NETDEV2_H_ */
+#endif /* EMB6_NETDEV2_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip.h b/pkg/lwip/include/lwip.h
index 999d07bca0..a866c85c5b 100644
--- a/pkg/lwip/include/lwip.h
+++ b/pkg/lwip/include/lwip.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_H_
-#define LWIP_H_
+#ifndef LWIP_H
+#define LWIP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,5 +41,5 @@ void lwip_bootstrap(void);
 }
 #endif
 
-#endif /* LWIP_H_ */
+#endif /* LWIP_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/conn.h b/pkg/lwip/include/lwip/conn.h
index be7bda1cff..4f815cb62d 100644
--- a/pkg/lwip/include/lwip/conn.h
+++ b/pkg/lwip/include/lwip/conn.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_CONN_H_
-#define LWIP_CONN_H_
+#ifndef LWIP_CONN_H
+#define LWIP_CONN_H
 
 #include "lwip/api.h"
 
@@ -89,5 +89,5 @@ int lwip_conn_sendto(struct netconn *netconn, const void *data, size_t len,
 }
 #endif
 
-#endif /* LWIP_CONN_H_ */
+#endif /* LWIP_CONN_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/netif/netdev2.h b/pkg/lwip/include/lwip/netif/netdev2.h
index 93a7db9250..0af5102148 100644
--- a/pkg/lwip/include/lwip/netif/netdev2.h
+++ b/pkg/lwip/include/lwip/netif/netdev2.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_H_
-#define NETDEV2_H_
+#ifndef LWIP_NETDEV2_H
+#define LWIP_NETDEV2_H
 
 #include "net/ethernet.h"
 #include "net/netdev2.h"
@@ -58,5 +58,5 @@ err_t lwip_netdev2_init(struct netif *netif);
 }
 #endif
 
-#endif /* NETDEV2_H_ */
+#endif /* LWIP_NETDEV2_H */
 /** @} */
diff --git a/pkg/lwip/include/lwip/sock_internal.h b/pkg/lwip/include/lwip/sock_internal.h
index a0c0e464c6..1ac5860eec 100644
--- a/pkg/lwip/include/lwip/sock_internal.h
+++ b/pkg/lwip/include/lwip/sock_internal.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_INTERNAL_H_
-#define SOCK_INTERNAL_H_
+#ifndef SOCK_INTERNAL_H
+#define SOCK_INTERNAL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -55,5 +55,5 @@ ssize_t lwip_sock_send(struct netconn **conn, const void *data, size_t len,
 }
 #endif
 
-#endif /* SOCK_INTERNAL_H_ */
+#endif /* SOCK_INTERNAL_H */
 /** @} */
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index 404864eb25..6dedf10f5a 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef LWIP_LWIPOPTS_H_
-#define LWIP_LWIPOPTS_H_
+#ifndef LWIP_LWIPOPTS_H
+#define LWIP_LWIPOPTS_H
 
 #include "thread.h"
 #include "net/gnrc/netif/hdr.h"
@@ -153,5 +153,5 @@ extern "C" {
 }
 #endif
 
-#endif /* LWIP_LWIPOPTS_H_ */
+#endif /* LWIP_LWIPOPTS_H */
 /** @} */
diff --git a/pkg/lwip/include/sock_types.h b/pkg/lwip/include/sock_types.h
index e0d8050116..1dff41acf3 100644
--- a/pkg/lwip/include/sock_types.h
+++ b/pkg/lwip/include/sock_types.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_TYPES_H_
-#define SOCK_TYPES_H_
+#ifndef SOCK_TYPES_H
+#define SOCK_TYPES_H
 
 #include "net/af.h"
 #include "lwip/api.h"
@@ -37,5 +37,5 @@ struct sock_ip {
 }
 #endif
 
-#endif /* SOCK_TYPES_H_ */
+#endif /* SOCK_TYPES_H */
 /** @} */
diff --git a/pkg/nordic_softdevice_ble/src/ble-core.h b/pkg/nordic_softdevice_ble/src/ble-core.h
index 84c181d2ef..cfda2ae349 100644
--- a/pkg/nordic_softdevice_ble/src/ble-core.h
+++ b/pkg/nordic_softdevice_ble/src/ble-core.h
@@ -42,8 +42,8 @@
  * \author
  *         Wojciech Bober <wojciech.bober@nordicsemi.no>
  */
-#ifndef DEV_BLE_H_
-#define DEV_BLE_H_
+#ifndef DEV_BLE_H
+#define DEV_BLE_H
 
 #include <stdint.h>
 
@@ -52,7 +52,7 @@ void ble_advertising_init(const char *name);
 void ble_advertising_start(void);
 void ble_get_mac(uint8_t addr[8]);
 
-#endif /* DEV_BLE_H_ */
+#endif /* DEV_BLE_H */
 
 /**
  * @}
diff --git a/sys/embunit/ColorTextColors.h b/sys/embunit/ColorTextColors.h
index eb057b7004..a6878b49cb 100644
--- a/sys/embunit/ColorTextColors.h
+++ b/sys/embunit/ColorTextColors.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef EMBUNIT_COLORTEXTCOLORS_H_
-#define EMBUNIT_COLORTEXTCOLORS_H_
+#ifndef EMBUNIT_COLORTEXTCOLORS_H
+#define EMBUNIT_COLORTEXTCOLORS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,5 +53,5 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_COLORTEXTCOLORS_H_ */
+#endif/* EMBUNIT_COLORTEXTCOLORS_H */
 /** @} */
diff --git a/sys/include/base64.h b/sys/include/base64.h
index 21caa50a1a..c545cfab5b 100644
--- a/sys/include/base64.h
+++ b/sys/include/base64.h
@@ -17,8 +17,8 @@
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
 
-#ifndef BASE64_ENCODER_DECODER_H_
-#define BASE64_ENCODER_DECODER_H_
+#ifndef BASE64_ENCODER_DECODER_H
+#define BASE64_ENCODER_DECODER_H
 
 #include <stddef.h> /* for size_t */
 
@@ -79,4 +79,4 @@ int base64_decode(unsigned char *base64_in, size_t base64_in_size, \
 #endif
 
 /** @} */
-#endif /* BASE64_ENCODER_DECODER_H_ */
+#endif /* BASE64_ENCODER_DECODER_H */
diff --git a/sys/include/checksum/ucrc16.h b/sys/include/checksum/ucrc16.h
index 5e48e9a081..60c2db524d 100644
--- a/sys/include/checksum/ucrc16.h
+++ b/sys/include/checksum/ucrc16.h
@@ -26,8 +26,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef UCRC16_H_
-#define UCRC16_H_
+#ifndef UCRC16_H
+#define UCRC16_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -78,5 +78,5 @@ uint16_t ucrc16_calc_le(const uint8_t *buf, size_t len, uint16_t poly,
 }
 #endif
 
-#endif /* UCRC16_H_ */
+#endif /* UCRC16_H */
 /** @} */
diff --git a/sys/include/crypto/3des.h b/sys/include/crypto/3des.h
index 13c54dc2b8..1551f9e12b 100644
--- a/sys/include/crypto/3des.h
+++ b/sys/include/crypto/3des.h
@@ -26,8 +26,8 @@
 
 #include "crypto/ciphers.h"
 
-#ifndef THREEDES_H_
-#define THREEDES_H_
+#ifndef THREEDES_H
+#define THREEDES_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -134,4 +134,4 @@ int tripledes_decrypt(const cipher_context_t *context, const uint8_t *crypt, uin
 #endif
 
 /** @} */
-#endif /* THREEDES_H_ */
+#endif /* THREEDES_H */
diff --git a/sys/include/crypto/cbcmode.h b/sys/include/crypto/cbcmode.h
index ecb1efaab0..4a3a80ee13 100644
--- a/sys/include/crypto/cbcmode.h
+++ b/sys/include/crypto/cbcmode.h
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#ifndef CBCMODE_H_
-#define CBCMODE_H_
+#ifndef CBCMODE_H
+#define CBCMODE_H
 
 #include "crypto/ciphers.h"
 
@@ -214,4 +214,4 @@ int block_cipher_mode_decrypt(CipherModeContext *context,
 #endif
 
 /** @} */
-#endif /* CBCMODE_H_ */
+#endif /* CBCMODE_H */
diff --git a/sys/include/crypto/chacha.h b/sys/include/crypto/chacha.h
index 5dd18f5632..120e91171c 100644
--- a/sys/include/crypto/chacha.h
+++ b/sys/include/crypto/chacha.h
@@ -31,8 +31,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef CRYPTO_CHACHA_H_
-#define CRYPTO_CHACHA_H_
+#ifndef CRYPTO_CHACHA_H
+#define CRYPTO_CHACHA_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -137,7 +137,7 @@ uint32_t chacha_prng_next(void);
 }
 #endif
 
-#endif /* ifndef CRYPTO_CHACHA_H_ */
+#endif /* ifndef CRYPTO_CHACHA_H */
 
 /**
  * @}
diff --git a/sys/include/crypto/ciphers.h b/sys/include/crypto/ciphers.h
index a003514ef3..d931b6746b 100644
--- a/sys/include/crypto/ciphers.h
+++ b/sys/include/crypto/ciphers.h
@@ -19,8 +19,8 @@
  * @author      Mark Essien <markessien@gmail.com>
  */
 
-#ifndef CRYPTO_CIPHERS_H_
-#define CRYPTO_CIPHERS_H_
+#ifndef CRYPTO_CIPHERS_H
+#define CRYPTO_CIPHERS_H
 
 #include <stdint.h>
 
@@ -171,4 +171,4 @@ int cipher_get_block_size(const cipher_t* cipher);
 #endif
 
 /** @} */
-#endif /* CRYPTO_CIPHERS_H_ */
+#endif /* CRYPTO_CIPHERS_H */
diff --git a/sys/include/crypto/helper.h b/sys/include/crypto/helper.h
index 5af1551017..054a82d08f 100644
--- a/sys/include/crypto/helper.h
+++ b/sys/include/crypto/helper.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_HELPER_H_
-#define CRYPTO_MODES_HELPER_H_
+#ifndef CRYPTO_MODES_HELPER_H
+#define CRYPTO_MODES_HELPER_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -53,4 +53,4 @@ int crypto_equals(uint8_t *a, uint8_t *b, size_t len);
 }
 #endif
 
-#endif /* CRYPTO_MODES_HELPER_H_ */
+#endif /* CRYPTO_MODES_HELPER_H */
diff --git a/sys/include/crypto/modes/cbc.h b/sys/include/crypto/modes/cbc.h
index 338066fd8a..022bfa20f1 100644
--- a/sys/include/crypto/modes/cbc.h
+++ b/sys/include/crypto/modes/cbc.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CBC_H_
-#define CRYPTO_MODES_CBC_H_
+#ifndef CRYPTO_MODES_CBC_H
+#define CRYPTO_MODES_CBC_H
 
 #include "crypto/ciphers.h"
 
@@ -58,4 +58,4 @@ int cipher_decrypt_cbc(cipher_t* cipher, uint8_t iv[16], uint8_t* input,
 }
 #endif
 
-#endif /* CRYPTO_MODES_CBC_H_ */
+#endif /* CRYPTO_MODES_CBC_H */
diff --git a/sys/include/crypto/modes/ccm.h b/sys/include/crypto/modes/ccm.h
index 6f31704b50..c5cf5e1b6b 100644
--- a/sys/include/crypto/modes/ccm.h
+++ b/sys/include/crypto/modes/ccm.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CCM_H_
-#define CRYPTO_MODES_CCM_H_
+#ifndef CRYPTO_MODES_CCM_H
+#define CRYPTO_MODES_CCM_H
 
 #include "crypto/ciphers.h"
 
@@ -85,4 +85,4 @@ int cipher_decrypt_ccm(cipher_t* cipher, uint8_t* auth_data,
 }
 #endif
 
-#endif /* CRYPTO_MODES_CCM_H_ */
+#endif /* CRYPTO_MODES_CCM_H */
diff --git a/sys/include/crypto/modes/ctr.h b/sys/include/crypto/modes/ctr.h
index e1ce1ad7d1..f3db7af733 100644
--- a/sys/include/crypto/modes/ctr.h
+++ b/sys/include/crypto/modes/ctr.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_CTR_H_
-#define CRYPTO_MODES_CTR_H_
+#ifndef CRYPTO_MODES_CTR_H
+#define CRYPTO_MODES_CTR_H
 
 #include "crypto/ciphers.h"
 
diff --git a/sys/include/crypto/modes/ecb.h b/sys/include/crypto/modes/ecb.h
index 4c0738c6bb..2cb8aa7fc7 100644
--- a/sys/include/crypto/modes/ecb.h
+++ b/sys/include/crypto/modes/ecb.h
@@ -17,8 +17,8 @@
  * @author      Nico von Geyso <nico.geyso@fu-berlin.de>
  */
 
-#ifndef CRYPTO_MODES_ECB_H_
-#define CRYPTO_MODES_ECB_H_
+#ifndef CRYPTO_MODES_ECB_H
+#define CRYPTO_MODES_ECB_H
 
 #include "crypto/ciphers.h"
 
diff --git a/sys/include/embUnit/AssertImpl.h b/sys/include/embUnit/AssertImpl.h
index c82d36523c..5ce4f45c79 100644
--- a/sys/include/embUnit/AssertImpl.h
+++ b/sys/include/embUnit/AssertImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: AssertImpl.h,v 1.6 2003/09/16 11:09:53 arms22 Exp $
  */
-#ifndef EMBUNIT_ASSERTIMPL_H_
-#define EMBUNIT_ASSERTIMPL_H_
+#ifndef EMBUNIT_ASSERTIMPL_H
+#define EMBUNIT_ASSERTIMPL_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ void assertImplementationCStr(const char *expected,const char *actual, long line
 }
 #endif
 
-#endif/* EMBUNIT_ASSERTIMPL_H_ */
+#endif/* EMBUNIT_ASSERTIMPL_H */
diff --git a/sys/include/embUnit/ColorOutputter.h b/sys/include/embUnit/ColorOutputter.h
index b1faed4a61..e2aaadd159 100644
--- a/sys/include/embUnit/ColorOutputter.h
+++ b/sys/include/embUnit/ColorOutputter.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef EMBUNIT_COLOROUTPUTTER_H_
-#define EMBUNIT_COLOROUTPUTTER_H_
+#ifndef EMBUNIT_COLOROUTPUTTER_H
+#define EMBUNIT_COLOROUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -41,5 +41,5 @@ void ColorOutputter_printStatistics(OutputterRef self, TestResultRef result);
 }
 #endif
 
-#endif/* EMBUNIT_COLOROUTPUTTER_H_ */
+#endif/* EMBUNIT_COLOROUTPUTTER_H */
 /** @} */
diff --git a/sys/include/embUnit/ColorTextOutputter.h b/sys/include/embUnit/ColorTextOutputter.h
index ccced25fff..9aebdc83cb 100644
--- a/sys/include/embUnit/ColorTextOutputter.h
+++ b/sys/include/embUnit/ColorTextOutputter.h
@@ -11,8 +11,8 @@
  *
  * @file    ColorTextOutputter.h
  */
-#ifndef EMBUNIT_COLORTEXTOUTPUTTER_H_
-#define EMBUNIT_COLORTEXTOUTPUTTER_H_
+#ifndef EMBUNIT_COLORTEXTOUTPUTTER_H
+#define EMBUNIT_COLORTEXTOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -26,5 +26,5 @@ OutputterRef ColorTextOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_COLORTEXTOUTPUTTER_H_ */
+#endif/* EMBUNIT_COLORTEXTOUTPUTTER_H */
 /** @} */
diff --git a/sys/include/embUnit/CompilerOutputter.h b/sys/include/embUnit/CompilerOutputter.h
index dad11aacca..95612d176d 100644
--- a/sys/include/embUnit/CompilerOutputter.h
+++ b/sys/include/embUnit/CompilerOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: CompilerOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_COMPILEROUTPUTTER_H_
-#define EMBUNIT_COMPILEROUTPUTTER_H_
+#ifndef EMBUNIT_COMPILEROUTPUTTER_H
+#define EMBUNIT_COMPILEROUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef CompilerOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_COMPILEROUTPUTTER_H_ */
+#endif/* EMBUNIT_COMPILEROUTPUTTER_H */
diff --git a/sys/include/embUnit/HelperMacro.h b/sys/include/embUnit/HelperMacro.h
index ef244eeaf3..5e0a5333c2 100644
--- a/sys/include/embUnit/HelperMacro.h
+++ b/sys/include/embUnit/HelperMacro.h
@@ -32,8 +32,8 @@
  *
  * $Id: HelperMacro.h,v 1.3 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_HELPERMACRO_H_
-#define EMBUNIT_HELPERMACRO_H_
+#ifndef EMBUNIT_HELPERMACRO_H
+#define EMBUNIT_HELPERMACRO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_HELPERMACRO_H_ */
+#endif/* EMBUNIT_HELPERMACRO_H */
diff --git a/sys/include/embUnit/Outputter.h b/sys/include/embUnit/Outputter.h
index fe7746ff13..972e7f770d 100644
--- a/sys/include/embUnit/Outputter.h
+++ b/sys/include/embUnit/Outputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: Outputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_OUTPUTTER_H_
-#define EMBUNIT_OUTPUTTER_H_
+#ifndef EMBUNIT_OUTPUTTER_H
+#define EMBUNIT_OUTPUTTER_H
 
 #include <embUnit/embUnit.h>
 
@@ -79,4 +79,4 @@ struct __Outputter {
 }
 #endif
 
-#endif/* EMBUNIT_OUTPUTTER_H_ */
+#endif/* EMBUNIT_OUTPUTTER_H */
diff --git a/sys/include/embUnit/RepeatedTest.h b/sys/include/embUnit/RepeatedTest.h
index b246d81155..345ff2e00b 100644
--- a/sys/include/embUnit/RepeatedTest.h
+++ b/sys/include/embUnit/RepeatedTest.h
@@ -32,8 +32,8 @@
  *
  * $Id: RepeatedTest.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_REPEATEDTEST_H_
-#define EMBUNIT_REPEATEDTEST_H_
+#ifndef EMBUNIT_REPEATEDTEST_H
+#define EMBUNIT_REPEATEDTEST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ extern const TestImplement RepeatedTestImplement;
 }
 #endif
 
-#endif/* EMBUNIT_REPEATEDTEST_H_ */
+#endif/* EMBUNIT_REPEATEDTEST_H */
diff --git a/sys/include/embUnit/Test.h b/sys/include/embUnit/Test.h
index 596d7dfa9b..8475464b5c 100644
--- a/sys/include/embUnit/Test.h
+++ b/sys/include/embUnit/Test.h
@@ -32,8 +32,8 @@
  *
  * $Id: Test.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TEST_H_
-#define EMBUNIT_TEST_H_
+#ifndef EMBUNIT_TEST_H
+#define EMBUNIT_TEST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ struct __Test {
 }
 #endif
 
-#endif/* EMBUNIT_TEST_H_ */
+#endif/* EMBUNIT_TEST_H */
diff --git a/sys/include/embUnit/TestCaller.h b/sys/include/embUnit/TestCaller.h
index f67d50822b..bc103d17f4 100644
--- a/sys/include/embUnit/TestCaller.h
+++ b/sys/include/embUnit/TestCaller.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCaller.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTCALLER_H_
-#define EMBUNIT_TESTCALLER_H_
+#ifndef EMBUNIT_TESTCALLER_H
+#define EMBUNIT_TESTCALLER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ extern const TestImplement TestCallerImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTCALLER_H_ */
+#endif/* EMBUNIT_TESTCALLER_H */
diff --git a/sys/include/embUnit/TestCase.h b/sys/include/embUnit/TestCase.h
index eb65522001..be98e99a4e 100644
--- a/sys/include/embUnit/TestCase.h
+++ b/sys/include/embUnit/TestCase.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCase.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTCASE_H_
-#define EMBUNIT_TESTCASE_H_
+#ifndef EMBUNIT_TESTCASE_H
+#define EMBUNIT_TESTCASE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,4 +65,4 @@ extern const TestImplement TestCaseImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTCASE_H_ */
+#endif/* EMBUNIT_TESTCASE_H */
diff --git a/sys/include/embUnit/TestListener.h b/sys/include/embUnit/TestListener.h
index 7a9879d68f..ffb0fda448 100644
--- a/sys/include/embUnit/TestListener.h
+++ b/sys/include/embUnit/TestListener.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestListener.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTLISTENER_H_
-#define EMBUNIT_TESTLISTENER_H_
+#ifndef EMBUNIT_TESTLISTENER_H
+#define EMBUNIT_TESTLISTENER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ struct __TestListner {
 }
 #endif
 
-#endif/* EMBUNIT_TESTLISTENER_H_ */
+#endif/* EMBUNIT_TESTLISTENER_H */
diff --git a/sys/include/embUnit/TestResult.h b/sys/include/embUnit/TestResult.h
index 5ec20d1dbc..6d7167f60f 100644
--- a/sys/include/embUnit/TestResult.h
+++ b/sys/include/embUnit/TestResult.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestResult.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTRESULT_H_
-#define EMBUNIT_TESTRESULT_H_
+#ifndef EMBUNIT_TESTRESULT_H
+#define EMBUNIT_TESTRESULT_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ void TestResult_addFailure(TestResult* self,Test* test,const char* msg,int line,
 }
 #endif
 
-#endif/* EMBUNIT_TESTRESULT_H_ */
+#endif/* EMBUNIT_TESTRESULT_H */
diff --git a/sys/include/embUnit/TestRunner.h b/sys/include/embUnit/TestRunner.h
index d592c6370d..dfab0a461b 100644
--- a/sys/include/embUnit/TestRunner.h
+++ b/sys/include/embUnit/TestRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestRunner.h,v 1.6 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTRUNNER_H_
-#define EMBUNIT_TESTRUNNER_H_
+#ifndef EMBUNIT_TESTRUNNER_H
+#define EMBUNIT_TESTRUNNER_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -49,4 +49,4 @@ extern int TestRunnerHadErrors;
 }
 #endif
 
-#endif/* EMBUNIT_TESTRUNNER_H_ */
+#endif/* EMBUNIT_TESTRUNNER_H */
diff --git a/sys/include/embUnit/TestSuite.h b/sys/include/embUnit/TestSuite.h
index 788d403cd4..2fc378d64d 100644
--- a/sys/include/embUnit/TestSuite.h
+++ b/sys/include/embUnit/TestSuite.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestSuite.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef EMBUNIT_TESTSUITE_H_
-#define EMBUNIT_TESTSUITE_H_
+#ifndef EMBUNIT_TESTSUITE_H
+#define EMBUNIT_TESTSUITE_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -63,4 +63,4 @@ extern const TestImplement TestSuiteImplement;
 }
 #endif
 
-#endif/* EMBUNIT_TESTSUITE_H_ */
+#endif/* EMBUNIT_TESTSUITE_H */
diff --git a/sys/include/embUnit/TextOutputter.h b/sys/include/embUnit/TextOutputter.h
index 0ee9432851..89a42aa7d7 100644
--- a/sys/include/embUnit/TextOutputter.h
+++ b/sys/include/embUnit/TextOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_TEXTOUTPUTTER_H_
-#define EMBUNIT_TEXTOUTPUTTER_H_
+#ifndef EMBUNIT_TEXTOUTPUTTER_H
+#define EMBUNIT_TEXTOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef TextOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_TEXTOUTPUTTER_H_ */
+#endif/* EMBUNIT_TEXTOUTPUTTER_H */
diff --git a/sys/include/embUnit/TextUIRunner.h b/sys/include/embUnit/TextUIRunner.h
index 7dfc23b513..ea711baac9 100644
--- a/sys/include/embUnit/TextUIRunner.h
+++ b/sys/include/embUnit/TextUIRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextUIRunner.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_TEXTUIRUNNER_H_
-#define EMBUNIT_TEXTUIRUNNER_H_
+#ifndef EMBUNIT_TEXTUIRUNNER_H
+#define EMBUNIT_TEXTUIRUNNER_H
 
 #include "Outputter.h"
 
@@ -53,4 +53,4 @@ void TextUIRunner_end(void);
 }
 #endif
 
-#endif/* EMBUNIT_TEXTUIRUNNER_H_ */
+#endif/* EMBUNIT_TEXTUIRUNNER_H */
diff --git a/sys/include/embUnit/XMLOutputter.h b/sys/include/embUnit/XMLOutputter.h
index 49e31a71fa..af9077c5b1 100644
--- a/sys/include/embUnit/XMLOutputter.h
+++ b/sys/include/embUnit/XMLOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: XMLOutputter.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef EMBUNIT_XMLOUTPUTTER_H_
-#define EMBUNIT_XMLOUTPUTTER_H_
+#ifndef EMBUNIT_XMLOUTPUTTER_H
+#define EMBUNIT_XMLOUTPUTTER_H
 
 #include "Outputter.h"
 
@@ -48,4 +48,4 @@ OutputterRef XMLOutputter_outputter(void);
 }
 #endif
 
-#endif/* EMBUNIT_XMLOUTPUTTER_H_ */
+#endif/* EMBUNIT_XMLOUTPUTTER_H */
diff --git a/sys/include/embUnit/embUnit.h b/sys/include/embUnit/embUnit.h
index 866eb7408d..212da419d5 100644
--- a/sys/include/embUnit/embUnit.h
+++ b/sys/include/embUnit/embUnit.h
@@ -32,8 +32,8 @@
  *
  * $Id: embUnit.h,v 1.4 2004/02/10 16:16:19 arms22 Exp $
  */
-#ifndef EMBUNIT_EMBUNIT_H_
-#define EMBUNIT_EMBUNIT_H_
+#ifndef EMBUNIT_EMBUNIT_H
+#define EMBUNIT_EMBUNIT_H
 
 #include <embUnit/Test.h>
 #include <embUnit/TestCase.h>
@@ -55,4 +55,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_EMBUNIT_H_ */
+#endif/* EMBUNIT_EMBUNIT_H */
diff --git a/sys/include/embUnit/embUnit_config.h b/sys/include/embUnit/embUnit_config.h
index 469a32a2ef..85d6145b70 100644
--- a/sys/include/embUnit/embUnit_config.h
+++ b/sys/include/embUnit/embUnit_config.h
@@ -32,8 +32,8 @@
  *
  * $Id: config.h,v 1.7 2004/02/10 16:17:07 arms22 Exp $
  */
-#ifndef EMBUNIT_CONFIG_H_
-#define EMBUNIT_CONFIG_H_
+#ifndef EMBUNIT_CONFIG_H
+#define EMBUNIT_CONFIG_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ extern "C" {
 }
 #endif
 
-#endif/* EMBUNIT_CONFIG_H_ */
+#endif/* EMBUNIT_CONFIG_H */
diff --git a/sys/include/embUnit/stdImpl.h b/sys/include/embUnit/stdImpl.h
index ac334906fa..88ee57b4f6 100644
--- a/sys/include/embUnit/stdImpl.h
+++ b/sys/include/embUnit/stdImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: stdImpl.h,v 1.4 2004/02/10 16:15:25 arms22 Exp $
  */
-#ifndef EMBUNIT_STDIMPL_H_
-#define EMBUNIT_STDIMPL_H_
+#ifndef EMBUNIT_STDIMPL_H
+#define EMBUNIT_STDIMPL_H
 
 #ifdef  __cplusplus
 extern "C" {
@@ -59,4 +59,4 @@ static inline char* stdimpl_itoa(int v,char *string,int r)
 }
 #endif
 
-#endif/* EMBUNIT_STDIMPL_H_ */
+#endif/* EMBUNIT_STDIMPL_H */
diff --git a/sys/include/fmt.h b/sys/include/fmt.h
index d70591f9c3..e3144c824c 100644
--- a/sys/include/fmt.h
+++ b/sys/include/fmt.h
@@ -19,8 +19,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef FMT_H_
-#define FMT_H_
+#ifndef FMT_H
+#define FMT_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -280,4 +280,4 @@ void print_str(const char* str);
 #endif
 
 /** @} */
-#endif /* FMT_H_ */
+#endif /* FMT_H */
diff --git a/sys/include/hashes.h b/sys/include/hashes.h
index 84ed3413f0..8e33807634 100644
--- a/sys/include/hashes.h
+++ b/sys/include/hashes.h
@@ -17,8 +17,8 @@
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
-#ifndef HASHES_H_
-#define HASHES_H_
+#ifndef HASHES_H
+#define HASHES_H
 
 #include <stddef.h>
 #include <inttypes.h>
@@ -160,4 +160,4 @@ uint32_t one_at_a_time_hash(const uint8_t *buf, size_t len);
 #endif
 
 /** @} */
-#endif /* HASHES_H_ */
+#endif /* HASHES_H */
diff --git a/sys/include/hashes/sha256.h b/sys/include/hashes/sha256.h
index 5368aae2ce..887d028865 100644
--- a/sys/include/hashes/sha256.h
+++ b/sys/include/hashes/sha256.h
@@ -41,8 +41,8 @@
  * @author      Rene Kijewski
  */
 
-#ifndef _SHA256_H_
-#define _SHA256_H_
+#ifndef _SHA256_H
+#define _SHA256_H
 
 #include <inttypes.h>
 
@@ -203,4 +203,4 @@ int sha256_chain_verify_element(void *element,
 #endif
 
 /** @} */
-#endif /* _SHA256_H_ */
+#endif /* _SHA256_H */
diff --git a/sys/include/mineplex.h b/sys/include/mineplex.h
index 4f34d50736..4060ed1a27 100644
--- a/sys/include/mineplex.h
+++ b/sys/include/mineplex.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef MINEPLEX_H_
-#define MINEPLEX_H_
+#ifndef MINEPLEX_H
+#define MINEPLEX_H
 
 #include <stdint.h>
 
@@ -55,5 +55,5 @@ const uint8_t *mineplex_char(char c);
 }
 #endif
 
-#endif /* MINEPLEX_H_ */
+#endif /* MINEPLEX_H */
 /** @} */
diff --git a/sys/include/net/af.h b/sys/include/net/af.h
index ff4017d3cb..3b462b60eb 100644
--- a/sys/include/net/af.h
+++ b/sys/include/net/af.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef AF_H_
-#define AF_H_
+#ifndef AF_H
+#define AF_H
 
 
 
@@ -47,5 +47,5 @@ enum {
 }
 #endif
 
-#endif /* AF_H_ */
+#endif /* AF_H */
 /** @} */
diff --git a/sys/include/net/conn.h b/sys/include/net/conn.h
index 8577d746ca..7ea944f3c0 100644
--- a/sys/include/net/conn.h
+++ b/sys/include/net/conn.h
@@ -73,8 +73,8 @@
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef NET_CONN_H_
-#define NET_CONN_H_
+#ifndef NET_CONN_H
+#define NET_CONN_H
 
 #include "net/conn/ip.h"
 #include "net/conn/tcp.h"
@@ -101,5 +101,5 @@ ipv6_addr_t *conn_find_best_source(const ipv6_addr_t *dst);
 }
 #endif
 
-#endif /* NET_CONN_H_ */
+#endif /* NET_CONN_H */
 /** @} */
diff --git a/sys/include/net/conn/ip.h b/sys/include/net/conn/ip.h
index cdd24395f8..f3cfd697eb 100644
--- a/sys/include/net/conn/ip.h
+++ b/sys/include/net/conn/ip.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_IP_H_
-#define NET_CONN_IP_H_
+#ifndef NET_CONN_IP_H
+#define NET_CONN_IP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -129,5 +129,5 @@ int conn_ip_sendto(const void *data, size_t len, const void *src, size_t src_len
 }
 #endif
 
-#endif /* NET_CONN_IP_H_ */
+#endif /* NET_CONN_IP_H */
 /** @} */
diff --git a/sys/include/net/conn/tcp.h b/sys/include/net/conn/tcp.h
index 7e5a17f6b9..c87e2ce40e 100644
--- a/sys/include/net/conn/tcp.h
+++ b/sys/include/net/conn/tcp.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_TCP_H_
-#define NET_CONN_TCP_H_
+#ifndef NET_CONN_TCP_H
+#define NET_CONN_TCP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -174,5 +174,5 @@ int conn_tcp_send(conn_tcp_t *conn, const void *data, size_t len);
 }
 #endif
 
-#endif /* NET_CONN_TCP_H_ */
+#endif /* NET_CONN_TCP_H */
 /** @} */
diff --git a/sys/include/net/conn/udp.h b/sys/include/net/conn/udp.h
index d1f6102ede..eddaf4b378 100644
--- a/sys/include/net/conn/udp.h
+++ b/sys/include/net/conn/udp.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NET_CONN_UDP_H_
-#define NET_CONN_UDP_H_
+#ifndef NET_CONN_UDP_H
+#define NET_CONN_UDP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -147,5 +147,5 @@ int conn_udp_sendto(const void *data, size_t len, const void *src, size_t src_le
 }
 #endif
 
-#endif /* NET_CONN_UDP4_H_ */
+#endif /* NET_CONN_UDP4_H */
 /** @} */
diff --git a/sys/include/net/csma_sender.h b/sys/include/net/csma_sender.h
index 6faed9db60..981bcb71b5 100644
--- a/sys/include/net/csma_sender.h
+++ b/sys/include/net/csma_sender.h
@@ -22,8 +22,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef CSMA_SENDER_H_
-#define CSMA_SENDER_H_
+#ifndef CSMA_SENDER_H
+#define CSMA_SENDER_H
 
 #include <stdint.h>
 
@@ -140,6 +140,6 @@ int csma_sender_cca_send(netdev2_t *dev, struct iovec *vector, unsigned count);
 }
 #endif
 
-#endif /* CSMA_SENDER_H_ */
+#endif /* CSMA_SENDER_H */
 
 /** @} */
diff --git a/sys/include/net/ethernet.h b/sys/include/net/ethernet.h
index d3914984ff..a7dde2f642 100644
--- a/sys/include/net/ethernet.h
+++ b/sys/include/net/ethernet.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef ETHERNET_H_
-#define ETHERNET_H_
+#ifndef ETHERNET_H
+#define ETHERNET_H
 
 #include <stdint.h>
 
@@ -74,7 +74,7 @@ static inline void ethernet_get_iid(eui64_t *eui64, uint8_t *mac)
 }
 #endif
 
-#endif /* ETHERNET_H_ */
+#endif /* ETHERNET_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethernet/hdr.h b/sys/include/net/ethernet/hdr.h
index ec39186ad1..f0716643d3 100644
--- a/sys/include/net/ethernet/hdr.h
+++ b/sys/include/net/ethernet/hdr.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef ETHERNET_HDR_H_
-#define ETHERNET_HDR_H_
+#ifndef ETHERNET_HDR_H
+#define ETHERNET_HDR_H
 
 #include <inttypes.h>
 
@@ -51,7 +51,7 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* ETHERNET_HDR_H_ */
+#endif /* ETHERNET_HDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ethertype.h b/sys/include/net/ethertype.h
index 1f823f7899..297c48a504 100644
--- a/sys/include/net/ethertype.h
+++ b/sys/include/net/ethertype.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef ETHERTYPE_H_
-#define ETHERTYPE_H_
+#ifndef ETHERTYPE_H
+#define ETHERTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,7 +42,7 @@ extern "C" {
 }
 #endif
 
-#endif /* ETHERTYPE_H_ */
+#endif /* ETHERTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/eui64.h b/sys/include/net/eui64.h
index 5a68c8692e..d4900b0301 100644
--- a/sys/include/net/eui64.h
+++ b/sys/include/net/eui64.h
@@ -21,8 +21,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef EUI64_H_
-#define EUI64_H_
+#ifndef EUI64_H
+#define EUI64_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -44,5 +44,5 @@ typedef union {
 }
 #endif
 
-#endif /* EUI64_H_ */
+#endif /* EUI64_H */
 /** @} */
diff --git a/sys/include/net/fib.h b/sys/include/net/fib.h
index d5c19181c2..7d19002b9d 100644
--- a/sys/include/net/fib.h
+++ b/sys/include/net/fib.h
@@ -22,8 +22,8 @@
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
 
-#ifndef FIB_H_
-#define FIB_H_
+#ifndef FIB_H
+#define FIB_H
 
 #include <stdint.h>
 
@@ -513,5 +513,5 @@ int fib_devel_get_lifetime(fib_table_t *table, uint64_t *lifetime, uint8_t *dst,
 }
 #endif
 
-#endif /* FIB_H_ */
+#endif /* FIB_H */
 /** @} */
diff --git a/sys/include/net/fib/table.h b/sys/include/net/fib/table.h
index 02f0f86c6b..124c4724b8 100644
--- a/sys/include/net/fib/table.h
+++ b/sys/include/net/fib/table.h
@@ -16,8 +16,8 @@
  * @author      Martin Landsmann <martin.landsmann@haw-hamburg.de>
  */
 
-#ifndef FIB_TABLE_H_
-#define FIB_TABLE_H_
+#ifndef FIB_TABLE_H
+#define FIB_TABLE_H
 
 #include <stdint.h>
 
@@ -139,5 +139,5 @@ typedef struct {
 }
 #endif
 
-#endif /* FIB_TABLE_H_ */
+#endif /* FIB_TABLE_H */
 /** @} */
diff --git a/sys/include/net/gnrc.h b/sys/include/net/gnrc.h
index 80c041e305..f055d44783 100644
--- a/sys/include/net/gnrc.h
+++ b/sys/include/net/gnrc.h
@@ -280,8 +280,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETBASE_H_
-#define GNRC_NETBASE_H_
+#ifndef GNRC_NETBASE_H
+#define GNRC_NETBASE_H
 
 #include "net/netopt.h"
 #include "net/gnrc/netdev.h"
@@ -303,5 +303,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_NETBASE_H_ */
+#endif /* GNRC_NETBASE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/coap.h b/sys/include/net/gnrc/coap.h
index b7785424f3..b45d5ab511 100644
--- a/sys/include/net/gnrc/coap.h
+++ b/sys/include/net/gnrc/coap.h
@@ -132,8 +132,8 @@
  * @author      Ken Bannister <kb2ma@runbox.com>
  */
 
-#ifndef GCOAP_H_
-#define GCOAP_H_
+#ifndef GCOAP_H
+#define GCOAP_H
 
 #include "net/gnrc.h"
 #include "net/gnrc/ipv6.h"
@@ -384,5 +384,5 @@ void gcoap_op_state(uint8_t *open_reqs);
 }
 #endif
 
-#endif /* GCOAP_H_ */
+#endif /* GCOAP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/conn.h b/sys/include/net/gnrc/conn.h
index ad0d2100ff..013efddeac 100644
--- a/sys/include/net/gnrc/conn.h
+++ b/sys/include/net/gnrc/conn.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_CONN_H_
-#define GNRC_CONN_H_
+#ifndef GNRC_CONN_H
+#define GNRC_CONN_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -127,5 +127,5 @@ int gnrc_conn_recvfrom(conn_t *conn, void *data, size_t max_len, void *addr, siz
 }
 #endif
 
-#endif /* GNRC_CONN_H_ */
+#endif /* GNRC_CONN_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6.h b/sys/include/net/gnrc/icmpv6.h
index f780189804..deccdb4d81 100644
--- a/sys/include/net/gnrc/icmpv6.h
+++ b/sys/include/net/gnrc/icmpv6.h
@@ -24,8 +24,8 @@
  * @todo build error messages
  */
 
-#ifndef GNRC_ICMPV6_H_
-#define GNRC_ICMPV6_H_
+#ifndef GNRC_ICMPV6_H
+#define GNRC_ICMPV6_H
 
 #include "kernel_types.h"
 #include "net/icmpv6.h"
@@ -79,7 +79,7 @@ int gnrc_icmpv6_calc_csum(gnrc_pktsnip_t *hdr, gnrc_pktsnip_t *pseudo_hdr);
 }
 #endif
 
-#endif /* GNRC_ICMPV6_H_ */
+#endif /* GNRC_ICMPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/icmpv6/echo.h b/sys/include/net/gnrc/icmpv6/echo.h
index 91279f93f9..9a3066adf2 100644
--- a/sys/include/net/gnrc/icmpv6/echo.h
+++ b/sys/include/net/gnrc/icmpv6/echo.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_ICMPV6_ECHO_H_
-#define GNRC_ICMPV6_ECHO_H_
+#ifndef GNRC_ICMPV6_ECHO_H
+#define GNRC_ICMPV6_ECHO_H
 
 #include <inttypes.h>
 
@@ -62,5 +62,5 @@ void gnrc_icmpv6_echo_req_handle(kernel_pid_t iface, ipv6_hdr_t *ipv6_hdr,
 }
 #endif
 
-#endif /* GNRC_ICMPV6_ECHO_H_ */
+#endif /* GNRC_ICMPV6_ECHO_H */
 /** @} */
diff --git a/sys/include/net/gnrc/icmpv6/error.h b/sys/include/net/gnrc/icmpv6/error.h
index 74b868b345..f02e1a0afd 100644
--- a/sys/include/net/gnrc/icmpv6/error.h
+++ b/sys/include/net/gnrc/icmpv6/error.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_ICMPV6_ERROR_H_
-#define GNRC_ICMPV6_ERROR_H_
+#ifndef GNRC_ICMPV6_ERROR_H
+#define GNRC_ICMPV6_ERROR_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -165,5 +165,5 @@ static inline void gnrc_icmpv6_error_param_prob_send(uint8_t code, void *ptr,
 }
 #endif
 
-#endif /* GNRC_ICMPV6_ERROR_H_ */
+#endif /* GNRC_ICMPV6_ERROR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h
index 39d56387cb..d688b4ec05 100644
--- a/sys/include/net/gnrc/ipv6.h
+++ b/sys/include/net/gnrc/ipv6.h
@@ -26,8 +26,8 @@
  */
 
 
-#ifndef GNRC_IPV6_H_
-#define GNRC_IPV6_H_
+#ifndef GNRC_IPV6_H
+#define GNRC_IPV6_H
 
 #include "kernel_types.h"
 #include "net/gnrc.h"
@@ -151,7 +151,7 @@ ipv6_hdr_t *gnrc_ipv6_get_header(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_IPV6_H_ */
+#endif /* GNRC_IPV6_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/blacklist.h b/sys/include/net/gnrc/ipv6/blacklist.h
index 8a954d06c4..e536dc6e30 100644
--- a/sys/include/net/gnrc/ipv6/blacklist.h
+++ b/sys/include/net/gnrc/ipv6/blacklist.h
@@ -19,8 +19,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Martin Landsmann <martin.landsmann@haw-hamburg.de>
  */
-#ifndef GNRC_IPV6_BLACKLIST_H_
-#define GNRC_IPV6_BLACKLIST_H_
+#ifndef GNRC_IPV6_BLACKLIST_H
+#define GNRC_IPV6_BLACKLIST_H
 
 #include <stdbool.h>
 
@@ -75,5 +75,5 @@ void gnrc_ipv6_blacklist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_BLACKLIST_H_ */
+#endif /* GNRC_IPV6_BLACKLIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/ext.h b/sys/include/net/gnrc/ipv6/ext.h
index a7bcdf5396..995dbe25b6 100644
--- a/sys/include/net/gnrc/ipv6/ext.h
+++ b/sys/include/net/gnrc/ipv6/ext.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef GNRC_IPV6_EXT_H_
-#define GNRC_IPV6_EXT_H_
+#ifndef GNRC_IPV6_EXT_H
+#define GNRC_IPV6_EXT_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -81,7 +81,7 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_build(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *next,
 }
 #endif
 
-#endif /* GNRC_IPV6_EXT_H_ */
+#endif /* GNRC_IPV6_EXT_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/hdr.h b/sys/include/net/gnrc/ipv6/hdr.h
index 6828e2f416..aab108d9d5 100644
--- a/sys/include/net/gnrc/ipv6/hdr.h
+++ b/sys/include/net/gnrc/ipv6/hdr.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_IPV6_HDR_H_
-#define GNRC_IPV6_HDR_H_
+#ifndef GNRC_IPV6_HDR_H
+#define GNRC_IPV6_HDR_H
 
 #include <stdint.h>
 
@@ -50,5 +50,5 @@ gnrc_pktsnip_t *gnrc_ipv6_hdr_build(gnrc_pktsnip_t *payload, const ipv6_addr_t *
 }
 #endif
 
-#endif /* GNRC_IPV6_HDR_H_ */
+#endif /* GNRC_IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ipv6/nc.h b/sys/include/net/gnrc/ipv6/nc.h
index babc73822f..c197428c65 100644
--- a/sys/include/net/gnrc/ipv6/nc.h
+++ b/sys/include/net/gnrc/ipv6/nc.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_IPV6_NC_H_
-#define GNRC_IPV6_NC_H_
+#ifndef GNRC_IPV6_NC_H
+#define GNRC_IPV6_NC_H
 
 #include <assert.h>
 #include <stdbool.h>
@@ -313,7 +313,7 @@ kernel_pid_t gnrc_ipv6_nc_get_l2_addr(uint8_t *l2_addr, uint8_t *l2_addr_len,
 }
 #endif
 
-#endif /* GNRC_IPV6_NC_H_ */
+#endif /* GNRC_IPV6_NC_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/netif.h b/sys/include/net/gnrc/ipv6/netif.h
index 4de109421e..f3a913c355 100644
--- a/sys/include/net/gnrc/ipv6/netif.h
+++ b/sys/include/net/gnrc/ipv6/netif.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_IPV6_NETIF_H_
-#define GNRC_IPV6_NETIF_H_
+#ifndef GNRC_IPV6_NETIF_H
+#define GNRC_IPV6_NETIF_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -607,7 +607,7 @@ netstats_t *gnrc_ipv6_netif_get_stats(kernel_pid_t pid);
 }
 #endif
 
-#endif /* NETIF_H_ */
+#endif /* NETIF_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ipv6/whitelist.h b/sys/include/net/gnrc/ipv6/whitelist.h
index 50b4e3cb78..9977dafc38 100644
--- a/sys/include/net/gnrc/ipv6/whitelist.h
+++ b/sys/include/net/gnrc/ipv6/whitelist.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_IPV6_WHITELIST_H_
-#define GNRC_IPV6_WHITELIST_H_
+#ifndef GNRC_IPV6_WHITELIST_H
+#define GNRC_IPV6_WHITELIST_H
 
 #include <stdbool.h>
 
@@ -73,5 +73,5 @@ void gnrc_ipv6_whitelist_print(void);
 }
 #endif
 
-#endif /* GNRC_IPV6_WHITELIST_H_ */
+#endif /* GNRC_IPV6_WHITELIST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/internal.h b/sys/include/net/gnrc/mac/internal.h
index 0c09e333da..19300ad265 100644
--- a/sys/include/net/gnrc/mac/internal.h
+++ b/sys/include/net/gnrc/mac/internal.h
@@ -18,8 +18,8 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_MAC_INTERNAL_H_
-#define GNRC_MAC_INTERNAL_H_
+#ifndef GNRC_MAC_INTERNAL_H
+#define GNRC_MAC_INTERNAL_H
 
 #include <stdint.h>
 #include <net/ieee802154.h>
@@ -76,5 +76,5 @@ void gnrc_mac_dispatch(gnrc_mac_rx_t* rx);
 }
 #endif
 
-#endif /* GNRC_MAC_INTERNAL_H_ */
+#endif /* GNRC_MAC_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
index 47b5c29070..fd860ecee1 100644
--- a/sys/include/net/gnrc/mac/types.h
+++ b/sys/include/net/gnrc/mac/types.h
@@ -18,8 +18,8 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#ifndef GNRC_MAC_TYPES_H_
-#define GNRC_MAC_TYPES_H_
+#ifndef GNRC_MAC_TYPES_H
+#define GNRC_MAC_TYPES_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -186,5 +186,5 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_MAC_TYPES_H_ */
+#endif /* GNRC_MAC_TYPES_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp.h b/sys/include/net/gnrc/ndp.h
index e939d708ca..425a360063 100644
--- a/sys/include/net/gnrc/ndp.h
+++ b/sys/include/net/gnrc/ndp.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_NDP_H_
-#define GNRC_NDP_H_
+#ifndef GNRC_NDP_H
+#define GNRC_NDP_H
 
 #include <inttypes.h>
 #include <stdlib.h>
@@ -557,7 +557,7 @@ gnrc_pktsnip_t *gnrc_ndp_opt_mtu_build(uint32_t mtu, gnrc_pktsnip_t *next);
 }
 #endif
 
-#endif /* GNRC_NDP_H_ */
+#endif /* GNRC_NDP_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/ndp/host.h b/sys/include/net/gnrc/ndp/host.h
index 0fc2edf8e9..d073f488c8 100644
--- a/sys/include/net/gnrc/ndp/host.h
+++ b/sys/include/net/gnrc/ndp/host.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_HOST_H_
-#define GNRC_NDP_HOST_H_
+#ifndef GNRC_NDP_HOST_H
+#define GNRC_NDP_HOST_H
 
 #include "net/gnrc/ipv6/netif.h"
 
@@ -50,5 +50,5 @@ void gnrc_ndp_host_retrans_rtr_sol(gnrc_ipv6_netif_t *iface);
 }
 #endif
 
-#endif /* GNRC_NDP_HOST_H_ */
+#endif /* GNRC_NDP_HOST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/internal.h b/sys/include/net/gnrc/ndp/internal.h
index 91177f6265..ad97670780 100644
--- a/sys/include/net/gnrc/ndp/internal.h
+++ b/sys/include/net/gnrc/ndp/internal.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_INTERNAL_H_
-#define GNRC_NDP_INTERNAL_H_
+#ifndef GNRC_NDP_INTERNAL_H
+#define GNRC_NDP_INTERNAL_H
 
 #include "kernel_types.h"
 #include "net/gnrc/ipv6/nc.h"
@@ -211,5 +211,5 @@ static inline void gnrc_ndp_internal_reset_nbr_sol_timer(gnrc_ipv6_nc_t *nc_entr
 }
 #endif
 
-#endif /* GNRC_NDP_INTERNAL_H_ */
+#endif /* GNRC_NDP_INTERNAL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/node.h b/sys/include/net/gnrc/ndp/node.h
index 60999cdbd7..a5f4ae1e1e 100644
--- a/sys/include/net/gnrc/ndp/node.h
+++ b/sys/include/net/gnrc/ndp/node.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_NODE_H_
-#define GNRC_NDP_NODE_H_
+#ifndef GNRC_NDP_NODE_H
+#define GNRC_NDP_NODE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,5 +49,5 @@ kernel_pid_t gnrc_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
 }
 #endif
 
-#endif /* GNRC_NDP_NODE_H_ */
+#endif /* GNRC_NDP_NODE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/ndp/router.h b/sys/include/net/gnrc/ndp/router.h
index d82c9705fb..9658d5876f 100644
--- a/sys/include/net/gnrc/ndp/router.h
+++ b/sys/include/net/gnrc/ndp/router.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NDP_ROUTER_H_
-#define GNRC_NDP_ROUTER_H_
+#ifndef GNRC_NDP_ROUTER_H
+#define GNRC_NDP_ROUTER_H
 
 #include <stdbool.h>
 
@@ -84,5 +84,5 @@ void gnrc_ndp_router_send_rtr_adv(gnrc_ipv6_nc_t *neighbor);
 }
 #endif
 
-#endif /* GNRC_NDP_ROUTER_H_ */
+#endif /* GNRC_NDP_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netapi.h b/sys/include/net/gnrc/netapi.h
index 25dc2a41dd..15b3a136c3 100644
--- a/sys/include/net/gnrc/netapi.h
+++ b/sys/include/net/gnrc/netapi.h
@@ -55,8 +55,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETAPI_H_
-#define GNRC_NETAPI_H_
+#ifndef GNRC_NETAPI_H
+#define GNRC_NETAPI_H
 
 #include "thread.h"
 #include "net/netopt.h"
@@ -210,7 +210,7 @@ int gnrc_netapi_set(kernel_pid_t pid, netopt_t opt, uint16_t context,
 }
 #endif
 
-#endif /* GNRC_NETAPI_H_ */
+#endif /* GNRC_NETAPI_H */
 /**
  * @}^
  */
diff --git a/sys/include/net/gnrc/netdev.h b/sys/include/net/gnrc/netdev.h
index 08e2aa3968..fb8aac313f 100644
--- a/sys/include/net/gnrc/netdev.h
+++ b/sys/include/net/gnrc/netdev.h
@@ -24,8 +24,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETDEV_H_
-#define GNRC_NETDEV_H_
+#ifndef GNRC_NETDEV_H
+#define GNRC_NETDEV_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -189,5 +189,5 @@ struct gnrc_netdev {
 }
 #endif
 
-#endif /* GNRC_NETDEV_H_ */
+#endif /* GNRC_NETDEV_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev2/ieee802154.h b/sys/include/net/gnrc/netdev2/ieee802154.h
index c9acf9405b..b55b266957 100644
--- a/sys/include/net/gnrc/netdev2/ieee802154.h
+++ b/sys/include/net/gnrc/netdev2/ieee802154.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETDEV2_IEEE802154_H_
-#define GNRC_NETDEV2_IEEE802154_H_
+#ifndef GNRC_NETDEV2_IEEE802154_H
+#define GNRC_NETDEV2_IEEE802154_H
 
 #include "net/netdev2/ieee802154.h"
 #include "net/gnrc/netdev2.h"
@@ -42,5 +42,5 @@ int gnrc_netdev2_ieee802154_init(gnrc_netdev2_t *gnrc_netdev2,
 }
 #endif
 
-#endif /* GNRC_IEEE802154_H_ */
+#endif /* GNRC_IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netdev2/xbee_adpt.h b/sys/include/net/gnrc/netdev2/xbee_adpt.h
index 68106c4e97..d1f254fab3 100644
--- a/sys/include/net/gnrc/netdev2/xbee_adpt.h
+++ b/sys/include/net/gnrc/netdev2/xbee_adpt.h
@@ -25,8 +25,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NETDEV2_XBEE_ADPT_H_
-#define GNRC_NETDEV2_XBEE_ADPT_H_
+#ifndef GNRC_NETDEV2_XBEE_ADPT_H
+#define GNRC_NETDEV2_XBEE_ADPT_H
 
 #include "xbee.h"
 #include "net/gnrc/netdev2.h"
@@ -48,5 +48,5 @@ void gnrc_netdev2_xbee_init(gnrc_netdev2_t *gnrc_netdev2, xbee_t *dev);
 }
 #endif
 
-#endif /* GNRC_NETDEV2_XBEE_ADPT_H_ */
+#endif /* GNRC_NETDEV2_XBEE_ADPT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/neterr.h b/sys/include/net/gnrc/neterr.h
index 19d1c41ceb..838ddc7577 100644
--- a/sys/include/net/gnrc/neterr.h
+++ b/sys/include/net/gnrc/neterr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETERR_H_
-#define GNRC_NETERR_H_
+#ifndef GNRC_NETERR_H
+#define GNRC_NETERR_H
 
 #include <errno.h>
 #include <stdint.h>
@@ -89,5 +89,5 @@ static inline int gnrc_neterr_reg(gnrc_pktsnip_t *pkt)
 }
 #endif
 
-#endif /* GNRC_NETERR_H_ */
+#endif /* GNRC_NETERR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif.h b/sys/include/net/gnrc/netif.h
index 176b63170e..f033aa2d9a 100644
--- a/sys/include/net/gnrc/netif.h
+++ b/sys/include/net/gnrc/netif.h
@@ -22,8 +22,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef GNRC_NETIF_H_
-#define GNRC_NETIF_H_
+#ifndef GNRC_NETIF_H
+#define GNRC_NETIF_H
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -142,5 +142,5 @@ size_t gnrc_netif_addr_from_str(uint8_t *out, size_t out_len, const char *str);
 }
 #endif
 
-#endif /* GNRC_NETIF_H_ */
+#endif /* GNRC_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netif/hdr.h b/sys/include/net/gnrc/netif/hdr.h
index bcb93ad038..425278d71d 100644
--- a/sys/include/net/gnrc/netif/hdr.h
+++ b/sys/include/net/gnrc/netif/hdr.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef NETIF_HDR_H_
-#define NETIF_HDR_H_
+#ifndef NETIF_HDR_H
+#define NETIF_HDR_H
 
 #include <string.h>
 #include <stdint.h>
@@ -234,5 +234,5 @@ int gnrc_netif_hdr_get_srcaddr(gnrc_pktsnip_t* pkt, uint8_t** pointer_to_addr);
 }
 #endif
 
-#endif /* NETIF_HDR_H_ */
+#endif /* NETIF_HDR_H */
 /** @} */
diff --git a/sys/include/net/gnrc/netreg.h b/sys/include/net/gnrc/netreg.h
index e078a51d9c..0e506683ed 100644
--- a/sys/include/net/gnrc/netreg.h
+++ b/sys/include/net/gnrc/netreg.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETREG_H_
-#define NETREG_H_
+#ifndef NETREG_H
+#define NETREG_H
 
 #include <inttypes.h>
 
@@ -340,5 +340,5 @@ int gnrc_netreg_calc_csum(gnrc_pktsnip_t *hdr, gnrc_pktsnip_t *pseudo_hdr);
 }
 #endif
 
-#endif /* NETREG_H_ */
+#endif /* NETREG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettest.h b/sys/include/net/gnrc/nettest.h
index 6b7e9fddb3..5c1446c7eb 100644
--- a/sys/include/net/gnrc/nettest.h
+++ b/sys/include/net/gnrc/nettest.h
@@ -18,8 +18,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETTEST_H_
-#define GNRC_NETTEST_H_
+#ifndef GNRC_NETTEST_H
+#define GNRC_NETTEST_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -264,5 +264,5 @@ void gnrc_nettest_reset(void);
 }
 #endif
 
-#endif /* GNRC_NETTEST_H_ */
+#endif /* GNRC_NETTEST_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nettype.h b/sys/include/net/gnrc/nettype.h
index ea52551f4c..6bc8777b9d 100644
--- a/sys/include/net/gnrc/nettype.h
+++ b/sys/include/net/gnrc/nettype.h
@@ -22,8 +22,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_NETTYPE_H_
-#define GNRC_NETTYPE_H_
+#ifndef GNRC_NETTYPE_H
+#define GNRC_NETTYPE_H
 
 #include <inttypes.h>
 
@@ -245,5 +245,5 @@ static inline uint8_t gnrc_nettype_to_protnum(gnrc_nettype_t type)
 }
 #endif
 
-#endif /* GNRC_NETTYPE_H_ */
+#endif /* GNRC_NETTYPE_H */
 /** @} */
diff --git a/sys/include/net/gnrc/nomac.h b/sys/include/net/gnrc/nomac.h
index dcbefda65f..343433a17d 100644
--- a/sys/include/net/gnrc/nomac.h
+++ b/sys/include/net/gnrc/nomac.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_NOMAC_H_
-#define GNRC_NOMAC_H_
+#ifndef GNRC_NOMAC_H
+#define GNRC_NOMAC_H
 
 #include "net/gnrc/netdev.h"
 
@@ -58,5 +58,5 @@ kernel_pid_t gnrc_nomac_init(char *stack, int stacksize, char priority,
 }
 #endif
 
-#endif /* __NOMAC_H_ */
+#endif /* __NOMAC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pkt.h b/sys/include/net/gnrc/pkt.h
index b068ca3b00..e6756bbc4b 100644
--- a/sys/include/net/gnrc/pkt.h
+++ b/sys/include/net/gnrc/pkt.h
@@ -19,8 +19,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
-#ifndef GNRC_PKT_H_
-#define GNRC_PKT_H_
+#ifndef GNRC_PKT_H
+#define GNRC_PKT_H
 
 #include <inttypes.h>
 #include <stdlib.h>
@@ -196,5 +196,5 @@ gnrc_pktsnip_t *gnrc_pktsnip_search_type(gnrc_pktsnip_t *pkt,
 }
 #endif
 
-#endif /* GNRC_PKT_H_ */
+#endif /* GNRC_PKT_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktbuf.h b/sys/include/net/gnrc/pktbuf.h
index af21f4a087..5939f17df8 100644
--- a/sys/include/net/gnrc/pktbuf.h
+++ b/sys/include/net/gnrc/pktbuf.h
@@ -27,8 +27,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
-#ifndef GNRC_PKTBUF_H_
-#define GNRC_PKTBUF_H_
+#ifndef GNRC_PKTBUF_H
+#define GNRC_PKTBUF_H
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -310,5 +310,5 @@ bool gnrc_pktbuf_is_sane(void);
 }
 #endif
 
-#endif /* GNRC_PKTBUF_H_ */
+#endif /* GNRC_PKTBUF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h
index 63d095a50f..0afdaf079d 100644
--- a/sys/include/net/gnrc/pktdump.h
+++ b/sys/include/net/gnrc/pktdump.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_PKTDUMP_H_
-#define GNRC_PKTDUMP_H_
+#ifndef GNRC_PKTDUMP_H
+#define GNRC_PKTDUMP_H
 
 #include "kernel_types.h"
 
@@ -66,5 +66,5 @@ kernel_pid_t gnrc_pktdump_init(void);
 }
 #endif
 
-#endif /* GNRC_PKTDUMP_H_ */
+#endif /* GNRC_PKTDUMP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/pktqueue.h b/sys/include/net/gnrc/pktqueue.h
index e13c7c70d9..8826032391 100644
--- a/sys/include/net/gnrc/pktqueue.h
+++ b/sys/include/net/gnrc/pktqueue.h
@@ -18,8 +18,8 @@
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef GNRC_PKTQUEUE_H_
-#define GNRC_PKTQUEUE_H_
+#ifndef GNRC_PKTQUEUE_H
+#define GNRC_PKTQUEUE_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -84,7 +84,7 @@ static inline gnrc_pktqueue_t *gnrc_pktqueue_remove_head(gnrc_pktqueue_t **queue
 }
 #endif
 
-#endif /* GNRC_PKTQUEUE_H_ */
+#endif /* GNRC_PKTQUEUE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h
index 997e194fdc..f2647f0c97 100644
--- a/sys/include/net/gnrc/rpl.h
+++ b/sys/include/net/gnrc/rpl.h
@@ -95,8 +95,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_H_
-#define GNRC_RPL_H_
+#ifndef GNRC_RPL_H
+#define GNRC_RPL_H
 
 #include <string.h>
 #include <stdint.h>
@@ -634,5 +634,5 @@ static inline void gnrc_rpl_config_pio(gnrc_rpl_dodag_t *dodag, bool status)
 }
 #endif
 
-#endif /* GNRC_RPL_H_ */
+#endif /* GNRC_RPL_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/dodag.h b/sys/include/net/gnrc/rpl/dodag.h
index 95ed66d5b3..9bc181481d 100644
--- a/sys/include/net/gnrc/rpl/dodag.h
+++ b/sys/include/net/gnrc/rpl/dodag.h
@@ -20,8 +20,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_DODAG_H_
-#define GNRC_RPL_DODAG_H_
+#ifndef GNRC_RPL_DODAG_H
+#define GNRC_RPL_DODAG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -173,7 +173,7 @@ void gnrc_rpl_router_operation(gnrc_rpl_dodag_t *dodag);
 }
 #endif
 
-#endif /* GNRC_RPL_DODAG_H_ */
+#endif /* GNRC_RPL_DODAG_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/p2p.h b/sys/include/net/gnrc/rpl/p2p.h
index c1e0819b20..e8f9f51884 100644
--- a/sys/include/net/gnrc/rpl/p2p.h
+++ b/sys/include/net/gnrc/rpl/p2p.h
@@ -20,8 +20,8 @@
  *
  * @author  Cenk Gündoğan <mail@cgundogan.de>
  */
-#ifndef GNRC_RPL_P2P_H_
-#define GNRC_RPL_P2P_H_
+#ifndef GNRC_RPL_P2P_H
+#define GNRC_RPL_P2P_H
 
 #include "net/ipv6/addr.h"
 #include "net/gnrc.h"
@@ -176,5 +176,5 @@ void gnrc_rpl_p2p_update(void);
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_H_ */
+#endif /* GNRC_RPL_P2P_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/p2p_dodag.h b/sys/include/net/gnrc/rpl/p2p_dodag.h
index 466c7b71a9..cc285b01ae 100644
--- a/sys/include/net/gnrc/rpl/p2p_dodag.h
+++ b/sys/include/net/gnrc/rpl/p2p_dodag.h
@@ -18,8 +18,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_P2P_DODAG_H_
-#define GNRC_RPL_P2P_DODAG_H_
+#ifndef GNRC_RPL_P2P_DODAG_H
+#define GNRC_RPL_P2P_DODAG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,7 +68,7 @@ gnrc_rpl_p2p_ext_t *gnrc_rpl_p2p_ext_get(gnrc_rpl_dodag_t *dodag);
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_DODAG_H_ */
+#endif /* GNRC_RPL_P2P_DODAG_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/p2p_structs.h b/sys/include/net/gnrc/rpl/p2p_structs.h
index 69602baf45..39c87e5be5 100644
--- a/sys/include/net/gnrc/rpl/p2p_structs.h
+++ b/sys/include/net/gnrc/rpl/p2p_structs.h
@@ -18,8 +18,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_P2P_STRUCTS_H_
-#define GNRC_RPL_P2P_STRUCTS_H_
+#ifndef GNRC_RPL_P2P_STRUCTS_H
+#define GNRC_RPL_P2P_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,7 +100,7 @@ typedef struct {
 }
 #endif
 
-#endif /* GNRC_RPL_P2P_STRUCTS_H_ */
+#endif /* GNRC_RPL_P2P_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/rpl/srh.h b/sys/include/net/gnrc/rpl/srh.h
index 8ed747a385..e8cdf79e49 100644
--- a/sys/include/net/gnrc/rpl/srh.h
+++ b/sys/include/net/gnrc/rpl/srh.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_RPL_SRH_H_
-#define GNRC_RPL_SRH_H_
+#ifndef GNRC_RPL_SRH_H
+#define GNRC_RPL_SRH_H
 
 #include "net/ipv6/hdr.h"
 #include "net/ipv6/addr.h"
@@ -70,5 +70,5 @@ int gnrc_rpl_srh_process(ipv6_hdr_t *ipv6, gnrc_rpl_srh_t *rh);
 }
 #endif
 
-#endif /* GNRC_RPL_SRH_H_ */
+#endif /* GNRC_RPL_SRH_H */
 /** @} */
diff --git a/sys/include/net/gnrc/rpl/structs.h b/sys/include/net/gnrc/rpl/structs.h
index 06f7bd6c24..d61ceeea61 100644
--- a/sys/include/net/gnrc/rpl/structs.h
+++ b/sys/include/net/gnrc/rpl/structs.h
@@ -20,8 +20,8 @@
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef GNRC_RPL_STRUCTS_H_
-#define GNRC_RPL_STRUCTS_H_
+#ifndef GNRC_RPL_STRUCTS_H
+#define GNRC_RPL_STRUCTS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -280,7 +280,7 @@ struct gnrc_rpl_instance {
 }
 #endif
 
-#endif /* GNRC_RPL_STRUCTS_H_ */
+#endif /* GNRC_RPL_STRUCTS_H */
 /**
  * @}
  */
diff --git a/sys/include/net/gnrc/sixlowpan.h b/sys/include/net/gnrc/sixlowpan.h
index 6f76c2698e..a0e564a7b5 100644
--- a/sys/include/net/gnrc/sixlowpan.h
+++ b/sys/include/net/gnrc/sixlowpan.h
@@ -97,8 +97,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_H_
-#define GNRC_SIXLOWPAN_H_
+#ifndef GNRC_SIXLOWPAN_H
+#define GNRC_SIXLOWPAN_H
 
 #include <stdbool.h>
 
@@ -150,5 +150,5 @@ kernel_pid_t gnrc_sixlowpan_init(void);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_H_ */
+#endif /* GNRC_SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/ctx.h b/sys/include/net/gnrc/sixlowpan/ctx.h
index 6d5aa86216..ae4d9ff9f8 100644
--- a/sys/include/net/gnrc/sixlowpan/ctx.h
+++ b/sys/include/net/gnrc/sixlowpan/ctx.h
@@ -23,8 +23,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_CTX_H_
-#define GNRC_SIXLOWPAN_CTX_H_
+#ifndef GNRC_SIXLOWPAN_CTX_H
+#define GNRC_SIXLOWPAN_CTX_H
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -136,5 +136,5 @@ void gnrc_sixlowpan_ctx_reset(void);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_CTX_H_ */
+#endif /* GNRC_SIXLOWPAN_CTX_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/frag.h b/sys/include/net/gnrc/sixlowpan/frag.h
index 47bc406063..53a62c3c4f 100644
--- a/sys/include/net/gnrc/sixlowpan/frag.h
+++ b/sys/include/net/gnrc/sixlowpan/frag.h
@@ -22,8 +22,8 @@
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  * @author  Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  */
-#ifndef GNRC_SIXLOWPAN_FRAG_H_
-#define GNRC_SIXLOWPAN_FRAG_H_
+#ifndef GNRC_SIXLOWPAN_FRAG_H
+#define GNRC_SIXLOWPAN_FRAG_H
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -72,5 +72,5 @@ void gnrc_sixlowpan_frag_handle_pkt(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_FRAG_H_ */
+#endif /* GNRC_SIXLOWPAN_FRAG_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/iphc.h b/sys/include/net/gnrc/sixlowpan/iphc.h
index 4d6bcd0dd8..14dcbb9fb0 100644
--- a/sys/include/net/gnrc/sixlowpan/iphc.h
+++ b/sys/include/net/gnrc/sixlowpan/iphc.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_IPHC_H_
-#define GNRC_SIXLOWPAN_IPHC_H_
+#ifndef GNRC_SIXLOWPAN_IPHC_H
+#define GNRC_SIXLOWPAN_IPHC_H
 
 #include <stdbool.h>
 
@@ -64,5 +64,5 @@ bool gnrc_sixlowpan_iphc_encode(gnrc_pktsnip_t *pkt);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_IPHC_H_ */
+#endif /* GNRC_SIXLOWPAN_IPHC_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd.h b/sys/include/net/gnrc/sixlowpan/nd.h
index 91fac57ec2..14eece0958 100644
--- a/sys/include/net/gnrc/sixlowpan/nd.h
+++ b/sys/include/net/gnrc/sixlowpan/nd.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_ND_H_
-#define GNRC_SIXLOWPAN_ND_H_
+#ifndef GNRC_SIXLOWPAN_ND_H
+#define GNRC_SIXLOWPAN_ND_H
 
 #include <stdint.h>
 
@@ -282,5 +282,5 @@ gnrc_pktsnip_t *gnrc_sixlowpan_nd_opt_abr_build(uint32_t version, uint16_t ltime
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_ND_H_ */
+#endif /* GNRC_SIXLOWPAN_ND_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd/border_router.h b/sys/include/net/gnrc/sixlowpan/nd/border_router.h
index 73e95b6630..f461626dcd 100644
--- a/sys/include/net/gnrc/sixlowpan/nd/border_router.h
+++ b/sys/include/net/gnrc/sixlowpan/nd/border_router.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_BORDER_ROUTER_H_
-#define GNRC_SIXLOWPAN_BORDER_ROUTER_H_
+#ifndef GNRC_SIXLOWPAN_BORDER_ROUTER_H
+#define GNRC_SIXLOWPAN_BORDER_ROUTER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_BORDER_ROUTER_H_ */
+#endif /* GNRC_SIXLOWPAN_BORDER_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/nd/router.h b/sys/include/net/gnrc/sixlowpan/nd/router.h
index 551f732abd..99114c03ff 100644
--- a/sys/include/net/gnrc/sixlowpan/nd/router.h
+++ b/sys/include/net/gnrc/sixlowpan/nd/router.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_ND_ROUTER_H_
-#define GNRC_SIXLOWPAN_ND_ROUTER_H_
+#ifndef GNRC_SIXLOWPAN_ND_ROUTER_H
+#define GNRC_SIXLOWPAN_ND_ROUTER_H
 
 #include <stdbool.h>
 
@@ -222,5 +222,5 @@ void gnrc_sixlowpan_nd_router_abr_rem_ctx(gnrc_sixlowpan_nd_router_abr_t *abr, u
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_ND_ROUTER_H_ */
+#endif /* GNRC_SIXLOWPAN_ND_ROUTER_H */
 /** @} */
diff --git a/sys/include/net/gnrc/sixlowpan/netif.h b/sys/include/net/gnrc/sixlowpan/netif.h
index 13589d1c07..855eb20edc 100644
--- a/sys/include/net/gnrc/sixlowpan/netif.h
+++ b/sys/include/net/gnrc/sixlowpan/netif.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_NETIF_H_
-#define GNRC_SIXLOWPAN_NETIF_H_
+#ifndef GNRC_SIXLOWPAN_NETIF_H
+#define GNRC_SIXLOWPAN_NETIF_H
 
 #include <stdbool.h>
 
@@ -73,5 +73,5 @@ gnrc_sixlowpan_netif_t *gnrc_sixlowpan_netif_get(kernel_pid_t pid);
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_NETIF_H_ */
+#endif /* GNRC_SIXLOWPAN_NETIF_H */
 /** @} */
diff --git a/sys/include/net/gnrc/slip.h b/sys/include/net/gnrc/slip.h
index f21244befe..85e2558604 100644
--- a/sys/include/net/gnrc/slip.h
+++ b/sys/include/net/gnrc/slip.h
@@ -21,8 +21,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_SLIP_H_
-#define GNRC_SLIP_H_
+#ifndef GNRC_SLIP_H
+#define GNRC_SLIP_H
 
 #include <inttypes.h>
 
@@ -88,5 +88,5 @@ kernel_pid_t gnrc_slip_init(gnrc_slip_dev_t *dev, uart_t uart, uint32_t baudrate
 }
 #endif
 
-#endif /* __SLIP_H_ */
+#endif /* __SLIP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/tftp.h b/sys/include/net/gnrc/tftp.h
index 9b724bbc3a..48475c4145 100644
--- a/sys/include/net/gnrc/tftp.h
+++ b/sys/include/net/gnrc/tftp.h
@@ -32,8 +32,8 @@
  * @author      Nick van IJzendoorn <nijzendoorn@engineering-spirit.nl>
  */
 
-#ifndef GNRC_TFTP_H_
-#define GNRC_TFTP_H_
+#ifndef GNRC_TFTP_H
+#define GNRC_TFTP_H
 
 #include <inttypes.h>
 
@@ -199,7 +199,7 @@ int gnrc_tftp_client_write(ipv6_addr_t *addr, const char *file_name, tftp_mode_t
 }
 #endif
 
-#endif /* GNRC_TFTP_H_ */
+#endif /* GNRC_TFTP_H */
 
 /**
  * @}
diff --git a/sys/include/net/gnrc/udp.h b/sys/include/net/gnrc/udp.h
index cc8b921fb0..b9e1ec3c31 100644
--- a/sys/include/net/gnrc/udp.h
+++ b/sys/include/net/gnrc/udp.h
@@ -19,8 +19,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef GNRC_UDP_H_
-#define GNRC_UDP_H_
+#ifndef GNRC_UDP_H
+#define GNRC_UDP_H
 
 #include <stdint.h>
 
@@ -92,5 +92,5 @@ int gnrc_udp_init(void);
 }
 #endif
 
-#endif /* GNRC_UDP_H_ */
+#endif /* GNRC_UDP_H */
 /** @} */
diff --git a/sys/include/net/gnrc/zep.h b/sys/include/net/gnrc/zep.h
index 9e0e55b97c..6317d26c29 100644
--- a/sys/include/net/gnrc/zep.h
+++ b/sys/include/net/gnrc/zep.h
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef GNRC_ZEP_H_
-#define GNRC_ZEP_H_
+#ifndef GNRC_ZEP_H
+#define GNRC_ZEP_H
 
 #include <inttypes.h>
 
@@ -236,7 +236,7 @@ kernel_pid_t gnrc_zep_init(gnrc_zep_t *dev, uint16_t src_port, ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* GNRC_ZEP_H_ */
+#endif /* GNRC_ZEP_H */
 /**
  * @}
  */
diff --git a/sys/include/net/iana/portrange.h b/sys/include/net/iana/portrange.h
index 2ea7acdc33..bc421634ce 100644
--- a/sys/include/net/iana/portrange.h
+++ b/sys/include/net/iana/portrange.h
@@ -17,8 +17,8 @@
  *
  * @author  smlng <s@mlng.net>,
  */
-#ifndef IANA_H_
-#define IANA_H_
+#ifndef IANA_H
+#define IANA_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,5 +43,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IANA_H_ */
+#endif /* IANA_H */
 /** @} */
diff --git a/sys/include/net/icmp.h b/sys/include/net/icmp.h
index 533225e31d..ccdf2a96c8 100644
--- a/sys/include/net/icmp.h
+++ b/sys/include/net/icmp.h
@@ -20,8 +20,8 @@
  *
  * @author  José Ignacio Alamos <jialamos@uc.cl>
  */
-#ifndef ICMP_H_
-#define ICMP_H_
+#ifndef ICMP_H
+#define ICMP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* ICMP_H_ */
+#endif /* ICMP_H */
 /** @} */
diff --git a/sys/include/net/icmpv6.h b/sys/include/net/icmpv6.h
index 256bf04c4f..19342af92a 100644
--- a/sys/include/net/icmpv6.h
+++ b/sys/include/net/icmpv6.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef ICMPV6_H_
-#define ICMPV6_H_
+#ifndef ICMPV6_H
+#define ICMPV6_H
 
 #include <stdint.h>
 
@@ -221,5 +221,5 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* ICMPV6_H_ */
+#endif /* ICMPV6_H */
 /** @} */
diff --git a/sys/include/net/ieee802154.h b/sys/include/net/ieee802154.h
index ff169fb21e..0aa61e2b3e 100644
--- a/sys/include/net/ieee802154.h
+++ b/sys/include/net/ieee802154.h
@@ -18,8 +18,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef IEEE802154_H_
-#define IEEE802154_H_
+#ifndef IEEE802154_H
+#define IEEE802154_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -298,5 +298,5 @@ static inline eui64_t *ieee802154_get_iid(eui64_t *eui64, const uint8_t *addr,
 }
 #endif
 
-#endif /* IEEE802154_H_ */
+#endif /* IEEE802154_H */
 /** @} */
diff --git a/sys/include/net/inet_csum.h b/sys/include/net/inet_csum.h
index 6356e96998..1d24ea75fd 100644
--- a/sys/include/net/inet_csum.h
+++ b/sys/include/net/inet_csum.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef INET_CSUM_H_
-#define INET_CSUM_H_
+#ifndef INET_CSUM_H
+#define INET_CSUM_H
 
 #include <inttypes.h>
 #include <stddef.h>
@@ -77,5 +77,5 @@ static inline uint16_t inet_csum(uint16_t sum, const uint8_t *buf, uint16_t len)
 }
 #endif
 
-#endif /* INET_CSUM_H_ */
+#endif /* INET_CSUM_H */
 /** @} */
diff --git a/sys/include/net/ipv4.h b/sys/include/net/ipv4.h
index 4632e484e7..ccca570dde 100644
--- a/sys/include/net/ipv4.h
+++ b/sys/include/net/ipv4.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV4_H_
-#define IPV4_H_
+#ifndef IPV4_H
+#define IPV4_H
 
 #include "net/ipv4/addr.h"
 
@@ -31,5 +31,5 @@ extern "C" {
 }
 #endif
 
-#endif /* IPV4_H_ */
+#endif /* IPV4_H */
 /** @} */
diff --git a/sys/include/net/ipv4/addr.h b/sys/include/net/ipv4/addr.h
index 6122284730..0f99f9df0d 100644
--- a/sys/include/net/ipv4/addr.h
+++ b/sys/include/net/ipv4/addr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV4_ADDR_H_
-#define IPV4_ADDR_H_
+#ifndef IPV4_ADDR_H
+#define IPV4_ADDR_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -87,5 +87,5 @@ ipv4_addr_t *ipv4_addr_from_str(ipv4_addr_t *result, const char *addr);
 }
 #endif
 
-#endif /* IPV4_ADDR_H_ */
+#endif /* IPV4_ADDR_H */
 /** @} */
diff --git a/sys/include/net/ipv6.h b/sys/include/net/ipv6.h
index aa5a4d56b1..f5a68a8f10 100644
--- a/sys/include/net/ipv6.h
+++ b/sys/include/net/ipv6.h
@@ -21,8 +21,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_H_
-#define IPV6_H_
+#ifndef IPV6_H
+#define IPV6_H
 
 #include "net/ipv6/addr.h"
 #include "net/ipv6/ext.h"
@@ -46,5 +46,5 @@ extern "C" {
 #endif
 
 
-#endif /* IPV6_H_ */
+#endif /* IPV6_H */
 /** @} */
diff --git a/sys/include/net/ipv6/addr.h b/sys/include/net/ipv6/addr.h
index a46d27f98e..89ecb4d70b 100644
--- a/sys/include/net/ipv6/addr.h
+++ b/sys/include/net/ipv6/addr.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef IPV6_ADDR_H_
-#define IPV6_ADDR_H_
+#ifndef IPV6_ADDR_H
+#define IPV6_ADDR_H
 
 #include <stdbool.h>
 #include <string.h>
@@ -780,7 +780,7 @@ void ipv6_addr_print(const ipv6_addr_t *addr);
 }
 #endif
 
-#endif /* IPV6_ADDR_H_ */
+#endif /* IPV6_ADDR_H */
 /**
  * @}
  */
diff --git a/sys/include/net/ipv6/ext.h b/sys/include/net/ipv6/ext.h
index 0f4ab66dd2..6b842c59cc 100644
--- a/sys/include/net/ipv6/ext.h
+++ b/sys/include/net/ipv6/ext.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_EXT_H_
-#define IPV6_EXT_H_
+#ifndef IPV6_EXT_H
+#define IPV6_EXT_H
 
 #include <stdint.h>
 
@@ -60,5 +60,5 @@ static inline ipv6_ext_t *ipv6_ext_get_next(ipv6_ext_t *ext)
 }
 #endif
 
-#endif /* IPV6_EXT_H_ */
+#endif /* IPV6_EXT_H */
 /** @} */
diff --git a/sys/include/net/ipv6/ext/rh.h b/sys/include/net/ipv6/ext/rh.h
index b26b97cc4f..a02c4752fd 100644
--- a/sys/include/net/ipv6/ext/rh.h
+++ b/sys/include/net/ipv6/ext/rh.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_EXT_RH_H_
-#define IPV6_EXT_RH_H_
+#ifndef IPV6_EXT_RH_H
+#define IPV6_EXT_RH_H
 
 #include <stdint.h>
 
@@ -73,5 +73,5 @@ int ipv6_ext_rh_process(ipv6_hdr_t *ipv6, ipv6_ext_rh_t *ext);
 }
 #endif
 
-#endif /* IPV6_EXT_RH_H_ */
+#endif /* IPV6_EXT_RH_H */
 /** @} */
diff --git a/sys/include/net/ipv6/hdr.h b/sys/include/net/ipv6/hdr.h
index 265dd9c71e..e607c06127 100644
--- a/sys/include/net/ipv6/hdr.h
+++ b/sys/include/net/ipv6/hdr.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef IPV6_HDR_H_
-#define IPV6_HDR_H_
+#ifndef IPV6_HDR_H
+#define IPV6_HDR_H
 
 #include <stdint.h>
 
@@ -308,5 +308,5 @@ void ipv6_hdr_print(ipv6_hdr_t *hdr);
 }
 #endif
 
-#endif /* IPV6_HDR_H_ */
+#endif /* IPV6_HDR_H */
 /** @} */
diff --git a/sys/include/net/ndp.h b/sys/include/net/ndp.h
index ed9f124101..d3a04fbae3 100644
--- a/sys/include/net/ndp.h
+++ b/sys/include/net/ndp.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NDP_H_
-#define NDP_H_
+#ifndef NDP_H
+#define NDP_H
 
 #include <stdint.h>
 
@@ -291,5 +291,5 @@ typedef struct __attribute__((packed)) {
 }
 #endif
 
-#endif /* NDP_H_ */
+#endif /* NDP_H */
 /** @} */
diff --git a/sys/include/net/netdev2_test.h b/sys/include/net/netdev2_test.h
index 8af455ad71..9e3c751b77 100644
--- a/sys/include/net/netdev2_test.h
+++ b/sys/include/net/netdev2_test.h
@@ -76,8 +76,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef NETDEV2_TEST_H_
-#define NETDEV2_TEST_H_
+#ifndef NETDEV2_TEST_H
+#define NETDEV2_TEST_H
 
 #include "mutex.h"
 
@@ -302,5 +302,5 @@ void netdev2_test_reset(netdev2_test_t *dev);
 }
 #endif
 
-#endif /* NETDEV2_TEST_H_ */
+#endif /* NETDEV2_TEST_H */
 /** @} */
diff --git a/sys/include/net/netopt.h b/sys/include/net/netopt.h
index d9a02b1060..9ef932f756 100644
--- a/sys/include/net/netopt.h
+++ b/sys/include/net/netopt.h
@@ -22,8 +22,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NETOPT_H_
-#define NETOPT_H_
+#ifndef NETOPT_H
+#define NETOPT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -303,5 +303,5 @@ const char *netopt2str(netopt_t opt);
 }
 #endif
 
-#endif /* NETOPT_H_ */
+#endif /* NETOPT_H */
 /** @} */
diff --git a/sys/include/net/ntp_packet.h b/sys/include/net/ntp_packet.h
index c9e84b18e3..3484d54f64 100644
--- a/sys/include/net/ntp_packet.h
+++ b/sys/include/net/ntp_packet.h
@@ -19,8 +19,8 @@
  * @author      Martine Lenders <m.lenders@fu-berlin.de>
  */
 
-#ifndef NTP_PACKET_H_
-#define NTP_PACKET_H_
+#ifndef NTP_PACKET_H
+#define NTP_PACKET_H
 
 #include <stdint.h>
 #include "byteorder.h"
@@ -163,5 +163,5 @@ static inline ntp_mode_t ntp_packet_get_mode(ntp_packet_t *packet)
 }
 #endif
 
-#endif /* NTP_PACKET_H_ */
+#endif /* NTP_PACKET_H */
 /** @} */
diff --git a/sys/include/net/ppp/hdr.h b/sys/include/net/ppp/hdr.h
index 4e22e0c157..b4b2996617 100644
--- a/sys/include/net/ppp/hdr.h
+++ b/sys/include/net/ppp/hdr.h
@@ -18,8 +18,8 @@
  * @author  José Ignacio Alamos
  */
 
-#ifndef PPP_HDR_H_
-#define PPP_HDR_H_
+#ifndef PPP_HDR_H
+#define PPP_HDR_H
 
 #include <inttypes.h>
 
@@ -63,5 +63,5 @@ typedef struct __attribute__((packed)){
 }
 #endif
 
-#endif /* PPP_HDR_H_ */
+#endif /* PPP_HDR_H */
 /** @} */
diff --git a/sys/include/net/ppptype.h b/sys/include/net/ppptype.h
index c2d14085a1..69d23c51fa 100644
--- a/sys/include/net/ppptype.h
+++ b/sys/include/net/ppptype.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef PPPTYPE_H_
-#define PPPTYPE_H_
+#ifndef PPPTYPE_H
+#define PPPTYPE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +44,7 @@ extern "C" {
 }
 #endif
 
-#endif /* PPPTYPE_H_ */
+#endif /* PPPTYPE_H */
 /**
  * @}
  */
diff --git a/sys/include/net/protnum.h b/sys/include/net/protnum.h
index b1d00281f6..1db38342e4 100644
--- a/sys/include/net/protnum.h
+++ b/sys/include/net/protnum.h
@@ -23,8 +23,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef PROTNUM_H_
-#define PROTNUM_H_
+#ifndef PROTNUM_H
+#define PROTNUM_H
 
 
 #ifdef __cplusplus
@@ -182,5 +182,5 @@ extern "C" {
 }
 #endif
 
-#endif /* PROTNUM_H_ */
+#endif /* PROTNUM_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan.h b/sys/include/net/sixlowpan.h
index eb9bdac4ea..de9c54f432 100644
--- a/sys/include/net/sixlowpan.h
+++ b/sys/include/net/sixlowpan.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SIXLOWPAN_H_
-#define SIXLOWPAN_H_
+#ifndef SIXLOWPAN_H
+#define SIXLOWPAN_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -261,5 +261,5 @@ void sixlowpan_print(uint8_t *data, size_t size);
 }
 #endif
 
-#endif /* SIXLOWPAN_H_ */
+#endif /* SIXLOWPAN_H */
 /** @} */
diff --git a/sys/include/net/sixlowpan/nd.h b/sys/include/net/sixlowpan/nd.h
index ef8e91d39e..30a05fb180 100644
--- a/sys/include/net/sixlowpan/nd.h
+++ b/sys/include/net/sixlowpan/nd.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SIXLOWPAN_ND_H_
-#define SIXLOWPAN_ND_H_
+#ifndef SIXLOWPAN_ND_H
+#define SIXLOWPAN_ND_H
 
 #include <stdint.h>
 
@@ -227,5 +227,5 @@ static inline void sixlowpan_nd_opt_6ctx_set_cid(sixlowpan_nd_opt_6ctx_t *ctx_op
 }
 #endif
 
-#endif /* SIXLOWPAN_ND_H_ */
+#endif /* SIXLOWPAN_ND_H */
 /** @} */
diff --git a/sys/include/net/sntp.h b/sys/include/net/sntp.h
index 7390438fcc..23594a75a7 100644
--- a/sys/include/net/sntp.h
+++ b/sys/include/net/sntp.h
@@ -19,8 +19,8 @@
  * @author      Martine Lenders <m.lenders@fu-berlin.de>
  */
 
-#ifndef SNTP_H_
-#define SNTP_H_
+#ifndef SNTP_H
+#define SNTP_H
 
 #include <stdint.h>
 #include "net/sock/udp.h"
@@ -51,5 +51,5 @@ int64_t sntp_get_offset(void);
 }
 #endif
 
-#endif /* SNTP_H_ */
+#endif /* SNTP_H */
 /** @} */
diff --git a/sys/include/net/sock.h b/sys/include/net/sock.h
index c1b8949c5a..dee7d009e7 100644
--- a/sys/include/net/sock.h
+++ b/sys/include/net/sock.h
@@ -98,8 +98,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef NET_SOCK_H_
-#define NET_SOCK_H_
+#ifndef NET_SOCK_H
+#define NET_SOCK_H
 
 #include <stdint.h>
 
@@ -231,5 +231,5 @@ struct _sock_tl_ep {
 }
 #endif
 
-#endif /* NET_SOCK_H_ */
+#endif /* NET_SOCK_H */
 /** @} */
diff --git a/sys/include/net/sock/ip.h b/sys/include/net/sock/ip.h
index 4b8d166f6a..4ef4cf7053 100644
--- a/sys/include/net/sock/ip.h
+++ b/sys/include/net/sock/ip.h
@@ -265,8 +265,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_IP_H_
-#define NET_SOCK_IP_H_
+#ifndef NET_SOCK_IP_H
+#define NET_SOCK_IP_H
 
 #include <assert.h>
 #include <stdint.h>
@@ -454,5 +454,5 @@ ssize_t sock_ip_send(sock_ip_t *sock, const void *data, size_t len,
 }
 #endif
 
-#endif /* NET_SOCK_IP_H_ */
+#endif /* NET_SOCK_IP_H */
 /** @} */
diff --git a/sys/include/net/sock/tcp.h b/sys/include/net/sock/tcp.h
index a1151d2c53..29f3e32301 100644
--- a/sys/include/net/sock/tcp.h
+++ b/sys/include/net/sock/tcp.h
@@ -296,8 +296,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_TCP_H_
-#define NET_SOCK_TCP_H_
+#ifndef NET_SOCK_TCP_H
+#define NET_SOCK_TCP_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -534,5 +534,5 @@ ssize_t sock_tcp_write(sock_tcp_t *sock, const void *data, size_t len);
 }
 #endif
 
-#endif /* NET_SOCK_TCP_H_ */
+#endif /* NET_SOCK_TCP_H */
 /** @} */
diff --git a/sys/include/net/sock/udp.h b/sys/include/net/sock/udp.h
index bea58f3e18..bd37fb351c 100644
--- a/sys/include/net/sock/udp.h
+++ b/sys/include/net/sock/udp.h
@@ -265,8 +265,8 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef NET_SOCK_UDP_H_
-#define NET_SOCK_UDP_H_
+#ifndef NET_SOCK_UDP_H
+#define NET_SOCK_UDP_H
 
 #include <assert.h>
 #include <stdint.h>
@@ -439,5 +439,5 @@ ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,
 }
 #endif
 
-#endif /* NET_SOCK_UDP_H_ */
+#endif /* NET_SOCK_UDP_H */
 /** @} */
diff --git a/sys/include/net/udp.h b/sys/include/net/udp.h
index 836dd2d747..8d3b5cd082 100644
--- a/sys/include/net/udp.h
+++ b/sys/include/net/udp.h
@@ -20,8 +20,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef UDP_H_
-#define UDP_H_
+#ifndef UDP_H
+#define UDP_H
 
 #include "byteorder.h"
 
@@ -50,5 +50,5 @@ void udp_hdr_print(udp_hdr_t *hdr);
 }
 #endif
 
-#endif /* UDP_H_ */
+#endif /* UDP_H */
 /** @} */
diff --git a/sys/include/pm_layered.h b/sys/include/pm_layered.h
index 85db1ea020..e97c9e7c9e 100644
--- a/sys/include/pm_layered.h
+++ b/sys/include/pm_layered.h
@@ -30,8 +30,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef PM_LAYERED_H_
-#define PM_LAYERED_H_
+#ifndef PM_LAYERED_H
+#define PM_LAYERED_H
 
 #include "assert.h"
 #include "periph/pm.h"
@@ -71,5 +71,5 @@ void pm_set(unsigned mode);
 }
 #endif
 
-#endif /* __PM_LAYERED_H_ */
+#endif /* __PM_LAYERED_H */
 /** @} */
diff --git a/sys/include/universal_address.h b/sys/include/universal_address.h
index 05ff005ba8..1228ea6225 100644
--- a/sys/include/universal_address.h
+++ b/sys/include/universal_address.h
@@ -18,8 +18,8 @@
  * @author      Martin Landsmann
  */
 
-#ifndef UNIVERSAL_ADDRESS_H_
-#define UNIVERSAL_ADDRESS_H_
+#ifndef UNIVERSAL_ADDRESS_H
+#define UNIVERSAL_ADDRESS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -171,5 +171,5 @@ void universal_address_print_table(void);
 }
 #endif
 
-#endif /* UNIVERSAL_ADDRESS_H_ */
+#endif /* UNIVERSAL_ADDRESS_H */
 /** @} */
diff --git a/sys/include/xtimer/implementation.h b/sys/include/xtimer/implementation.h
index 62fc0ffb22..54d8a02493 100644
--- a/sys/include/xtimer/implementation.h
+++ b/sys/include/xtimer/implementation.h
@@ -16,8 +16,8 @@
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
-#ifndef XTIMER_IMPLEMENTATION_H_
-#define XTIMER_IMPLEMENTATION_H_
+#ifndef XTIMER_IMPLEMENTATION_H
+#define XTIMER_IMPLEMENTATION_H
 
 #ifndef XTIMER_H
 #error "Do not include this file directly! Use xtimer.h instead"
diff --git a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
index e95c576f54..c93bf58e5d 100644
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.h
@@ -16,8 +16,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SIXLOWPAN_FRAG_RBUF_H_
-#define GNRC_SIXLOWPAN_FRAG_RBUF_H_
+#ifndef GNRC_SIXLOWPAN_FRAG_RBUF_H
+#define GNRC_SIXLOWPAN_FRAG_RBUF_H
 
 #include <inttypes.h>
 
@@ -104,5 +104,5 @@ void rbuf_add(gnrc_netif_hdr_t *netif_hdr, gnrc_pktsnip_t *frag,
 }
 #endif
 
-#endif /* GNRC_SIXLOWPAN_FRAG_RBUF_H_ */
+#endif /* GNRC_SIXLOWPAN_FRAG_RBUF_H */
 /** @} */
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
index 2d9077dba6..c2fc9c3f1e 100644
--- a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
+++ b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/netstats.h
@@ -16,8 +16,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef RPL_NETSTATS_H_
-#define RPL_NETSTATS_H_
+#ifndef RPL_NETSTATS_H
+#define RPL_NETSTATS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -187,5 +187,5 @@ static inline void gnrc_rpl_netstats_tx_DAO_ACK(netstats_rpl_t *netstats, size_t
 }
 #endif
 
-#endif /* RPL_NETSTATS_H_ */
+#endif /* RPL_NETSTATS_H */
 /** @} */
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
index ec649f90fa..cb4e555ba0 100644
--- a/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
+++ b/sys/net/gnrc/routing/rpl/gnrc_rpl_internal/validation.h
@@ -16,8 +16,8 @@
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
 
-#ifndef GNRC_RPL_VALIDATION_H_
-#define GNRC_RPL_VALIDATION_H_
+#ifndef GNRC_RPL_VALIDATION_H
+#define GNRC_RPL_VALIDATION_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -143,5 +143,5 @@ static inline bool gnrc_rpl_validation_DAO_ACK(gnrc_rpl_dao_ack_t *dao_ack, uint
 }
 #endif
 
-#endif /* GNRC_RPL_VALIDATION_H_ */
+#endif /* GNRC_RPL_VALIDATION_H */
 /** @} */
diff --git a/sys/net/gnrc/sock/include/gnrc_sock_internal.h b/sys/net/gnrc/sock/include/gnrc_sock_internal.h
index c4c218dc24..98ba45e190 100644
--- a/sys/net/gnrc/sock/include/gnrc_sock_internal.h
+++ b/sys/net/gnrc/sock/include/gnrc_sock_internal.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef GNRC_SOCK_INTERNAL_H_
-#define GNRC_SOCK_INTERNAL_H_
+#ifndef GNRC_SOCK_INTERNAL_H
+#define GNRC_SOCK_INTERNAL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -112,5 +112,5 @@ ssize_t gnrc_sock_send(gnrc_pktsnip_t *payload, sock_ip_ep_t *local,
 }
 #endif
 
-#endif /* GNRC_SOCK_INTERNAL_H_ */
+#endif /* GNRC_SOCK_INTERNAL_H */
 /** @} */
diff --git a/sys/net/gnrc/sock/include/sock_types.h b/sys/net/gnrc/sock/include/sock_types.h
index a72b17c802..82e446d414 100644
--- a/sys/net/gnrc/sock/include/sock_types.h
+++ b/sys/net/gnrc/sock/include/sock_types.h
@@ -19,8 +19,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef SOCK_TYPES_H_
-#define SOCK_TYPES_H_
+#ifndef SOCK_TYPES_H
+#define SOCK_TYPES_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -79,5 +79,5 @@ struct sock_udp {
 }
 #endif
 
-#endif /* SOCK_TYPES_H_ */
+#endif /* SOCK_TYPES_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/iib_table.h b/sys/net/routing/nhdp/iib_table.h
index 02c4a5249d..65be11fce4 100644
--- a/sys/net/routing/nhdp/iib_table.h
+++ b/sys/net/routing/nhdp/iib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef IIB_TABLE_H_
-#define IIB_TABLE_H_
+#ifndef IIB_TABLE_H
+#define IIB_TABLE_H
 
 #include "timex.h"
 #include "kernel_types.h"
@@ -185,5 +185,5 @@ void iib_process_metric_refresh(void);
 }
 #endif
 
-#endif /* IIB_TABLE_H_ */
+#endif /* IIB_TABLE_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/lib_table.h b/sys/net/routing/nhdp/lib_table.h
index 00f45e4fe5..a063d7140b 100644
--- a/sys/net/routing/nhdp/lib_table.h
+++ b/sys/net/routing/nhdp/lib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef LIB_TABLE_H_
-#define LIB_TABLE_H_
+#ifndef LIB_TABLE_H
+#define LIB_TABLE_H
 
 #include "kernel_types.h"
 
@@ -85,5 +85,5 @@ uint8_t lib_is_reg_addr(kernel_pid_t if_pid, nhdp_addr_t *addr);
 }
 #endif
 
-#endif /* LIB_TABLE_H_ */
+#endif /* LIB_TABLE_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp.h b/sys/net/routing/nhdp/nhdp.h
index f3ad5b1018..e720fe3e3e 100644
--- a/sys/net/routing/nhdp/nhdp.h
+++ b/sys/net/routing/nhdp/nhdp.h
@@ -18,8 +18,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_H_
-#define NHDP_H_
+#ifndef NHDP_H
+#define NHDP_H
 
 #include "timex.h"
 #include "xtimer.h"
@@ -204,5 +204,5 @@ int nhdp_add_address(kernel_pid_t if_pid, uint8_t *addr, size_t addr_size, uint8
 }
 #endif
 
-#endif /* NHDP_H_ */
+#endif /* NHDP_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_address.h b/sys/net/routing/nhdp/nhdp_address.h
index 33ae2b7126..3ad444fd09 100644
--- a/sys/net/routing/nhdp/nhdp_address.h
+++ b/sys/net/routing/nhdp/nhdp_address.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_ADDRESS_H_
-#define NHDP_ADDRESS_H_
+#ifndef NHDP_ADDRESS_H
+#define NHDP_ADDRESS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -138,5 +138,5 @@ nhdp_addr_t *nhdp_get_addr_db_head(void);
 }
 #endif
 
-#endif /* NHDP_ADDRESS_H_ */
+#endif /* NHDP_ADDRESS_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_metric.h b/sys/net/routing/nhdp/nhdp_metric.h
index 9ea5232fd6..2dc62a4e86 100644
--- a/sys/net/routing/nhdp/nhdp_metric.h
+++ b/sys/net/routing/nhdp/nhdp_metric.h
@@ -21,8 +21,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_METRIC_H_
-#define NHDP_METRIC_H_
+#ifndef NHDP_METRIC_H
+#define NHDP_METRIC_H
 
 #include "rfc5444/rfc5444.h"
 
@@ -90,4 +90,4 @@ extern "C" {
 }
 #endif
 
-#endif /* NHDP_METRIC_H_ */
+#endif /* NHDP_METRIC_H */
diff --git a/sys/net/routing/nhdp/nhdp_reader.h b/sys/net/routing/nhdp/nhdp_reader.h
index 15f4af37c2..838ee0cf6a 100644
--- a/sys/net/routing/nhdp/nhdp_reader.h
+++ b/sys/net/routing/nhdp/nhdp_reader.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_READER_H_
-#define NHDP_READER_H_
+#ifndef NHDP_READER_H
+#define NHDP_READER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,5 +54,5 @@ int nhdp_reader_handle_packet(kernel_pid_t rcvg_if_pid, void *buffer, size_t len
 }
 #endif
 
-#endif /* NHDP_READER_H_ */
+#endif /* NHDP_READER_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nhdp_writer.h b/sys/net/routing/nhdp/nhdp_writer.h
index 111ab0f740..f945408494 100644
--- a/sys/net/routing/nhdp/nhdp_writer.h
+++ b/sys/net/routing/nhdp/nhdp_writer.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NHDP_WRITER_H_
-#define NHDP_WRITER_H_
+#ifndef NHDP_WRITER_H
+#define NHDP_WRITER_H
 
 #include "rfc5444/rfc5444_iana.h"
 #include "rfc5444/rfc5444_writer.h"
@@ -76,5 +76,5 @@ void nhdp_writer_add_addr(struct rfc5444_writer *wr, nhdp_addr_t *addr,
 }
 #endif
 
-#endif /* NHDP_WRITER_H_ */
+#endif /* NHDP_WRITER_H */
 /** @} */
diff --git a/sys/net/routing/nhdp/nib_table.h b/sys/net/routing/nhdp/nib_table.h
index 700ce8c721..4d9dd4db49 100644
--- a/sys/net/routing/nhdp/nib_table.h
+++ b/sys/net/routing/nhdp/nib_table.h
@@ -16,8 +16,8 @@
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  */
 
-#ifndef NIB_TABLE_H_
-#define NIB_TABLE_H_
+#ifndef NIB_TABLE_H
+#define NIB_TABLE_H
 
 #include "timex.h"
 
@@ -102,5 +102,5 @@ void nib_reset_nb_entry_sym(nib_entry_t *nib_entry, timex_t *now);
 }
 #endif
 
-#endif /* NIB_TABLE_H_ */
+#endif /* NIB_TABLE_H */
 /** @} */
diff --git a/sys/posix/include/semaphore.h b/sys/posix/include/semaphore.h
index 176d2b439b..c10d4f76af 100644
--- a/sys/posix/include/semaphore.h
+++ b/sys/posix/include/semaphore.h
@@ -22,8 +22,8 @@
  * @author  Víctor Ariño <victor.arino@zii.aero>
  */
 
-#ifndef POSIX_SEMAPHORE_H_
-#define POSIX_SEMAPHORE_H_
+#ifndef POSIX_SEMAPHORE_H
+#define POSIX_SEMAPHORE_H
 
 #include <errno.h>
 #include <time.h>
@@ -291,5 +291,5 @@ static inline int sem_getvalue(sem_t *sem, int *sval)
 }
 #endif
 
-#endif  /* POSIX_SEMAPHORE_H_ */
+#endif  /* POSIX_SEMAPHORE_H */
 /** @} */
diff --git a/sys/posix/include/sys/bytes.h b/sys/posix/include/sys/bytes.h
index 86d4872f62..440519c1f9 100644
--- a/sys/posix/include/sys/bytes.h
+++ b/sys/posix/include/sys/bytes.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef BYTES_H_
-#define BYTES_H_
+#ifndef BYTES_H
+#define BYTES_H
 
 #include "byteorder.h"
 
@@ -92,5 +92,5 @@ typedef size_t socklen_t;           /**< socket address length */
 }
 #endif
 
-#endif /* BYTES_H_ */
+#endif /* BYTES_H */
 /** @} */
diff --git a/sys/posix/pthread/include/pthread_spin.h b/sys/posix/pthread/include/pthread_spin.h
index e089fa630e..9d0c31ea3f 100644
--- a/sys/posix/pthread/include/pthread_spin.h
+++ b/sys/posix/pthread/include/pthread_spin.h
@@ -17,8 +17,8 @@
  *          Use irq_disable() and irq_restore() for shortterm locks instead.
  */
 
-#ifndef SYS_POSIX_PTHREAD_SPIN_H_
-#define SYS_POSIX_PTHREAD_SPIN_H_
+#ifndef SYS_POSIX_PTHREAD_SPIN_H
+#define SYS_POSIX_PTHREAD_SPIN_H
 
 #include <errno.h>
 
diff --git a/tests/driver_at86rf2xx/common.h b/tests/driver_at86rf2xx/common.h
index 8829b6e54d..b81ab4553f 100644
--- a/tests/driver_at86rf2xx/common.h
+++ b/tests/driver_at86rf2xx/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef COMMON_H_
-#define COMMON_H_
+#ifndef COMMON_H
+#define COMMON_H
 
 #include <stdint.h>
 
@@ -49,5 +49,5 @@ void print_addr(uint8_t *addr, size_t addr_len);
 }
 #endif
 
-#endif /* COMMON_H_ */
+#endif /* COMMON_H */
 /** @} */
diff --git a/tests/emb6/common.h b/tests/emb6/common.h
index 0efd9e9afa..0e8a419659 100644
--- a/tests/emb6/common.h
+++ b/tests/emb6/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef MAIN_H_
-#define MAIN_H_
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -75,5 +75,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H_ */
+#endif /* MAIN_H */
 /** @} */
diff --git a/tests/gnrc_sock_ip/constants.h b/tests/gnrc_sock_ip/constants.h
index 88776e4ee2..0f70829540 100644
--- a/tests/gnrc_sock_ip/constants.h
+++ b/tests/gnrc_sock_ip/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/gnrc_sock_ip/stack.h b/tests/gnrc_sock_ip/stack.h
index 637ef466f5..f5ab509da9 100644
--- a/tests/gnrc_sock_ip/stack.h
+++ b/tests/gnrc_sock_ip/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -86,5 +86,5 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/gnrc_sock_udp/constants.h b/tests/gnrc_sock_udp/constants.h
index fefe416638..9e9c2fa3d0 100644
--- a/tests/gnrc_sock_udp/constants.h
+++ b/tests/gnrc_sock_udp/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -40,5 +40,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/gnrc_sock_udp/stack.h b/tests/gnrc_sock_udp/stack.h
index 415057a3a9..8f83392f79 100644
--- a/tests/gnrc_sock_udp/stack.h
+++ b/tests/gnrc_sock_udp/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -91,5 +91,5 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/lwip/common.h b/tests/lwip/common.h
index 635f1dae94..8dfb62951b 100644
--- a/tests/lwip/common.h
+++ b/tests/lwip/common.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef MAIN_H_
-#define MAIN_H_
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -77,5 +77,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* MAIN_H_ */
+#endif /* MAIN_H */
 /** @} */
diff --git a/tests/lwip_sock_ip/constants.h b/tests/lwip_sock_ip/constants.h
index 7e0aef2843..4ddf627149 100644
--- a/tests/lwip_sock_ip/constants.h
+++ b/tests/lwip_sock_ip/constants.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
-#ifndef CONSTANTS_H_
-#define CONSTANTS_H_
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 
 #ifdef __cplusplus
@@ -44,5 +44,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CONSTANTS_H_ */
+#endif /* CONSTANTS_H */
 /** @} */
diff --git a/tests/lwip_sock_ip/stack.h b/tests/lwip_sock_ip/stack.h
index ad05a37668..bdbac98ebb 100644
--- a/tests/lwip_sock_ip/stack.h
+++ b/tests/lwip_sock_ip/stack.h
@@ -17,8 +17,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef STACK_H_
-#define STACK_H_
+#ifndef STACK_H
+#define STACK_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -119,5 +119,5 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 }
 #endif
 
-#endif /* STACK_H_ */
+#endif /* STACK_H */
 /** @} */
diff --git a/tests/unittests/README.md b/tests/unittests/README.md
index bcfbde4a58..a56d82151a 100644
--- a/tests/unittests/README.md
+++ b/tests/unittests/README.md
@@ -149,8 +149,8 @@ The test header ``tests-<modulename>/tests-<module>.h`` of a module you add to `
  *
  * @author      <author>
  */
-#ifndef TESTS_<MODULE>_H_
-#define TESTS_<MODULE>_H_
+#ifndef TESTS_<MODULE>_H
+#define TESTS_<MODULE>_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -177,7 +177,7 @@ Test *tests_<module>_<header2>_tests(void);
 }
 #endif
 
-#endif /* TESTS_<MODULE>_H_ */
+#endif /* TESTS_<MODULE>_H */
 /** @} */
 ```
 
diff --git a/tests/unittests/common/unittests-constants.h b/tests/unittests/common/unittests-constants.h
index b20583bedc..e36e2ceac7 100644
--- a/tests/unittests/common/unittests-constants.h
+++ b/tests/unittests/common/unittests-constants.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef UNITTESTS_CONSTANTS_H_
-#define UNITTESTS_CONSTANTS_H_
+#ifndef UNITTESTS_CONSTANTS_H
+#define UNITTESTS_CONSTANTS_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -65,5 +65,5 @@ extern "C" {
 }
 #endif
 
-#endif /* UNITTESTS_CONSTANTS_H_ */
+#endif /* UNITTESTS_CONSTANTS_H */
 /** @} */
diff --git a/tests/unittests/map.h b/tests/unittests/map.h
index 5efe141a92..13bf1e107d 100644
--- a/tests/unittests/map.h
+++ b/tests/unittests/map.h
@@ -26,8 +26,8 @@
  * prior written authorization from the authors.
  */
 
-#ifndef UNITTESTS_MAP_H_
-#define UNITTESTS_MAP_H_
+#ifndef UNITTESTS_MAP_H
+#define UNITTESTS_MAP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,4 +56,4 @@ extern "C" {
 }
 #endif
 
-#endif /* UNITTESTS_MAP_H_ */
+#endif /* UNITTESTS_MAP_H */
diff --git a/tests/unittests/tests-base64/tests-base64.h b/tests/unittests/tests-base64/tests-base64.h
index d0d5e80df5..d3f21d19c1 100644
--- a/tests/unittests/tests-base64/tests-base64.h
+++ b/tests/unittests/tests-base64/tests-base64.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_BASE64_H_
-#define TESTS_BASE64_H_
+#ifndef TESTS_BASE64_H
+#define TESTS_BASE64_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_base64_tests(void);
 }
 #endif
 
-#endif /* TESTS_BASE64_H_ */
+#endif /* TESTS_BASE64_H */
 /** @} */
diff --git a/tests/unittests/tests-bloom/tests-bloom-sets.h b/tests/unittests/tests-bloom/tests-bloom-sets.h
index 672eaf9506..f2d7d20b95 100644
--- a/tests/unittests/tests-bloom/tests-bloom-sets.h
+++ b/tests/unittests/tests-bloom/tests-bloom-sets.h
@@ -6,8 +6,8 @@
  * directory for more details.
  */
 
-#ifndef TESTS_BLOOM_SETS_H_
-#define TESTS_BLOOM_SETS_H_
+#ifndef TESTS_BLOOM_SETS_H
+#define TESTS_BLOOM_SETS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -1033,4 +1033,4 @@ const char* const B[10] = {"interbedded"
 }
 #endif
 
-#endif /* TESTS_BLOOM_SETS_H_ */
+#endif /* TESTS_BLOOM_SETS_H */
diff --git a/tests/unittests/tests-bloom/tests-bloom.h b/tests/unittests/tests-bloom/tests-bloom.h
index ab2082d4bd..9de0f3eb37 100644
--- a/tests/unittests/tests-bloom/tests-bloom.h
+++ b/tests/unittests/tests-bloom/tests-bloom.h
@@ -15,8 +15,8 @@
  *
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  */
-#ifndef TESTS_BLOOM_H_
-#define TESTS_BLOOM_H_
+#ifndef TESTS_BLOOM_H
+#define TESTS_BLOOM_H
 
 #include "embUnit.h"
 
@@ -40,5 +40,5 @@ Test *tests_bloom_tests(void);
 }
 #endif
 
-#endif /* TESTS_BLOOM_H_ */
+#endif /* TESTS_BLOOM_H */
 /** @} */
diff --git a/tests/unittests/tests-core/tests-core.h b/tests/unittests/tests-core/tests-core.h
index 35ad00788e..71dd58792e 100644
--- a/tests/unittests/tests-core/tests-core.h
+++ b/tests/unittests/tests-core/tests-core.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_CORE_H_
-#define TESTS_CORE_H_
+#ifndef TESTS_CORE_H
+#define TESTS_CORE_H
 
 #include "embUnit.h"
 
@@ -89,5 +89,5 @@ Test *tests_core_ringbuffer_tests(void);
 }
 #endif
 
-#endif /* TESTS_CORE_H_ */
+#endif /* TESTS_CORE_H */
 /** @} */
diff --git a/tests/unittests/tests-crypto/tests-crypto.h b/tests/unittests/tests-crypto/tests-crypto.h
index cd2bfabc73..30d557e702 100644
--- a/tests/unittests/tests-crypto/tests-crypto.h
+++ b/tests/unittests/tests-crypto/tests-crypto.h
@@ -16,8 +16,8 @@
  *
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  */
-#ifndef TESTS_CRYPTO_H_
-#define TESTS_CRYPTO_H_
+#ifndef TESTS_CRYPTO_H
+#define TESTS_CRYPTO_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -63,5 +63,5 @@ Test* tests_crypto_modes_ctr_tests(void);
 }
 #endif
 
-#endif /* TESTS_CRYPTO_H_ */
+#endif /* TESTS_CRYPTO_H */
 /** @} */
diff --git a/tests/unittests/tests-div/tests-div.h b/tests/unittests/tests-div/tests-div.h
index 037ee6b021..c9c054dd47 100644
--- a/tests/unittests/tests-div/tests-div.h
+++ b/tests/unittests/tests-div/tests-div.h
@@ -15,8 +15,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef TESTS_DIV_H_
-#define TESTS_DIV_H_
+#ifndef TESTS_DIV_H
+#define TESTS_DIV_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_div_tests(void);
 }
 #endif
 
-#endif /* TESTS_DIV_H_ */
+#endif /* TESTS_DIV_H */
 /** @} */
diff --git a/tests/unittests/tests-fib/tests-fib.h b/tests/unittests/tests-fib/tests-fib.h
index 91b645b39a..4e2bea76a0 100644
--- a/tests/unittests/tests-fib/tests-fib.h
+++ b/tests/unittests/tests-fib/tests-fib.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_FIB_H_
-#define TESTS_FIB_H_
+#ifndef TESTS_FIB_H
+#define TESTS_FIB_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_fib_tests(void);
 }
 #endif
 
-#endif /* TESTS_FIB_H_ */
+#endif /* TESTS_FIB_H */
 /** @} */
diff --git a/tests/unittests/tests-fib_sr/tests-fib_sr.h b/tests/unittests/tests-fib_sr/tests-fib_sr.h
index 6acdb9776b..21dab5d81d 100644
--- a/tests/unittests/tests-fib_sr/tests-fib_sr.h
+++ b/tests/unittests/tests-fib_sr/tests-fib_sr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martin Landsmann <Martin.Landsmann@HAW-Hamburg.de>
  */
-#ifndef TESTS_FIB_H_
-#define TESTS_FIB_H_
+#ifndef TESTS_FIB_H
+#define TESTS_FIB_H
 #include "embUnit/embUnit.h"
 
 #ifdef __cplusplus
@@ -39,5 +39,5 @@ Test *tests_fib_sr_tests(void);
 }
 #endif
 
-#endif /* TESTS_FIB_H_ */
+#endif /* TESTS_FIB_H */
 /** @} */
diff --git a/tests/unittests/tests-fmt/tests-fmt.h b/tests/unittests/tests-fmt/tests-fmt.h
index ddfa917566..f7644b067c 100644
--- a/tests/unittests/tests-fmt/tests-fmt.h
+++ b/tests/unittests/tests-fmt/tests-fmt.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
-#ifndef TESTS_FMT_H_
-#define TESTS_FMT_H_
+#ifndef TESTS_FMT_H
+#define TESTS_FMT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_fmt(void);
 }
 #endif
 
-#endif /* TESTS_FMT_H_ */
+#endif /* TESTS_FMT_H */
 /** @} */
diff --git a/tests/unittests/tests-gcoap/tests-gcoap.h b/tests/unittests/tests-gcoap/tests-gcoap.h
index 74a3d8dfa6..3eadaa28b4 100644
--- a/tests/unittests/tests-gcoap/tests-gcoap.h
+++ b/tests/unittests/tests-gcoap/tests-gcoap.h
@@ -15,8 +15,8 @@
  *
  * @author      Ken Bannister <kb2ma@runbox.com>
  */
-#ifndef TESTS_GCOAP_H_
-#define TESTS_GCOAP_H_
+#ifndef TESTS_GCOAP_H
+#define TESTS_GCOAP_H
 
 #include "embUnit.h"
 
@@ -36,5 +36,5 @@ void tests_gcoap(void);
 }
 #endif
 
-#endif /* TESTS_GCOAP_H_ */
+#endif /* TESTS_GCOAP_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h b/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
index 58904805cb..6342556a41 100644
--- a/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
+++ b/tests/unittests/tests-gnrc_ipv6/tests-gnrc_ipv6.h
@@ -15,8 +15,8 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef TESTS_GNRC_IPV6_H_
-#define TESTS_GNRC_IPV6_H_
+#ifndef TESTS_GNRC_IPV6_H
+#define TESTS_GNRC_IPV6_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_ipv6(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_IPV6_H_ */
+#endif /* TESTS_GNRC_IPV6_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h b/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
index a31fda0a61..b013e11b71 100644
--- a/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
+++ b/tests/unittests/tests-gnrc_ipv6_hdr/tests-gnrc_ipv6_hdr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_GNRC_IPV6_HDR_H_
-#define TESTS_GNRC_IPV6_HDR_H_
+#ifndef TESTS_GNRC_IPV6_HDR_H
+#define TESTS_GNRC_IPV6_HDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_ipv6_hdr(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_IPV6_HDR_H_ */
+#endif /* TESTS_GNRC_IPV6_HDR_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
index 00a55775af..3ff0240d26 100644
--- a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
+++ b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.h
@@ -15,8 +15,8 @@
  *
  * @author      Shuguo Zhuo <shuguo.zhuo@inria.fr>
  */
-#ifndef TESTS_PRIORITY_PKTQUEUE_H_
-#define TESTS_PRIORITY_PKTQUEUE_H_
+#ifndef TESTS_PRIORITY_PKTQUEUE_H
+#define TESTS_PRIORITY_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_mac_internal(void);
 }
 #endif
 
-#endif /* TESTS_PRIORITY_PKTQUEUE_H_ */
+#endif /* TESTS_PRIORITY_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h b/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
index 025100ebf4..3b6bbbf3fa 100644
--- a/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
+++ b/tests/unittests/tests-gnrc_netif/tests-gnrc_netif.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_GNRC_NETIF_H_
-#define TESTS_GNRC_NETIF_H_
+#ifndef TESTS_GNRC_NETIF_H
+#define TESTS_GNRC_NETIF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_netif(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_NETIF_H_ */
+#endif /* TESTS_GNRC_NETIF_H */
 /** @} */
diff --git a/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h b/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
index 4c2b7750cf..ff24c13b5f 100644
--- a/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
+++ b/tests/unittests/tests-gnrc_udp/tests-gnrc_udp.h
@@ -15,8 +15,8 @@
  *
  * @author      Takuo Yonezawa <Yonezawa-T2@mail.dnp.co.jp>
  */
-#ifndef TESTS_GNRC_UDP_H_
-#define TESTS_GNRC_UDP_H_
+#ifndef TESTS_GNRC_UDP_H
+#define TESTS_GNRC_UDP_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_gnrc_udp(void);
 }
 #endif
 
-#endif /* TESTS_GNRC_UDP_H_ */
+#endif /* TESTS_GNRC_UDP_H */
 /** @} */
diff --git a/tests/unittests/tests-hashes/tests-hashes.h b/tests/unittests/tests-hashes/tests-hashes.h
index c6dc6a2dc3..3904c01336 100644
--- a/tests/unittests/tests-hashes/tests-hashes.h
+++ b/tests/unittests/tests-hashes/tests-hashes.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_HASHES_H_
-#define TESTS_HASHES_H_
+#ifndef TESTS_HASHES_H
+#define TESTS_HASHES_H
 
 #include "embUnit.h"
 
@@ -69,5 +69,5 @@ Test *tests_hashes_sha256_chain_tests(void);
 }
 #endif
 
-#endif /* TESTS_CRYPTO_H_ */
+#endif /* TESTS_CRYPTO_H */
 /** @} */
diff --git a/tests/unittests/tests-ieee802154/tests-ieee802154.h b/tests/unittests/tests-ieee802154/tests-ieee802154.h
index fb376bd83e..8e16524aca 100644
--- a/tests/unittests/tests-ieee802154/tests-ieee802154.h
+++ b/tests/unittests/tests-ieee802154/tests-ieee802154.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IEEE802154_H_
-#define TESTS_IEEE802154_H_
+#ifndef TESTS_IEEE802154_H
+#define TESTS_IEEE802154_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ieee802154(void);
 }
 #endif
 
-#endif /* TESTS_IEEE802154_H_ */
+#endif /* TESTS_IEEE802154_H */
 /** @} */
diff --git a/tests/unittests/tests-inet_csum/tests-inet_csum.h b/tests/unittests/tests-inet_csum/tests-inet_csum.h
index 9fe5558e43..31f0a68d46 100644
--- a/tests/unittests/tests-inet_csum/tests-inet_csum.h
+++ b/tests/unittests/tests-inet_csum/tests-inet_csum.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_INET_CSUM_H_
-#define TESTS_INET_CSUM_H_
+#ifndef TESTS_INET_CSUM_H
+#define TESTS_INET_CSUM_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_inet_csum(void);
 }
 #endif
 
-#endif /* TESTS_INET_CSUM_H_ */
+#endif /* TESTS_INET_CSUM_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h b/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
index df743ee96a..8511dd0398 100644
--- a/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
+++ b/tests/unittests/tests-ipv4_addr/tests-ipv4_addr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV4_ADDR_H_
-#define TESTS_IPV4_ADDR_H_
+#ifndef TESTS_IPV4_ADDR_H
+#define TESTS_IPV4_ADDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv4_addr(void);
 }
 #endif
 
-#endif /* TESTS_IPV4_ADDR_H_ */
+#endif /* TESTS_IPV4_ADDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h b/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
index b91b796f6d..7b56371d0c 100644
--- a/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
+++ b/tests/unittests/tests-ipv6_addr/tests-ipv6_addr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_ADDR_H_
-#define TESTS_IPV6_ADDR_H_
+#ifndef TESTS_IPV6_ADDR_H
+#define TESTS_IPV6_ADDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_addr(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_ADDR_H_ */
+#endif /* TESTS_IPV6_ADDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h b/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
index aec9eee7e4..d328424def 100644
--- a/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
+++ b/tests/unittests/tests-ipv6_hdr/tests-ipv6_hdr.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_HDR_H_
-#define TESTS_IPV6_HDR_H_
+#ifndef TESTS_IPV6_HDR_H
+#define TESTS_IPV6_HDR_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_hdr(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_HDR_H_ */
+#endif /* TESTS_IPV6_HDR_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h b/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
index d2dc8d4d1d..457c6baa9a 100644
--- a/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
+++ b/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_NC_H_
-#define TESTS_IPV6_NC_H_
+#ifndef TESTS_IPV6_NC_H
+#define TESTS_IPV6_NC_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_nc(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_NC_H_ */
+#endif /* TESTS_IPV6_NC_H */
 /** @} */
diff --git a/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h b/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
index f485837ea7..5962a8f925 100644
--- a/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
+++ b/tests/unittests/tests-ipv6_netif/tests-ipv6_netif.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_IPV6_NETIF_H_
-#define TESTS_IPV6_NETIF_H_
+#ifndef TESTS_IPV6_NETIF_H
+#define TESTS_IPV6_NETIF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_ipv6_netif(void);
 }
 #endif
 
-#endif /* TESTS_IPV6_NETIF_H_ */
+#endif /* TESTS_IPV6_NETIF_H */
 /** @} */
diff --git a/tests/unittests/tests-netopt/tests-netopt.h b/tests/unittests/tests-netopt/tests-netopt.h
index 9c187f3792..a34cb9de62 100644
--- a/tests/unittests/tests-netopt/tests-netopt.h
+++ b/tests/unittests/tests-netopt/tests-netopt.h
@@ -15,8 +15,8 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
-#ifndef TESTS_NETOPT_H_
-#define TESTS_NETOPT_H_
+#ifndef TESTS_NETOPT_H
+#define TESTS_NETOPT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_netopt(void);
 }
 #endif
 
-#endif /* TESTS_NETOPT_H_ */
+#endif /* TESTS_NETOPT_H */
 /** @} */
diff --git a/tests/unittests/tests-netreg/tests-netreg.h b/tests/unittests/tests-netreg/tests-netreg.h
index a14dca58b8..b683b91bd1 100644
--- a/tests/unittests/tests-netreg/tests-netreg.h
+++ b/tests/unittests/tests-netreg/tests-netreg.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_NETREG_H_
-#define TESTS_NETREG_H_
+#ifndef TESTS_NETREG_H
+#define TESTS_NETREG_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_netreg(void);
 }
 #endif
 
-#endif /* TESTS_NETREG_H_ */
+#endif /* TESTS_NETREG_H */
 /** @} */
diff --git a/tests/unittests/tests-pkt/tests-pkt.h b/tests/unittests/tests-pkt/tests-pkt.h
index e0af10e9d5..415348da89 100644
--- a/tests/unittests/tests-pkt/tests-pkt.h
+++ b/tests/unittests/tests-pkt/tests-pkt.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKT_H_
-#define TESTS_PKT_H_
+#ifndef TESTS_PKT_H
+#define TESTS_PKT_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pkt(void);
 }
 #endif
 
-#endif /* TESTS_PKT_H_ */
+#endif /* TESTS_PKT_H */
 /** @} */
diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.h b/tests/unittests/tests-pktbuf/tests-pktbuf.h
index 4c07a20aae..32f9c6be65 100644
--- a/tests/unittests/tests-pktbuf/tests-pktbuf.h
+++ b/tests/unittests/tests-pktbuf/tests-pktbuf.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKTBUF_H_
-#define TESTS_PKTBUF_H_
+#ifndef TESTS_PKTBUF_H
+#define TESTS_PKTBUF_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pktbuf(void);
 }
 #endif
 
-#endif /* TESTS_PKTBUF_H_ */
+#endif /* TESTS_PKTBUF_H */
 /** @} */
diff --git a/tests/unittests/tests-pktqueue/tests-pktqueue.h b/tests/unittests/tests-pktqueue/tests-pktqueue.h
index a280cd447d..3aa680ac2d 100644
--- a/tests/unittests/tests-pktqueue/tests-pktqueue.h
+++ b/tests/unittests/tests-pktqueue/tests-pktqueue.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_PKTQUEUE_H_
-#define TESTS_PKTQUEUE_H_
+#ifndef TESTS_PKTQUEUE_H
+#define TESTS_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_pktqueue(void);
 }
 #endif
 
-#endif /* TESTS_PKTQUEUE_H_ */
+#endif /* TESTS_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-printf_float/tests-printf_float.h b/tests/unittests/tests-printf_float/tests-printf_float.h
index 01afa14dd6..0d1032aab8 100644
--- a/tests/unittests/tests-printf_float/tests-printf_float.h
+++ b/tests/unittests/tests-printf_float/tests-printf_float.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_PRINTF_FLOAT_H_
-#define TESTS_PRINTF_FLOAT_H_
+#ifndef TESTS_PRINTF_FLOAT_H
+#define TESTS_PRINTF_FLOAT_H
 
 #include "embUnit.h"
 
@@ -34,5 +34,5 @@ void tests_printf_float(void);
 }
 #endif
 
-#endif /* TESTS_PRINTF_FLOAT_H_ */
+#endif /* TESTS_PRINTF_FLOAT_H */
 /** @} */
diff --git a/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h b/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
index 87f8c5d4cf..4c4eb52a5c 100644
--- a/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
+++ b/tests/unittests/tests-priority_pktqueue/tests-priority_pktqueue.h
@@ -15,8 +15,8 @@
  *
  * @author      Shuguo Zhuo <shuguo.zhuo@inria.fr>
  */
-#ifndef TESTS_PRIORITY_PKTQUEUE_H_
-#define TESTS_PRIORITY_PKTQUEUE_H_
+#ifndef TESTS_PRIORITY_PKTQUEUE_H
+#define TESTS_PRIORITY_PKTQUEUE_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_priority_pktqueue(void);
 }
 #endif
 
-#endif /* TESTS_PRIORITY_PKTQUEUE_H_ */
+#endif /* TESTS_PRIORITY_PKTQUEUE_H */
 /** @} */
diff --git a/tests/unittests/tests-rpl_srh/tests-rpl_srh.h b/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
index 180ea81322..45d44ccb3c 100644
--- a/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
+++ b/tests/unittests/tests-rpl_srh/tests-rpl_srh.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <mail@cgundogan.de>
  */
-#ifndef TESTS_RPL_SRH_H_
-#define TESTS_RPL_SRH_H_
+#ifndef TESTS_RPL_SRH_H
+#define TESTS_RPL_SRH_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_rpl_srh(void);
 }
 #endif
 
-#endif /* TESTS_RPL_SRH_H_ */
+#endif /* TESTS_RPL_SRH_H */
 /** @} */
diff --git a/tests/unittests/tests-saul_reg/tests-saul_reg.h b/tests/unittests/tests-saul_reg/tests-saul_reg.h
index 464bd43723..41f1beb963 100644
--- a/tests/unittests/tests-saul_reg/tests-saul_reg.h
+++ b/tests/unittests/tests-saul_reg/tests-saul_reg.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef TESTS_SAUL_REG_H_
-#define TESTS_SAUL_REG_H_
+#ifndef TESTS_SAUL_REG_H
+#define TESTS_SAUL_REG_H
 
 #include "embUnit.h"
 
@@ -34,5 +34,5 @@ void tests_saul_reg(void);
 }
 #endif
 
-#endif /* TESTS_SAUL_REG_H_ */
+#endif /* TESTS_SAUL_REG_H */
 /** @} */
diff --git a/tests/unittests/tests-seq/tests-seq.h b/tests/unittests/tests-seq/tests-seq.h
index e3fa96343c..b8904866f0 100644
--- a/tests/unittests/tests-seq/tests-seq.h
+++ b/tests/unittests/tests-seq/tests-seq.h
@@ -15,8 +15,8 @@
  *
  * @author      Cenk Gündoğan <cnkgndgn@gmail.com>
  */
-#ifndef TESTS_SEQ_H_
-#define TESTS_SEQ_H_
+#ifndef TESTS_SEQ_H
+#define TESTS_SEQ_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_seq(void);
 }
 #endif
 
-#endif /* TESTS_SEQ_H_ */
+#endif /* TESTS_SEQ_H */
 /** @} */
diff --git a/tests/unittests/tests-sixlowpan/tests-sixlowpan.h b/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
index 48be671b4a..700c76db9c 100644
--- a/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
+++ b/tests/unittests/tests-sixlowpan/tests-sixlowpan.h
@@ -15,8 +15,8 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
-#ifndef TESTS_SIXLOWPAN_H_
-#define TESTS_SIXLOWPAN_H_
+#ifndef TESTS_SIXLOWPAN_H
+#define TESTS_SIXLOWPAN_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_sixlowpan(void);
 }
 #endif
 
-#endif /* TESTS_SIXLOWPAN_H_ */
+#endif /* TESTS_SIXLOWPAN_H */
 /** @} */
diff --git a/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h b/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
index 3a4c911b8c..06cd96a4bc 100644
--- a/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
+++ b/tests/unittests/tests-sixlowpan_ctx/tests-sixlowpan_ctx.h
@@ -15,8 +15,8 @@
  *
  * @author      Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef TESTS_SIXLOWPAN_CTX_H_
-#define TESTS_SIXLOWPAN_CTX_H_
+#ifndef TESTS_SIXLOWPAN_CTX_H
+#define TESTS_SIXLOWPAN_CTX_H
 
 #include "embUnit.h"
 
@@ -33,5 +33,5 @@ void tests_sixlowpan_ctx(void);
 }
 #endif
 
-#endif /* TESTS_SIXLOWPAN_CTX_H_ */
+#endif /* TESTS_SIXLOWPAN_CTX_H */
 /** @} */
diff --git a/tests/unittests/tests-timex/tests-timex.h b/tests/unittests/tests-timex/tests-timex.h
index 55ae5d2e71..3d8c0ca192 100644
--- a/tests/unittests/tests-timex/tests-timex.h
+++ b/tests/unittests/tests-timex/tests-timex.h
@@ -16,8 +16,8 @@
  * @author      Philipp Rosenkranz <philipp.rosenkranz@fu-berlin.de>
  * @author      Daniel Jentsch <d.jentsch@fu-berlin.de>
  */
-#ifndef TESTS_TIMEX_H_
-#define TESTS_TIMEX_H_
+#ifndef TESTS_TIMEX_H
+#define TESTS_TIMEX_H
 
 #include "embUnit.h"
 
@@ -41,5 +41,5 @@ Test *tests_timex_tests(void);
 }
 #endif
 
-#endif /* TESTS_TIMEX_H_ */
+#endif /* TESTS_TIMEX_H */
 /** @} */
diff --git a/tests/unittests/tests-ubjson/tests-ubjson.h b/tests/unittests/tests-ubjson/tests-ubjson.h
index fb190f4a82..2087ab4a0a 100644
--- a/tests/unittests/tests-ubjson/tests-ubjson.h
+++ b/tests/unittests/tests-ubjson/tests-ubjson.h
@@ -26,8 +26,8 @@
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
  */
 
-#ifndef TESTS_UBJSON_H_
-#define TESTS_UBJSON_H_
+#ifndef TESTS_UBJSON_H
+#define TESTS_UBJSON_H
 
 #include "embUnit.h"
 #include "kernel_defines.h"
@@ -50,5 +50,5 @@ void test_ubjson_empty_object(void);
 }
 #endif
 
-#endif /* TESTS_UBJSON_H_ */
+#endif /* TESTS_UBJSON_H */
 /** @} */
-- 
GitLab