diff --git a/test/pts/Makefile b/test/pts/Makefile
index da4ef16e7..63b5cd016 100644
--- a/test/pts/Makefile
+++ b/test/pts/Makefile
@@ -1,20 +1,51 @@
 # Makefile for libusb based PTS tests
 BTSTACK_ROOT = ../..
 
-CORE += main.c stdin_support.c
+CORE += \
+	btstack_memory.c            \
+	btstack_linked_list.c	    \
+	btstack_memory_pool.c       \
+	btstack_run_loop.c		    \
+	btstack_util.c 	            \
+	main.c 	\
+	stdin_support.c \
+	
+
+COMMON += \
+	hci.c			            \
+	hci_cmd.c		            \
+	hci_dump.c		            \
+	l2cap.c			            \
+	l2cap_signaling.c	        \
+	hci_transport_h2_libusb.c \
+	btstack_run_loop_posix.c \
+	btstack_link_key_db_fs.c \
+	le_device_db_fs.c \
+	wav_util.c \
+	sdp_util.c	                \
+	sdp_server.c			            \
 
-COMMON += hci_transport_h2_libusb.c btstack_run_loop_posix.c btstack_link_key_db_fs.c le_device_db_fs.c
 
 include ${BTSTACK_ROOT}/example/Makefile.inc
 
-CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror \
-          -I${BTSTACK_ROOT}/platform/posix \
-          -I${BTSTACK_ROOT}/platform/embedded \
-	      -I${BTSTACK_ROOT}/port/libusb \
-	      -D ENABLE_LE_DATA_CHANNELS
+CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror 
+CFLAGS += -I.
+CFLAGS += -I${BTSTACK_ROOT}/src
+CFLAGS += -I${BTSTACK_ROOT}/src/classic
+CFLAGS += -I${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/include -D OI_DEBUG
+CFLAGS += -I${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/include
+CFLAGS += -I${BTSTACK_ROOT}/platform/posix 
+CFLAGS += -I${BTSTACK_ROOT}/platform/embedded 
+CFLAGS += -I${BTSTACK_ROOT}/port/libusb 
+CFLAGS += -D ENABLE_LE_DATA_CHANNELS
 
+VPATH += ${BTSTACK_ROOT}/src
+VPATH += ${BTSTACK_ROOT}/src/classic
 VPATH += ${BTSTACK_ROOT}/platform/posix
+VPATH += ${BTSTACK_ROOT}/platform/libusb
 VPATH += ${BTSTACK_ROOT}/port/libusb
+# VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/srce 
+# VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/srce 
 
 # use pkg-config for libusb
 CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
diff --git a/test/pts/le_data_channel.c b/test/pts/le_data_channel.c
index 05c28e75d..cd30b4528 100644
--- a/test/pts/le_data_channel.c
+++ b/test/pts/le_data_channel.c
@@ -275,9 +275,8 @@ void show_usage(void){
     bd_addr_t iut_address;
     uint8_t uit_addr_type;
 
-    // gap_local_bd_addr(iut_address);
-    gap_advertisements_get_address(&uit_addr_type, iut_address);
-
+    gap_le_get_own_address(&uit_addr_type, iut_address);
+    
     printf("\n--- CLI for LE Data Channel %s ---\n", bd_addr_to_str(iut_address));
     printf("a - create HCI connection to type %u address %s\n", pts_address_type, bd_addr_to_str(pts_address));
     printf("b - connect to PSM 0x%02x (TSPX_le_psm - LE)\n", TSPX_le_psm);
@@ -295,6 +294,7 @@ void show_usage(void){
 }
 
 static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callback_type_t callback_type){
+    UNUSED(callback_type);
     char buffer;
     read(ds->fd, &buffer, 1);
 
@@ -378,7 +378,8 @@ static void stdin_process(btstack_data_source_t *ds, btstack_data_source_callbac
 
 int btstack_main(int argc, const char * argv[]);
 int btstack_main(int argc, const char * argv[]){
-    
+    (void)argc;
+    (void)argv;
     printf("BTstack LE Data Channel test starting up...\n");
 
     // register for HCI events