diff --git a/bdk/libs/fatfs/ffsystem.c b/bdk/libs/fatfs/ffsystem.c
index b4af45469..58df7f86d 100644
--- a/bdk/libs/fatfs/ffsystem.c
+++ b/bdk/libs/fatfs/ffsystem.c
@@ -4,7 +4,9 @@
 /* (C) CTCaer, 2018-2024                                                  */
 /*------------------------------------------------------------------------*/
 
-#include <bdk.h>
+#include <mem/heap.h>
+#include <rtc/max77620-rtc.h>
+#include <storage/sdmmc.h>
 
 #include <libs/fatfs/ff.h>
 
diff --git a/bdk/usb/usb_gadget_ums.c b/bdk/usb/usb_gadget_ums.c
index a97e9c65f..428c7952c 100644
--- a/bdk/usb/usb_gadget_ums.c
+++ b/bdk/usb/usb_gadget_ums.c
@@ -23,9 +23,11 @@
 
 #include <usb/usbd.h>
 #include <gfx_utils.h>
+#include <mem/minerva.h>
 #include <soc/hw_init.h>
 #include <soc/timer.h>
 #include <soc/t210.h>
+#include <storage/emmc.h>
 #include <storage/sd.h>
 #include <storage/sdmmc.h>
 #include <storage/sdmmc_driver.h>