diff --git a/Target/Source/ARMCM0_STM32F0/can.c b/Target/Source/ARMCM0_STM32F0/can.c
index c4684fb9..3252cb67 100644
--- a/Target/Source/ARMCM0_STM32F0/can.c
+++ b/Target/Source/ARMCM0_STM32F0/can.c
@@ -31,11 +31,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32f0xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f0xx_ll_rcc.h"                    /* STM32 LL RCC header                */
 
 
-#if (BOOT_COM_CAN_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM0_STM32F0/uart.c b/Target/Source/ARMCM0_STM32F0/uart.c
index 2adfc571..8f09cc47 100644
--- a/Target/Source/ARMCM0_STM32F0/uart.c
+++ b/Target/Source/ARMCM0_STM32F0/uart.c
@@ -30,11 +30,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_UART_ENABLE > 0)
 #include "stm32f0xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f0xx_ll_usart.h"                  /* STM32 LL USART header              */
 
 
-#if (BOOT_COM_UART_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM3_STM32F1/can.c b/Target/Source/ARMCM3_STM32F1/can.c
index a070d2d3..46433f58 100644
--- a/Target/Source/ARMCM3_STM32F1/can.c
+++ b/Target/Source/ARMCM3_STM32F1/can.c
@@ -31,13 +31,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32f1xx.h"                           /* STM32 CPU and HAL header           */
-#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32f1xx_ll_rcc.h"                    /* STM32 LL RCC header                */
-#endif
 
 
-#if (BOOT_COM_CAN_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM3_STM32F2/can.c b/Target/Source/ARMCM3_STM32F2/can.c
index ff02d913..c3151e10 100644
--- a/Target/Source/ARMCM3_STM32F2/can.c
+++ b/Target/Source/ARMCM3_STM32F2/can.c
@@ -31,11 +31,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32f2xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f2xx_ll_rcc.h"                    /* STM32 LL RCC header                */
 
 
-#if (BOOT_COM_CAN_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM3_STM32F2/uart.c b/Target/Source/ARMCM3_STM32F2/uart.c
index f2dc5626..8c5718c2 100644
--- a/Target/Source/ARMCM3_STM32F2/uart.c
+++ b/Target/Source/ARMCM3_STM32F2/uart.c
@@ -30,11 +30,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_UART_ENABLE > 0)
 #include "stm32f2xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f2xx_ll_usart.h"                  /* STM32 LL USART header              */
 
 
-#if (BOOT_COM_UART_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM4_STM32F3/can.c b/Target/Source/ARMCM4_STM32F3/can.c
index c0234bd3..53be423e 100644
--- a/Target/Source/ARMCM4_STM32F3/can.c
+++ b/Target/Source/ARMCM4_STM32F3/can.c
@@ -31,11 +31,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32f3xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f3xx_ll_rcc.h"                    /* STM32 LL RCC header                */
 
 
-#if (BOOT_COM_CAN_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM4_STM32F3/uart.c b/Target/Source/ARMCM4_STM32F3/uart.c
index a1d8dba0..1b38ce25 100644
--- a/Target/Source/ARMCM4_STM32F3/uart.c
+++ b/Target/Source/ARMCM4_STM32F3/uart.c
@@ -30,11 +30,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_UART_ENABLE > 0)
 #include "stm32f3xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f3xx_ll_usart.h"                  /* STM32 LL USART header              */
 
 
-#if (BOOT_COM_UART_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM4_STM32L4/can.c b/Target/Source/ARMCM4_STM32L4/can.c
index e89cbde8..0d927e93 100644
--- a/Target/Source/ARMCM4_STM32L4/can.c
+++ b/Target/Source/ARMCM4_STM32L4/can.c
@@ -31,11 +31,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_CAN_ENABLE > 0)
 #include "stm32l4xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32l4xx_ll_rcc.h"                    /* STM32 LL RCC header                */
 
 
-#if (BOOT_COM_CAN_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/
diff --git a/Target/Source/ARMCM4_STM32L4/uart.c b/Target/Source/ARMCM4_STM32L4/uart.c
index c04cf215..3e8a144d 100644
--- a/Target/Source/ARMCM4_STM32L4/uart.c
+++ b/Target/Source/ARMCM4_STM32L4/uart.c
@@ -30,11 +30,11 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
+#if (BOOT_COM_UART_ENABLE > 0)
 #include "stm32l4xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32l4xx_ll_usart.h"                  /* STM32 LL USART header              */
 
 
-#if (BOOT_COM_UART_ENABLE > 0)
 /****************************************************************************************
 * Macro definitions
 ****************************************************************************************/