diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index 07b469fe68..70eb157e4b 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -11,6 +11,7 @@ if(CONFIG_BT_ENABLED)
             bluedroid/bta/av/include
             bluedroid/bta/dm/include
             bluedroid/bta/gatt/include
+            bluedroid/bta/hf_client/include
             bluedroid/bta/hh/include
             bluedroid/bta/jv/include
             bluedroid/bta/sdp/include
diff --git a/components/lwip/CMakeLists.txt b/components/lwip/CMakeLists.txt
index 29c8d9fb69..6527de92ce 100644
--- a/components/lwip/CMakeLists.txt
+++ b/components/lwip/CMakeLists.txt
@@ -84,6 +84,7 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
                    "port/esp32/vfs_lwip.c"
                    "port/esp32/debug/lwip_debug.c"
                    "port/esp32/freertos/sys_arch.c"
+                   "port/esp32/netif/dhcp_state.c"
                    "port/esp32/netif/ethernetif.c"
                    "port/esp32/netif/wlanif.c")
 
@@ -121,7 +122,7 @@ if(CONFIG_PPP_SUPPORT)
 endif()
 
 set(COMPONENT_REQUIRES vfs)
-set(COMPONENT_PRIV_REQUIRES ethernet tcpip_adapter)
+set(COMPONENT_PRIV_REQUIRES ethernet tcpip_adapter nvs_flash)
 
 register_component()