diff --git a/components/esp_hw_support/include/esp_intr.h b/components/esp_hw_support/include/esp_intr.h
deleted file mode 100644
index 0818ed3fea..0000000000
--- a/components/esp_hw_support/include/esp_intr.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-#warning esp_intr.h is deprecated, please include esp_intr_alloc.h instead
-#include "esp_intr_alloc.h"
diff --git a/components/xtensa/include/esp_panic.h b/components/xtensa/include/esp_panic.h
deleted file mode 100644
index 587c7953b0..0000000000
--- a/components/xtensa/include/esp_panic.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#warning "esp_panic.h is deprecated, please use esp_debug_helpers.h or/and esp_private/panic_reason.h"
-#include "esp_private/panic_reason.h"
-#include "esp_debug_helpers.h"
diff --git a/docs/en/migration-guides/system.rst b/docs/en/migration-guides/system.rst
index 638273677a..d9237fa975 100644
--- a/docs/en/migration-guides/system.rst
+++ b/docs/en/migration-guides/system.rst
@@ -41,4 +41,7 @@ The header ``task_snapshot.h`` has been removed from ``freertos/task.h``. ESP-ID
 
 ESP HW Support
 --------------
-The header files ``soc/cpu.h`` have been deleted and deprecated CPU util functions have been removed. ESP-IDF developers should include ``esp_cpu.h`` instead for equivalent functions.
+
+- The header files ``soc/cpu.h`` have been deleted and deprecated CPU util functions have been removed. ESP-IDF developers should include ``esp_cpu.h`` instead for equivalent functions.
+- The header file ``esp_intr.h`` has been deleted. Please include ``esp_intr_alloc.h`` to allocate and manipulate interrupts.
+- The header file ``esp_panic.h`` has been deleted. ESP-IDF developers should include ``esp_private/panic_reason.h`` to get supported panic reasons. And should include ``esp_debug_helpers.h`` to use any debug related helper functions, e.g. print backtrace.
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
index 9701c55383..5bd7910562 100644
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@@ -2442,7 +2442,6 @@ components/xtensa/esp32s3/include/xtensa/config/system.h
 components/xtensa/esp32s3/include/xtensa/config/tie-asm.h
 components/xtensa/esp32s3/include/xtensa/config/tie.h
 components/xtensa/include/eri.h
-components/xtensa/include/esp_panic.h
 components/xtensa/include/esp_private/panic_reason.h
 components/xtensa/include/xt_instr_macros.h
 components/xtensa/include/xt_trax.h