diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index a7de71ef203946422f8c67b511495ca4c78db1e7..d28f9aec6fa6e9bd0c9aaac835cb55a57a5e9b32 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -37,7 +37,7 @@
 #include "py/mphal.h"
 
 // need this header for any overrides to the below constants
-#include "mpconfigboard.h"
+#include "py/mpconfig.h"
 
 #ifndef USBD_LANGID_STRING
 #define USBD_LANGID_STRING            0x409
diff --git a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
index d4a218a4a6f4bbf5997154a1189b1aaa53dc8084..d46f763d1dc41fde834e557b1330676284dcb340 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
@@ -7,8 +7,7 @@
 #include  "usbd_ioreq.h"
 
 // These are included to get direct access the MICROPY_HW_USB_xxx config
-#include "mpconfigboard.h"
-#include "mpconfigboard_common.h"
+#include "py/mpconfig.h"
 
 // Work out if we should support USB high-speed device mode
 #if MICROPY_HW_USB_HS \