diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c
index da06ce3d..b5d90c1f 100644
--- a/components/bootloader_support/src/bootloader_utility.c
+++ b/components/bootloader_support/src/bootloader_utility.c
@@ -494,7 +494,7 @@ static void set_cache_and_start_app(
 
 #include "esp_flash_partitions.h"
 #include "esp_fast_boot.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 
 static const char* TAG = "boot";
 
diff --git a/components/esp8266/Makefile.projbuild b/components/esp8266/Makefile.projbuild
index e5ae1631..5c06e621 100644
--- a/components/esp8266/Makefile.projbuild
+++ b/components/esp8266/Makefile.projbuild
@@ -40,9 +40,9 @@ ESPTOOL_ALL_FLASH_ARGS += $(PHY_DATA_OFFSET) $(PHY_INIT_DATA_BIN)
 
 ESP8266_COMPONENT_PATH := $(COMPONENT_PATH)
 
-$(PHY_INIT_DATA_OBJ): $(ESP8266_COMPONENT_PATH)/include/internal/phy_init_data.h $(BUILD_DIR_BASE)/include/sdkconfig.h
+$(PHY_INIT_DATA_OBJ): $(ESP8266_COMPONENT_PATH)/include/esp_private/phy_init_data.h $(BUILD_DIR_BASE)/include/sdkconfig.h
 	$(summary) CC $(notdir $@)
-	printf "#include \"internal/phy_init_data.h\"\n" | $(CC) -I $(BUILD_DIR_BASE)/include -I $(ESP8266_COMPONENT_PATH) -I $(ESP8266_COMPONENT_PATH)/include -I $(ESP8266_COMPONENT_PATH)/../esp_common/include -c -o $@ -xc -
+	printf "#include \"esp_private/phy_init_data.h\"\n" | $(CC) -I $(BUILD_DIR_BASE)/include -I $(ESP8266_COMPONENT_PATH) -I $(ESP8266_COMPONENT_PATH)/include -I $(ESP8266_COMPONENT_PATH)/../esp_common/include -c -o $@ -xc -
 
 $(PHY_INIT_DATA_BIN): $(PHY_INIT_DATA_OBJ)
 	$(summary) BIN $(notdir $@)
diff --git a/components/esp8266/include/internal/esp_system_internal.h b/components/esp8266/include/esp_private/esp_system_internal.h
similarity index 100%
rename from components/esp8266/include/internal/esp_system_internal.h
rename to components/esp8266/include/esp_private/esp_system_internal.h
diff --git a/components/esp8266/include/internal/phy_init_data.h b/components/esp8266/include/esp_private/phy_init_data.h
similarity index 100%
rename from components/esp8266/include/internal/phy_init_data.h
rename to components/esp8266/include/esp_private/phy_init_data.h
diff --git a/components/esp8266/include/internal/esp_wifi_internal.h b/components/esp8266/include/esp_private/wifi.h
similarity index 100%
rename from components/esp8266/include/internal/esp_wifi_internal.h
rename to components/esp8266/include/esp_private/wifi.h
diff --git a/components/esp8266/source/esp_fast_boot.c b/components/esp8266/source/esp_fast_boot.c
index 7f562ef3..7fe73c72 100644
--- a/components/esp8266/source/esp_fast_boot.c
+++ b/components/esp8266/source/esp_fast_boot.c
@@ -19,7 +19,7 @@
 #include <sys/errno.h>
 #include "esp_log.h"
 #include "rom/crc.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 #include "esp_fast_boot.h"
 #ifndef BOOTLOADER_BUILD
 #include "esp_ota_ops.h"
diff --git a/components/esp8266/source/esp_sleep.c b/components/esp8266/source/esp_sleep.c
index 220322b6..a3546695 100644
--- a/components/esp8266/source/esp_sleep.c
+++ b/components/esp8266/source/esp_sleep.c
@@ -28,7 +28,7 @@
 #include "esp8266/rom_functions.h"
 #include "driver/rtc.h"
 #include "rom/uart.h"
-#include "internal/phy_init_data.h"
+#include "esp_private/phy_init_data.h"
 
 #define FRC2_LOAD               (0x60000620)
 #define FRC2_COUNT              (0x60000624)
diff --git a/components/esp8266/source/esp_wifi.c b/components/esp8266/source/esp_wifi.c
index e1d1fab9..4fe6d906 100644
--- a/components/esp8266/source/esp_wifi.c
+++ b/components/esp8266/source/esp_wifi.c
@@ -17,7 +17,7 @@
 #include "esp_system.h"
 #include "esp_wifi.h"
 #include "esp_log.h"
-#include "internal/esp_wifi_internal.h"
+#include "esp_private/wifi.h"
 #include "phy.h"
 
 #define TAG "wifi_init"
@@ -168,4 +168,4 @@ bool IRAM_ATTR esp_wifi_try_rate_from_high(void) {
     }
 #endif
     return false;
-}
\ No newline at end of file
+}
diff --git a/components/esp8266/source/phy_init.c b/components/esp8266/source/phy_init.c
index 700f4aaa..722dec55 100644
--- a/components/esp8266/source/phy_init.c
+++ b/components/esp8266/source/phy_init.c
@@ -28,7 +28,7 @@
 #include "nvs_flash.h"
 #include "sdkconfig.h"
 
