diff --git a/port/esp32/components/btstack/CMakeLists.txt b/port/esp32/components/btstack/CMakeLists.txt
index d7b0a7752..116bd830a 100644
--- a/port/esp32/components/btstack/CMakeLists.txt
+++ b/port/esp32/components/btstack/CMakeLists.txt
@@ -5,41 +5,44 @@ if (CMAKE_HOST_WIN32)
     string(REPLACE "\\" "/" IDF_PATH $ENV{IDF_PATH})
 endif()
 
-set(include_dirs "3rd-party/bluedroid/decoder/include"
-                 "3rd-party/bluedroid/encoder/include"
-                 "3rd-party/hxcmod-player"
-                 "3rd-party/hxcmod-player/mods"
-                 "3rd-party/lc3-google/include"
-                 "${IDF_PATH}/components/lwip/lwip/src/include"
-                 "3rd-party/lwip/dhcp-server"
-                 "3rd-party/md5"
-                 "3rd-party/yxml"
-                 "src/classic"
-                 "src/ble/gatt-service"
-                 "src/ble"
-                 "src/classic"
-                 "src"
-                 "platform/embedded"
-                 "platform/freertos"
-                 "platform/lwip"
-                 "include")
+set(include_dirs
+    "3rd-party/bluedroid/decoder/include"
+    "3rd-party/bluedroid/encoder/include"
+    "3rd-party/hxcmod-player"
+    "3rd-party/hxcmod-player/mods"
+    "3rd-party/lc3-google/include"
+    "3rd-party/lwip/dhcp-server"
+    "3rd-party/md5"
+    "3rd-party/yxml"
+    "src/classic"
+    "src/ble/gatt-service"
+    "src/ble"
+    "src/classic"
+    "src"
+    "platform/embedded"
+    "platform/freertos"
+    "platform/lwip"
+    "${IDF_PATH}/components/lwip/lwip/src/include"
+    "include")
 
-set(src_dirs "3rd-party/bluedroid/decoder/srce"
-             "3rd-party/bluedroid/encoder/srce"
-             "3rd-party/hxcmod-player"
-             "3rd-party/hxcmod-player/mods"
-             "${IDF_PATH}/components/lwip/lwip/src/apps/http"
-             "3rd-party/md5"
-             "3rd-party/micro-ecc"
-             "3rd-party/lwip/dhcp-server"
-             "src/ble/gatt-service"
-             "src/ble"
-             "src/mesh"
-             "src/"
-             "platform/embedded"
-             "platform/freertos"
-             "platform/lwip"
-             ".")
+set(src_dirs
+    "3rd-party/bluedroid/decoder/srce"
+    "3rd-party/bluedroid/encoder/srce"
+    "3rd-party/hxcmod-player"
+    "3rd-party/hxcmod-player/mods"
+    "3rd-party/lwip/dhcp-server"
+    "3rd-party/md5"
+    "3rd-party/micro-ecc"
+    "3rd-party/yxml"
+    "src/ble/gatt-service"
+    "src/ble"
+    "src/mesh"
+    "src/"
+    "platform/embedded"
+    "platform/freertos"
+    "platform/lwip"
+    "${IDF_PATH}/components/lwip/lwip/src/apps/http"
+    ".")
 
 if(CONFIG_IDF_TARGET_ESP32)
         list(APPEND src_dirs "src/classic")
diff --git a/port/esp32/components/btstack/component.mk b/port/esp32/components/btstack/component.mk
index cc89f1f6d..4b14d3b1e 100644
--- a/port/esp32/components/btstack/component.mk
+++ b/port/esp32/components/btstack/component.mk
@@ -15,7 +15,6 @@ COMPONENT_ADD_INCLUDEDIRS := \
 	3rd-party/bluedroid/encoder/include \
 	3rd-party/hxcmod-player \
 	3rd-party/hxcmod-player/mods \
-	../lwip/lwip/src/include \
 	3rd-party/lwip/dhcp-server \
 	3rd-party/md5 \
 	3rd-party/yxml \
@@ -24,6 +23,7 @@ COMPONENT_ADD_INCLUDEDIRS := \
 	platform/embedded \
 	platform/freertos \
 	platform/lwip \
+	../lwip/lwip/src/include \
 	include \
 
 COMPONENT_PRIV_INCLUDEDIRS := \
@@ -34,10 +34,10 @@ COMPONENT_SRCDIRS := \
 	3rd-party/bluedroid/encoder/srce \
 	3rd-party/hxcmod-player \
 	3rd-party/hxcmod-player/mods \
-	../lwip/lwip/src/apps/http \
 	3rd-party/lwip/dhcp-server \
 	3rd-party/micro-ecc \
 	3rd-party/md5 \
+	3rd-party/yxml \
 	src/ble/gatt-service \
 	src/ble \
 	src/mesh \
@@ -45,6 +45,7 @@ COMPONENT_SRCDIRS := \
 	platform/embedded \
 	platform/freertos \
 	platform/lwip \
+	../lwip/lwip/src/apps/http \
 	. \
 
 ifdef CONFIG_IDF_TARGET_ESP32