diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h
index f5a4057296..bce9f42258 100644
--- a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h
+++ b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h
@@ -9,7 +9,7 @@
 #include "sdkconfig.h"
 #include <stdint.h>
 #include "spinlock.h"
-#include "soc/interrupt_core0_reg.h"
+#include "soc/interrupt_reg.h"
 #include "esp_macros.h"
 #include "esp_cpu.h"
 #include "esp_private/crosscore_int.h"
diff --git a/components/freertos/FreeRTOS-Kernel/portable/port_systick.c b/components/freertos/FreeRTOS-Kernel/portable/port_systick.c
index 9031ef81bd..2c12f72f89 100644
--- a/components/freertos/FreeRTOS-Kernel/portable/port_systick.c
+++ b/components/freertos/FreeRTOS-Kernel/portable/port_systick.c
@@ -16,7 +16,6 @@
 #include "sdkconfig.h"
 #ifdef CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER
 #include "soc/periph_defs.h"
-#include "soc/system_reg.h"
 #include "hal/systimer_hal.h"
 #include "hal/systimer_ll.h"
 #endif
diff --git a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
index d719560520..0a31a1a6b1 100644
--- a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
+++ b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
@@ -43,7 +43,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "spinlock.h"
-#include "soc/interrupt_core0_reg.h"
+#include "soc/interrupt_reg.h"
 #include "esp_macros.h"
 #include "esp_attr.h"
 #include "esp_cpu.h"
diff --git a/components/ulp/ulp_common/ulp_common.c b/components/ulp/ulp_common/ulp_common.c
index caa48115e8..32307ba729 100644
--- a/components/ulp/ulp_common/ulp_common.c
+++ b/components/ulp/ulp_common/ulp_common.c
@@ -9,10 +9,10 @@
 #include "ulp_common.h"
 #include "esp_private/esp_clk.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_cntl_periph.h"
 
 #if CONFIG_IDF_TARGET_ESP32
+#include "soc/sens_reg.h"
 #define ULP_FSM_PREPARE_SLEEP_CYCLES 2    /*!< Cycles spent by FSM preparing ULP for sleep */
 #define ULP_FSM_WAKEUP_SLEEP_CYCLES  2    /*!< Cycles spent by FSM waking up ULP from sleep */
 #endif