diff --git a/os/common/startup/ARM/devices/LPC214x/armparams.h b/os/common/startup/ARM/devices/LPC214x/armparams.h
index 476ad1e4e..d273c9f0a 100644
--- a/os/common/startup/ARM/devices/LPC214x/armparams.h
+++ b/os/common/startup/ARM/devices/LPC214x/armparams.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    armparams.h
+ * @file    LPC214x/armparams.h
  * @brief   ARM parameters for the LPC214x.
  *
  * @defgroup ARM_LPC214x LPC214x Specific Parameters
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _ARMPARAMS_H_
-#define _ARMPARAMS_H_
+#ifndef ARMPARAMS_H
+#define ARMPARAMS_H
 
 /**
  * @brief   ARM core model.
@@ -57,6 +57,6 @@
 #define ARM_IRQ_VECTOR_REG      0xFFFFF030
 #endif
 
-#endif /* _ARMPARAMS_H_ */
+#endif /* ARMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARM/devices/LPC214x/lpc214x.h b/os/common/startup/ARM/devices/LPC214x/lpc214x.h
index ccf344e6d..b21c0b49a 100644
--- a/os/common/startup/ARM/devices/LPC214x/lpc214x.h
+++ b/os/common/startup/ARM/devices/LPC214x/lpc214x.h
@@ -15,12 +15,12 @@
 */
 
 /**
- * @file lpc214x.h
- * @brief LPC214x register definitions.
+ * @file    lpc214x.h
+ * @brief   LPC214x register definitions.
  */
 
-#ifndef _LPC214X_H_
-#define _LPC214X_H_
+#ifndef LPC214X_H
+#define LPC214X_H
 
 typedef volatile uint8_t IOREG8;
 typedef volatile uint16_t IOREG16;
