diff --git a/cpu/stellaris_common/include/cortex-m4-def.h b/cpu/stellaris_common/include/cortex-m4-def.h
index a03fe8e51..7f4c19e9a 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 STELLARIS_CORTEX_M4_DEF_H_
+#define STELLARIS_CORTEX_M4_DEF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -10062,4 +10062,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 8eadc6e43..bb9af580f 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 STELLARIS_HW_ADC_H_
+#define STELLARIS_HW_ADC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1357,4 +1357,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 5f74be23f..5c547fad3 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 STELLARIS_HW_GPIO_H_
+#define STELLARIS_HW_GPIO_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,4 +197,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 9f024f154..4b7480097 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 STELLARIS_HW_HIBERNATE_H_
+#define STELLARIS_HW_HIBERNATE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -291,4 +291,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 a082cbcce..30fcd0f5d 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 STELLARIS_HW_I2C_H_
+#define STELLARIS_HW_I2C_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -494,4 +494,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 605c0747d..14c77782e 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 STELLARIS_HW_INTS_H_
+#define STELLARIS_HW_INTS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,4 +222,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 3dc05b6db..8dccea6c6 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 STELLARIS_HW_MEMMAP_H_
+#define STELLARIS_HW_MEMMAP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 d70d03089..a472561e2 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 STELLARIS_HW_NVIC_H_
+#define STELLARIS_HW_NVIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1722,4 +1722,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 e9394eded..e8c0368ee 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 STELLARIS_HW_PWM_H_
+#define STELLARIS_HW_PWM_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -2025,4 +2025,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 d3fc4dcfe..41bf1cc11 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 STELLARIS_HW_SSI_H_
+#define STELLARIS_HW_SSI_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -249,4 +249,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 3ab38ee90..097071a06 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 STELLARIS_HW_SYSCTL_H_
+#define STELLARIS_HW_SYSCTL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -3681,4 +3681,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 f8aafabf8..999a328e6 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 STELLARIS_HW_SYSEXC_H_
+#define STELLARIS_HW_SYSEXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 f4665d4ac..949990e28 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 STELLARIS_HW_TIMER_H_
+#define STELLARIS_HW_TIMER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -764,4 +764,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 58dfe9404..c6aec30b0 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 STELLARIS_HW_TYPES_H_
+#define STELLARIS_HW_TYPES_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,4 +223,4 @@ typedef unsigned char tBoolean;
 }
 #endif
 
-#endif /* 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 39db08c01..18986fc42 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 STELLARIS_HW_UART_H_
+#define STELLARIS_HW_UART_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -527,4 +527,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 0b38da6d8..2bc65a02a 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 STELLARIS_HW_WATCHDOG_H_
+#define STELLARIS_HW_WATCHDOG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,4 +196,4 @@ extern "C" {
 }
 #endif
 
-#endif /* 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 fecd1e801..7446e651e 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 STELLARIS_ADC_H_
+#define STELLARIS_ADC_H_
 
 //*****************************************************************************
 //
@@ -308,4 +308,4 @@ extern unsigned long ADCPhaseDelayGet(unsigned long ulBase);
 }
 #endif
 
-#endif /* 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 3b2a81a0a..e6e204475 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 STELLARIS_COMP_H_
+#define STELLARIS_COMP_H_
 
 //*****************************************************************************
 //
@@ -142,4 +142,4 @@ extern void ComparatorIntClear(unsigned long ulBase, unsigned long ulComp);
 }
 #endif
 
-#endif /* COMP_H_ */
+#endif /* STELLARIS_COMP_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/fpu.h b/cpu/stellaris_common/include/stellaris_periph/fpu.h
index 72637c82b..3c486b355 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 STELLARIS_FPU_H_
+#define STELLARIS_FPU_H_
 
 //*****************************************************************************
 //
@@ -109,4 +109,4 @@ extern void FPURoundingModeSet(unsigned long ulMode);
 }
 #endif
 
-#endif /* 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 683c329e6..32454b81f 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 STELLARIS_GPIO_H_
+#define STELLARIS_GPIO_H_
 
 //*****************************************************************************
 //
@@ -196,4 +196,4 @@ extern void GPIOADCTriggerDisable(unsigned long ulPort, unsigned char ucPins);
 }
 #endif
 
-#endif /* 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 39732cb4d..589028d11 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 STELLARIS_HIBERNATE_H_
+#define STELLARIS_HIBERNATE_H_
 
 //*****************************************************************************
 //
@@ -164,4 +164,4 @@ extern unsigned long HibernateBatCheckDone(void);
 }
 #endif
 
-#endif  /* HIBERNATE_H_ */
+#endif  /* STELLARIS_HIBERNATE_H_ */