diff --git a/boards/chronos/drivers/include/display.h b/boards/chronos/drivers/include/display.h
index 5c1c73c65..329987666 100644
--- a/boards/chronos/drivers/include/display.h
+++ b/boards/chronos/drivers/include/display.h
@@ -463,4 +463,4 @@ void display_all_off(void);
 }
 #endif
 
-#endif /* DISPLAY_ */
+#endif /* DISPLAY_H */
diff --git a/boards/chronos/include/buttons.h b/boards/chronos/include/buttons.h
index 592f2ad0b..ddaaf9a19 100644
--- a/boards/chronos/include/buttons.h
+++ b/boards/chronos/include/buttons.h
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* BUTTONS_H */
diff --git a/boards/msb-430-common/include/board_common.h b/boards/msb-430-common/include/board_common.h
index 9bf576ee2..c7e731fac 100644
--- a/boards/msb-430-common/include/board_common.h
+++ b/boards/msb-430-common/include/board_common.h
@@ -61,5 +61,5 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD-CONF_H */
+#endif /* BOARD_COMMON_H */
 /** @} */
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index 190ec28f0..d29b40bda 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -132,5 +132,5 @@ void board_init(void);
 }
 #endif
 
-#endif /* __BOARD_H */
+#endif /* BOARD_H */
 /** @} */
diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h
index 3cb9f6460..bc8de6c30 100644
--- a/boards/pba-d-01-kw2x/include/periph_conf.h
+++ b/boards/pba-d-01-kw2x/include/periph_conf.h
@@ -293,5 +293,5 @@ static const pwm_conf_t pwm_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 dac8cef99..bafb3d954 100644
--- a/boards/qemu-i386/include/board.h
+++ b/boards/qemu-i386/include/board.h
@@ -37,7 +37,7 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* QEMU_I386_BOARD_H */
 
 /**
  * @}
diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h
index cb89aea39..e4c0f59db 100644
--- a/boards/qemu-i386/include/cpu_conf.h
+++ b/boards/qemu-i386/include/cpu_conf.h
@@ -36,6 +36,6 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* QEMU_I386_CPU_CONF_H */
 
 /** @} */
diff --git a/boards/telosb/include/board-conf.h b/boards/telosb/include/board-conf.h
index bdf1dc619..cfe2d6cad 100644
--- a/boards/telosb/include/board-conf.h
+++ b/boards/telosb/include/board-conf.h
@@ -19,4 +19,4 @@ extern "C" {
 }
 #endif
 
-#endif /* BOARD-CONF_H */
+#endif /* BOARD_CONF_H */
diff --git a/boards/z1/include/board-conf.h b/boards/z1/include/board-conf.h
index 3031846d7..7af54e7bd 100644
--- a/boards/z1/include/board-conf.h
+++ b/boards/z1/include/board-conf.h
@@ -34,4 +34,4 @@ extern "C" {
 #endif
 
 /** @} */
-#endif /* BOARD-CONF_H */
+#endif /* BOARD_CONF_H */
diff --git a/cpu/arm7_common/include/VIC.h b/cpu/arm7_common/include/VIC.h
index b35c9d639..085303591 100644
--- a/cpu/arm7_common/include/VIC.h
+++ b/cpu/arm7_common/include/VIC.h
@@ -89,4 +89,4 @@ bool cpu_install_irq(int IntNumber, void *HandlerAddr, int Priority);
 #endif
 
 /** @} */
-#endif /* VIC_H_*/
+#endif /* VIC_H */
diff --git a/cpu/arm7_common/include/iap.h b/cpu/arm7_common/include/iap.h
index 84c2086dc..7a8b854a9 100644
--- a/cpu/arm7_common/include/iap.h
+++ b/cpu/arm7_common/include/iap.h
@@ -64,4 +64,4 @@ uint8_t iap_get_sector(uint32_t addr);
 #endif
 
 
-#endif /*IAP_H_*/
+#endif /* IAP_H */
diff --git a/cpu/k60/include/system_MK60D10.h b/cpu/k60/include/system_MK60D10.h
index 0d25d8499..e5df6b3f7 100644
--- a/cpu/k60/include/system_MK60D10.h
+++ b/cpu/k60/include/system_MK60D10.h
@@ -77,4 +77,4 @@ void SystemCoreClockUpdate(void);
 }
 #endif
 
-#endif  /* #if !defined(SYSTEM_MK60D10_H_) */
+#endif  /* #if !defined(SYSTEM_MK60D10_H) */
diff --git a/cpu/stm32l1/include/cpu_conf.h b/cpu/stm32l1/include/cpu_conf.h
index 18fef4e24..4e8430e87 100644
--- a/cpu/stm32l1/include/cpu_conf.h
+++ b/cpu/stm32l1/include/cpu_conf.h
@@ -42,6 +42,6 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPUCONF_H */
 /** @} */
 /** @} */
