diff --git a/demos/AVR/NIL-ARDUINOMEGA/mcuconf.h b/demos/AVR/NIL-ARDUINOMEGA/mcuconf.h
index cb354779e..3682828bf 100644
--- a/demos/AVR/NIL-ARDUINOMEGA/mcuconf.h
+++ b/demos/AVR/NIL-ARDUINOMEGA/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -77,3 +80,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/AVR/RT-ARDUINOMEGA/mcuconf.h b/demos/AVR/RT-ARDUINOMEGA/mcuconf.h
index cb354779e..3682828bf 100644
--- a/demos/AVR/RT-ARDUINOMEGA/mcuconf.h
+++ b/demos/AVR/RT-ARDUINOMEGA/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -77,3 +80,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
index 2b013b687..198a03dcf 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -109,3 +112,5 @@
 #define KINETIS_EXT_PORTD_WIDTH                 16
 #define KINETIS_EXT_PORTE_WIDTH                 13
 #endif
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/mcuconf.h b/demos/KINETIS/RT-FREEDOM-K20D50M/mcuconf.h
index 2277ad4b4..61897094e 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M/mcuconf.h
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -67,3 +70,5 @@
  * SERIAL driver system settings.
  */
 #define KINETIS_SERIAL_USE_UART0              TRUE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/mcuconf.h b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/mcuconf.h
index bd2abc1d3..da7ba95f0 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/mcuconf.h
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define KL2x_MCUCONF
 
 /*
@@ -142,3 +145,5 @@
 #ifndef KINETIS_EXT_PORTE_WIDTH
 #define KINETIS_EXT_PORTE_WIDTH                 0
 #endif
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/mcuconf.h b/demos/KINETIS/RT-FREEDOM-KL25Z/mcuconf.h
index 5ddb8fe7e..3b77632f7 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z/mcuconf.h
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -69,3 +72,5 @@
  * SERIAL driver system settings.
  */
 #define KINETIS_SERIAL_USE_UART0              TRUE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-MCHCK-K20-GPT/mcuconf.h b/demos/KINETIS/RT-MCHCK-K20-GPT/mcuconf.h
index efe95cb44..cc4b58127 100644
--- a/demos/KINETIS/RT-MCHCK-K20-GPT/mcuconf.h
+++ b/demos/KINETIS/RT-MCHCK-K20-GPT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -72,3 +75,4 @@
 /* TODO: Move this to a KINETIS registry */
 #define KINETIS_HAS_PIT0                    TRUE
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/mcuconf.h b/demos/KINETIS/RT-MCHCK-K20-SPI/mcuconf.h
index 4cb8eb628..70b86cf72 100644
--- a/demos/KINETIS/RT-MCHCK-K20-SPI/mcuconf.h
+++ b/demos/KINETIS/RT-MCHCK-K20-SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -63,3 +66,5 @@
  */
 #define KINETIS_SPI_USE_SPI0                TRUE
 #define KINETIS_SPI_SPI0_IRQ_PRIORITY       8
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/KINETIS/RT-TEENSY3/mcuconf.h b/demos/KINETIS/RT-TEENSY3/mcuconf.h
index e216230c8..ae35fe36d 100644
--- a/demos/KINETIS/RT-TEENSY3/mcuconf.h
+++ b/demos/KINETIS/RT-TEENSY3/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -55,3 +58,5 @@
  * SERIAL driver system settings.
  */
 #define KINETIS_SERIAL_USE_UART0              TRUE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/mcuconf.h b/demos/LPC21xx/RT-LPC214x-OLIMEX/mcuconf.h
index 313ad505c..20e2e2152 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/mcuconf.h
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * LPC214x drivers configuration.
  * The following settings override the default settings present in
@@ -51,3 +54,5 @@
  * SPI driver system settings.
  */
 #define USE_LPC214x_SPI1            TRUE
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/NIL-SPC560D-EVB/mcuconf.h b/demos/SPC5/NIL-SPC560D-EVB/mcuconf.h
index 195a81a2e..0b48d33e0 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/mcuconf.h
+++ b/demos/SPC5/NIL-SPC560D-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC560B/Cxx drivers configuration.
  * The following settings override the default settings present in
