diff --git a/src/classic/a2dp_source.c b/src/classic/a2dp_source.c
index 5a23d2cd9..74251c032 100644
--- a/src/classic/a2dp_source.c
+++ b/src/classic/a2dp_source.c
@@ -66,6 +66,12 @@
 #define AVDTP_MAX_SEP_NUM 10
 #define A2DP_SET_CONFIG_DELAY_MS 150
 
+typedef struct {
+    avdtp_stream_endpoint_t * local_stream_endpoint;
+    uint8_t active_remote_sep_index;
+} avdtp_stream_endpoint_context_t;
+
+
 static const char * default_a2dp_source_service_name = "BTstack A2DP Source Service";
 static const char * default_a2dp_source_service_provider_name = "BTstack A2DP Source Service Provider";
 static btstack_timer_source_t a2dp_source_set_config_timer;
diff --git a/src/classic/avdtp.h b/src/classic/avdtp.h
index f0c9e9d30..e598cbf53 100644
--- a/src/classic/avdtp.h
+++ b/src/classic/avdtp.h
@@ -554,27 +554,6 @@ typedef struct avdtp_stream_endpoint {
     uint16_t sequence_number;
 } avdtp_stream_endpoint_t;
 
-typedef struct {
-    uint32_t fill_audio_ring_buffer_timeout_ms;
-    uint32_t time_audio_data_sent; // msstream
-    uint32_t acc_num_missed_samples;
-    uint32_t samples_ready;
-    btstack_timer_source_t fill_audio_ring_buffer_timer;
-    btstack_ring_buffer_t sbc_ring_buffer;
-    
-    int reconfigure;
-    int num_channels;
-    int sampling_frequency;
-    int channel_mode;
-    int block_length;
-    int subbands;
-    int allocation_method;
-    int min_bitpool_value;
-    int max_bitpool_value;
-    avdtp_stream_endpoint_t * local_stream_endpoint;
-    uint8_t active_remote_sep_index;
-} avdtp_stream_endpoint_context_t;
-
 void avdtp_init(void);
 avdtp_connection_t * avdtp_get_connection_for_avdtp_cid(uint16_t avdtp_cid);
 avdtp_connection_t * avdtp_get_connection_for_l2cap_signaling_cid(uint16_t l2cap_cid);