diff --git a/doc/manual/update_apis.py b/doc/manual/update_apis.py
index c1d48b04f..48d854f3f 100755
--- a/doc/manual/update_apis.py
+++ b/doc/manual/update_apis.py
@@ -20,7 +20,7 @@ apis = [
["src/classic/pan.h", "PAN", "pan"],
["src/classic/btstack_link_key_db.h","Remote Device DB","rdevDb"],
["src/classic/rfcomm.h", "RFCOMM", "rfcomm"],
- ["src/classic/sdp.h", "SDP", "sdp"],
+ ["src/classic/sdp_server.h", "SDP", "sdp"],
["src/classic/sdp_client.h", "SDP Client", "sdpClient"],
["src/classic/sdp_parser.h","SDP Parser","sdpParser"],
["src/classic/sdp_query_rfcomm.h", "SDP RFCOMM Query", "sdpQueries"],
diff --git a/example/embedded/Makefile.inc b/example/embedded/Makefile.inc
index 23ad7e58a..b90b68b6d 100644
--- a/example/embedded/Makefile.inc
+++ b/example/embedded/Makefile.inc
@@ -25,7 +25,7 @@ COMMON += \
sdp_util.c \
rfcomm.c \
bnep.c \
- sdp.c \
+ sdp_server.c \
SDP_CLIENT += \
sdp_client.o \
diff --git a/example/embedded/hsp_hs_test.c b/example/embedded/hsp_hs_test.c
index c8ede17ce..bc2ac160e 100644
--- a/example/embedded/hsp_hs_test.c
+++ b/example/embedded/hsp_hs_test.c
@@ -69,7 +69,7 @@
#include "btstack_run_loop.h"
#include "classic/sdp_util.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/hsp_hs.h"
#include "hci.h"
diff --git a/example/embedded/spp_and_le_counter.c b/example/embedded/spp_and_le_counter.c
index 9beea78db..a331491b6 100644
--- a/example/embedded/spp_and_le_counter.c
+++ b/example/embedded/spp_and_le_counter.c
@@ -66,7 +66,7 @@
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "spp_and_le_counter.h"
#include "ble/att.h"
diff --git a/example/embedded/spp_counter.c b/example/embedded/spp_counter.c
index 45ebdae42..ff22c5fdb 100644
--- a/example/embedded/spp_counter.c
+++ b/example/embedded/spp_counter.c
@@ -64,7 +64,7 @@
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#define RFCOMM_SERVER_CHANNEL 1
#define HEARTBEAT_PERIOD_MS 1000
diff --git a/example/embedded/spp_flowcontrol.c b/example/embedded/spp_flowcontrol.c
index 8cc80cecf..ab65b593f 100644
--- a/example/embedded/spp_flowcontrol.c
+++ b/example/embedded/spp_flowcontrol.c
@@ -57,7 +57,7 @@
#include "l2cap.h"
#include "btstack_memory.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_config.h"
#define HEARTBEAT_PERIOD_MS 500
diff --git a/platform/daemon/daemon.c b/platform/daemon/daemon.c
index 5dd2299f7..74e4882f6 100644
--- a/platform/daemon/daemon.c
+++ b/platform/daemon/daemon.c
@@ -66,7 +66,7 @@
#include "btstack_version.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_client.h"
#include "classic/sdp_parser.h"
#include "classic/sdp_query_rfcomm.h"
diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in
index 304fa371d..cc129c0e6 100644
--- a/port/daemon/src/Makefile.in
+++ b/port/daemon/src/Makefile.in
@@ -48,7 +48,7 @@ BTdaemon_SOURCES = \
btstack_memory_pool.c \
rfcomm.c \
bnep.c \
- sdp.c \
+ sdp_server.c \
sdp_client.c \
sdp_parser.c \
sdp_query_rfcomm.c \
diff --git a/port/ez430-rf2560/example/ant_test.c b/port/ez430-rf2560/example/ant_test.c
index c3ec790c4..6330174cb 100644
--- a/port/ez430-rf2560/example/ant_test.c
+++ b/port/ez430-rf2560/example/ant_test.c
@@ -67,7 +67,7 @@
#include "btstack_memory.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_config.h"
#define HEARTBEAT_PERIOD_MS 1000
diff --git a/port/ez430-rf2560/example/spp_accel.c b/port/ez430-rf2560/example/spp_accel.c
index e70821e3f..23d897458 100644
--- a/port/ez430-rf2560/example/spp_accel.c
+++ b/port/ez430-rf2560/example/spp_accel.c
@@ -63,7 +63,7 @@
#include "btstack_memory.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_config.h"
#define HEARTBEAT_PERIOD_MS 1000
diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile
index 5e647133c..9c2fa758d 100644
--- a/port/ios/src/Makefile
+++ b/port/ios/src/Makefile
@@ -46,7 +46,7 @@ BTdaemon_FILES = \
l2cap_signaling.c \
platform_iphone.m \
rfcomm.c \
- sdp.c \
+ sdp_server.c \
SpringBoardAccess.c \
rfcomm_service_db_cocoa.m \
sdp_client.c \
diff --git a/port/msp-exp430f5438-cc2564b/example/ant_test.c b/port/msp-exp430f5438-cc2564b/example/ant_test.c
index 3f20b3a13..4dcd7d5a3 100644
--- a/port/msp-exp430f5438-cc2564b/example/ant_test.c
+++ b/port/msp-exp430f5438-cc2564b/example/ant_test.c
@@ -67,7 +67,7 @@
#include "btstack_memory.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_config.h"
#define HEARTBEAT_PERIOD_MS 1000
diff --git a/port/msp-exp430f5438-cc2564b/example/spp_accel.c b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
index e05bc55a2..830eff884 100644
--- a/port/msp-exp430f5438-cc2564b/example/spp_accel.c
+++ b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
@@ -63,7 +63,7 @@
#include "btstack_memory.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_config.h"
#define HEARTBEAT_PERIOD_MS 1000
diff --git a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk
index 2cd3cbc52..1cbccd0a6 100644
--- a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk
+++ b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk
@@ -45,7 +45,7 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
# Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c
+SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c
# Object Files Quoted if spaced
OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_parser.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_query_util.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o
@@ -55,7 +55,7 @@ POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/2048875307/system_init.o.d ${OBJECTDIR}/_ext
OBJECTFILES=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_parser.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_query_util.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o
# Source Files
-SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c
+SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_embedded.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_run_loop_embedded.c ../../../src/sdp_server.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/btstack_util.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/btstack_chipset_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c
CFLAGS=
@@ -220,11 +220,11 @@ ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o: ../../../src/btstack_r
@${RM} ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o.d" -o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ../../../src/btstack_run_loop_embedded.c
-${OBJECTDIR}/_ext/1386528437/sdp.o: ../../../src/sdp.c nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/_ext/1386528437/sdp.o: ../../../src/sdp_server.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp.o.d
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp.o
- @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/sdp.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp.o ../../../src/sdp.c
+ @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/sdp.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp.o ../../../src/sdp_server.c
${OBJECTDIR}/_ext/1386528437/sdp_client.o: ../../../src/sdp_client.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
@@ -479,11 +479,11 @@ ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o: ../../../src/btstack_r
@${RM} ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o.d" -o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop_embedded.o ../../../src/btstack_run_loop_embedded.c
-${OBJECTDIR}/_ext/1386528437/sdp.o: ../../../src/sdp.c nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/_ext/1386528437/sdp.o: ../../../src/sdp_server.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp.o.d
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp.o
- @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/sdp.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp.o ../../../src/sdp.c
+ @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/sdp.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp.o ../../../src/sdp_server.c
${OBJECTDIR}/_ext/1386528437/sdp_client.o: ../../../src/sdp_client.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
diff --git a/port/pic32-harmony/app.X/nbproject/configurations.xml b/port/pic32-harmony/app.X/nbproject/configurations.xml
index 1785bdd1c..be2d8ffce 100644
--- a/port/pic32-harmony/app.X/nbproject/configurations.xml
+++ b/port/pic32-harmony/app.X/nbproject/configurations.xml
@@ -55,7 +55,7 @@
../../../src/classic/sdp_util.h
../../../src/remote_device_db.h
../../../src/rfcomm.h
- ../../../src/sdp.h
+ ../../../src/sdp_server.h
../../../src/sdp_client.h
../../../src/sdp_parser.h
../../../src/sdp_query_rfcomm.h
@@ -133,7 +133,7 @@
../../../src/classic/rfcomm.c
../../../src/btstack_run_loop.c
../../../src/btstack_run_loop_embedded.c
- ../../../src/classic/sdp.c
+ ../../../src/classic/sdp_server.c
../../../src/classic/sdp_client.c
../../../src/classic/sdp_parser.c
../../../src/classic/sdp_query_rfcomm.c
diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile
index e6067e5c5..c0d49c5c7 100644
--- a/port/stm32-f103rb-nucleo/Makefile
+++ b/port/stm32-f103rb-nucleo/Makefile
@@ -34,7 +34,7 @@ COMMON = \
l2cap_signaling.c \
remote_device_db_memory.c \
rfcomm.c \
- sdp.c \
+ sdp_server.c \
sdp_util.c \
btstack_util.c \
sdp_parser.c \
diff --git a/port/wiced/wiced.mk b/port/wiced/wiced.mk
index 8a33e3fe6..cfb8603e4 100644
--- a/port/wiced/wiced.mk
+++ b/port/wiced/wiced.mk
@@ -20,7 +20,7 @@ $(NAME)_SOURCES += \
../../src/classic/hsp_hs.c \
../../src/classic/remote_device_db_memory.c \
../../src/classic/rfcomm.c \
- ../../src/classic/sdp.c \
+ ../../src/classic/sdp_server.c \
../../src/classic/sdp_client.c \
../../src/classic/sdp_parser.c \
../../src/classic/sdp_query_rfcomm.c \
diff --git a/src/btstack.h b/src/btstack.h
index 46a87447d..6131c0c71 100644
--- a/src/btstack.h
+++ b/src/btstack.h
@@ -86,7 +86,7 @@
#include "classic/pan.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_client.h"
#include "classic/sdp_parser.h"
#include "classic/sdp_query_rfcomm.h"
diff --git a/src/btstack_memory.h b/src/btstack_memory.h
index b488c0751..c6469a72e 100644
--- a/src/btstack_memory.h
+++ b/src/btstack_memory.h
@@ -63,7 +63,7 @@ extern "C" {
#include "classic/btstack_link_key_db.h"
#include "classic/btstack_link_key_db_memory.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
// BLE
#ifdef ENABLE_BLE
diff --git a/src/classic/hfp.c b/src/classic/hfp.c
index 7ab717030..8a6ebe717 100644
--- a/src/classic/hfp.c
+++ b/src/classic/hfp.c
@@ -57,7 +57,7 @@
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_query_rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "btstack_event.h"
diff --git a/src/classic/hfp_ag.c b/src/classic/hfp_ag.c
index f96e112fc..2958afd7a 100644
--- a/src/classic/hfp_ag.c
+++ b/src/classic/hfp_ag.c
@@ -56,7 +56,7 @@
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_query_rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "classic/hfp.h"
#include "classic/hfp_gsm_model.h"
diff --git a/src/classic/hfp_gsm_model.c b/src/classic/hfp_gsm_model.c
index 7e0f3adf6..8d1fedfb5 100644
--- a/src/classic/hfp_gsm_model.c
+++ b/src/classic/hfp_gsm_model.c
@@ -51,7 +51,7 @@
#include "btstack_memory.h"
#include "classic/hfp.h"
#include "classic/hfp_gsm_model.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_query_rfcomm.h"
#include "btstack_debug.h"
#include "hci.h"
diff --git a/src/classic/hfp_hf.c b/src/classic/hfp_hf.c
index 8cc7bb973..92f544df9 100644
--- a/src/classic/hfp_hf.c
+++ b/src/classic/hfp_hf.c
@@ -56,7 +56,7 @@
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_query_rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "classic/hfp.h"
#include "classic/hfp_hf.h"
diff --git a/src/classic/hsp_ag.c b/src/classic/hsp_ag.c
index b68aaba6e..a848b3015 100644
--- a/src/classic/hsp_ag.c
+++ b/src/classic/hsp_ag.c
@@ -52,7 +52,7 @@
#include "btstack_event.h"
#include "btstack_memory.h"
#include "btstack_run_loop.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_query_rfcomm.h"
#include "hci.h"
#include "hci_cmd.h"
diff --git a/src/classic/hsp_hs.c b/src/classic/hsp_hs.c
index 60537b225..44a928293 100644
--- a/src/classic/hsp_hs.c
+++ b/src/classic/hsp_hs.c
@@ -52,7 +52,7 @@
#include "btstack_event.h"
#include "btstack_memory.h"
#include "btstack_run_loop.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_query_rfcomm.h"
#include "hci.h"
#include "hci_cmd.h"
diff --git a/src/classic/sdp_client.c b/src/classic/sdp_client.c
index e60e1cfab..1f98ccc98 100644
--- a/src/classic/sdp_client.c
+++ b/src/classic/sdp_client.c
@@ -46,7 +46,7 @@
#include "l2cap.h"
#include "classic/sdp_parser.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
typedef enum {
diff --git a/src/classic/sdp.c b/src/classic/sdp_server.c
similarity index 99%
rename from src/classic/sdp.c
rename to src/classic/sdp_server.c
index aa01f8073..2c3f80942 100644
--- a/src/classic/sdp.c
+++ b/src/classic/sdp_server.c
@@ -47,7 +47,7 @@
#include "hci_dump.h"
#include "l2cap.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_util.h"
// max reserved ServiceRecordHandle
diff --git a/src/classic/sdp.h b/src/classic/sdp_server.h
similarity index 100%
rename from src/classic/sdp.h
rename to src/classic/sdp_server.h
diff --git a/test/hfp/Makefile b/test/hfp/Makefile
index a827db5ba..0e15ea09c 100644
--- a/test/hfp/Makefile
+++ b/test/hfp/Makefile
@@ -8,7 +8,7 @@ CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
COMMON = \
- sdp.c \
+ sdp_server.c \
sdp_query_rfcomm.c \
btstack_link_key_db_memory.c \
btstack_linked_list.c \
diff --git a/test/hfp/hfp_ag_client_test.c b/test/hfp/hfp_ag_client_test.c
index 6cd48a4f1..55b50ae3c 100644
--- a/test/hfp/hfp_ag_client_test.c
+++ b/test/hfp/hfp_ag_client_test.c
@@ -58,7 +58,7 @@
#include "hci.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_parser.h"
#include "btstack_debug.h"
#include "classic/hfp_ag.h"
diff --git a/test/hfp/hfp_hf_client_test.c b/test/hfp/hfp_hf_client_test.c
index 7cc79dd60..19d41e9c0 100644
--- a/test/hfp/hfp_hf_client_test.c
+++ b/test/hfp/hfp_hf_client_test.c
@@ -58,7 +58,7 @@
#include "hci.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_parser.h"
#include "btstack_debug.h"
#include "classic/hfp_hf.h"
diff --git a/test/pts/bnep_test.c b/test/pts/bnep_test.c
index 742611eff..02e714e2f 100644
--- a/test/pts/bnep_test.c
+++ b/test/pts/bnep_test.c
@@ -63,7 +63,7 @@
#include "btstack_memory.h"
#include "hci_dump.h"
#include "l2cap.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "pan.h"
#include "stdin_support.h"
diff --git a/test/pts/classic_test.c b/test/pts/classic_test.c
index 77e349c5d..9b6286c81 100644
--- a/test/pts/classic_test.c
+++ b/test/pts/classic_test.c
@@ -59,7 +59,7 @@
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "classic/sdp_query_rfcomm.h"
#include "ble/sm.h"
#include "stdin_support.h"
diff --git a/test/pts/hfp_ag_test.c b/test/pts/hfp_ag_test.c
index 3b88aee35..ac8277242 100644
--- a/test/pts/hfp_ag_test.c
+++ b/test/pts/hfp_ag_test.c
@@ -61,7 +61,7 @@
#include "hci.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "classic/hfp_ag.h"
#include "stdin_support.h"
diff --git a/test/pts/hfp_hf_test.c b/test/pts/hfp_hf_test.c
index c502c4c04..53a5e3733 100644
--- a/test/pts/hfp_hf_test.c
+++ b/test/pts/hfp_hf_test.c
@@ -64,7 +64,7 @@
#include "hci.h"
#include "l2cap.h"
#include "classic/rfcomm.h"
-#include "sdp.h"
+#include "sdp_server.h"
#include "btstack_debug.h"
#include "classic/hfp_hf.h"
#include "stdin_support.h"
diff --git a/test/pts/hsp_ag_test.c b/test/pts/hsp_ag_test.c
index e14472aca..e584178b2 100644
--- a/test/pts/hsp_ag_test.c
+++ b/test/pts/hsp_ag_test.c
@@ -60,7 +60,7 @@
#include "hci.h"
#include "l2cap.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "hsp_ag.h"
#include "stdin_support.h"
diff --git a/test/pts/hsp_hs_test.c b/test/pts/hsp_hs_test.c
index 2ef140318..763729f45 100644
--- a/test/pts/hsp_hs_test.c
+++ b/test/pts/hsp_hs_test.c
@@ -64,7 +64,7 @@
#include "hci.h"
#include "l2cap.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
#include "btstack_debug.h"
#include "hsp_hs.h"
#include "stdin_support.h"
diff --git a/tool/btstack_memory_generator.py b/tool/btstack_memory_generator.py
index 5487e1086..49b64bf0f 100755
--- a/tool/btstack_memory_generator.py
+++ b/tool/btstack_memory_generator.py
@@ -66,7 +66,7 @@ extern "C" {
#include "classic/btstack_link_key_db.h"
#include "classic/btstack_link_key_db_memory.h"
#include "classic/rfcomm.h"
-#include "classic/sdp.h"
+#include "classic/sdp_server.h"
// BLE
#ifdef ENABLE_BLE