diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c
index 91be9f8ada..3c720d122a 100644
--- a/components/esp_system/port/cpu_start.c
+++ b/components/esp_system/port/cpu_start.c
@@ -504,7 +504,7 @@ void IRAM_ATTR call_start_cpu0(void)
         esp_restart();
     }
 
-#if CONFIG_ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
+#if ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
 #if CONFIG_APP_BUILD_TYPE_ELF_RAM
     // For RAM loadable ELF case, we don't need to reserve IROM/DROM as instructions and data
     // are all in internal RAM. If the RAM loadable ELF has any requirement to memory map the
@@ -521,7 +521,7 @@ void IRAM_ATTR call_start_cpu0(void)
 
     /* Configure the Cache MMU size for instruction and rodata in flash. */
     Cache_Set_IDROM_MMU_Size(cache_mmu_irom_size, CACHE_DROM_MMU_MAX_END - cache_mmu_irom_size);
-#endif // CONFIG_ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
+#endif // ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
 
 #if CONFIG_ESPTOOLPY_OCT_FLASH && !CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT
     bool efuse_opflash_en = efuse_ll_get_flash_type();
diff --git a/components/soc/esp32p4/include/soc/mmu.h b/components/soc/esp32p4/include/soc/mmu.h
deleted file mode 100644
index 94937c2117..0000000000
--- a/components/soc/esp32p4/include/soc/mmu.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#include <stdint.h>
-#include "soc/ext_mem_defs.h"
-#include "soc/soc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//To delete this file
-//TODO: IDF-7686
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/components/spi_flash/flash_mmap.c b/components/spi_flash/flash_mmap.c
index 218c799f3d..c620a2d86f 100644
--- a/components/spi_flash/flash_mmap.c
+++ b/components/spi_flash/flash_mmap.c
@@ -12,10 +12,13 @@
 #include "sdkconfig.h"
 #include "esp_attr.h"
 #include "esp_log.h"
+#include "esp_rom_caps.h"
 #include "hal/mmu_ll.h"
 #include "hal/mmu_hal.h"
 #include "hal/cache_hal.h"
+#if ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE
 #include "soc/mmu.h"
+#endif
 
 #include "esp_private/esp_mmu_map_private.h"
 #include "esp_mmu_map.h"
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index 65618d6332..d6303f7566 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -256,7 +256,6 @@ components/soc/esp32c6/include/soc/mmu.h
 components/soc/esp32h2/include/soc/ext_mem_defs.h
 components/soc/esp32h2/include/soc/mmu.h
 components/soc/esp32p4/include/soc/ext_mem_defs.h
-components/soc/esp32p4/include/soc/mmu.h
 components/spi_flash/include/esp_private/spi_flash_os.h
 
 ### To be fixed: files which don't compile for esp32s2 target: