diff --git a/hw/bsp/imxrt/family.c b/hw/bsp/imxrt/family.c
index e5f63010..fc6e9e26 100644
--- a/hw/bsp/imxrt/family.c
+++ b/hw/bsp/imxrt/family.c
@@ -34,13 +34,13 @@
 
 #include "clock_config.h"
 
-#ifdef BOARD_TUD_RHPORT
+#if defined(BOARD_TUD_RHPORT) && CFG_TUD_ENABLED
   #define PORT_SUPPORT_DEVICE(_n)  (BOARD_TUD_RHPORT == _n)
 #else
   #define PORT_SUPPORT_DEVICE(_n)  0
 #endif
 
-#ifdef BOARD_TUH_RHPORT
+#if defined(BOARD_TUH_RHPORT) && CFG_TUH_ENABLED
   #define PORT_SUPPORT_HOST(_n)    (BOARD_TUH_RHPORT == _n)
 #else
   #define PORT_SUPPORT_HOST(_n)    0
diff --git a/src/portable/synopsys/dwc2/dwc2_stm32.h b/src/portable/synopsys/dwc2/dwc2_stm32.h
index 709428f7..b500ddc4 100644
--- a/src/portable/synopsys/dwc2/dwc2_stm32.h
+++ b/src/portable/synopsys/dwc2/dwc2_stm32.h
@@ -47,6 +47,7 @@
   #include "stm32f4xx.h"
   #define EP_MAX_FS       USB_OTG_FS_MAX_IN_ENDPOINTS
   #define EP_FIFO_SIZE_FS USB_OTG_FS_TOTAL_FIFO_SIZE
+
   #define EP_MAX_HS       USB_OTG_HS_MAX_IN_ENDPOINTS
   #define EP_FIFO_SIZE_HS USB_OTG_HS_TOTAL_FIFO_SIZE
 
@@ -54,6 +55,7 @@
   #include "stm32h7xx.h"
   #define EP_MAX_FS       9
   #define EP_FIFO_SIZE_FS 4096
+
   #define EP_MAX_HS       9
   #define EP_FIFO_SIZE_HS 4096
 
@@ -64,6 +66,7 @@
   #include "stm32f7xx.h"
   #define EP_MAX_FS       6
   #define EP_FIFO_SIZE_FS 1280
+
   #define EP_MAX_HS       9
   #define EP_FIFO_SIZE_HS 4096
 
@@ -77,7 +80,7 @@
 #endif
 
 // OTG HS always has higher number of endpoints than FS
-#ifdef EP_MAX_HS
+#ifdef USB_OTG_HS_PERIPH_BASE
   #define DWC2_EP_MAX   EP_MAX_HS
 #else
   #define DWC2_EP_MAX   EP_MAX_FS