diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 5e678ea..934106b 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
@@ -506,7 +506,7 @@ static ssize_t get_element_attributes(struct avrcp *session,
 	if (!params || params_len != 9 + params[8] * 4)
 		return -EINVAL;
 
-	uid = bt_get_be64(params);
+	uid = get_be64(params);
 	number = params[8];
 
 	for (i = 0; i < number; i++) {
diff --git a/monitor/sdp.c b/monitor/sdp.c
index d729e1f..a0ab314 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -97,8 +97,7 @@ static void print_uint(uint8_t indent, const uint8_t *data, uint32_t size)
 		print_field("%*c0x%8.8x", indent, ' ', get_be32(data));
 		break;
 	case 8:
-		print_field("%*c0x%16.16" PRIx64, indent, ' ',
-							bt_get_be64(data));
+		print_field("%*c0x%16.16" PRIx64, indent, ' ', get_be64(data));
 		break;
 	default:
 		packet_hexdump(data, size);
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 6772984..ebd10a9 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -2126,7 +2126,7 @@ static struct media_item *parse_media_element(struct avrcp *session,
 	if (len < 13)
 		return NULL;
 
-	uid = bt_get_be64(&operands[0]);
+	uid = get_be64(&operands[0]);
 
 	namelen = MIN(get_be16(&operands[11]), sizeof(name) - 1);
 	if (namelen > 0) {
@@ -2161,7 +2161,7 @@ static struct media_item *parse_media_folder(struct avrcp *session,
 	if (len < 12)
 		return NULL;
 
-	uid = bt_get_be64(&operands[0]);
+	uid = get_be64(&operands[0]);
 	type = operands[8];
 	playable = operands[9];
 
@@ -3072,7 +3072,7 @@ static void avrcp_track_changed(struct avrcp *session,
 {
 	if (session->browsing_id) {
 		struct avrcp_player *player = session->controller->player;
-		player->uid = bt_get_be64(&pdu->params[1]);
+		player->uid = get_be64(&pdu->params[1]);
 		avrcp_get_item_attributes(session, player->uid);
 	} else
 		avrcp_get_element_attributes(session);