diff --git a/cpu/x86/include/cpu.h b/cpu/x86/include/cpu.h
index b7919addd..fed1f66b6 100644
--- a/cpu/x86/include/cpu.h
+++ b/cpu/x86/include/cpu.h
@@ -131,6 +131,6 @@ static inline void cpu_print_last_instruction(void)
 }
 #endif
 
-#endif
+#endif /* CPU_X86_CPU_H */
 
 /** @} */
diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h
index 4af9faf2a..a90fc43a4 100644
--- a/drivers/include/kw2xrf.h
+++ b/drivers/include/kw2xrf.h
@@ -159,5 +159,5 @@ extern const gnrc_netdev_driver_t kw2xrf_driver;
 }
 #endif
 
-#endif
+#endif /* MKW2XDRF_H */
 /** @} */
diff --git a/drivers/include/sht11.h b/drivers/include/sht11.h
index ae3b7c464..d347bc4a4 100644
--- a/drivers/include/sht11.h
+++ b/drivers/include/sht11.h
@@ -105,4 +105,4 @@ uint8_t sht11_read_status(uint8_t *p_value, uint8_t *p_checksum);
 #endif
 
 /** @} */
-#endif /*SHT11_H_*/
+#endif /* SHT11_H */
diff --git a/examples/riot_and_cpp/c_functions.h b/examples/riot_and_cpp/c_functions.h
index 9d3ee18a8..3a4de5ab3 100644
--- a/examples/riot_and_cpp/c_functions.h
+++ b/examples/riot_and_cpp/c_functions.h
@@ -47,4 +47,4 @@ int day_of_week(int day, int month, int year);
 #endif
 
 /** @} */
-#endif // _C_FUNCTIONS_H
+#endif /* C_FUNCTIONS_H */
diff --git a/examples/riot_and_cpp/cpp_class.hpp b/examples/riot_and_cpp/cpp_class.hpp
index 19f0c075f..353cd72f7 100644
--- a/examples/riot_and_cpp/cpp_class.hpp
+++ b/examples/riot_and_cpp/cpp_class.hpp
@@ -60,4 +60,4 @@ private:
 };
 
 /** @} */
-#endif //__CPP_CLASS__
+#endif /* CPP_CLASS_H */
diff --git a/sys/include/crypto/modes/ctr.h b/sys/include/crypto/modes/ctr.h
index f3db7af73..62925f069 100644
--- a/sys/include/crypto/modes/ctr.h
+++ b/sys/include/crypto/modes/ctr.h
@@ -70,4 +70,4 @@ int cipher_decrypt_ctr(cipher_t* cipher, uint8_t nonce_counter[16],
 }
 #endif
 
-#endif /* CRYPTO_MODES_CTR_H_*/
+#endif /* CRYPTO_MODES_CTR_H */
diff --git a/sys/include/crypto/modes/ecb.h b/sys/include/crypto/modes/ecb.h
index 2cb8aa7fc..39f86c337 100644
--- a/sys/include/crypto/modes/ecb.h
+++ b/sys/include/crypto/modes/ecb.h
@@ -59,4 +59,4 @@ int cipher_decrypt_ecb(cipher_t* cipher, uint8_t* input, size_t length,
 }
 #endif
 
-#endif /* CRYPTO_MODES_ECB_H_*/
+#endif /* CRYPTO_MODES_ECB_H */
diff --git a/sys/include/xtimer/implementation.h b/sys/include/xtimer/implementation.h
index 54d8a0249..4190260ef 100644
--- a/sys/include/xtimer/implementation.h
+++ b/sys/include/xtimer/implementation.h
@@ -302,4 +302,4 @@ static inline bool xtimer_less64(xtimer_ticks64_t a, xtimer_ticks64_t b)
 }
 #endif
 
-#endif
+#endif /* XTIMER_IMPLEMENTATION_H */
diff --git a/sys/posix/pthread/include/pthread_spin.h b/sys/posix/pthread/include/pthread_spin.h
index 9d0c31ea3..1389ec76e 100644
--- a/sys/posix/pthread/include/pthread_spin.h
+++ b/sys/posix/pthread/include/pthread_spin.h
@@ -91,7 +91,7 @@ int pthread_spin_unlock(pthread_spinlock_t *lock);
 }
 #endif
 
-#endif
+#endif /* SYS_POSIX_PTHREAD_SPIN_H */
 
 /**
  * @}