-#include "internal/phy_init_data.h"
+#include "esp_private/phy_init_data.h"
 #include "phy.h"
 
 #include "driver/rtc.h"
diff --git a/components/esp8266/source/reset_reason.c b/components/esp8266/source/reset_reason.c
index b7956d4b..1bac407a 100644
--- a/components/esp8266/source/reset_reason.c
+++ b/components/esp8266/source/reset_reason.c
@@ -15,7 +15,7 @@
 #include "sdkconfig.h"
 #include <string.h>
 #include "esp_system.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 #include "esp8266/rtc_register.h"
 #include "esp8266/rom_functions.h"
 #include "esp_log.h"
diff --git a/components/esp8266/source/startup.c b/components/esp8266/source/startup.c
index d7b5a98e..0d10feab 100644
--- a/components/esp8266/source/startup.c
+++ b/components/esp8266/source/startup.c
@@ -27,8 +27,8 @@
 #include "esp_phy_init.h"
 #include "esp_heap_caps_init.h"
 #include "esp_task_wdt.h"
-#include "internal/esp_wifi_internal.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/wifi.h"
+#include "esp_private/esp_system_internal.h"
 #include "esp8266/eagle_soc.h"
 
 #include "FreeRTOS.h"
diff --git a/components/esp8266/source/system_api.c b/components/esp8266/source/system_api.c
index 913e9502..080514e4 100644
--- a/components/esp8266/source/system_api.c
+++ b/components/esp8266/source/system_api.c
@@ -17,7 +17,7 @@
 
 #include "esp_log.h"
 #include "esp_system.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 
 #include "rom/crc.h"
 
diff --git a/components/freertos/port/esp8266/panic.c b/components/freertos/port/esp8266/panic.c
index 0e82f206..f3421fc6 100644
--- a/components/freertos/port/esp8266/panic.c
+++ b/components/freertos/port/esp8266/panic.c
@@ -18,7 +18,7 @@
 #include "esp_libc.h"
 #include "esp_system.h"
 #include "esp_task_wdt.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 
 #include "esp8266/rom_functions.h"
 #include "esp8266/backtrace.h"
diff --git a/components/spi_flash/port/port.c b/components/spi_flash/port/port.c
index 7c3011d9..ba6398ef 100644
--- a/components/spi_flash/port/port.c
+++ b/components/spi_flash/port/port.c
@@ -26,8 +26,8 @@
 #include "esp_libc.h"
 #include "esp8266/rom_functions.h"
 #include "esp8266/eagle_soc.h"
-#include "internal/phy_init_data.h"
-#include "internal/esp_system_internal.h"
+#include "esp_private/phy_init_data.h"
+#include "esp_private/esp_system_internal.h"
 
 #define PARTITION_DATA_OFFSET   (s_v2_flash_bin_size / 2)
 
diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
index 35ab7ac4..6722afd1 100644
--- a/components/tcpip_adapter/tcpip_adapter_lwip.c
+++ b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -41,7 +41,7 @@
 #include "dhcpserver/dhcpserver.h"
 #include "dhcpserver/dhcpserver_options.h"
 #include "esp_log.h"
-#include "internal/esp_wifi_internal.h"
+#include "esp_private/wifi.h"
 
 #include "FreeRTOS.h"
 #include "timers.h"
diff --git a/examples/system/ota/native_ota/1MB_flash/new_to_new_with_old/main/ota_example_main.c b/examples/system/ota/native_ota/1MB_flash/new_to_new_with_old/main/ota_example_main.c
index 29fd3f63..b03ec2a4 100644
--- a/examples/system/ota/native_ota/1MB_flash/new_to_new_with_old/main/ota_example_main.c
+++ b/examples/system/ota/native_ota/1MB_flash/new_to_new_with_old/main/ota_example_main.c
@@ -13,7 +13,7 @@
 
 #include "sdkconfig.h"
 #ifdef CONFIG_CONNECT_ORIGINAL_AP
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 #endif
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
diff --git a/examples/system/ota/native_ota/2+MB_flash/new_to_new_with_old/main/ota_example_main.c b/examples/system/ota/native_ota/2+MB_flash/new_to_new_with_old/main/ota_example_main.c
index 29fd3f63..b03ec2a4 100644
--- a/examples/system/ota/native_ota/2+MB_flash/new_to_new_with_old/main/ota_example_main.c
+++ b/examples/system/ota/native_ota/2+MB_flash/new_to_new_with_old/main/ota_example_main.c
@@ -13,7 +13,7 @@
 
 #include "sdkconfig.h"
 #ifdef CONFIG_CONNECT_ORIGINAL_AP
-#include "internal/esp_system_internal.h"
+#include "esp_private/esp_system_internal.h"
 #endif
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"