diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 688e657..d40a551 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
@@ -36,8 +36,6 @@
 #include "avctp.h"
 #include "avrcp-lib.h"
 
-/* Company IDs for vendor dependent commands */
-#define IEEEID_BTSIG		0x001958
 
 /* Packet types */
 #define AVRCP_PACKET_TYPE_SINGLE		0x00
diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h
index 8625425..37b3d2e 100644
--- a/android/avrcp-lib.h
+++ b/android/avrcp-lib.h
@@ -74,6 +74,9 @@
 #define CAP_COMPANY_ID				0x02
 #define CAP_EVENTS_SUPPORTED			0x03
 
+/* Company IDs for vendor dependent commands */
+#define IEEEID_BTSIG		0x001958
+
 struct avrcp;
 
 struct avrcp_control_handler {
diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c
index 695f62c..8119b53 100644
--- a/unit/test-avrcp.c
+++ b/unit/test-avrcp.c
@@ -294,15 +294,13 @@ static ssize_t avrcp_handle_get_capabilities(struct avrcp *session,
 						uint8_t *params,
 						void *user_data)
 {
-	uint32_t id = 0x001958;
-
 	if (params_len != 1)
 		return -EINVAL;
 
 	switch (params[0]) {
 	case CAP_COMPANY_ID:
 		params[1] = 1;
-		hton24(&params[2], id);
+		hton24(&params[2], IEEEID_BTSIG);
 		return 5;
 	}