diff --git a/src/hci_cmd.h b/src/hci_cmd.h
index f53b9e241..a2ca927a2 100644
--- a/src/hci_cmd.h
+++ b/src/hci_cmd.h
@@ -93,43 +93,45 @@ extern const hci_cmd_t hci_change_connection_packet_type;
 extern const hci_cmd_t hci_create_connection;
 extern const hci_cmd_t hci_create_connection_cancel;
 extern const hci_cmd_t hci_delete_stored_link_key;
-extern const hci_cmd_t hci_enhanced_setup_synchronous_connection;
-extern const hci_cmd_t hci_enhanced_accept_synchronous_connection;
 extern const hci_cmd_t hci_disconnect;
+extern const hci_cmd_t hci_enhanced_accept_synchronous_connection;
+extern const hci_cmd_t hci_enhanced_setup_synchronous_connection;
 extern const hci_cmd_t hci_flush;
 extern const hci_cmd_t hci_host_buffer_size;
 extern const hci_cmd_t hci_inquiry;
-extern const hci_cmd_t hci_io_capability_request_reply;
-extern const hci_cmd_t hci_io_capability_request_negative_reply;
 extern const hci_cmd_t hci_inquiry_cancel;
+extern const hci_cmd_t hci_io_capability_request_negative_reply;
+extern const hci_cmd_t hci_io_capability_request_reply;
 extern const hci_cmd_t hci_link_key_request_negative_reply;
 extern const hci_cmd_t hci_link_key_request_reply;
-extern const hci_cmd_t hci_pin_code_request_reply;
 extern const hci_cmd_t hci_pin_code_request_negative_reply;
+extern const hci_cmd_t hci_pin_code_request_reply;
 extern const hci_cmd_t hci_qos_setup;
 extern const hci_cmd_t hci_read_bd_addr;
 extern const hci_cmd_t hci_read_buffer_size;
 extern const hci_cmd_t hci_read_le_host_supported;
 extern const hci_cmd_t hci_read_link_policy_settings;
 extern const hci_cmd_t hci_read_link_supervision_timeout;
+extern const hci_cmd_t hci_read_local_extended_ob_data;
 extern const hci_cmd_t hci_read_local_extended_oob_data;
 extern const hci_cmd_t hci_read_local_name;
 extern const hci_cmd_t hci_read_local_oob_data;
 extern const hci_cmd_t hci_read_local_supported_commands;
 extern const hci_cmd_t hci_read_local_supported_features;
 extern const hci_cmd_t hci_read_local_version_information;
+extern const hci_cmd_t hci_read_loopback_mode;
 extern const hci_cmd_t hci_read_num_broadcast_retransmissions;
 extern const hci_cmd_t hci_read_remote_supported_features_command;
 extern const hci_cmd_t hci_read_rssi;
 extern const hci_cmd_t hci_reject_connection_request;
 extern const hci_cmd_t hci_remote_name_request;
 extern const hci_cmd_t hci_remote_name_request_cancel;
-extern const hci_cmd_t hci_remote_oob_data_request_reply;
 extern const hci_cmd_t hci_remote_oob_data_request_negative_reply;
+extern const hci_cmd_t hci_remote_oob_data_request_reply;
 extern const hci_cmd_t hci_reset;
 extern const hci_cmd_t hci_role_discovery;
-extern const hci_cmd_t hci_set_event_mask;
 extern const hci_cmd_t hci_set_connection_encryption;
+extern const hci_cmd_t hci_set_event_mask;
 extern const hci_cmd_t hci_setup_synchronous_connection;
 extern const hci_cmd_t hci_sniff_mode;
 extern const hci_cmd_t hci_switch_role_command;
@@ -146,13 +148,12 @@ extern const hci_cmd_t hci_write_le_host_supported;
 extern const hci_cmd_t hci_write_link_policy_settings;
 extern const hci_cmd_t hci_write_link_supervision_timeout;
 extern const hci_cmd_t hci_write_local_name;
+extern const hci_cmd_t hci_write_loopback_mode;
 extern const hci_cmd_t hci_write_num_broadcast_retransmissions;
 extern const hci_cmd_t hci_write_page_timeout;
 extern const hci_cmd_t hci_write_scan_enable;
 extern const hci_cmd_t hci_write_simple_pairing_mode;
 extern const hci_cmd_t hci_write_synchronous_flow_control_enable;
-extern const hci_cmd_t hci_read_loopback_mode;
-extern const hci_cmd_t hci_write_loopback_mode;
 
 extern const hci_cmd_t hci_le_add_device_to_white_list;
 extern const hci_cmd_t hci_le_clear_white_list;
@@ -186,7 +187,6 @@ extern const hci_cmd_t hci_le_set_scan_response_data;
 extern const hci_cmd_t hci_le_start_encryption;
 extern const hci_cmd_t hci_le_test_end;
 extern const hci_cmd_t hci_le_transmitter_test;
-
 /**
  * construct HCI Command based on template
  *
diff --git a/test/avdtp/avdtp.h b/test/avdtp/avdtp.h
index 2c52fe76b..9a3bfb78c 100644
--- a/test/avdtp/avdtp.h
+++ b/test/avdtp/avdtp.h
@@ -403,8 +403,6 @@ typedef struct {
     uint16_t num_packets;
 } avdtp_signaling_packet_t;
 
-btstack_packet_handler_t avdtp_sink_callback;
-
 typedef struct {
     btstack_linked_item_t    item;
 
diff --git a/test/avdtp/avdtp_sink.c b/test/avdtp/avdtp_sink.c
index c112b8c3d..8e13ac83b 100644
--- a/test/avdtp/avdtp_sink.c
+++ b/test/avdtp/avdtp_sink.c
@@ -58,6 +58,8 @@ static uint16_t stream_endpoints_id_counter;
 
 static btstack_linked_list_t stream_endpoints;
 
+btstack_packet_handler_t avdtp_sink_callback;
+
 static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
 
 static void (*handle_media_data)(avdtp_stream_endpoint_t * stream_endpoint, uint8_t *packet, uint16_t size);    
diff --git a/test/avdtp/avdtp_sink.h b/test/avdtp/avdtp_sink.h
index fae62163d..a10c7e95c 100644
--- a/test/avdtp/avdtp_sink.h
+++ b/test/avdtp/avdtp_sink.h
@@ -178,6 +178,8 @@ void avdtp_sink_stop_stream(uint16_t con_handle, uint8_t seid);
 
 /* API_END */
 
+extern btstack_packet_handler_t avdtp_sink_callback;
+
 #if defined __cplusplus
 }
 #endif