diff --git a/cpu/native/include/clang_compat.h b/cpu/native/include/clang_compat.h
index 1459d3a16b44db2c0046375964c9ffe38a8c0c7e..6c1b6917df053189606b795ce249a323f71a9ae5 100644
--- a/cpu/native/include/clang_compat.h
+++ b/cpu/native/include/clang_compat.h
@@ -8,7 +8,8 @@
  * directory for more details.
  */
 
-#ifndef __CLANG_COMPAT_H
+#ifndef CLANG_COMPAT_H
+#define CLANG_COMPAT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,4 +26,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* CLANG_COMPAT_H */
diff --git a/cpu/nrf51/include/cpu_conf.h b/cpu/nrf51/include/cpu_conf.h
index 1c582677d67aee16ac5a7a7131947befc58e2a21..1bcecaf783f50a99912695f264795392b2860e71 100644
--- a/cpu/nrf51/include/cpu_conf.h
+++ b/cpu/nrf51/include/cpu_conf.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef __CPU_CONF_H
-#define __CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 #include "nrf51.h"
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/nrf51/include/nrf51_bitfields.h b/cpu/nrf51/include/nrf51_bitfields.h
index 1bcdb7269c1947719c3a691eba9bdd8aa4008304..4ee0826d5617879f8ad38048c275b94844ef7625 100644
--- a/cpu/nrf51/include/nrf51_bitfields.h
+++ b/cpu/nrf51/include/nrf51_bitfields.h
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef __NRF51_BITS_H
-#define __NRF51_BITS_H
+#ifndef NRF51_BITS_H
+#define NRF51_BITS_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -7077,4 +7077,4 @@
 #endif
 
 /*lint --flb "Leave library region" */
-#endif
+#endif /* NRF51_BITS_H */
diff --git a/cpu/nrf52/include/nrf52_bitfields.h b/cpu/nrf52/include/nrf52_bitfields.h
index 1cb6c7ec0d971e349fe533d9c8b0a736364e87b8..5fee210c150a6b890fbf1bddd777bb6e00c19fa4 100644
--- a/cpu/nrf52/include/nrf52_bitfields.h
+++ b/cpu/nrf52/include/nrf52_bitfields.h
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef __NRF52_BITS_H
-#define __NRF52_BITS_H
+#ifndef NRF52_BITS_H
+#define NRF52_BITS_H
 
 /*lint ++flb "Enter library region" */
 
@@ -12142,4 +12142,4 @@ extern "C" {
 #endif
 
 /*lint --flb "Leave library region" */
-#endif
+#endif /* NRF52_BITS_H */
diff --git a/cpu/sam3/include/cpu_conf.h b/cpu/sam3/include/cpu_conf.h
index f3219f397dd3af9a9388ae07a68bba4f4d5cbdc5..481fad47b0d274d9b9b5d46080555bafc5593a4f 100644
--- a/cpu/sam3/include/cpu_conf.h
+++ b/cpu/sam3/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __CPU_CONF_H
-#define __CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 #include "sam3x8e.h"
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/samd21/include/cpu_conf.h b/cpu/samd21/include/cpu_conf.h
index 8ce539c9cd70a5dda90213aabf7e50195da7b007..59bbd8742d2d42ad3d1997c94b9a3c292e3bd9cc 100644
--- a/cpu/samd21/include/cpu_conf.h
+++ b/cpu/samd21/include/cpu_conf.h
@@ -15,8 +15,8 @@
  * @author          Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __CPU_CONF_H
-#define __CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/stellaris_common/include/cortex-m4-def.h b/cpu/stellaris_common/include/cortex-m4-def.h
index 6792776f5f6bbbfd3c0d399e703048a7ad16bc47..a03fe8e512588c34f7b9876b27ea65687609a7ef 100644
--- a/cpu/stellaris_common/include/cortex-m4-def.h
+++ b/cpu/stellaris_common/include/cortex-m4-def.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __CORTEX_M4_DEF_H__
-#define __CORTEX_M4_DEF_H__
+#ifndef CORTEX_M4_DEF_H_
+#define CORTEX_M4_DEF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -10062,4 +10062,4 @@ extern "C" {
 }
 #endif
 
