avoid #include "btstack.h" by core stack

src/classic/avdtp_acceptor.c

@@ -39,11 +39,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "btstack.h"
 #include "classic/avdtp.h"
 #include "classic/avdtp_util.h"
 #include "classic/avdtp_acceptor.h"
 
+#include "btstack_debug.h"
+#include "btstack_util.h"
+#include "l2cap.h"
+
 
 static int avdtp_acceptor_send_accept_response(uint16_t cid,  uint8_t transaction_label, avdtp_signal_identifier_t identifier){
     uint8_t command[2];

src/classic/avdtp_util.c

@@ -40,9 +40,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "btstack.h"
-#include "avdtp.h"
-#include "avdtp_util.h"
+#include "classic/avdtp.h"
+#include "classic/avdtp_util.h"
+
+#include "btstack_debug.h"
+#include "btstack_util.h"
+#include "l2cap.h"
 
 #define MAX_MEDIA_CODEC_INFORMATION_LENGTH 100
 

src/classic/avrcp_browsing_controller.c

@@ -40,9 +40,13 @@
 #include <stdint.h>
 #include <string.h>
 #include <inttypes.h>
-#include "btstack.h"
 #include "classic/avrcp_browsing.h"
 #include "classic/avrcp_browsing_controller.h"
+#include "classic/avrcp_controller.h"
+
+#include "bluetooth_sdp.h"
+#include "btstack_debug.h"
+#include "btstack_event.h"
 
 
 static void avrcp_browsing_controller_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);

src/classic/avrcp_browsing_target.c

@@ -40,9 +40,15 @@
 #include <stdint.h>
 #include <string.h>
 #include <inttypes.h>
-#include "btstack.h"
+#include "classic/avrcp.h"
 #include "classic/avrcp_browsing.h"
 #include "classic/avrcp_browsing_target.h"
+#include "classic/avrcp_target.h"
+#include "classic/avrcp_controller.h"
+
+#include "bluetooth_sdp.h"
+#include "btstack_debug.h"
+#include "btstack_event.h"
 
 static void avrcp_browsing_target_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
 

src/classic/avrcp_controller.c

@@ -41,10 +41,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "btstack.h"
 #include "classic/avrcp.h"
 #include "classic/avrcp_controller.h"
 
+#include "bluetooth_sdp.h"
+#include "btstack_debug.h"
+#include "btstack_event.h"
+#include "btstack_util.h"
+#include "l2cap.h"
+
 #define AVRCP_CMD_BUFFER_SIZE 30
 
 // made public in avrcp_controller.h

src/classic/avrcp_target.c

@@ -41,8 +41,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "btstack.h"
 #include "classic/avrcp.h"
+#include "classic/avrcp_target.h"
+
+#include "bluetooth_sdp.h"
+#include "btstack_debug.h"
+#include "btstack_event.h"
+#include "btstack_util.h"
+#include "l2cap.h"
 
 #define AVRCP_ATTR_HEADER_LEN  8
 

src/classic/btstack_sbc_decoder_bluedroid.c

@@ -54,12 +54,13 @@
 #include <stdio.h>
 #endif
 
+#include "btstack_debug.h"
+#include "btstack_util.h"
 #include "btstack_sbc.h"
 #include "btstack_sbc_plc.h"
 
 #include "oi_codec_sbc.h"
 #include "oi_assert.h"
-#include "btstack.h"
 
 #define mSBC_SYNCWORD 0xad
 #define SBC_SYNCWORD 0x9c

src/classic/btstack_sbc_encoder_bluedroid.c

@@ -51,9 +51,10 @@
 
 #include "btstack_sbc.h"
 #include "btstack_sbc_plc.h"
+#include "btstack_debug.h"
+#include "btstack_util.h"
 
 #include "sbc_encoder.h"
-#include "btstack.h"
 
 #define mSBC_SYNCWORD 0xad
 #define SBC_SYNCWORD 0x9c

src/mesh/mesh_lower_transport.c

@@ -40,11 +40,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <btstack.h>
 
 #include "btstack_memory.h"
 #include "btstack_util.h"
 #include "btstack_bool.h"
+#include "btstack_debug.h"
 
 #include "mesh/beacon.h"
 #include "mesh/mesh_iv_index_seq_number.h"

src/mesh/provisioning_device.c

@@ -42,9 +42,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "btstack.h"
 #include "btstack_memory.h"
+#include "btstack_event.h"
 
+#include "mesh/provisioning_device.h"
 #include "mesh/mesh_crypto.h"
 #ifdef ENABLE_MESH_ADV_BEARER
 #include "mesh/pb_adv.h"

src/mesh/provisioning_provisioner.c

@@ -43,7 +43,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "btstack.h"
+#include "btstack_debug.h"
+#include "btstack_event.h"
+#include "btstack_run_loop.h"
+#include "btstack_util.h"
 
 #include "mesh/mesh_crypto.h"
 #include "mesh/pb_adv.h"