diff --git a/src/classic/avdtp_acceptor.c b/src/classic/avdtp_acceptor.c
index 1231cba21..13825f97b 100644
--- a/src/classic/avdtp_acceptor.c
+++ b/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];
diff --git a/src/classic/avdtp_util.c b/src/classic/avdtp_util.c
index 185dcc0f0..50a947b1a 100644
--- a/src/classic/avdtp_util.c
+++ b/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
 
diff --git a/src/classic/avrcp_browsing_controller.c b/src/classic/avrcp_browsing_controller.c
index a372788b3..22a15555a 100644
--- a/src/classic/avrcp_browsing_controller.c
+++ b/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);
diff --git a/src/classic/avrcp_browsing_target.c b/src/classic/avrcp_browsing_target.c
index 2954f6a58..e74e0f17a 100644
--- a/src/classic/avrcp_browsing_target.c
+++ b/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);
 
diff --git a/src/classic/avrcp_controller.c b/src/classic/avrcp_controller.c
index a4223b410..a590e9e2d 100644
--- a/src/classic/avrcp_controller.c
+++ b/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
diff --git a/src/classic/avrcp_target.c b/src/classic/avrcp_target.c
index 48e0c88e3..cb72de988 100644
--- a/src/classic/avrcp_target.c
+++ b/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
 
diff --git a/src/classic/btstack_sbc_decoder_bluedroid.c b/src/classic/btstack_sbc_decoder_bluedroid.c
index 10ef0acd6..35622f555 100644
--- a/src/classic/btstack_sbc_decoder_bluedroid.c
+++ b/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
diff --git a/src/classic/btstack_sbc_encoder_bluedroid.c b/src/classic/btstack_sbc_encoder_bluedroid.c
index a9402ed71..4f72b4ef5 100644
--- a/src/classic/btstack_sbc_encoder_bluedroid.c
+++ b/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
diff --git a/src/mesh/mesh_lower_transport.c b/src/mesh/mesh_lower_transport.c
index e5a400133..352180425 100644
--- a/src/mesh/mesh_lower_transport.c
+++ b/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"
diff --git a/src/mesh/provisioning_device.c b/src/mesh/provisioning_device.c
index f8b95a435..d0996bbac 100644
--- a/src/mesh/provisioning_device.c
+++ b/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"
diff --git a/src/mesh/provisioning_provisioner.c b/src/mesh/provisioning_provisioner.c
index 9e6f7d795..68db38b6e 100644
--- a/src/mesh/provisioning_provisioner.c
+++ b/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"