diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 11f893bef3..531a04e9b6 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -107,8 +107,6 @@ endif
 
 ifeq ($(CONFIG_USBHOST),y)
 CHIP_CSRCS += stm32_otghost.c
-endif
-
 ifeq ($(CONFIG_USBHOST_TRACE),y)
 CHIP_CSRCS += stm32_usbhost.c
 else
@@ -116,6 +114,7 @@ ifeq ($(CONFIG_DEBUG_USB),y)
 CHIP_CSRCS += stm32_usbhost.c
 endif
 endif
+endif
 
 ifeq ($(CONFIG_STM32F7_TIM),y)
 CHIP_CSRCS += stm32_tim.c stm32_tim_lowerhalf.c
diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs
index 39cb9a6731..5b38888238 100644
--- a/arch/arm/src/stm32h7/Make.defs
+++ b/arch/arm/src/stm32h7/Make.defs
@@ -128,8 +128,6 @@ endif
 
 ifeq ($(CONFIG_USBHOST),y)
 CHIP_CSRCS += stm32_otghost.c
-endif
-
 ifeq ($(CONFIG_USBHOST_TRACE),y)
 CHIP_CSRCS += stm32_usbhost.c
 else
@@ -137,6 +135,7 @@ ifeq ($(CONFIG_DEBUG_USB),y)
 CHIP_CSRCS += stm32_usbhost.c
 endif
 endif
+endif
 
 ifeq ($(CONFIG_STM32H7_TIM),y)
 CHIP_CSRCS += stm32_tim.c