-#endif // __LM4F120H5QR_H__
+#endif /* CORTEX_M4_DEF_H_ */
diff --git a/cpu/stellaris_common/include/hw_adc.h b/cpu/stellaris_common/include/hw_adc.h
index 7d742cdce017359e7bf28a6cbd2d800b399f16fe..8eadc6e4368393aa60b4180109ed96377ff3c180 100644
--- a/cpu/stellaris_common/include/hw_adc.h
+++ b/cpu/stellaris_common/include/hw_adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_ADC_H__
-#define __HW_ADC_H__
+#ifndef HW_ADC_H_
+#define HW_ADC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1357,4 +1357,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_ADC_H__
+#endif /* HW_ADC_H_ */
diff --git a/cpu/stellaris_common/include/hw_gpio.h b/cpu/stellaris_common/include/hw_gpio.h
index 96f96c8a6b369915bce9d8763bcecac0370552d0..5f74be23f8ee34986ed6324cc327446cfe25e57d 100644
--- a/cpu/stellaris_common/include/hw_gpio.h
+++ b/cpu/stellaris_common/include/hw_gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_GPIO_H__
-#define __HW_GPIO_H__
+#ifndef HW_GPIO_H_
+#define HW_GPIO_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,4 +197,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_GPIO_H__
+#endif /* HW_GPIO_H_ */
diff --git a/cpu/stellaris_common/include/hw_hibernate.h b/cpu/stellaris_common/include/hw_hibernate.h
index b8c36a3942ef2f6f404eb6e76c23db7c31be065b..9f024f1543e75f7e31f2710ff44cc682e2ab0c59 100644
--- a/cpu/stellaris_common/include/hw_hibernate.h
+++ b/cpu/stellaris_common/include/hw_hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_HIBERNATE_H__
-#define __HW_HIBERNATE_H__
+#ifndef HW_HIBERNATE_H_
+#define HW_HIBERNATE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -291,4 +291,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_HIBERNATE_H__
+#endif /* HW_HIBERNATE_H_ */
diff --git a/cpu/stellaris_common/include/hw_i2c.h b/cpu/stellaris_common/include/hw_i2c.h
index 359bbaee47b81ee756945ec981e3a8a4dc74ce61..a082cbcced05b954dc6c44dde65db0dcbd5f8204 100644
--- a/cpu/stellaris_common/include/hw_i2c.h
+++ b/cpu/stellaris_common/include/hw_i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_I2C_H__
-#define __HW_I2C_H__
+#ifndef HW_I2C_H_
+#define HW_I2C_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -494,4 +494,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_I2C_H__
+#endif /* HW_I2C_H_ */
diff --git a/cpu/stellaris_common/include/hw_ints.h b/cpu/stellaris_common/include/hw_ints.h
index 96200bccd44048e8c52db64eace2d6e2b07872c3..605c0747d5d75e2ea602da379c70b890f501db60 100644
--- a/cpu/stellaris_common/include/hw_ints.h
+++ b/cpu/stellaris_common/include/hw_ints.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_INTS_H__
-#define __HW_INTS_H__
+#ifndef HW_INTS_H_
+#define HW_INTS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,4 +222,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_INTS_H__
+#endif /* HW_INTS_H_ */
diff --git a/cpu/stellaris_common/include/hw_memmap.h b/cpu/stellaris_common/include/hw_memmap.h
index 4ad3b93d7025ddfd1199712b934ec34b4563619f..3dc05b6db890d8de4677fab63ded54efc2c1427b 100644
--- a/cpu/stellaris_common/include/hw_memmap.h
+++ b/cpu/stellaris_common/include/hw_memmap.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_MEMMAP_H__
-#define __HW_MEMMAP_H__
+#ifndef HW_MEMMAP_H_
+#define HW_MEMMAP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_MEMMAP_H__
+#endif /* HW_MEMMAP_H_ */
diff --git a/cpu/stellaris_common/include/hw_nvic.h b/cpu/stellaris_common/include/hw_nvic.h
index 8273103108191bfaeb10562eede6826b89fe72cf..d70d030895b015f0b94adc71a5a8c3f1a6901c71 100644
--- a/cpu/stellaris_common/include/hw_nvic.h
+++ b/cpu/stellaris_common/include/hw_nvic.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_NVIC_H__
-#define __HW_NVIC_H__
+#ifndef HW_NVIC_H_
+#define HW_NVIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1722,4 +1722,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_NVIC_H__
+#endif /* HW_NVIC_H_ */
diff --git a/cpu/stellaris_common/include/hw_pwm.h b/cpu/stellaris_common/include/hw_pwm.h
index d780480dad23d42e7858af84cf332054eb427a96..e9394ededd4a5564ca503ae41cab407a63d708f9 100644
--- a/cpu/stellaris_common/include/hw_pwm.h
+++ b/cpu/stellaris_common/include/hw_pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_PWM_H__
-#define __HW_PWM_H__
+#ifndef HW_PWM_H_
+#define HW_PWM_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -2025,4 +2025,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_PWM_H__
+#endif /* HW_PWM_H_ */
diff --git a/cpu/stellaris_common/include/hw_ssi.h b/cpu/stellaris_common/include/hw_ssi.h
index ac3b67a18240225779ece5d5c3e527d3cba7ba5f..d3fc4dcfe4dd5a16c574e586fbf8cea59041c9f3 100644
--- a/cpu/stellaris_common/include/hw_ssi.h
+++ b/cpu/stellaris_common/include/hw_ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SSI_H__
-#define __HW_SSI_H__
+#ifndef HW_SSI_H_
+#define HW_SSI_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -249,4 +249,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SSI_H__
+#endif /* HW_SSI_H_ */
diff --git a/cpu/stellaris_common/include/hw_sysctl.h b/cpu/stellaris_common/include/hw_sysctl.h
index cff565e62f0dd1e9d687c09a6678d1b7c89092c2..3ab38ee907daf682885259c890e110d4be6af0e9 100644
--- a/cpu/stellaris_common/include/hw_sysctl.h
+++ b/cpu/stellaris_common/include/hw_sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SYSCTL_H__
-#define __HW_SYSCTL_H__
+#ifndef HW_SYSCTL_H_
+#define HW_SYSCTL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -3681,4 +3681,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SYSCTL_H__
+#endif /* HW_SYSCTL_H_ */
diff --git a/cpu/stellaris_common/include/hw_sysexc.h b/cpu/stellaris_common/include/hw_sysexc.h
index 325b5c953fc211ab788ca745a02b9037881c0f42..f8aafabf8c9fe2b45f5156532ee0db80dc1decde 100644
--- a/cpu/stellaris_common/include/hw_sysexc.h
+++ b/cpu/stellaris_common/include/hw_sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SYSEXC_H__
-#define __HW_SYSEXC_H__
+#ifndef HW_SYSEXC_H_
+#define HW_SYSEXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SYSEXC_H__
+#endif /* HW_SYSEXC_H_ */
diff --git a/cpu/stellaris_common/include/hw_timer.h b/cpu/stellaris_common/include/hw_timer.h
index 544f338606cd784ff763699f922170cbf098e78a..f4665d4acb837348dcb5f1ede0cd149fb9d4f0f5 100644
--- a/cpu/stellaris_common/include/hw_timer.h
+++ b/cpu/stellaris_common/include/hw_timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_TIMER_H__
-#define __HW_TIMER_H__
+#ifndef HW_TIMER_H_
+#define HW_TIMER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -764,4 +764,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_TIMER_H__
+#endif /* HW_TIMER_H_ */
diff --git a/cpu/stellaris_common/include/hw_types.h b/cpu/stellaris_common/include/hw_types.h
index c3cf5c35b0e0643d073fa90d49b35c1ef14695e5..58dfe9404e8a07b1d19b26b0ccd7bbac06620ff4 100644
--- a/cpu/stellaris_common/include/hw_types.h
+++ b/cpu/stellaris_common/include/hw_types.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_TYPES_H__
-#define __HW_TYPES_H__
+#ifndef HW_TYPES_H_
+#define HW_TYPES_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,4 +223,4 @@ typedef unsigned char tBoolean;
 }
 #endif
 
