tests: Bluetooth: Tester: Audio: Cleanup includes

Thalley · fabiobaltieri · commit 69b722566aa5 · 2025-05-19T16:48:53.000+01:00
Update the includes so that only what is actually used is included,
and so that everything is used is includes (IWYU).

Signed-off-by: Emil Gydesen &lt;emil.gydesen@nordicsemi.no&gt;
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_aics.h b/tests/bluetooth/tester/src/audio/btp/btp_aics.h
@@ -6,8 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/conn.h>
+#include <zephyr/sys/util.h>
 
 /*AICS service */
 struct btp_aics_instance {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_ascs.h b/tests/bluetooth/tester/src/audio/btp/btp_ascs.h
@@ -5,6 +5,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 
 /* ASCS commands */
 #define BTP_ASCS_READ_SUPPORTED_COMMANDS	0x01
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_bap.h b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
@@ -6,7 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/iso.h>
 
 /* BAP commands */
 #define BTP_BAP_READ_SUPPORTED_COMMANDS		0x01
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_cap.h b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
@@ -6,6 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/sys/util_macro.h>
+
 /* CAP commands */
 #define BTP_CAP_READ_SUPPORTED_COMMANDS		0x01
 struct btp_cap_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_cas.h b/tests/bluetooth/tester/src/audio/btp/btp_cas.h
@@ -6,6 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/csip.h>
+
 /* CAS commands */
 #define BTP_CAS_READ_SUPPORTED_COMMANDS	0x01
 struct btp_cas_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_ccp.h b/tests/bluetooth/tester/src/audio/btp/btp_ccp.h
@@ -5,6 +5,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/tbs.h>
 
 /* CCP commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_csip.h b/tests/bluetooth/tester/src/audio/btp/btp_csip.h
@@ -5,6 +5,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/csip.h>
 
 /* CSIP commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_csis.h b/tests/bluetooth/tester/src/audio/btp/btp_csis.h
@@ -5,6 +5,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/csip.h>
 
 /* CSIS commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_hap.h b/tests/bluetooth/tester/src/audio/btp/btp_hap.h
@@ -5,7 +5,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/types.h>
+
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 
 /* HAP commands */
 #define BTP_HAP_READ_SUPPORTED_COMMANDS         0x01
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_has.h b/tests/bluetooth/tester/src/audio/btp/btp_has.h
@@ -5,6 +5,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
 
 /* HAS commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_mcp.h b/tests/bluetooth/tester/src/audio/btp/btp_mcp.h
@@ -5,6 +5,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/services/ots.h>
 
 /* MCP commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_mcs.h b/tests/bluetooth/tester/src/audio/btp/btp_mcs.h
@@ -5,6 +5,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
+#include <stdint.h>
+
 #include <zephyr/bluetooth/services/ots.h>
 
 /* MCS commands */
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_micp.h b/tests/bluetooth/tester/src/audio/btp/btp_micp.h
@@ -6,6 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+
 /* MICP commands */
 #define BTP_MICP_READ_SUPPORTED_COMMANDS	0x01
 struct btp_micp_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_mics.h b/tests/bluetooth/tester/src/audio/btp/btp_mics.h
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
 /* MICS commands */
 #define BTP_MICS_READ_SUPPORTED_COMMANDS	0x01
 struct btp_mics_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_pacs.h b/tests/bluetooth/tester/src/audio/btp/btp_pacs.h
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
 /* PACS commands */
 #define BTP_PACS_READ_SUPPORTED_COMMANDS			0x01
 struct btp_pacs_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_pbp.h b/tests/bluetooth/tester/src/audio/btp/btp_pbp.h
@@ -6,7 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* This is main.h */
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #define BTP_PBP_READ_SUPPORTED_COMMANDS	0x01
 struct btp_pbp_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_tbs.h b/tests/bluetooth/tester/src/audio/btp/btp_tbs.h
@@ -6,6 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
+
 /* TBS commands */
 #define BTP_TBS_READ_SUPPORTED_COMMANDS		0x01
 struct btp_tbs_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_tmap.h b/tests/bluetooth/tester/src/audio/btp/btp_tmap.h
@@ -5,7 +5,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/types.h>
+
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 
 /* TMAP commands */
 #define BTP_TMAP_READ_SUPPORTED_COMMANDS	0x01
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_vcp.h b/tests/bluetooth/tester/src/audio/btp/btp_vcp.h
@@ -6,7 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 
 #define BTP_VCP_READ_SUPPORTED_COMMANDS		0x01
 struct btp_vcp_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_vcs.h b/tests/bluetooth/tester/src/audio/btp/btp_vcs.h
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
 
 #define BTP_VCS_READ_SUPPORTED_COMMANDS		0x01
 struct btp_vcs_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp/btp_vocs.h b/tests/bluetooth/tester/src/audio/btp/btp_vocs.h
@@ -6,7 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
+
+#include <zephyr/bluetooth/addr.h>
 
 #define BTP_VOCS_READ_SUPPORTED_COMMANDS	0x01
 struct btp_vocs_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/audio/btp_aics.c b/tests/bluetooth/tester/src/audio/btp_aics.c
@@ -6,18 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
 #include <stddef.h>
-#include <errno.h>
-
-#include <zephyr/types.h>
-#include <zephyr/kernel.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/micp.h>
 #include <zephyr/bluetooth/audio/aics.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #include "bap_endpoint.h"
 #include "btp/btp.h"
diff --git a/tests/bluetooth/tester/src/audio/btp_bap.c b/tests/bluetooth/tester/src/audio/btp_bap.c
@@ -7,26 +7,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <errno.h>
 
-#include <zephyr/types.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/lc3.h>
 #include <zephyr/bluetooth/audio/pacs.h>
 #include <zephyr/bluetooth/audio/bap_lc3_preset.h>
-#include <hci_core.h>
-
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
-#define LOG_MODULE_NAME bttester_bap
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
+
 #include "btp/btp.h"
 #include "btp_bap_audio_stream.h"
 #include "btp_bap_unicast.h"
 #include "btp_bap_broadcast.h"
 
+#include <hci_core.h>
+
+#define LOG_MODULE_NAME bttester_bap
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
+
 #define SUPPORTED_SINK_CONTEXT	BT_AUDIO_CONTEXT_TYPE_ANY
 #define SUPPORTED_SOURCE_CONTEXT BT_AUDIO_CONTEXT_TYPE_ANY
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.c b/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.c
@@ -32,7 +32,6 @@
 #include <zephyr/sys/util_macro.h>
 #include <zephyr/types.h>
 
-#include "btp/btp.h"
 #include "btp_bap_audio_stream.h"
 
 LOG_MODULE_REGISTER(bttester_bap_audio_stream, CONFIG_BTTESTER_LOG_LEVEL);
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.h b/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.h
@@ -10,6 +10,7 @@
 #ifndef BTP_BAP_AUDIO_STREAM_H
 #define BTP_BAP_AUDIO_STREAM_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include <zephyr/bluetooth/conn.h>
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
@@ -7,27 +7,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stddef.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
+#include <zephyr/bluetooth/audio/cap.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/crypto.h>
+#include <zephyr/bluetooth/gap.h>
 #include <zephyr/bluetooth/iso.h>
-#include <zephyr/types.h>
+#include <zephyr/bluetooth/uuid.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/ring_buffer.h>
-#include <zephyr/bluetooth/audio/audio.h>
-#include <zephyr/bluetooth/audio/bap.h>
-#include <zephyr/bluetooth/gap.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/types.h>
 
+#include "btp_bap_audio_stream.h"
 #include "bap_endpoint.h"
-#include <zephyr/logging/log.h>
-#include <zephyr/sys/byteorder.h>
-#define LOG_MODULE_NAME bttester_bap_broadcast
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #include "btp/btp.h"
 #include "btp_bap_audio_stream.h"
 #include "btp_bap_broadcast.h"
 
+#define LOG_MODULE_NAME bttester_bap_broadcast
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
+
 static K_SEM_DEFINE(sem_stream_stopped, 0U,
 		    (CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT * CONFIG_BT_BAP_BROADCAST_SRC_COUNT));
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
@@ -6,7 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/cap.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/iso.h>
 
 #include "btp_bap_audio_stream.h"
 
diff --git a/tests/bluetooth/tester/src/audio/btp_bap_unicast.h b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
diff --git a/tests/bluetooth/tester/src/audio/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
diff --git a/tests/bluetooth/tester/src/audio/btp_cas.c b/tests/bluetooth/tester/src/audio/btp_cas.c
diff --git a/tests/bluetooth/tester/src/audio/btp_ccp.c b/tests/bluetooth/tester/src/audio/btp_ccp.c
diff --git a/tests/bluetooth/tester/src/audio/btp_csip.c b/tests/bluetooth/tester/src/audio/btp_csip.c
diff --git a/tests/bluetooth/tester/src/audio/btp_csis.c b/tests/bluetooth/tester/src/audio/btp_csis.c
diff --git a/tests/bluetooth/tester/src/audio/btp_hap.c b/tests/bluetooth/tester/src/audio/btp_hap.c
diff --git a/tests/bluetooth/tester/src/audio/btp_has.c b/tests/bluetooth/tester/src/audio/btp_has.c
diff --git a/tests/bluetooth/tester/src/audio/btp_mcp.c b/tests/bluetooth/tester/src/audio/btp_mcp.c
diff --git a/tests/bluetooth/tester/src/audio/btp_micp.c b/tests/bluetooth/tester/src/audio/btp_micp.c
diff --git a/tests/bluetooth/tester/src/audio/btp_pbp.c b/tests/bluetooth/tester/src/audio/btp_pbp.c
diff --git a/tests/bluetooth/tester/src/audio/btp_tmap.c b/tests/bluetooth/tester/src/audio/btp_tmap.c
diff --git a/tests/bluetooth/tester/src/audio/btp_vcp.c b/tests/bluetooth/tester/src/audio/btp_vcp.c

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`*`
`6`	`6`	`* SPDX-License-Identifier: Apache-2.0`
`7`	`7`	`*/`
	`8`	`+#include <stdint.h>`
	`9`	`+`
	`10`	`+#include <zephyr/bluetooth/addr.h>`
`8`	`11`
`9`	`12`	`/* ASCS commands */`
`10`	`13`	`#define BTP_ASCS_READ_SUPPORTED_COMMANDS 0x01`