diff --git a/test/avdtp_util/avdtp_util_test.cpp b/test/avdtp_util/avdtp_util_test.cpp
index ae4097c2a..dd81ecbc0 100644
--- a/test/avdtp_util/avdtp_util_test.cpp
+++ b/test/avdtp_util/avdtp_util_test.cpp
@@ -51,7 +51,6 @@
 #include "CppUTest/CommandLineTestRunner.h"
 
 #include "classic/avdtp_util.h"
-#include "btstack.h"
 #include "classic/avdtp.h"
 #include "classic/avdtp_util.h"
 
diff --git a/test/classic-oob-pairing/Makefile b/test/classic-oob-pairing/Makefile
index ac89a1e60..732cb1649 100644
--- a/test/classic-oob-pairing/Makefile
+++ b/test/classic-oob-pairing/Makefile
@@ -76,10 +76,11 @@ CFLAGS += -I${BTSTACK_ROOT}/src
 CFLAGS += -I${BTSTACK_ROOT}/example
 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}/3rd-party/eCC
+CFLAGS += -I${BTSTACK_ROOT}/3rd-party/micro-ecc
 CFLAGS += -I${BTSTACK_ROOT}/3rd-party/rijndael
 CFLAGS += -I${BTSTACK_ROOT}/3rd-party/tinydir
-CFLAGS += -I${BTSTACK_ROOT}/platform/posix 
+CFLAGS += -I${BTSTACK_ROOT}/3rd-party/yxml
+CFLAGS += -I${BTSTACK_ROOT}/platform/posix
 
 VPATH += ${BTSTACK_ROOT}/src
 VPATH += ${BTSTACK_ROOT}/src/ble/mesh