diff --git a/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c b/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c
index 9d64b03d81..b5ab89cb7d 100644
--- a/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c
+++ b/components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c
@@ -72,7 +72,7 @@ void sar_periph_ctrl_pwdet_power_release(void)
     s_pwdet_power_on_cnt--;
     /* Sanity check */
     if (s_pwdet_power_on_cnt < 0) {
-        esp_os_exit_critical(&rtc_spinlock);
+        esp_os_exit_critical_safe(&rtc_spinlock);
         ESP_LOGE(TAG, "%s called, but s_pwdet_power_on_cnt == 0", __func__);
         abort();
     } else if (s_pwdet_power_on_cnt == 0) {
diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt
index c94e9145b2..4666552eb6 100644
--- a/components/esp_system/CMakeLists.txt
+++ b/components/esp_system/CMakeLists.txt
@@ -26,7 +26,8 @@ endif()
 if(BOOTLOADER_BUILD OR esp_tee_build)
         # "_esp_error_check_failed()" requires spi_flash module
         # Bootloader relies on some Kconfig options defined in esp_system.
-        idf_component_register(SRCS "${srcs}" REQUIRES spi_flash)
+        idf_component_register(SRCS "${srcs}" REQUIRES spi_flash
+                               INCLUDE_DIRS include)
 else()
     list(APPEND srcs "crosscore_int.c"
             "esp_ipc.c"
diff --git a/components/esp_system/include/esp_private/critical_section.h b/components/esp_system/include/esp_private/critical_section.h
index 075a2669d0..94ff9bf937 100644
--- a/components/esp_system/include/esp_private/critical_section.h
+++ b/components/esp_system/include/esp_private/critical_section.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,18 +9,20 @@
  * It furthermore provides macros to define and initialize an optional spinlock
  * if the used chip is a multi-core chip. If a single-core chip is used, just disabling interrupts
  * is sufficient to guarantee consecutive, non-interrupted execution of a critical section.
- * Hence, the spinlock is unneccessary and will be automatically ommitted by the macros.
+ * Hence, the spinlock is unnecessary and will be automatically omitted by the macros.
  */
 #pragma once
 
+#if !NON_OS_BUILD
 #include "freertos/FreeRTOS.h"
+#endif
 #include "spinlock.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32P4
+#if (CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32P4) && !NON_OS_BUILD
 /**
  * This macro also helps users switching between spinlock declarations/definitions for multi-/single core environments
  * if the macros below aren't sufficient.
@@ -207,7 +209,7 @@ typedef spinlock_t esp_os_spinlock_t;
  * @brief Enter a critical section, i.e., a section that will not be interrupted by any other task or interrupt.
  *
  * On multi-core systems, this will disable interrupts and take the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are disabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are disabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.
@@ -236,7 +238,7 @@ typedef spinlock_t esp_os_spinlock_t;
  * @brief Exit a critical section.
  *
  * On multi-core systems, this will enable interrupts and release the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are enabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are enabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.
@@ -265,7 +267,7 @@ typedef spinlock_t esp_os_spinlock_t;
  * @brief Enter a critical section while from ISR.
  *
  * On multi-core systems, this will disable interrupts and take the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are disabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are disabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.
@@ -294,7 +296,7 @@ typedef spinlock_t esp_os_spinlock_t;
  * @brief Exit a critical section after entering from ISR.
  *
  * On multi-core systems, this will enable interrupts and release the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are enabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are enabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.
@@ -324,7 +326,7 @@ typedef spinlock_t esp_os_spinlock_t;
  *        an ISR or not and enter the critical section accordingly.
  *
  * On multi-core systems, this will disable interrupts and take the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are disabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are disabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.
@@ -353,7 +355,7 @@ typedef spinlock_t esp_os_spinlock_t;
  * @brief Exit a critical section after entering via esp_os_enter_critical_safe.
  *
  * On multi-core systems, this will enable interrupts and release the spinlock \c lock. On single core systems, a
- * spinlock is unncessary, hence \c lock is ignored and interrupts are enabled only.
+ * spinlock is unnecessary, hence \c lock is ignored and interrupts are enabled only.
  *
  * @note This macro MUST be used together with any of the initialization macros, e.g.
  *       DEFINE_CRIT_SECTION_LOCK_STATIC. If not, there may be unused variables.