diff --git a/configs/mikroe-stm32f4/src/up_idle.c b/configs/mikroe-stm32f4/src/up_idle.c
index 71928876f0e..22b5bc73838 100644
--- a/configs/mikroe-stm32f4/src/up_idle.c
+++ b/configs/mikroe-stm32f4/src/up_idle.c
@@ -43,12 +43,12 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
 
-#include <debug.h>
-#include <nuttx/rtc.h>
 #include <arch/irq.h>
 
 #include "up_internal.h"
diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
index 84d6032cd4f..045b101c637 100644
--- a/configs/stm3210e-eval/src/stm32_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -45,7 +45,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
-#include <nuttx/rtc.h>
 
 #include <arch/irq.h>
 
@@ -55,6 +54,7 @@
 #include "stm32_pm.h"
 #include "stm32_rcc.h"
 #include "stm32_exti.h"
+#include "stm32_rtc.h"
 
 #include "stm3210e-eval.h"
 
@@ -226,7 +226,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
   /* Set the alarm */
 
   g_alarmwakeup = false;
-  ret = up_rtc_setalarm(&alarmtime, stm32_alarmcb);
+  ret = stm32_rtc_setalarm(&alarmtime, stm32_alarmcb);
   if (ret < 0)
     {
       lldbg("Warning: The alarm is already set\n");
@@ -363,7 +363,7 @@ static void stm32_idlepm(void)
 
 #ifdef CONFIG_RTC_ALARM
             stm32_exti_cancel();
-            ret = up_rtc_cancelalarm();
+            ret = stm32_rtc_cancelalarm();
             if (ret < 0)
               {
                 lldbg("Warning: Cancel alarm failed\n");
diff --git a/configs/stm32f429i-disco/src/stm32_idle.c b/configs/stm32f429i-disco/src/stm32_idle.c
index d4951f5313e..24e3255351d 100644
--- a/configs/stm32f429i-disco/src/stm32_idle.c
+++ b/configs/stm32f429i-disco/src/stm32_idle.c
@@ -42,12 +42,12 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
 
-#include <debug.h>
-#include <nuttx/rtc.h>
 #include <arch/irq.h>
 
 #include "up_internal.h"
diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c
index 861df512301..46dc3b76651 100644
--- a/configs/stm32f4discovery/src/stm32_idle.c
+++ b/configs/stm32f4discovery/src/stm32_idle.c
@@ -42,12 +42,12 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
 
-#include <debug.h>
-#include <nuttx/rtc.h>
 #include <arch/irq.h>
 
 #include "up_internal.h"
diff --git a/configs/vsn/src/sif.c b/configs/vsn/src/sif.c
index 4488357af02..18b3d51a4be 100644
--- a/configs/vsn/src/sif.c
+++ b/configs/vsn/src/sif.c
@@ -71,9 +71,9 @@
 #include <nuttx/config.h>
 #include <nuttx/fs/fs.h>
 #include <semaphore.h>
+#include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/time.h>
-#include <nuttx/rtc.h>
 #include <nuttx/progmem.h>
 
 #include <nuttx/i2c.h>