diff --git a/subsys/bluetooth/mesh/va.h b/subsys/bluetooth/mesh/va.h
index 7620a157b2e0..32b9d956191d 100644
--- a/subsys/bluetooth/mesh/va.h
+++ b/subsys/bluetooth/mesh/va.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+#include <stdbool.h>
+
 /** Virtual address entry. */
 struct bt_mesh_va {
 	uint16_t ref:15,
diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c
index 169b8c9e5024..da8a2826409a 100644
--- a/tests/bluetooth/tester/src/btp.c
+++ b/tests/bluetooth/tester/src/btp.c
@@ -6,19 +6,27 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#include <zephyr/kernel.h>
+#include <errno.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
-#include <zephyr/types.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/toolchain.h>
-#include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/sys/byteorder.h>
 #include <zephyr/drivers/uart_pipe.h>
-
+#include <zephyr/kernel.h>
+#include <zephyr/kernel/thread_stack.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/types.h>
+
 #define LOG_MODULE_NAME bttester
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
diff --git a/tests/bluetooth/tester/src/btp/btp.h b/tests/bluetooth/tester/src/btp/btp.h
index 469a878dc25e..5333cc379c9b 100644
--- a/tests/bluetooth/tester/src/btp/btp.h
+++ b/tests/bluetooth/tester/src/btp/btp.h
@@ -10,8 +10,7 @@
 #ifndef TESTS_BLUETOOTH_TESTER_SRC_BTP_
 #define TESTS_BLUETOOTH_TESTER_SRC_BTP_
 
-#include <zephyr/sys/util.h>
-#include <zephyr/bluetooth/addr.h>
+#include <stdint.h>
 
 #include "bttester.h"
 #include "btp_core.h"
diff --git a/tests/bluetooth/tester/src/btp/btp_core.h b/tests/bluetooth/tester/src/btp/btp_core.h
index c31b7f8dee62..9b4f1a88d401 100644
--- a/tests/bluetooth/tester/src/btp/btp_core.h
+++ b/tests/bluetooth/tester/src/btp/btp_core.h
@@ -7,8 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
-#include <zephyr/bluetooth/addr.h>
+#include <stdint.h>
 
 /* Core Service */
 #define BTP_CORE_READ_SUPPORTED_COMMANDS	0x01
diff --git a/tests/bluetooth/tester/src/btp/btp_gap.h b/tests/bluetooth/tester/src/btp/btp_gap.h
index b9df0f091367..7ed49338bd0e 100644
--- a/tests/bluetooth/tester/src/btp/btp_gap.h
+++ b/tests/bluetooth/tester/src/btp/btp_gap.h
@@ -7,7 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
 
 /* GAP Service */
diff --git a/tests/bluetooth/tester/src/btp/btp_gatt.h b/tests/bluetooth/tester/src/btp/btp_gatt.h
index c22bc748229e..e26b3767b6a9 100644
--- a/tests/bluetooth/tester/src/btp/btp_gatt.h
+++ b/tests/bluetooth/tester/src/btp/btp_gatt.h
@@ -7,7 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
 
 /* GATT Service */
diff --git a/tests/bluetooth/tester/src/btp/btp_ias.h b/tests/bluetooth/tester/src/btp/btp_ias.h
index a2af9d35f592..007239bd01c0 100644
--- a/tests/bluetooth/tester/src/btp/btp_ias.h
+++ b/tests/bluetooth/tester/src/btp/btp_ias.h
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/bluetooth/services/ias.h>
 #include <stdint.h>
 
 /* events */
diff --git a/tests/bluetooth/tester/src/btp/btp_l2cap.h b/tests/bluetooth/tester/src/btp/btp_l2cap.h
index d08a89fba850..2f9e9937cd21 100644
--- a/tests/bluetooth/tester/src/btp/btp_l2cap.h
+++ b/tests/bluetooth/tester/src/btp/btp_l2cap.h
@@ -7,7 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
 
 /* L2CAP Service */
diff --git a/tests/bluetooth/tester/src/btp/btp_mesh.h b/tests/bluetooth/tester/src/btp/btp_mesh.h
index 6a8e54f9f141..7f197e907cdf 100644
--- a/tests/bluetooth/tester/src/btp/btp_mesh.h
+++ b/tests/bluetooth/tester/src/btp/btp_mesh.h
@@ -7,8 +7,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/util.h>
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
+#include <zephyr/sys/util_macro.h>
 
 /* MESH Service */
 /* commands */
diff --git a/tests/bluetooth/tester/src/btp/btp_ots.h b/tests/bluetooth/tester/src/btp/btp_ots.h
index ae6900eb0f51..be2f2fab4880 100644
--- a/tests/bluetooth/tester/src/btp/btp_ots.h
+++ b/tests/bluetooth/tester/src/btp/btp_ots.h
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdint.h>
+
 /* OTS commands */
 #define BTP_OTS_READ_SUPPORTED_COMMANDS	0x01
 struct btp_ots_read_supported_commands_rp {
diff --git a/tests/bluetooth/tester/src/btp/bttester.h b/tests/bluetooth/tester/src/btp/bttester.h
index e0bb268cf1bb..b3c162721686 100644
--- a/tests/bluetooth/tester/src/btp/bttester.h
+++ b/tests/bluetooth/tester/src/btp/bttester.h
@@ -7,9 +7,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/types.h>
-#include <zephyr/sys/util.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <zephyr/bluetooth/addr.h>
+#include <zephyr/sys/util_macro.h>
 #include <sys/types.h>
 
 static inline void tester_set_bit(uint8_t *addr, unsigned int bit)
diff --git a/tests/bluetooth/tester/src/btp_core.c b/tests/bluetooth/tester/src/btp_core.c
index ddc8db2958b8..3ef89414ce0d 100644
--- a/tests/bluetooth/tester/src/btp_core.c
+++ b/tests/bluetooth/tester/src/btp_core.c
@@ -7,27 +7,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/sys/atomic.h>
-#include <zephyr/types.h>
-#include <string.h>
+#include <stdint.h>
 
-#include <zephyr/toolchain.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/hci.h>
-
-#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
-#include <hci_core.h>
+#include "btp/btp.h"
+#include "hci_core.h"
 
-#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_core
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
-#include "btp/btp.h"
-
 static ATOMIC_DEFINE(registered_services, BTP_SERVICE_ID_MAX);
 
 static uint8_t supported_commands(const void *cmd, uint16_t cmd_len,
diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c
index 440be8d3d888..ea68f212156b 100644
--- a/tests/bluetooth/tester/src/btp_gap.c
+++ b/tests/bluetooth/tester/src/btp_gap.c
@@ -5,33 +5,37 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
 #include <stdint.h>
-
-#include <zephyr/bluetooth/audio/bap.h>
-#include <zephyr/bluetooth/addr.h>
-#include <zephyr/bluetooth/gap.h>
-#include <zephyr/sys/atomic.h>
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/types.h>
 #include <string.h>
 
-#include <zephyr/toolchain.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/gap.h>
+#include <zephyr/bluetooth/hci_types.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/types.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/net_buf.h>
 
 #include <hci_core.h>
 
-#include <zephyr/logging/log.h>
-#define LOG_MODULE_NAME bttester_gap
-LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
-
 #include "btp/btp.h"
 
+#define LOG_MODULE_NAME bttester_gap
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #define CONTROLLER_NAME "btp_tester"
 
 #define BT_LE_AD_DISCOV_MASK (BT_LE_AD_LIMITED | BT_LE_AD_GENERAL)
diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c
index c12a4021397c..5f9ad63be619 100644
--- a/tests/bluetooth/tester/src/btp_gatt.c
+++ b/tests/bluetooth/tester/src/btp_gatt.c
@@ -6,29 +6,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/types.h>
-#include <string.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include <zephyr/toolchain.h>
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/att.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/__assert.h>
-#include <zephyr/net_buf.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
+#include <sys/types.h>
+
+#include "btp/btp.h"
 
-#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_gatt
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
-#include "btp/btp.h"
-
 #define MAX_BUFFER_SIZE 2048
 #define MAX_UUID_LEN 16
 
@@ -2063,7 +2068,7 @@ static uint8_t config_subscription_ind(const void *cmd, uint16_t cmd_len,
 #if defined(CONFIG_BT_GATT_NOTIFY_MULTIPLE)
 static void notify_cb(struct bt_conn *conn, void *user_data)
 {
-	LOG_DBG("Nofication sent");
+	LOG_DBG("Notification sent");
 }
 
 static uint8_t notify_mult(const void *cmd, uint16_t cmd_len,
diff --git a/tests/bluetooth/tester/src/btp_ias.c b/tests/bluetooth/tester/src/btp_ias.c
index 58d0aa71f641..6795d39dc05e 100644
--- a/tests/bluetooth/tester/src/btp_ias.c
+++ b/tests/bluetooth/tester/src/btp_ias.c
@@ -5,13 +5,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <stdint.h>
+
+#include <zephyr/autoconf.h>
 #include <zephyr/bluetooth/services/ias.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "btp/btp.h"
-#include <zephyr/sys/byteorder.h>
-#include <stdint.h>
 
-#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_ias
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
diff --git a/tests/bluetooth/tester/src/btp_l2cap.c b/tests/bluetooth/tester/src/btp_l2cap.c
index e4c28d28ad32..260900f98a90 100644
--- a/tests/bluetooth/tester/src/btp_l2cap.c
+++ b/tests/bluetooth/tester/src/btp_l2cap.c
@@ -5,20 +5,29 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <stddef.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 <errno.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/l2cap.h>
-#include <zephyr/bluetooth/att.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 <sys/types.h>
+
+#include "btp/btp.h"
 
-#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_l2cap
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
-#include "btp/btp.h"
-
 #define L2CAP_MPS        96
 #define DATA_MTU         (3 * L2CAP_MPS)
 #define DATA_MTU_INITIAL (2 * L2CAP_MPS)
diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
index 826b11241686..11156f36c7ec 100644
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@@ -4,28 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/bluetooth/bluetooth.h>
-
 #include <assert.h>
 #include <errno.h>
+#include <stdint.h>
+#include <string.h>
+#include <va.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh/access.h>
 #include <zephyr/bluetooth/mesh/cfg.h>
-#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/mesh/cfg_cli.h>
+#include <zephyr/bluetooth/mesh/cfg_srv.h>
+#include <zephyr/bluetooth/mesh/health_cli.h>
+#include <zephyr/bluetooth/mesh/health_srv.h>
+#include <zephyr/bluetooth/mesh/main.h>
+#include <zephyr/bluetooth/mesh/msg.h>
+#include <zephyr/bluetooth/mesh/proxy.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net_buf.h>
 #include <zephyr/settings/settings.h>
-#include <app_keys.h>
-#include <va.h>
-#include <sar_cfg_internal.h>
-#include <string.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/sys_clock.h>
+
 #include "mesh/access.h"
+#include "mesh/dfu_slot.h"
 #include "mesh/testing.h"
 
-#include <zephyr/logging/log.h>
+#include "btp/btp.h"
+
 #define LOG_MODULE_NAME bttester_mesh
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
-#include "btp/btp.h"
-#include "dfu_slot.h"
-
 #define CID_LOCAL 0x05F1
 #define COMPANY_ID_LF 0x05F1
 #define COMPANY_ID_NORDIC_SEMI 0x05F9
@@ -1444,7 +1457,7 @@ static uint8_t start(const void *cmd, uint16_t cmd_len,
 	LOG_DBG("");
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
-		printk("Loading stored settings\n");
+		LOG_INF("Loading stored settings\n");
 		settings_load();
 	}
 
diff --git a/tests/bluetooth/tester/src/btp_ots.c b/tests/bluetooth/tester/src/btp_ots.c
index 8138b2cb7d90..1b0a6d8aff16 100644
--- a/tests/bluetooth/tester/src/btp_ots.c
+++ b/tests/bluetooth/tester/src/btp_ots.c
@@ -5,17 +5,26 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include <errno.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr/autoconf.h>
+#include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/services/ots.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/logging/log.h>
 
 #include <zephyr/sys/byteorder.h>
-#include <stdint.h>
+#include <zephyr/sys/util.h>
+#include <sys/types.h>
+
+#include "btp/btp.h"
 
-#include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_ots
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 
-#include "btp/btp.h"
-
 #define OBJ_POOL_SIZE CONFIG_BT_OTS_MAX_OBJ_CNT
 #define OBJ_MAX_SIZE  100
 
diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index 6951feab3ce1..8a0628ef39ae 100644
--- a/tests/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
@@ -6,11 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
-#include <zephyr/types.h>
-#include <zephyr/toolchain.h>
-
+#include <zephyr/autoconf.h>
 #include <zephyr/logging/log.h>
+
 #define LOG_MODULE_NAME bttester_main
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);