diff --git a/components/esp_hw_support/include/esp_memprot.h b/components/esp_hw_support/include/esp_memprot.h
index 02daf9c649..f6fc0bd165 100644
--- a/components/esp_hw_support/include/esp_memprot.h
+++ b/components/esp_hw_support/include/esp_memprot.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "sdkconfig.h"
-#if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE || CONFIG_ESP_SYSTEM_MEMPROT_TEST
+#if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -93,7 +93,7 @@ esp_err_t esp_mprot_get_active_intr(esp_memp_intr_source_t *active_memp_intr);
  * @brief Returns the address which caused the violation interrupt for given Memory type and CPU/Core ID.
  * This function is to be called after a basic resolving of (current) interrupt's parameters (ie corresponding
  * Memory type and CPU ID see esp_mprot_get_active_intr()). This is to minimize processing time of actual exception
- * as this API is typicaly used in a panic-handling code.
+ * as this API is typically used in a panic-handling code.
  * If there is no active interrupt available for the Memory type/CPU ID required, fault_addr is set to NULL.
  *
  * @param mem_type memory type
@@ -197,4 +197,4 @@ esp_err_t esp_mprot_dump_configuration(char **dump_info_string);
 }
 #endif
 
-#endif //CONFIG_ESP_SYSTEM_MEMPROT_FEATURE || CONFIG_ESP_SYSTEM_MEMPROT_TEST
+#endif //CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
diff --git a/components/esp_hw_support/port/esp32c61/CMakeLists.txt b/components/esp_hw_support/port/esp32c61/CMakeLists.txt
index ea0e988a9d..ad67c18301 100644
--- a/components/esp_hw_support/port/esp32c61/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32c61/CMakeLists.txt
@@ -10,11 +10,6 @@ set(srcs "rtc_clk_init.c"
 
 if(NOT BOOTLOADER_BUILD)
     list(APPEND srcs "sar_periph_ctrl.c")
-
-    if(CONFIG_ESP_SYSTEM_MEMPROT_FEATURE)
-        list(APPEND srcs "esp_memprot.c" "../esp_memprot_conv.c")
-    endif()
-
 endif()
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
diff --git a/components/esp_hw_support/port/esp32h4/CMakeLists.txt b/components/esp_hw_support/port/esp32h4/CMakeLists.txt
index e0bf022482..8c824225ec 100644
--- a/components/esp_hw_support/port/esp32h4/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32h4/CMakeLists.txt
@@ -14,11 +14,6 @@ endif()
 
 if(NOT BOOTLOADER_BUILD)
     # list(APPEND srcs "sar_periph_ctrl.c") // TODO: [ESP32H4] IDF-12368
-
-    if(CONFIG_ESP_SYSTEM_MEMPROT_FEATURE)
-        list(APPEND srcs "esp_memprot.c" "../esp_memprot_conv.c")
-    endif()
-
 endif()
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
diff --git a/components/esp_system/esp_system.c b/components/esp_system/esp_system.c
index bd80e2459f..b57a2631be 100644
--- a/components/esp_system/esp_system.c
+++ b/components/esp_system/esp_system.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,13 +8,6 @@
 #include "esp_private/system_internal.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
-#if CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/memprot.h"
-#else
-#include "esp_memprot.h"
-#endif
-#endif
 
 #define SHUTDOWN_HANDLERS_NO 5
 
diff --git a/components/esp_system/port/panic_handler.c b/components/esp_system/port/panic_handler.c
index 91d3e23ebc..bf7f850802 100644
--- a/components/esp_system/port/panic_handler.c
+++ b/components/esp_system/port/panic_handler.c
@@ -24,14 +24,6 @@
 #include "sdkconfig.h"
 #include "esp_rom_sys.h"
 
-#if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
-#ifdef CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/memprot.h"
-#else
-#include "esp_memprot.h"
-#endif
-#endif
-
 #include "esp_private/panic_internal.h"
 #include "esp_private/panic_reason.h"