diff --git a/components/lwip/include/apps/dhcpserver/dhcpserver.h b/components/lwip/include/apps/dhcpserver/dhcpserver.h
index ca97cea276..479c528009 100644
--- a/components/lwip/include/apps/dhcpserver/dhcpserver.h
+++ b/components/lwip/include/apps/dhcpserver/dhcpserver.h
@@ -7,6 +7,7 @@
 #define __DHCPS_H__
 
 #include "sdkconfig.h"
+#include <stdbool.h>
 #include "lwip/ip_addr.h"
 #include "lwip/err.h"
 
diff --git a/components/lwip/port/esp32/include/netif/dhcp_state.h b/components/lwip/port/esp32/include/netif/dhcp_state.h
index 44e5d4a308..0c2536b01c 100644
--- a/components/lwip/port/esp32/include/netif/dhcp_state.h
+++ b/components/lwip/port/esp32/include/netif/dhcp_state.h
@@ -1,21 +1,15 @@
-// Copyright 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: 2018-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 
 #ifndef _DHCP_STATE_H_
 #define _DHCP_STATE_H_
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/lwip/test_afl_host/dhcp_di.h b/components/lwip/test_afl_host/dhcp_di.h
index 87a6cac0c7..eeaff9c4ce 100644
--- a/components/lwip/test_afl_host/dhcp_di.h
+++ b/components/lwip/test_afl_host/dhcp_di.h
@@ -1,4 +1,6 @@
 #include "no_warn_host.h"
+#include <stdlib.h>     // For abort()
+#include <stdio.h>      // For printf()
 #include "lwip/opt.h"
 #include "lwip/stats.h"
 #include "lwip/mem.h"
diff --git a/components/lwip/test_afl_host/dhcpserver_di.h b/components/lwip/test_afl_host/dhcpserver_di.h
index d8f5f9b06e..82702d6c6c 100644
--- a/components/lwip/test_afl_host/dhcpserver_di.h
+++ b/components/lwip/test_afl_host/dhcpserver_di.h
@@ -5,7 +5,6 @@
 #include "no_warn_host.h"
 #include "lwip/pbuf.h"
 #include "lwip/udp.h"
-#include "esp_netif.h"
 
 #ifndef BUILDING_DEF
 
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
index 9b73b0846a..bb8b4994f7 100644
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@@ -982,7 +982,6 @@ components/lwip/port/esp32/include/arch/vfs_lwip.h
 components/lwip/port/esp32/include/arpa/inet.h
 components/lwip/port/esp32/include/debug/lwip_debug.h
 components/lwip/port/esp32/include/netdb.h
-components/lwip/port/esp32/include/netif/dhcp_state.h
 components/lwip/port/esp32/include/netif/ethernetif.h
 components/lwip/port/esp32/include/netif/openthreadif.h
 components/lwip/port/esp32/include/netif/wlanif.h