-#endif // __HW_TYPES_H__
+#endif /* HW_TYPES_H_ */
diff --git a/cpu/stellaris_common/include/hw_uart.h b/cpu/stellaris_common/include/hw_uart.h
index eb985338e1a3ff12cefceb9ef305ed2ed0fb484e..39db08c01866e667f3af871d0b2ce5b9339a7881 100644
--- a/cpu/stellaris_common/include/hw_uart.h
+++ b/cpu/stellaris_common/include/hw_uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_UART_H__
-#define __HW_UART_H__
+#ifndef HW_UART_H_
+#define HW_UART_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -527,4 +527,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_UART_H__
+#endif /* HW_UART_H_ */
diff --git a/cpu/stellaris_common/include/hw_watchdog.h b/cpu/stellaris_common/include/hw_watchdog.h
index a712adaf1f9d967393ed221f96bfedddc559847e..0b38da6d8cde0156cc85c769b6c57d0826818f7f 100644
--- a/cpu/stellaris_common/include/hw_watchdog.h
+++ b/cpu/stellaris_common/include/hw_watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_WATCHDOG_H__
-#define __HW_WATCHDOG_H__
+#ifndef HW_WATCHDOG_H_
+#define HW_WATCHDOG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,4 +196,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_WATCHDOG_H__
+#endif /* HW_WATCHDOG_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/adc.h b/cpu/stellaris_common/include/stellaris_periph/adc.h
index 47f82f9c4a059b1a1f1757c376275f87c6b4f83f..fecd1e8018c2afee9aeabf2ab5c2bc8e1e790359 100644
--- a/cpu/stellaris_common/include/stellaris_periph/adc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __ADC_H__
-#define __ADC_H__
+#ifndef ADC_H_
+#define ADC_H_
 
 //*****************************************************************************
 //
