diff --git a/components/esp_system/include/esp_int_wdt.h b/components/esp_system/include/esp_private/esp_int_wdt.h
similarity index 66%
rename from components/esp_system/include/esp_int_wdt.h
rename to components/esp_system/include/esp_private/esp_int_wdt.h
index 2bda5d8557..105c0ec280 100644
--- a/components/esp_system/include/esp_int_wdt.h
+++ b/components/esp_system/include/esp_private/esp_int_wdt.h
@@ -1,16 +1,8 @@
-// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #ifndef __ESP_INT_WDT_H
 #define __ESP_INT_WDT_H
diff --git a/components/esp_system/int_wdt.c b/components/esp_system/int_wdt.c
index 4a47bcb60c..4b794219d5 100644
--- a/components/esp_system/int_wdt.c
+++ b/components/esp_system/int_wdt.c
@@ -20,7 +20,7 @@
 #include "esp_freertos_hooks.h"
 #include "soc/timer_periph.h"
 #include "esp_private/periph_ctrl.h"
-#include "esp_int_wdt.h"
+#include "esp_private/esp_int_wdt.h"
 #include "esp_private/system_internal.h"
 #include "hal/cpu_hal.h"
 #include "hal/timer_types.h"
diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
index 14cd46cdd7..c5a840a34a 100644
--- a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
+++ b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
@@ -17,17 +17,17 @@
 #include "xtensa/config/core.h"
 #include "xtensa/config/core-isa.h"
 #include "xtensa/xtruntime.h"
+#include "esp_private/startup_internal.h"   /* Required by g_spiram_ok. [refactor-todo] for g_spiram_ok */
+#include "esp_private/esp_int_wdt.h"
 #include "esp_heap_caps.h"
 #include "esp_system.h"
 #include "esp_task.h"
 #include "esp_log.h"
 #include "esp_cpu.h"
 #include "esp_rom_sys.h"
-#include "esp_int_wdt.h"
 #include "esp_task_wdt.h"
 #include "esp_heap_caps_init.h"
 #include "esp_freertos_hooks.h"
-#include "esp_private/startup_internal.h"   /* Required by g_spiram_ok. [refactor-todo] for g_spiram_ok */
 #include "esp32/spiram.h"                   /* Required by esp_spiram_reserve_dma_pool() */
 #ifdef CONFIG_APPTRACE_ENABLE
 #include "esp_app_trace.h"
diff --git a/components/freertos/FreeRTOS-Kernel/portable/port_common.c b/components/freertos/FreeRTOS-Kernel/portable/port_common.c
index cb1fa368ed..b8bf1d4293 100644
--- a/components/freertos/FreeRTOS-Kernel/portable/port_common.c
+++ b/components/freertos/FreeRTOS-Kernel/portable/port_common.c
@@ -8,9 +8,9 @@
 #include "FreeRTOS.h"
 #include "task.h"
 #include "portmacro.h"
+#include "esp_private/esp_int_wdt.h"
 #include "esp_system.h"
 #include "esp_heap_caps_init.h"
-#include "esp_int_wdt.h"
 #include "esp_task_wdt.h"
 #include "esp_task.h"
 #include "esp_private/crosscore_int.h"
diff --git a/components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c b/components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
index 15729559ff..228678641c 100644
--- a/components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
+++ b/components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
@@ -65,9 +65,9 @@
 #include <xtensa/xtensa_context.h>
 #include "soc/soc_caps.h"
 #include "esp_private/crosscore_int.h"
+#include "esp_private/esp_int_wdt.h"
 #include "esp_system.h"
 #include "esp_log.h"
-#include "esp_int_wdt.h"
 #ifdef CONFIG_APPTRACE_ENABLE
 #include "esp_app_trace.h"    /* Required for esp_apptrace_init. [refactor-todo] */
 #endif
diff --git a/docs/en/migration-guides/system.rst b/docs/en/migration-guides/system.rst
index a2494bd9a2..3d6a8921c7 100644
--- a/docs/en/migration-guides/system.rst
+++ b/docs/en/migration-guides/system.rst
@@ -60,6 +60,7 @@ ESP System
 ----------
 - The header files ``esp_random.h``, ``esp_mac.h`` and ``esp_chip_info.h``, which were all previously indirectly included via the header file ``esp_system.h``, must now be included directly. These headers are removed from ``esp_system.h``.
 - The header file ``eh_frame_parser.h`` must now be included with a ``esp_private`` prefix like ``#include "esp_private/eh_frame_parser.h"``.
+- The header file ``esp_int_wdt.h`` must now be included with a ``esp_private`` prefix like ``#include "esp_private/esp_int_wdt.h"``.
 
 SOC dependency
 --------------