diff --git a/components/esp_wifi/include/esp_private/wifi_os_adapter.h b/components/esp_wifi/include/esp_private/wifi_os_adapter.h
index dbab9dbeb1..1db55d3537 100644
--- a/components/esp_wifi/include/esp_private/wifi_os_adapter.h
+++ b/components/esp_wifi/include/esp_private/wifi_os_adapter.h
@@ -8,6 +8,10 @@
 #define ESP_WIFI_OS_ADAPTER_H_
 
 #include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+#include "sdkconfig.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/esp_wifi/include/esp_wifi_crypto_types.h b/components/esp_wifi/include/esp_wifi_crypto_types.h
index 1249d331a6..c3f237f2e2 100644
--- a/components/esp_wifi/include/esp_wifi_crypto_types.h
+++ b/components/esp_wifi/include/esp_wifi_crypto_types.h
@@ -14,6 +14,9 @@
    During normal operation, you don't need to use any of these types or functions in this header.
    See esp_wifi.h & esp_wifi_types.h instead.
 */
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/esp_wifi/include/esp_wifi_default.h b/components/esp_wifi/include/esp_wifi_default.h
index 45be8a640f..d4c5b35a81 100644
--- a/components/esp_wifi/include/esp_wifi_default.h
+++ b/components/esp_wifi/include/esp_wifi_default.h
@@ -8,6 +8,7 @@
 #define _ESP_WIFI_DEFAULT_H
 
 #include "esp_netif.h"
+#include "esp_wifi_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/esp_wifi/include/esp_wifi_netif.h b/components/esp_wifi/include/esp_wifi_netif.h
index d5a5d285ab..9244a7b3f5 100644
--- a/components/esp_wifi/include/esp_wifi_netif.h
+++ b/components/esp_wifi/include/esp_wifi_netif.h
@@ -1,11 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "esp_err.h"
+#include "esp_wifi_types.h"
+#include "esp_netif_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_wifi/include/smartconfig_ack.h b/components/esp_wifi/include/smartconfig_ack.h
index abfada3ffa..75482f1a53 100644
--- a/components/esp_wifi/include/smartconfig_ack.h
+++ b/components/esp_wifi/include/smartconfig_ack.h
@@ -1,20 +1,16 @@
-// Copyright 2010-2017 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: 2010-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #ifndef SMARTCONFIG_ACK_H
 #define SMARTCONFIG_ACK_H
 
+#include "esp_smartconfig.h"
+#include "esp_err.h"
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index bbafaf3224..e8d4d2f241 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit bbafaf32240d9c7e8a01e34b9dbe111d72b96e49
+Subproject commit e8d4d2f241c5c7287b9d4a05dafbe05e8b1322b0
diff --git a/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h b/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
index eda48be0f7..fc9b8b504c 100644
--- a/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
+++ b/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
@@ -1,19 +1,14 @@
-// Copyright 2019 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: 2019-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 
+#include <stdbool.h>
+#include "sdkconfig.h"
+
 #include <protocomm.h>
 #include <protocomm_httpd.h>
 
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
index a6b430c410..b02be5c105 100644
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@@ -621,7 +621,6 @@ components/esp_system/ubsan.c
 components/esp_wifi/include/esp_private/esp_wifi_types_private.h
 components/esp_wifi/include/esp_private/wifi_types.h
 components/esp_wifi/include/esp_smartconfig.h
-components/esp_wifi/include/smartconfig_ack.h
 components/esp_wifi/src/lib_printf.c
 components/esp_wifi/src/mesh_event.c
 components/esp_wifi/src/smartconfig.c
@@ -1220,7 +1219,6 @@ components/vfs/test/test_vfs_lwip.c
 components/vfs/test/test_vfs_paths.c
 components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h
 components/wifi_provisioning/include/wifi_provisioning/scheme_console.h
-components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
 components/wifi_provisioning/include/wifi_provisioning/wifi_scan.h
 components/wifi_provisioning/proto-c/wifi_config.pb-c.c
 components/wifi_provisioning/proto-c/wifi_config.pb-c.h
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index 290a41af41..1584afdb62 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -96,7 +96,6 @@ components/esp_hw_support/include/esp_private/esp_memprot_internal.h
 
 ### Here are the files that use CONFIG_XXX values but don't include sdkconfig.h
 #
-components/esp_wifi/include/esp_private/wifi_os_adapter.h
 ### To be fixed: headers that rely on implicit inclusion
 #
 components/esp_rom/include/esp32/rom/sha.h
@@ -113,11 +112,7 @@ components/esp_rom/include/esp32s3/rom/rtc.h
 components/esp_rom/include/esp32h2/rom/rtc.h
 components/esp_rom/include/esp32c2/rom/rtc.h
 components/esp_ringbuf/include/freertos/ringbuf.h
-components/esp_wifi/include/esp_wifi_crypto_types.h
 components/esp_wifi/include/esp_coexist_internal.h
-components/esp_wifi/include/esp_wifi_netif.h
-components/esp_wifi/include/smartconfig_ack.h
-components/esp_wifi/include/esp_wifi_default.h
 components/esp_wifi/include/esp_coexist_adapter.h
 components/esp_event/include/esp_event_base.h
 components/esp_netif/include/esp_netif_sta_list.h
@@ -131,7 +126,6 @@ components/openssl/include/openssl/ssl.h
 components/ulp/include/ulp_common.h
 components/ulp/include/esp32s2/ulp_riscv.h
 components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h
-components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
 components/usb/include/esp_private/usb_phy.h
 components/usb/include/usb/usb_types_stack.h