@@ -308,4 +308,4 @@ extern unsigned long ADCPhaseDelayGet(unsigned long ulBase);
 }
 #endif
 
-#endif // __ADC_H__
+#endif /* ADC_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/comp.h b/cpu/stellaris_common/include/stellaris_periph/comp.h
index 43f12eff5d86bf23a5bab14db1d9046bb51a8564..3b2a81a0a1844ad299b85399b563f76ffa437546 100644
--- a/cpu/stellaris_common/include/stellaris_periph/comp.h
+++ b/cpu/stellaris_common/include/stellaris_periph/comp.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __COMP_H__
-#define __COMP_H__
+#ifndef COMP_H_
+#define COMP_H_
 
 //*****************************************************************************
 //
@@ -142,4 +142,4 @@ extern void ComparatorIntClear(unsigned long ulBase, unsigned long ulComp);
 }
 #endif
 
-#endif // __COMP_H__
+#endif /* COMP_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/cpu.h b/cpu/stellaris_common/include/stellaris_periph/cpu.h
index ca093d1e1a984f1ceb6ad17e0ed4777318dc9a83..b0d8468e6b401861dd6e6cbb24cf0a998bbe72fb 100644
--- a/cpu/stellaris_common/include/stellaris_periph/cpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/cpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __CPU_H__
-#define __CPU_H__
+#ifndef STELLARIS_CPU_H_
+#define STELLARIS_CPU_H_
 
 //*****************************************************************************
 //
@@ -72,4 +72,4 @@ extern void CPUbasepriSet(unsigned long ulNewBasepri);
 }
 #endif
 
-#endif // __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 cd7ab72010237a9b3a9bb77d18e74551d789de6d..72637c82b7c27596a4cf3f0dc8da95e6bec3a7e9 100644
--- a/cpu/stellaris_common/include/stellaris_periph/fpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/fpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __FPU_H__
-#define __FPU_H__
+#ifndef FPU_H_
+#define FPU_H_
 
 //*****************************************************************************
 //
@@ -109,4 +109,4 @@ extern void FPURoundingModeSet(unsigned long ulMode);
 }
 #endif
 
-#endif // __FPU_H__
+#endif /* FPU_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/gpio.h b/cpu/stellaris_common/include/stellaris_periph/gpio.h
index f8740eaac027046489544aca8f518e7d6cfc5460..683c329e624c543b5306b09216a037483d086073 100644
--- a/cpu/stellaris_common/include/stellaris_periph/gpio.h
+++ b/cpu/stellaris_common/include/stellaris_periph/gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef GPIO_H_
+#define GPIO_H_
 
 //*****************************************************************************
 //
@@ -196,4 +196,4 @@ extern void GPIOADCTriggerDisable(unsigned long ulPort, unsigned char ucPins);
 }
 #endif
 
-#endif //  __GPIO_H__
+#endif /* GPIO_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/hibernate.h b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
index d698ed86dd5c966633b4fabdd736806f5a9b300e..39732cb4d16821636565420af78f3c7428c27813 100644
--- a/cpu/stellaris_common/include/stellaris_periph/hibernate.h
+++ b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HIBERNATE_H__
-#define __HIBERNATE_H__
+#ifndef HIBERNATE_H_
+#define HIBERNATE_H_
 
 //*****************************************************************************
 //
@@ -164,4 +164,4 @@ extern unsigned long HibernateBatCheckDone(void);
 }
 #endif
 
-#endif  // __HIBERNATE_H__
+#endif  /* HIBERNATE_H_ */