@@ -519,5 +519,5 @@ typedef struct {
  */
 #define DACR                    (*((IOREG32 *)0xE006C000))
 
-#endif /* _LPC214X_H_ */
+#endif /* LPC214X_H */
 
diff --git a/os/common/startup/ARMCMx/compilers/GCC/vectors.h b/os/common/startup/ARMCMx/compilers/GCC/vectors.h
index d4149b747..a793a26bf 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/vectors.h
+++ b/os/common/startup/ARMCMx/compilers/GCC/vectors.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _VECTORS_H_
-#define _VECTORS_H_
+#ifndef VECTORS_H
+#define VECTORS_H
 
 #include "cmparams.h"
 
@@ -97,6 +97,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _VECTORS_H_ */
+#endif /* VECTORS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/K20x/cmparams.h b/os/common/startup/ARMCMx/devices/K20x/cmparams.h
index 1c305ec35..ec4c5a6af 100644
--- a/os/common/startup/ARMCMx/devices/K20x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/K20x/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -74,6 +74,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/KL2x/cmparams.h b/os/common/startup/ARMCMx/devices/KL2x/cmparams.h
index 7da85c8aa..f68e3cf51 100644
--- a/os/common/startup/ARMCMx/devices/KL2x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/KL2x/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -74,6 +74,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
index fb2e3360e..1ede485c9 100644
--- a/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -81,6 +81,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
index c7fa919d6..b54f872f5 100644
--- a/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -82,6 +82,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
index 8b344e691..4c92a3364 100644
--- a/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -76,6 +76,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
index cab4b5311..0064a5c63 100644
--- a/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -85,6 +85,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
index 6fe592ebe..9d8d2d84b 100644
--- a/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -85,6 +85,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
index 7a6599a7b..8fc73be10 100644
--- a/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -80,6 +80,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
index 4cf610399..a651345d1 100644
--- a/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -78,6 +78,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
index ff6a282a7..099ec7636 100644
--- a/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -89,6 +89,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
index a72c7dc6d..d12aa8e53 100644
--- a/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
+#ifndef CMPARAMS_H
+#define CMPARAMS_H
 
 /**
  * @brief   Cortex core model.
@@ -82,6 +82,6 @@
 
 #endif /* !defined(_FROM_ASM_) */
 
-#endif /* _CMPARAMS_H_ */
+#endif /* CMPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/compilers/CW/vectors.h b/os/common/startup/e200/compilers/CW/vectors.h
index 26f7607df..95b1ff72c 100644
--- a/os/common/startup/e200/compilers/CW/vectors.h
+++ b/os/common/startup/e200/compilers/CW/vectors.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _VECTORS_H_
-#define _VECTORS_H_
+#ifndef VECTORS_H
+#define VECTORS_H
 
 #include "ppcparams.h"
 
@@ -73,6 +73,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _VECTORS_H_ */
+#endif /* VECTORS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/compilers/GCC/vectors.h b/os/common/startup/e200/compilers/GCC/vectors.h
index 052314a60..392148fb2 100644
--- a/os/common/startup/e200/compilers/GCC/vectors.h
+++ b/os/common/startup/e200/compilers/GCC/vectors.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _VECTORS_H_
-#define _VECTORS_H_
+#ifndef VECTORS_H
+#define VECTORS_H
 
 #include "ppcparams.h"
 
@@ -73,6 +73,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _VECTORS_H_ */
+#endif /* VECTORS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560BCxx/boot.h b/os/common/startup/e200/devices/SPC560BCxx/boot.h
index fbc145c90..9116a6388 100644
--- a/os/common/startup/e200/devices/SPC560BCxx/boot.h
+++ b/os/common/startup/e200/devices/SPC560BCxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -109,6 +109,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560BCxx/intc.h b/os/common/startup/e200/devices/SPC560BCxx/intc.h
index 392c22a4e..99b849148 100644
--- a/os/common/startup/e200/devices/SPC560BCxx/intc.h
+++ b/os/common/startup/e200/devices/SPC560BCxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560BCxx/ppcparams.h b/os/common/startup/e200/devices/SPC560BCxx/ppcparams.h
index 4590ffec0..f65102d57 100644
--- a/os/common/startup/e200/devices/SPC560BCxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC560BCxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             217
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Bxx/boot.h b/os/common/startup/e200/devices/SPC560Bxx/boot.h
index 10f2a4c76..707244d00 100644
--- a/os/common/startup/e200/devices/SPC560Bxx/boot.h
+++ b/os/common/startup/e200/devices/SPC560Bxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -109,6 +109,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Bxx/intc.h b/os/common/startup/e200/devices/SPC560Bxx/intc.h
index b336e93b5..6ba7d7418 100644
--- a/os/common/startup/e200/devices/SPC560Bxx/intc.h
+++ b/os/common/startup/e200/devices/SPC560Bxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Bxx/ppcparams.h b/os/common/startup/e200/devices/SPC560Bxx/ppcparams.h
index afa7d1476..a9c76ed08 100644
--- a/os/common/startup/e200/devices/SPC560Bxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC560Bxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             234
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Dxx/boot.h b/os/common/startup/e200/devices/SPC560Dxx/boot.h
index 10f478dfb..9134d574a 100644
--- a/os/common/startup/e200/devices/SPC560Dxx/boot.h
+++ b/os/common/startup/e200/devices/SPC560Dxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -109,6 +109,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Dxx/intc.h b/os/common/startup/e200/devices/SPC560Dxx/intc.h
index d1886600e..98ca3e07a 100644
--- a/os/common/startup/e200/devices/SPC560Dxx/intc.h
+++ b/os/common/startup/e200/devices/SPC560Dxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Dxx/ppcparams.h b/os/common/startup/e200/devices/SPC560Dxx/ppcparams.h
index 953a1668e..b0c7a8a5a 100644
--- a/os/common/startup/e200/devices/SPC560Dxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC560Dxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             155
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Pxx/boot.h b/os/common/startup/e200/devices/SPC560Pxx/boot.h
index 70b4f53fb..855e95db9 100644
--- a/os/common/startup/e200/devices/SPC560Pxx/boot.h
+++ b/os/common/startup/e200/devices/SPC560Pxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -109,6 +109,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Pxx/intc.h b/os/common/startup/e200/devices/SPC560Pxx/intc.h
index 7727424da..d6b657da3 100644
--- a/os/common/startup/e200/devices/SPC560Pxx/intc.h
+++ b/os/common/startup/e200/devices/SPC560Pxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC560Pxx/ppcparams.h b/os/common/startup/e200/devices/SPC560Pxx/ppcparams.h
index f85f416a8..4c885a411 100644
--- a/os/common/startup/e200/devices/SPC560Pxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC560Pxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             261
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC563Mxx/boot.h b/os/common/startup/e200/devices/SPC563Mxx/boot.h
index 42164e92e..60002bfa8 100644
--- a/os/common/startup/e200/devices/SPC563Mxx/boot.h
+++ b/os/common/startup/e200/devices/SPC563Mxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -114,6 +114,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC563Mxx/intc.h b/os/common/startup/e200/devices/SPC563Mxx/intc.h
index 78a68295a..9988137d9 100644
--- a/os/common/startup/e200/devices/SPC563Mxx/intc.h
+++ b/os/common/startup/e200/devices/SPC563Mxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC563Mxx/ppcparams.h b/os/common/startup/e200/devices/SPC563Mxx/ppcparams.h
index b0ffb913b..abc888c73 100644
--- a/os/common/startup/e200/devices/SPC563Mxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC563Mxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             360
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC564Axx/boot.h b/os/common/startup/e200/devices/SPC564Axx/boot.h
index e6fba9918..7ee800546 100644
--- a/os/common/startup/e200/devices/SPC564Axx/boot.h
+++ b/os/common/startup/e200/devices/SPC564Axx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -237,6 +237,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC564Axx/intc.h b/os/common/startup/e200/devices/SPC564Axx/intc.h
index 404264db3..d661935b3 100644
--- a/os/common/startup/e200/devices/SPC564Axx/intc.h
+++ b/os/common/startup/e200/devices/SPC564Axx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC564Axx/ppcparams.h b/os/common/startup/e200/devices/SPC564Axx/ppcparams.h
index 6d4b26439..66365b751 100644
--- a/os/common/startup/e200/devices/SPC564Axx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC564Axx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             486
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ECxx/boot.h b/os/common/startup/e200/devices/SPC56ECxx/boot.h
index a8115553d..0d3c564db 100644
--- a/os/common/startup/e200/devices/SPC56ECxx/boot.h
+++ b/os/common/startup/e200/devices/SPC56ECxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -243,6 +243,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ECxx/intc.h b/os/common/startup/e200/devices/SPC56ECxx/intc.h
index 40401b36f..87d0caad5 100644
--- a/os/common/startup/e200/devices/SPC56ECxx/intc.h
+++ b/os/common/startup/e200/devices/SPC56ECxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -90,6 +90,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ECxx/ppcparams.h b/os/common/startup/e200/devices/SPC56ECxx/ppcparams.h
index e43abf108..4fb046199 100644
--- a/os/common/startup/e200/devices/SPC56ECxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC56ECxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             279
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ELxx/boot.h b/os/common/startup/e200/devices/SPC56ELxx/boot.h
index 47ec4a128..2bf8c1678 100644
--- a/os/common/startup/e200/devices/SPC56ELxx/boot.h
+++ b/os/common/startup/e200/devices/SPC56ELxx/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -243,6 +243,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ELxx/intc.h b/os/common/startup/e200/devices/SPC56ELxx/intc.h
index 0204449e2..06392ef80 100644
--- a/os/common/startup/e200/devices/SPC56ELxx/intc.h
+++ b/os/common/startup/e200/devices/SPC56ELxx/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC56ELxx/ppcparams.h b/os/common/startup/e200/devices/SPC56ELxx/ppcparams.h
index e8cb36ed1..2bec34c19 100644
--- a/os/common/startup/e200/devices/SPC56ELxx/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC56ELxx/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -78,6 +78,6 @@
  */
 #define PPC_NUM_VECTORS             256
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC57EMxx_HSM/boot.h b/os/common/startup/e200/devices/SPC57EMxx_HSM/boot.h
index 474113dbd..0c3af3957 100644
--- a/os/common/startup/e200/devices/SPC57EMxx_HSM/boot.h
+++ b/os/common/startup/e200/devices/SPC57EMxx_HSM/boot.h
@@ -20,8 +20,8 @@
  * @{
  */
 
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#ifndef BOOT_H
+#define BOOT_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -88,6 +88,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _BOOT_H_ */
+#endif /* BOOT_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC57EMxx_HSM/intc.h b/os/common/startup/e200/devices/SPC57EMxx_HSM/intc.h
index 3ad685556..e57e02688 100644
--- a/os/common/startup/e200/devices/SPC57EMxx_HSM/intc.h
+++ b/os/common/startup/e200/devices/SPC57EMxx_HSM/intc.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef INTC_H
+#define INTC_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -89,6 +89,6 @@
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _INTC_H_ */
+#endif /* INTC_H */
 
 /** @} */
diff --git a/os/common/startup/e200/devices/SPC57EMxx_HSM/ppcparams.h b/os/common/startup/e200/devices/SPC57EMxx_HSM/ppcparams.h
index db0d44d54..a6f86c15d 100644
--- a/os/common/startup/e200/devices/SPC57EMxx_HSM/ppcparams.h
+++ b/os/common/startup/e200/devices/SPC57EMxx_HSM/ppcparams.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _PPCPARAMS_H_
-#define _PPCPARAMS_H_
+#ifndef PPCPARAMS_H
+#define PPCPARAMS_H
 
 /**
  * @brief   Family identification macro.
@@ -83,6 +83,6 @@
  */
 #define PPC_NUM_VECTORS             64
 
-#endif /* _PPCPARAMS_H_ */
+#endif /* PPCPARAMS_H */
 
 /** @} */
diff --git a/os/hal/templates/hal_wdg_lld.c b/os/hal/templates/hal_wdg_lld.c
index 04e012cdd..603379684 100644
--- a/os/hal/templates/hal_wdg_lld.c
+++ b/os/hal/templates/hal_wdg_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    hal_templates/wdg_lld.c
+ * @file    wdg_lld.c
  * @brief   WDG Driver subsystem low level driver source template.
  *
  * @addtogroup WDG
diff --git a/os/hal/templates/hal_wdg_lld.h b/os/hal/templates/hal_wdg_lld.h
index 6fe501e24..1fff88558 100644
--- a/os/hal/templates/hal_wdg_lld.h
+++ b/os/hal/templates/hal_wdg_lld.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    hal_templates/wdg_lld.h
+ * @file    wdg_lld.h
  * @brief   WDG Driver subsystem low level driver header template.
  *
  * @addtogroup WDG
diff --git a/os/various/devices_lib/accel/lis302dl.h b/os/various/devices_lib/accel/lis302dl.h
index 719f8439d..397189bb9 100644
--- a/os/various/devices_lib/accel/lis302dl.h
+++ b/os/various/devices_lib/accel/lis302dl.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _LIS302DL_H_
-#define _LIS302DL_H_
+#ifndef LIS302DL_H
+#define LIS302DL_H
 
 /*===========================================================================*/
 /* Driver constants.                                                         */
@@ -88,6 +88,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _LIS302DL_H_ */
+#endif /* LIS302DL_H */
 
 /** @} */
diff --git a/os/various/devices_lib/lcd/lcd3310.h b/os/various/devices_lib/lcd/lcd3310.h
index 1fe59d6f6..b10e838b2 100644
--- a/os/various/devices_lib/lcd/lcd3310.h
+++ b/os/various/devices_lib/lcd/lcd3310.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _LCD3310_H_
-#define _LCD3310_H_
+#ifndef LCD3310_H
+#define LCD3310_H
 
 /*===========================================================================*/
 /* Driver constants.                                                         */
@@ -89,6 +89,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _LCD3310_H_ */
+#endif /* LCD3310_H */
 
 /** @} */
diff --git a/os/various/evtimer.h b/os/various/evtimer.h
index 584ba0f15..671e79f99 100644
--- a/os/various/evtimer.h
+++ b/os/various/evtimer.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _EVTIMER_H_
-#define _EVTIMER_H_
+#ifndef EVTIMER_H
+#define EVTIMER_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -89,6 +89,6 @@ static inline void vevtStop(event_timer_t *etp) {
   chVTReset(&etp->et_vt);
 }
 
-#endif /* _EVTIMER_H_ */
+#endif /* EVTIMER_H */
 
 /** @} */
diff --git a/os/various/lwip_bindings/lwipthread.h b/os/various/lwip_bindings/lwipthread.h
index b921f0280..8cd1c2e5d 100644
--- a/os/various/lwip_bindings/lwipthread.h
+++ b/os/various/lwip_bindings/lwipthread.h
@@ -21,8 +21,8 @@
  * @{
  */
 
-#ifndef _LWIPTHREAD_H_
-#define _LWIPTHREAD_H_
+#ifndef LWIPTHREAD_H
+#define LWIPTHREAD_H
 
 #include <lwip/opt.h>
 
@@ -156,6 +156,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _LWIPTHREAD_H_ */
+#endif /* LWIPTHREAD_H */
 
 /** @} */
diff --git a/os/various/shell/shell.h b/os/various/shell/shell.h
index 28701c599..5d026dd05 100644
--- a/os/various/shell/shell.h
+++ b/os/various/shell/shell.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SHELL_H_
-#define _SHELL_H_
+#ifndef SHELL_H
+#define SHELL_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -105,6 +105,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _SHELL_H_ */
+#endif /* SHELL_H */
 
 /** @} */
diff --git a/os/various/shell/shell_cmd.h b/os/various/shell/shell_cmd.h
index 1f9ad64b1..4eac1a122 100644
--- a/os/various/shell/shell_cmd.h
+++ b/os/various/shell/shell_cmd.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SHELLCMD_H_
-#define _SHELLCMD_H_
+#ifndef SHELLCMD_H
+#define SHELLCMD_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -109,6 +109,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _SHELLCMD_H_ */
+#endif /* SHELLCMD_H */
 
 /** @} */
diff --git a/test/hal/testbuild/board.h b/test/hal/testbuild/board.h
index e2ef46123..408cbb918 100644
--- a/test/hal/testbuild/board.h
+++ b/test/hal/testbuild/board.h
@@ -14,8 +14,8 @@
     limitations under the License.
 */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
 
 /*
  * Setup for a generic board.
@@ -37,4 +37,4 @@ extern "C" {
 #endif
 #endif /* _FROM_ASM_ */
 
-#endif /* _BOARD_H_ */
+#endif /* BOARD_H */
diff --git a/test/lib/ch_test.h b/test/lib/ch_test.h
index 6ecdb4af8..cbc2f2af8 100644
--- a/test/lib/ch_test.h
+++ b/test/lib/ch_test.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _CH_TEST_H_
-#define _CH_TEST_H_
+#ifndef CH_TEST_H
+#define CH_TEST_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -188,6 +188,6 @@ extern "C" {
 
 #include "test_root.h"
 
-#endif /* _CH_TEST_H_ */
+#endif /* CH_TEST_H */
 
 /** @} */
diff --git a/testhal/common/irq_storm.h b/testhal/common/irq_storm.h
index 73e2e10a2..7dd96ce5e 100644
--- a/testhal/common/irq_storm.h
+++ b/testhal/common/irq_storm.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _IRQ_STORM_H_
-#define _IRQ_STORM_H_
+#ifndef IRQ_STORM_H
+#define IRQ_STORM_H
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -161,6 +161,6 @@ extern "C" {
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
-#endif /* _IRQ_STORM_H_ */
+#endif /* IRQ_STORM_H */
 
 /** @} */