diff --git a/drivers/dev_urandom.c b/drivers/dev_urandom.c
index d5090ffc5f2..6deb9949499 100644
--- a/drivers/dev_urandom.c
+++ b/drivers/dev_urandom.c
@@ -53,6 +53,7 @@
 
 #include <nuttx/lib/lib.h>
 #include <nuttx/lib/xorshift128.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 #include <nuttx/random.h>
diff --git a/drivers/power/battery_charger.c b/drivers/power/battery_charger.c
index aa5b0c0fa9c..0bacbd90e37 100644
--- a/drivers/power/battery_charger.c
+++ b/drivers/power/battery_charger.c
@@ -41,10 +41,10 @@
 #include <nuttx/config.h>
 
 #include <stdbool.h>
-#include <semaphore.h>
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/power/battery_charger.h>
 #include <nuttx/power/battery_ioctl.h>