diff --git a/src/classic/avrcp_controller.c b/src/classic/avrcp_controller.c
index 2d5521566..b418d16ba 100644
--- a/src/classic/avrcp_controller.c
+++ b/src/classic/avrcp_controller.c
@@ -47,6 +47,9 @@
 #include "classic/avrcp.h"
 #include "classic/avrcp_controller.h"
 
+// made public in avrcp_controller.h
+avrcp_context_t avrcp_controller_context;
+
 void avrcp_controller_create_sdp_record(uint8_t * service, uint32_t service_record_handle, uint8_t browsing, uint16_t supported_features, const char * service_name, const char * service_provider_name){
     avrcp_create_sdp_record(1, service, service_record_handle, browsing, supported_features, service_name, service_provider_name);
 }
@@ -1147,4 +1150,4 @@ uint8_t avrcp_controller_disconnect(uint16_t avrcp_cid){
     if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
     l2cap_disconnect(connection->l2cap_signaling_cid, 0);
     return ERROR_CODE_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/src/classic/avrcp_controller.h b/src/classic/avrcp_controller.h
index b613867d3..8d29758a2 100644
--- a/src/classic/avrcp_controller.h
+++ b/src/classic/avrcp_controller.h
@@ -279,11 +279,11 @@ uint8_t avrcp_controller_set_shuffle_mode(uint16_t avrcp_cid, avrcp_shuffle_mode
 uint8_t avrcp_controller_set_repeat_mode(uint16_t avrcp_cid, avrcp_repeat_mode_t mode);
 /* API_END */
 
-// Only used by AVRCP controller and AVRCP browsing controller
-avrcp_context_t avrcp_controller_context;
+// Used by AVRCP controller and AVRCP browsing controller
+extern avrcp_context_t avrcp_controller_context;
 
 #if defined __cplusplus
 }
 #endif
 
-#endif // __AVRCP_CONTROLLER_H
\ No newline at end of file
+#endif // __AVRCP_CONTROLLER_H