diff --git a/src/btstack_memory.h b/src/btstack_memory.h
index efc3dfb57..f0730a740 100644
--- a/src/btstack_memory.h
+++ b/src/btstack_memory.h
@@ -66,7 +66,7 @@ extern "C" {
 #include "classic/sdp_server.h"
 #include "classic/avdtp_sink.h"
 #include "classic/avdtp_source.h"
-#include "../test/avrcp/avrcp.h"
+#include "classic/avrcp.h"
 
 // BLE
 #ifdef ENABLE_BLE
diff --git a/test/avrcp/avrcp.c b/src/classic/avrcp.c
similarity index 99%
rename from test/avrcp/avrcp.c
rename to src/classic/avrcp.c
index 19c04c4b6..76e79526f 100644
--- a/test/avrcp/avrcp.c
+++ b/src/classic/avrcp.c
@@ -42,7 +42,7 @@
 #include <unistd.h>
 
 #include "btstack.h"
-#include "avrcp.h"
+#include "classic/avrcp.h"
 
 #define AV_REMOTE_CONTROL_TARGET        0x110C
 #define AV_REMOTE_CONTROL               0x110E
diff --git a/test/avrcp/avrcp.h b/src/classic/avrcp.h
similarity index 100%
rename from test/avrcp/avrcp.h
rename to src/classic/avrcp.h
diff --git a/test/avrcp/avrcp_test.c b/test/avrcp/avrcp_test.c
index fdcb8b42c..b930e0ad4 100644
--- a/test/avrcp/avrcp_test.c
+++ b/test/avrcp/avrcp_test.c
@@ -52,7 +52,7 @@
 #include "hci_dump.h"
 #include "l2cap.h"
 #include "stdin_support.h"
-#include "avrcp.h"
+#include "classic/avrcp.h"
 
 #define AVRCP_BROWSING_ENABLED 0
 static btstack_packet_callback_registration_t hci_event_callback_registration;
diff --git a/tool/btstack_memory_generator.py b/tool/btstack_memory_generator.py
index cb2018f13..e480141c0 100755
--- a/tool/btstack_memory_generator.py
+++ b/tool/btstack_memory_generator.py
@@ -69,7 +69,7 @@ extern "C" {
 #include "classic/sdp_server.h"
 #include "classic/avdtp_sink.h"
 #include "classic/avdtp_source.h"
-#include "../test/avrcp/avrcp.h"
+#include "classic/avrcp.h"
 
 // BLE
 #ifdef ENABLE_BLE