diff --git a/components/bt/bluedroid/bta/include/bta_api.h b/components/bt/bluedroid/bta/include/bta_api.h
index f9c6c154f..338fb9689 100644
--- a/components/bt/bluedroid/bta/include/bta_api.h
+++ b/components/bt/bluedroid/bta/include/bta_api.h
@@ -29,6 +29,7 @@
 #include "bt_types.h"
 #include "btm_api.h"
 // #include "uipc_msg.h"
+#include "sdp_api.h"
 
 #if BLE_INCLUDED == TRUE
 #include "btm_ble_api.h"
diff --git a/components/bt/bluedroid/include/bt_target.h b/components/bt/bluedroid/include/bt_target.h
index 5f894a5d6..e9a1625e0 100644
--- a/components/bt/bluedroid/include/bt_target.h
+++ b/components/bt/bluedroid/include/bt_target.h
@@ -978,7 +978,7 @@
 ******************************************************************************/
 
 #ifndef SDP_INCLUDED
-#define SDP_INCLUDED                TRUE
+#define SDP_INCLUDED                FALSE //TRUE
 #endif
 
 /* This is set to enable SDP server functionality. */
diff --git a/components/bt/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/bluedroid/stack/btm/btm_ble_gap.c
index 0e484d952..906300a8a 100644
--- a/components/bt/bluedroid/stack/btm/btm_ble_gap.c
+++ b/components/bt/bluedroid/stack/btm/btm_ble_gap.c
@@ -2615,13 +2615,15 @@ BOOLEAN btm_ble_update_inq_result(tINQ_DB_ENT *p_i, UINT8 addr_type, UINT8 evt_t
                                              BTM_BLE_AD_TYPE_16SRV_CMPL, &len)) != NULL) {
                 UINT8 i;
                 for (i = 0; i + 2 <= len; i = i + 2) {
-                    /* if this BLE device support HID over LE, set HID Major in class of device */
+#if BTA_HH_LE_INCLUDED == TRUE
+					/* if this BLE device support HID over LE, set HID Major in class of device */
                     if ((p_uuid16[i] | (p_uuid16[i + 1] << 8)) == UUID_SERVCLASS_LE_HID) {
                         p_cur->dev_class[0] = 0;
                         p_cur->dev_class[1] = BTM_COD_MAJOR_PERIPHERAL;
                         p_cur->dev_class[2] = 0;
                         break;
                     }
+#endif /* BTA_HH_LE_INCLUDED */
                 }
             }
         }
diff --git a/components/bt/bluedroid/stack/gap/gap_ble.c b/components/bt/bluedroid/stack/gap/gap_ble.c
index 70c4a22f6..b560fad65 100644
--- a/components/bt/bluedroid/stack/gap/gap_ble.c
+++ b/components/bt/bluedroid/stack/gap/gap_ble.c
@@ -28,6 +28,7 @@
 #include "gatt_int.h"
 #include "btm_int.h"
 #include "hcimsgs.h"
+#include "sdpdefs.h"
 
 #define GAP_CHAR_ICON_SIZE          2
 #define GAP_CHAR_DEV_NAME_SIZE      248
diff --git a/components/bt/bluedroid/stack/gatt/gatt_api.c b/components/bt/bluedroid/stack/gatt/gatt_api.c
index 1a61d60b1..c464508da 100644
--- a/components/bt/bluedroid/stack/gatt/gatt_api.c
+++ b/components/bt/bluedroid/stack/gatt/gatt_api.c
@@ -33,7 +33,8 @@
 #include "gatt_int.h"
 #include "l2c_api.h"
 #include "btm_int.h"
-
+#include "sdpdefs.h"
+#include "sdp_api.h"
 
 /*******************************************************************************
 **
diff --git a/components/bt/bluedroid/stack/gatt/gatt_attr.c b/components/bt/bluedroid/stack/gatt/gatt_attr.c
index b7a87192b..b0aa3f71d 100644
--- a/components/bt/bluedroid/stack/gatt/gatt_attr.c
+++ b/components/bt/bluedroid/stack/gatt/gatt_attr.c
@@ -28,6 +28,7 @@
 
 #include "gatt_api.h"
 #include "gatt_int.h"
+#include "sdpdefs.h"
 
 #if BLE_INCLUDED == TRUE
 
diff --git a/components/bt/bluedroid/stack/include/dyn_mem.h b/components/bt/bluedroid/stack/include/dyn_mem.h
index 2693ae636..9a95fb956 100755
--- a/components/bt/bluedroid/stack/include/dyn_mem.h
+++ b/components/bt/bluedroid/stack/include/dyn_mem.h
@@ -31,7 +31,8 @@
 #endif
 
 #ifndef SDP_DYNAMIC_MEMORY
-#define SDP_DYNAMIC_MEMORY  FALSE
+//#define SDP_DYNAMIC_MEMORY  FALSE
+#define SDP_DYNAMIC_MEMORY  TRUE
 #endif
 
 #ifndef L2C_DYNAMIC_MEMORY
diff --git a/components/bt/bluedroid/stack/include/gap_api.h b/components/bt/bluedroid/stack/include/gap_api.h
index 2dc9836a8..1f22db008 100644
--- a/components/bt/bluedroid/stack/include/gap_api.h
+++ b/components/bt/bluedroid/stack/include/gap_api.h
@@ -19,6 +19,7 @@
 #ifndef GAP_API_H
 #define GAP_API_H
 
+#include "sdpdefs.h"
 #include "profiles_api.h"
 #include "btm_api.h"
 #include "l2c_api.h"