diff --git a/src/classic/a2dp_sink.c b/src/classic/a2dp_sink.c
index 308ce08a4..d42e7ae6a 100644
--- a/src/classic/a2dp_sink.c
+++ b/src/classic/a2dp_sink.c
@@ -43,10 +43,10 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
-#include "avdtp_sink.h"
-#include "a2dp_sink.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_sink.h"
+#include "classic/a2dp_sink.h"
 
 static const char * default_a2dp_sink_service_name = "BTstack A2DP Sink Service";
 static const char * default_a2dp_sink_service_provider_name = "BTstack A2DP Sink Service Provider";
diff --git a/src/classic/a2dp_source.c b/src/classic/a2dp_source.c
index 46e61a47d..51c3e302e 100644
--- a/src/classic/a2dp_source.c
+++ b/src/classic/a2dp_source.c
@@ -44,10 +44,10 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
-#include "avdtp_source.h"
-#include "a2dp_source.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_source.h"
+#include "classic/a2dp_source.h"
 
 #define AVDTP_MEDIA_PAYLOAD_HEADER_SIZE 12
 
diff --git a/src/classic/avdtp.c b/src/classic/avdtp.c
index 6a86b4a3b..673d226e6 100644
--- a/src/classic/avdtp.c
+++ b/src/classic/avdtp.c
@@ -44,10 +44,10 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
-#include "avdtp_acceptor.h"
-#include "avdtp_initiator.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_acceptor.h"
+#include "classic/avdtp_initiator.h"
 
 static int record_id = -1;
 static uint8_t   attribute_value[1000];
diff --git a/src/classic/avdtp_initiator.c b/src/classic/avdtp_initiator.c
index 88c3b79c6..de78424db 100644
--- a/src/classic/avdtp_initiator.c
+++ b/src/classic/avdtp_initiator.c
@@ -44,9 +44,9 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
-#include "avdtp_initiator.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_initiator.h"
 
 
 static int avdtp_initiator_send_signaling_cmd(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){
diff --git a/src/classic/avdtp_sink.c b/src/classic/avdtp_sink.c
index 0f505d12f..0970eb80e 100644
--- a/src/classic/avdtp_sink.c
+++ b/src/classic/avdtp_sink.c
@@ -43,11 +43,11 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_sink.h"
-#include "avdtp_util.h"
-#include "avdtp_initiator.h"
-#include "avdtp_acceptor.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_sink.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_initiator.h"
+#include "classic/avdtp_acceptor.h"
 
 static avdtp_context_t * avdtp_sink_context;
 
diff --git a/src/classic/avdtp_source.c b/src/classic/avdtp_source.c
index 80868c532..409c69eb8 100644
--- a/src/classic/avdtp_source.c
+++ b/src/classic/avdtp_source.c
@@ -45,9 +45,9 @@
 #include <string.h>
 
 #include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
-#include "avdtp_source.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+#include "classic/avdtp_source.h"
 
 static avdtp_context_t * avdtp_source_context;