diff --git a/cpu/stellaris_common/include/stellaris_periph/i2c.h b/cpu/stellaris_common/include/stellaris_periph/i2c.h
index eebbacc90e48b13bdc3ef1090add1d457c376f93..1b45a3366b2b9f90fbd20e304ed3e8b2b7f10dd8 100644
--- a/cpu/stellaris_common/include/stellaris_periph/i2c.h
+++ b/cpu/stellaris_common/include/stellaris_periph/i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __I2C_H__
-#define __I2C_H__
+#ifndef STELLARIS_I2C_H_
+#define STELLARIS_I2C_H_
 
 //*****************************************************************************
 //
@@ -221,4 +221,4 @@ extern unsigned long I2CSlaveStatus(unsigned long ulBase);
 }
 #endif
 
-#endif // __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 5afed45808fc70c4cf84639b709a0afe350946b8..f7d23c17d4695ad343a8aa621c690546fc319d49 100644
--- a/cpu/stellaris_common/include/stellaris_periph/interrupt.h
+++ b/cpu/stellaris_common/include/stellaris_periph/interrupt.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __INTERRUPT_H__
-#define __INTERRUPT_H__
+#ifndef STELLARIS_INTERRUPT_H_
+#define STELLARIS_INTERRUPT_H_
 
 //*****************************************************************************
 //
@@ -90,4 +90,4 @@ extern unsigned long IntPriorityMaskGet(void);
 }
 #endif
 
-#endif // __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 d36a0bbc650d2bd5268f01c46d35cd6be8a892d3..8bd33a4aad0fb9a163140e27f9c1c2bc5d6afebb 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 __PIN_MAP_H__
-#define __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 // __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 db9d9654d2b619fa4bf569fef53a5fabdccfb9dd..7692d624c18777b67fe091af0bc476ee7e020327 100644
--- a/cpu/stellaris_common/include/stellaris_periph/pwm.h
+++ b/cpu/stellaris_common/include/stellaris_periph/pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __PWM_H__
-#define __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 // __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 870e2aa24f93ed6498edda8558c193dbb288a65e..aa92d03b83723595d8315ac5238f709920fffea2 100644
--- a/cpu/stellaris_common/include/stellaris_periph/rom.h
+++ b/cpu/stellaris_common/include/stellaris_periph/rom.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __ROM_H__
-#define __ROM_H__
+#ifndef STELLARIS_ROM_H_
+#define STELLARIS_ROM_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -6749,4 +6749,4 @@ extern "C" {
 }
 #endif
 
-#endif // __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 976da29c6a004d54fb5dd9b645cf18b98ab2df4a..c48269eb3c965387c2b3abb50428b1b857c8a48d 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 __ROM_MAP_H__
-#define __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 // __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 20af87e7f3b77b5e8243a3ea8842503ee0da0e44..00dbe38e69d0963169b38c7de8b5c74dd14f256a 100644
--- a/cpu/stellaris_common/include/stellaris_periph/ssi.h
+++ b/cpu/stellaris_common/include/stellaris_periph/ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __SSI_H__
-#define __SSI_H__
+#ifndef STELLARIS_SSI_H_
+#define STELLARIS_SSI_H_
 
 //*****************************************************************************
 //
@@ -148,4 +148,4 @@ extern unsigned long SSIClockSourceGet(unsigned long ulBase);
 }
 #endif
 
-#endif // __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 c7c5748a40ee4042de5086b1c18c2c67c56d7c10..21dd874188c4c804349c900c616b4b2bf4c00ee7 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysctl.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __SYSCTL_H__
-#define __SYSCTL_H__
+#ifndef STELLARIS_SYSCTL_H_
+#define STELLARIS_SYSCTL_H_
 
 //*****************************************************************************
 //
@@ -639,4 +639,4 @@ extern unsigned long SysCtlI2SMClkSet(unsigned long ulInputClock,
 }
 #endif
 
-#endif // __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 1389b62d5351e42d9c2fa9ed6a1e908f33b1fb9a..e61422baf661d2462da5a1c240408ecda14b8fd6 100644
--- a/cpu/stellaris_common/include/stellaris_periph/sysexc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __SYSEXC_H__
-#define __SYSEXC_H__
+#ifndef STELLARIS_SYSEXC_H_
+#define STELLARIS_SYSEXC_H_
 
 //*****************************************************************************
 //
@@ -86,4 +86,4 @@ extern void SysExcIntClear(unsigned long ulIntFlags);
 }
 #endif
 
-#endif // __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 ba1c927da8074d814d0095d77df60876e4a5a15d..399c8485153603ae7d43461c60b68ce6a4e693da 100644
--- a/cpu/stellaris_common/include/stellaris_periph/systick.h
+++ b/cpu/stellaris_common/include/stellaris_periph/systick.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __SYSTICK_H__
-#define __SYSTICK_H__
+#ifndef STELLARIS_SYSTICK_H_
+#define STELLARIS_SYSTICK_H_
 
 //*****************************************************************************
 //
@@ -75,4 +75,4 @@ extern unsigned long SysTickValueGet(void);
 }
 #endif
 
-#endif // __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 7df7de8b828d0381f2bae3f49876a025fe516c2b..2db3c6438084a438ce92fa52533093d105595cdc 100644
--- a/cpu/stellaris_common/include/stellaris_periph/timer.h
+++ b/cpu/stellaris_common/include/stellaris_periph/timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __TIMER_H__
-#define __TIMER_H__
+#ifndef STELLARIS_TIMER_H_
+#define STELLARIS_TIMER_H_
 
 //*****************************************************************************
 //
@@ -233,4 +233,4 @@ extern void TimerQuiesce(unsigned long ulBase);
 }
 #endif
 
-#endif // __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 fe95b2d883891e817aa40329ce758f2f5977537c..de0649784b2bafb6439823b1cd725e8ed90486a5 100644
--- a/cpu/stellaris_common/include/stellaris_periph/uart.h
+++ b/cpu/stellaris_common/include/stellaris_periph/uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __UART_H__
-#define __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 //  __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 97dee207d57f566f560cf2cbf05cd56797958723..2a332479b3255e7f07edc93ed05d61ea074a6f31 100644
--- a/cpu/stellaris_common/include/stellaris_periph/watchdog.h
+++ b/cpu/stellaris_common/include/stellaris_periph/watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __WATCHDOG_H__
-#define __WATCHDOG_H__
+#ifndef STELLARIS_WATCHDOG_H_
+#define STELLARIS_WATCHDOG_H_
 
 //*****************************************************************************
 //
@@ -92,4 +92,4 @@ extern void WatchdogStallDisable(unsigned long ulBase);
 }
 #endif
 
-#endif // __WATCHDOG_H__
+#endif /* STELLARIS_WATCHDOG_H_ */