@@ -146,3 +149,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_ADC_ADC1_STOP_PCTL             (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC560B-EVB/mcuconf.h b/demos/SPC5/RT-SPC560B-EVB/mcuconf.h
index 161c03b97..b510c5be3 100644
--- a/demos/SPC5/RT-SPC560B-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC560B-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC560Bxx drivers configuration.
  * The following settings override the default settings present in
@@ -266,3 +269,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_ADC_ADC1_STOP_PCTL             (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC560D-EVB/mcuconf.h b/demos/SPC5/RT-SPC560D-EVB/mcuconf.h
index 195a81a2e..0b48d33e0 100644
--- a/demos/SPC5/RT-SPC560D-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC560D-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC560B/Cxx drivers configuration.
  * The following settings override the default settings present in
@@ -146,3 +149,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_ADC_ADC1_STOP_PCTL             (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC560P-EVB/mcuconf.h b/demos/SPC5/RT-SPC560P-EVB/mcuconf.h
index f5ea0dbc4..6ec56ad71 100644
--- a/demos/SPC5/RT-SPC560P-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC560P-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC560Pxx drivers configuration.
  * The following settings override the default settings present in
@@ -187,3 +190,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_ADC_ADC1_STOP_PCTL             (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC563M-EVB/mcuconf.h b/demos/SPC5/RT-SPC563M-EVB/mcuconf.h
index 83acd51a4..e8f7ebd81 100644
--- a/demos/SPC5/RT-SPC563M-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC563M-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC563Mxx drivers configuration.
  * The following settings override the default settings present in
@@ -151,3 +154,5 @@
 #define SPC5_CAN_USE_FLEXCAN1               FALSE
 #define SPC5_CAN_FLEXCAN1_USE_EXT_CLK       FALSE
 #define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY      11
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC564A-EVB/mcuconf.h b/demos/SPC5/RT-SPC564A-EVB/mcuconf.h
index 8c6e534b4..9094394d5 100644
--- a/demos/SPC5/RT-SPC564A-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC564A-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC564Axx drivers configuration.
  * The following settings override the default settings present in
@@ -181,3 +184,5 @@
 #define SPC5_CAN_USE_FLEXCAN2               FALSE
 #define SPC5_CAN_FLEXCAN2_USE_EXT_CLK       FALSE
 #define SPC5_CAN_FLEXCAN2_IRQ_PRIORITY      11
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC56EC-EVB/mcuconf.h b/demos/SPC5/RT-SPC56EC-EVB/mcuconf.h
index 96d37c06d..0172e8182 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC56EC-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC56ECxx drivers configuration.
  * The following settings override the default settings present in
@@ -286,3 +289,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_ADC_ADC1_STOP_PCTL             (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/SPC5/RT-SPC56EL-EVB/mcuconf.h b/demos/SPC5/RT-SPC56EL-EVB/mcuconf.h
index 542294fa3..bf28f0965 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/mcuconf.h
+++ b/demos/SPC5/RT-SPC56EL-EVB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * SPC56ELxx drivers configuration.
  * The following settings override the default settings present in
@@ -287,3 +290,5 @@
                                              SPC5_ME_PCTL_LP(2))
 #define SPC5_SPI_DSPI2_STOP_PCTL            (SPC5_ME_PCTL_RUN(0) |          \
                                              SPC5_ME_PCTL_LP(0))
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/mcuconf.h b/demos/STM32/CMSIS-STM32F407-DISCOVERY/mcuconf.h
index 993018b91..21e8e1931 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/mcuconf.h
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
index f3e60abb4..f00d17f23 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/mcuconf.h
index a4116c746..61b1e758d 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F100_MCUCONF
 
 /*
@@ -180,3 +183,4 @@
 #define STM32_UART_USART3_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/mcuconf.h
index d3f27d556..d1582ae8b 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
index db5dfebb7..cc115e4e4 100644
--- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
+++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/mcuconf.h
index b83806ebc..2adfdbff6 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
index 8d3a8d5e8..50f7f6d06 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -148,3 +151,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
index f3e60abb4..f00d17f23 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
index 6fb745217..d472167d5 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -163,3 +166,5 @@
 #define STM32_USB_USE_USB1                  FALSE
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F100-DISCOVERY/mcuconf.h
index a4116c746..61b1e758d 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F100_MCUCONF
 
 /*
@@ -180,3 +183,4 @@
 #define STM32_UART_USART3_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/mcuconf.h b/demos/STM32/RT-STM32F103-MAPLEMINI/mcuconf.h
index 2f28b5712..626332a6a 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/mcuconf.h
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h
index 06edc0795..9b74b9557 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h
index 67af36f7b..0e37a0335 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/mcuconf.h
index 2f28b5712..626332a6a 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
index e8e0a19d5..20f75e884 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h
index a2df10c1f..756c50eb0 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -172,3 +175,5 @@
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_USART3_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/STM32/RT-STM32F373-STM32373C_EVAL/mcuconf.h
index db5dfebb7..cc115e4e4 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/mcuconf.h
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h
index f2258c039..82e6f31d8 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -224,3 +227,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/mcuconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-G++/mcuconf.h
index a462f546a..ab65a3f61 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/mcuconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/mcuconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/mcuconf.h
index 989666e98..adbb05c94 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/mcuconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F407-DISCOVERY/mcuconf.h
index 993018b91..21e8e1931 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/mcuconf.h b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/mcuconf.h
index 14751a976..7f93c1095 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/mcuconf.h
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h
index 6e7e47f3b..be7d38f3b 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -224,3 +227,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F429-DISCOVERY/mcuconf.h
index 62e35f211..859f99471 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -317,3 +320,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32L152-DISCOVERY/mcuconf.h
index b83806ebc..2adfdbff6 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h
index 6d2b6367c..07fd9aaa1 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/os/hal/templates/mcuconf.h b/os/hal/templates/mcuconf.h
index 59cd772ba..bde70097d 100644
--- a/os/hal/templates/mcuconf.h
+++ b/os/hal/templates/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * Platform drivers configuration.
  * The following settings override the default settings present in
@@ -23,3 +26,5 @@
  */
 
 #define PLATFORM_MCUCONF
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/AVR/GPT/mcuconf.h b/testhal/AVR/GPT/mcuconf.h
index 7211f5034..8753d1857 100644
--- a/testhal/AVR/GPT/mcuconf.h
+++ b/testhal/AVR/GPT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -73,3 +76,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/AVR/I2C/mcuconf.h b/testhal/AVR/I2C/mcuconf.h
index 1a5780f90..b60c82bb0 100644
--- a/testhal/AVR/I2C/mcuconf.h
+++ b/testhal/AVR/I2C/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -77,3 +80,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/AVR/ICU/mcuconf.h b/testhal/AVR/ICU/mcuconf.h
index a8f5299bb..b738733ff 100644
--- a/testhal/AVR/ICU/mcuconf.h
+++ b/testhal/AVR/ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -73,3 +76,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/AVR/PWM/mcuconf.h b/testhal/AVR/PWM/mcuconf.h
index 995da47d9..b2340904b 100644
--- a/testhal/AVR/PWM/mcuconf.h
+++ b/testhal/AVR/PWM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * AVR drivers configuration.
  * The following settings override the default settings present in
@@ -77,3 +80,5 @@
  */
 #define AVR_SPI_USE_SPI1                   FALSE
 #define AVR_SPI_USE_16BIT_POLLED_EXCHANGE  FALSE
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/KINETIS/ADC/mcuconf.h b/testhal/KINETIS/ADC/mcuconf.h
index eb3a334cf..3dafa8585 100644
--- a/testhal/KINETIS/ADC/mcuconf.h
+++ b/testhal/KINETIS/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -74,3 +77,5 @@
  * ADC driver system settings.
  */
 #define KINETIS_ADC_USE_ADC0                  TRUE
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/KINETIS/I2C/mcuconf.h b/testhal/KINETIS/I2C/mcuconf.h
index 41320e5da..c5d56f263 100644
--- a/testhal/KINETIS/I2C/mcuconf.h
+++ b/testhal/KINETIS/I2C/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define K20x_MCUCONF
 
 /*
@@ -69,3 +72,5 @@
 #define KINETIS_SERIAL_USE_UART0              FALSE
 #define KINETIS_I2C_USE_I2C0                  TRUE
 #define KINETIS_I2C_I2C0_PRIORITY             8
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/ADC/mcuconf.h b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
index 2b7fbef04..2ecd12c5a 100644
--- a/testhal/STM32/STM32F0xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/EXT/mcuconf.h b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
index 1f42b4da7..33787072d 100644
--- a/testhal/STM32/STM32F0xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
index 0de40dd81..11bd1a4a4 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
index 05b258ac3..cd8249d20 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/SPI/mcuconf.h b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
index 33b1fa502..f79133772 100644
--- a/testhal/STM32/STM32F0xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/UART/mcuconf.h b/testhal/STM32/STM32F0xx/UART/mcuconf.h
index 4bbe41d9c..1a3cd67ea 100644
--- a/testhal/STM32/STM32F0xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -154,3 +157,5 @@
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
index 2c3bee217..7141e2f8d 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/USB_CDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F0xx drivers configuration.
  * The following settings override the default settings present in
@@ -163,3 +166,5 @@
 #define STM32_USB_USE_USB1                  TRUE
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/ADC/mcuconf.h b/testhal/STM32/STM32F1xx/ADC/mcuconf.h
index 8ee2548c4..0c5ed6d1f 100644
--- a/testhal/STM32/STM32F1xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/CAN/mcuconf.h b/testhal/STM32/STM32F1xx/CAN/mcuconf.h
index 9347a663d..529809537 100644
--- a/testhal/STM32/STM32F1xx/CAN/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/CAN/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/EXT/mcuconf.h b/testhal/STM32/STM32F1xx/EXT/mcuconf.h
index 8aba93855..3b4fea944 100644
--- a/testhal/STM32/STM32F1xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/I2C/mcuconf.h b/testhal/STM32/STM32F1xx/I2C/mcuconf.h
index 02cf605fe..6e7315afd 100644
--- a/testhal/STM32/STM32F1xx/I2C/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/I2C/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F1xx/IRQ_STORM/mcuconf.h
index 95252053a..e1ce58eed 100644
--- a/testhal/STM32/STM32F1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F1xx/PWM-ICU/mcuconf.h
index ffe4505b9..900f2bd7f 100644
--- a/testhal/STM32/STM32F1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/RTC/mcuconf.h b/testhal/STM32/STM32F1xx/RTC/mcuconf.h
index 674f5b1c0..fc566a85a 100644
--- a/testhal/STM32/STM32F1xx/RTC/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/RTC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/SPI/mcuconf.h b/testhal/STM32/STM32F1xx/SPI/mcuconf.h
index 145428ceb..38136095f 100644
--- a/testhal/STM32/STM32F1xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/UART/mcuconf.h b/testhal/STM32/STM32F1xx/UART/mcuconf.h
index 2881ed758..fcb49ace8 100644
--- a/testhal/STM32/STM32F1xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F1xx/USB_CDC/mcuconf.h
index 2f28b5712..626332a6a 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -203,3 +206,4 @@
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
 
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h b/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
index ed79607d0..8774d0c15 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 #define STM32F103_MCUCONF
 
 /*
@@ -211,3 +214,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/ADC/mcuconf.h b/testhal/STM32/STM32F30x/ADC/mcuconf.h
index 64717b9e6..8f8cae2c7 100644
--- a/testhal/STM32/STM32F30x/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F30x/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h b/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h
index e5fa3b529..aa5c9e336 100644
--- a/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h
+++ b/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/CAN/mcuconf.h b/testhal/STM32/STM32F30x/CAN/mcuconf.h
index ab2b58a9f..ab4afe325 100644
--- a/testhal/STM32/STM32F30x/CAN/mcuconf.h
+++ b/testhal/STM32/STM32F30x/CAN/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/EXT/mcuconf.h b/testhal/STM32/STM32F30x/EXT/mcuconf.h
index 744d26e2f..e187b1186 100644
--- a/testhal/STM32/STM32F30x/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F30x/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h
index 40be09bf0..365d8c518 100644
--- a/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h
index bbe727561..37d732b02 100644
--- a/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/SPI/mcuconf.h b/testhal/STM32/STM32F30x/SPI/mcuconf.h
index 9b05ab0ce..aaa274c6a 100644
--- a/testhal/STM32/STM32F30x/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F30x/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/UART/mcuconf.h b/testhal/STM32/STM32F30x/UART/mcuconf.h
index 61099b044..36fd26f6c 100644
--- a/testhal/STM32/STM32F30x/UART/mcuconf.h
+++ b/testhal/STM32/STM32F30x/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h b/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h
index 4f179a9f7..22dc582a8 100644
--- a/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h b/testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h
index 4f179a9f7..22dc582a8 100644
--- a/testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h
+++ b/testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F3xx drivers configuration.
  * The following settings override the default settings present in
@@ -217,3 +220,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/ADC/mcuconf.h b/testhal/STM32/STM32F37x/ADC/mcuconf.h
index a37f95252..6b7ab783b 100644
--- a/testhal/STM32/STM32F37x/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F37x/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/CAN/mcuconf.h b/testhal/STM32/STM32F37x/CAN/mcuconf.h
index 73b11f22e..e1ff110cd 100644
--- a/testhal/STM32/STM32F37x/CAN/mcuconf.h
+++ b/testhal/STM32/STM32F37x/CAN/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/EXT/mcuconf.h b/testhal/STM32/STM32F37x/EXT/mcuconf.h
index 73b11f22e..e1ff110cd 100644
--- a/testhal/STM32/STM32F37x/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F37x/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/I2C/mcuconf.h b/testhal/STM32/STM32F37x/I2C/mcuconf.h
index 923616c2a..8dc120ca3 100644
--- a/testhal/STM32/STM32F37x/I2C/mcuconf.h
+++ b/testhal/STM32/STM32F37x/I2C/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F37x/IRQ_STORM/mcuconf.h
index 52068c622..9cdb68d23 100644
--- a/testhal/STM32/STM32F37x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F37x/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F37x/PWM-ICU/mcuconf.h
index bb76bdb0b..2b3aa982e 100644
--- a/testhal/STM32/STM32F37x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F37x/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/SDADC/mcuconf.h b/testhal/STM32/STM32F37x/SDADC/mcuconf.h
index c30ef476d..2aab37104 100644
--- a/testhal/STM32/STM32F37x/SDADC/mcuconf.h
+++ b/testhal/STM32/STM32F37x/SDADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/SPI/mcuconf.h b/testhal/STM32/STM32F37x/SPI/mcuconf.h
index 02daa11c9..5c39bd13c 100644
--- a/testhal/STM32/STM32F37x/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F37x/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/UART/mcuconf.h b/testhal/STM32/STM32F37x/UART/mcuconf.h
index e747f3f3f..15fc5e3fe 100644
--- a/testhal/STM32/STM32F37x/UART/mcuconf.h
+++ b/testhal/STM32/STM32F37x/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F37x/USB_CDC/mcuconf.h b/testhal/STM32/STM32F37x/USB_CDC/mcuconf.h
index f067de293..9b67e0eb6 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F37x/USB_CDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F30x drivers configuration.
  * The following settings override the default settings present in
@@ -213,3 +216,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/ADC/mcuconf.h b/testhal/STM32/STM32F4xx/ADC/mcuconf.h
index a020bb4ec..7008fcb66 100644
--- a/testhal/STM32/STM32F4xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/CAN/mcuconf.h b/testhal/STM32/STM32F4xx/CAN/mcuconf.h
index 4d34a3d65..fe59ceff4 100644
--- a/testhal/STM32/STM32F4xx/CAN/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/CAN/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/DAC/mcuconf.h b/testhal/STM32/STM32F4xx/DAC/mcuconf.h
index 8f7f37703..4aeb855d4 100644
--- a/testhal/STM32/STM32F4xx/DAC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/DAC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -330,3 +333,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/mcuconf.h b/testhal/STM32/STM32F4xx/DMA_STORM/mcuconf.h
index e2a211b41..95ce2ee49 100644
--- a/testhal/STM32/STM32F4xx/DMA_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/DMA_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/EXT/mcuconf.h b/testhal/STM32/STM32F4xx/EXT/mcuconf.h
index 83f43c9e9..528b74418 100644
--- a/testhal/STM32/STM32F4xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/GPT/mcuconf.h b/testhal/STM32/STM32F4xx/GPT/mcuconf.h
index d464703e2..fe14829f8 100644
--- a/testhal/STM32/STM32F4xx/GPT/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/GPT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/I2C/mcuconf.h b/testhal/STM32/STM32F4xx/I2C/mcuconf.h
index df6ab1797..31df58f8d 100644
--- a/testhal/STM32/STM32F4xx/I2C/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/I2C/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/I2S/mcuconf.h b/testhal/STM32/STM32F4xx/I2S/mcuconf.h
index 8060acee8..de125c009 100644
--- a/testhal/STM32/STM32F4xx/I2S/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/I2S/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -317,3 +320,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM/mcuconf.h
index 1be478d47..709c31db8 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/mcuconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
index 1be478d47..709c31db8 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F4xx/PWM-ICU/mcuconf.h
index 8c7ca49ed..768cbce7d 100644
--- a/testhal/STM32/STM32F4xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/RTC/mcuconf.h b/testhal/STM32/STM32F4xx/RTC/mcuconf.h
index 89cef3d57..87a8b67f9 100644
--- a/testhal/STM32/STM32F4xx/RTC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/RTC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -304,3 +307,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/SDC/mcuconf.h b/testhal/STM32/STM32F4xx/SDC/mcuconf.h
index 2824e6048..b3ecb6a95 100644
--- a/testhal/STM32/STM32F4xx/SDC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/SDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/SPI/mcuconf.h b/testhal/STM32/STM32F4xx/SPI/mcuconf.h
index 67c260514..e01a34135 100644
--- a/testhal/STM32/STM32F4xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/UART/mcuconf.h b/testhal/STM32/STM32F4xx/UART/mcuconf.h
index 97aaf971d..0095b1ae0 100644
--- a/testhal/STM32/STM32F4xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
index c92679905..ca9b86a89 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/mcuconf.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/mcuconf.h
index c92679905..ca9b86a89 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32F4xx drivers configuration.
  * The following settings override the default settings present in
@@ -302,3 +305,5 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
 #define STM32_USB_OTG_THREAD_STACK_SIZE     128
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/ADC/mcuconf.h b/testhal/STM32/STM32L1xx/ADC/mcuconf.h
index 2e3ff75cd..8e8ad55d6 100644
--- a/testhal/STM32/STM32L1xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/ADC/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/EXT/mcuconf.h b/testhal/STM32/STM32L1xx/EXT/mcuconf.h
index e2ebd4cf6..3d58651cb 100644
--- a/testhal/STM32/STM32L1xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/EXT/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32L1xx/IRQ_STORM/mcuconf.h
index fcf9570ac..ac6101480 100644
--- a/testhal/STM32/STM32L1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/IRQ_STORM/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32L1xx/PWM-ICU/mcuconf.h
index 973354698..5003974ef 100644
--- a/testhal/STM32/STM32L1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/PWM-ICU/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/SPI/mcuconf.h b/testhal/STM32/STM32L1xx/SPI/mcuconf.h
index 8db3cd8a4..9d2fbed1d 100644
--- a/testhal/STM32/STM32L1xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/SPI/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/testhal/STM32/STM32L1xx/UART/mcuconf.h b/testhal/STM32/STM32L1xx/UART/mcuconf.h
index c531da11f..e23832a62 100644
--- a/testhal/STM32/STM32L1xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32L1xx/UART/mcuconf.h
@@ -14,6 +14,9 @@
     limitations under the License.
 */
 
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
 /*
  * STM32L1xx drivers configuration.
  * The following settings override the default settings present in
@@ -175,3 +178,5 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */