diff --git a/arch/posix/core/nsi_compat/nsi_compat.c b/arch/posix/core/nsi_compat/nsi_compat.c
index eccd2643295..cd338ca1e4f 100644
--- a/arch/posix/core/nsi_compat/nsi_compat.c
+++ b/arch/posix/core/nsi_compat/nsi_compat.c
@@ -12,7 +12,7 @@
  * the migration towards the Native simulator.
  */
 
-#include "zephyr/arch/posix/posix_trace.h"
+#include <zephyr/arch/posix/posix_trace.h>
 
 void nsi_print_error_and_exit(const char *format, ...)
 {
diff --git a/boards/posix/common/irq/board_irq.h b/boards/posix/common/irq/board_irq.h
index abe28b82b94..bad19084dd1 100644
--- a/boards/posix/common/irq/board_irq.h
+++ b/boards/posix/common/irq/board_irq.h
@@ -9,7 +9,7 @@
 #define BOARDS_POSIX_COMMON_BOARD_IRQ_H
 
 #include <zephyr/sw_isr_table.h>
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/posix/native_posix/cmdline.c b/boards/posix/native_posix/cmdline.c
index fd77f8abf94..aa0ef1e6974 100644
--- a/boards/posix/native_posix/cmdline.c
+++ b/boards/posix/native_posix/cmdline.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "cmdline_common.h"
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include "hw_models_top.h"
 #include "timer_model.h"
 #include "cmdline.h"
diff --git a/boards/posix/native_posix/cmdline_common.c b/boards/posix/native_posix/cmdline_common.c
index 40367033e11..8723505658a 100644
--- a/boards/posix/native_posix/cmdline_common.c
+++ b/boards/posix/native_posix/cmdline_common.c
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <zephyr/arch/posix/posix_trace.h>
 #include "posix_board_if.h"
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include "cmdline_common.h"
 
 /**
diff --git a/boards/posix/native_posix/hw_models_top.h b/boards/posix/native_posix/hw_models_top.h
index fe35f1b0455..47d3333277e 100644
--- a/boards/posix/native_posix/hw_models_top.h
+++ b/boards/posix/native_posix/hw_models_top.h
@@ -7,7 +7,7 @@
 #ifndef _NATIVE_POSIX_HW_MODELS_H
 #define _NATIVE_POSIX_HW_MODELS_H
 
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include <inttypes.h>
 
 #ifdef __cplusplus
diff --git a/boards/posix/native_posix/irq_ctrl.c b/boards/posix/native_posix/irq_ctrl.c
index 245f3f2eece..6524e5123a4 100644
--- a/boards/posix/native_posix/irq_ctrl.c
+++ b/boards/posix/native_posix/irq_ctrl.c
@@ -14,7 +14,7 @@
 #include <zephyr/arch/posix/arch.h> /* for find_lsb_set() */
 #include "board_soc.h"
 #include "posix_soc.h"
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 
 uint64_t irq_ctrl_timer = NEVER;
 
diff --git a/boards/posix/native_posix/native_rtc.h b/boards/posix/native_posix/native_rtc.h
index aaff5ae9d92..09fc1663882 100644
--- a/boards/posix/native_posix/native_rtc.h
+++ b/boards/posix/native_posix/native_rtc.h
@@ -15,7 +15,7 @@
 
 #include "hw_models_top.h"
 #include <stdbool.h>
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/boards/posix/native_posix/timer_model.c b/boards/posix/native_posix/timer_model.c
index cfa1c10ef06..4927d1028c4 100644
--- a/boards/posix/native_posix/timer_model.c
+++ b/boards/posix/native_posix/timer_model.c
@@ -25,7 +25,7 @@
 #include "hw_models_top.h"
 #include "irq_ctrl.h"
 #include "board_soc.h"
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include <zephyr/arch/posix/posix_trace.h>
 #include <zephyr/sys/util.h>
 #include "cmdline.h"
diff --git a/boards/posix/nrf52_bsim/board_irq.h b/boards/posix/nrf52_bsim/board_irq.h
index bc41162c223..e1a385194fb 100644
--- a/boards/posix/nrf52_bsim/board_irq.h
+++ b/boards/posix/nrf52_bsim/board_irq.h
@@ -7,7 +7,7 @@
 #ifndef BOARDS_POSIX_NRF52_BSIM_BOARD_IRQ_H
 #define BOARDS_POSIX_NRF52_BSIM_BOARD_IRQ_H
 
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include "../common/irq/board_irq.h"
 
 #ifdef __cplusplus
diff --git a/boards/posix/nrf52_bsim/time_machine.h b/boards/posix/nrf52_bsim/time_machine.h
index de973cf4c8f..2e8a70dfeed 100644
--- a/boards/posix/nrf52_bsim/time_machine.h
+++ b/boards/posix/nrf52_bsim/time_machine.h
@@ -8,7 +8,7 @@
 
 #include "bs_types.h"
 #include "time_machine_if.h"
-#include "zephyr/toolchain.h"
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/bluetooth/hci/hci_psoc6_bless.c b/drivers/bluetooth/hci/hci_psoc6_bless.c
index c001264618b..3a5fddb1000 100644
--- a/drivers/bluetooth/hci/hci_psoc6_bless.c
+++ b/drivers/bluetooth/hci/hci_psoc6_bless.c
@@ -21,7 +21,7 @@
 #include <zephyr/init.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
-#include "zephyr/logging/log.h"
+#include <zephyr/logging/log.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_LEVEL      CONFIG_BT_HCI_DRIVER_LOG_LEVEL
diff --git a/drivers/crypto/crypto_mchp_xec_symcr.c b/drivers/crypto/crypto_mchp_xec_symcr.c
index 626d3f88154..8f47e374d36 100644
--- a/drivers/crypto/crypto_mchp_xec_symcr.c
+++ b/drivers/crypto/crypto_mchp_xec_symcr.c
@@ -12,7 +12,7 @@
 #include <zephyr/crypto/crypto.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
-#include "zephyr/sys/util.h"
+#include <zephyr/sys/util.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(xec_symcr, CONFIG_CRYPTO_LOG_LEVEL);
 
diff --git a/drivers/ethernet/eth_smsc91x.c b/drivers/ethernet/eth_smsc91x.c
index 02d11a26838..cac41136217 100644
--- a/drivers/ethernet/eth_smsc91x.c
+++ b/drivers/ethernet/eth_smsc91x.c
@@ -4,7 +4,7 @@
  */
 
 #include <zephyr/net/ethernet.h>
-#include "zephyr/net/phy.h"
+#include <zephyr/net/phy.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/drivers/mdio.h>
diff --git a/drivers/i2c/i2c_rtio.c b/drivers/i2c/i2c_rtio.c
index f4a97345e27..7e74329612d 100644
--- a/drivers/i2c/i2c_rtio.c
+++ b/drivers/i2c/i2c_rtio.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/rtio/rtio.h"
+#include <zephyr/rtio/rtio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/rtio/rtio_spsc.h>
 #include <zephyr/sys/__assert.h>
diff --git a/drivers/i2c/i2c_sam_twihs_rtio.c b/drivers/i2c/i2c_sam_twihs_rtio.c
index 1111a03c4e1..40abfd0c263 100644
--- a/drivers/i2c/i2c_sam_twihs_rtio.c
+++ b/drivers/i2c/i2c_sam_twihs_rtio.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/spinlock.h"
+#include <zephyr/spinlock.h>
 #define DT_DRV_COMPAT atmel_sam_i2c_twihs
 
 /** @file
diff --git a/drivers/ipm/ipm_sedi.h b/drivers/ipm/ipm_sedi.h
index bb1e945c2c2..f1524b0beea 100644
--- a/drivers/ipm/ipm_sedi.h
+++ b/drivers/ipm/ipm_sedi.h
@@ -11,7 +11,7 @@ extern "C" {
 #endif
 #include "sedi_driver_common.h"
 #include "sedi_driver_ipc.h"
-#include "zephyr/sys/atomic.h"
+#include <zephyr/sys/atomic.h>
 
 /*
  * bit 31 indicates whether message is valid, and could generate interrupt
diff --git a/drivers/sensor/veml7700/veml7700.c b/drivers/sensor/veml7700/veml7700.c
index 7f00e3fd14c..e008b725167 100644
--- a/drivers/sensor/veml7700/veml7700.c
+++ b/drivers/sensor/veml7700/veml7700.c
@@ -14,7 +14,7 @@
 #include <zephyr/pm/device.h>
 #include <zephyr/sys/byteorder.h>
 
-#include "zephyr/drivers/sensor/veml7700.h"
+#include <zephyr/drivers/sensor/veml7700.h>
 
 LOG_MODULE_REGISTER(VEML7700, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index efe54e54bf0..31d1fc3bc69 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -10,7 +10,7 @@
  * It also provides a custom k_busy_wait() which can be used with the
  * POSIX arch and InfClock SOC
  */
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include <zephyr/irq.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/timer/system_timer.h>
diff --git a/include/zephyr/acpi/acpi_osal.h b/include/zephyr/acpi/acpi_osal.h
index 92e0180bc45..3332bd7ecc3 100644
--- a/include/zephyr/acpi/acpi_osal.h
+++ b/include/zephyr/acpi/acpi_osal.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_ARCH_X86_INCLUDE_ACPI_OSAL_H_
 
 #if defined(CONFIG_X86 || CONFIG_X86_64)
-#include "zephyr/acpi/x86_acpi_osal.h"
+#include <zephyr/acpi/x86_acpi_osal.h>
 #else
 #error "Currently only x86 Architecture support ACPI !!"
 #endif
diff --git a/include/zephyr/net/net_time.h b/include/zephyr/net/net_time.h
index 6277ea994c8..17795a9df95 100644
--- a/include/zephyr/net/net_time.h
+++ b/include/zephyr/net/net_time.h
@@ -18,7 +18,7 @@
 #define ZEPHYR_INCLUDE_NET_NET_TIME_H_
 
 /* Include required for NSEC_PER_* constants. */
-#include "zephyr/sys_clock.h"
+#include <zephyr/sys_clock.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/posix/inf_clock/posix_board_if.h b/soc/posix/inf_clock/posix_board_if.h
index 9fec9915443..1d851fb3935 100644
--- a/soc/posix/inf_clock/posix_board_if.h
+++ b/soc/posix/inf_clock/posix_board_if.h
@@ -6,7 +6,7 @@
 #ifndef _POSIX_CORE_BOARD_PROVIDED_IF_H
 #define _POSIX_CORE_BOARD_PROVIDED_IF_H
 
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 
 /*
  * This file lists the functions the posix "inf_clock" soc
diff --git a/subsys/bluetooth/audio/ascs.c b/subsys/bluetooth/audio/ascs.c
index 3ac041e2b7e..1b71d27fbf4 100644
--- a/subsys/bluetooth/audio/ascs.c
+++ b/subsys/bluetooth/audio/ascs.c
@@ -15,7 +15,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/gatt.h>
-#include "zephyr/bluetooth/iso.h"
+#include <zephyr/bluetooth/iso.h>
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/audio/pacs.h>
diff --git a/subsys/bluetooth/audio/vocs.c b/subsys/bluetooth/audio/vocs.c
index 4b9420d36ee..6a03ceb3b70 100644
--- a/subsys/bluetooth/audio/vocs.c
+++ b/subsys/bluetooth/audio/vocs.c
@@ -19,7 +19,7 @@
 
 #include "audio_internal.h"
 #include "vocs_internal.h"
-#include "zephyr/bluetooth/audio/audio.h"
+#include <zephyr/bluetooth/audio/audio.h>
 
 #define LOG_LEVEL CONFIG_BT_VOCS_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/subsys/rtio/rtio_handlers.c b/subsys/rtio/rtio_handlers.c
index ec7dc192e38..3be7f2f9f86 100644
--- a/subsys/rtio/rtio_handlers.c
+++ b/subsys/rtio/rtio_handlers.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/kernel.h"
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <zephyr/rtio/rtio.h>
 #include <zephyr/syscall_handler.h>
diff --git a/tests/arch/arm64/arm64_smc_call/src/main.c b/tests/arch/arm64/arm64_smc_call/src/main.c
index 01589656e7c..ac397bf6289 100644
--- a/tests/arch/arm64/arm64_smc_call/src/main.c
+++ b/tests/arch/arm64/arm64_smc_call/src/main.c
@@ -5,7 +5,7 @@
 
 #include <zephyr/ztest.h>
 
-#include "zephyr/arch/arm64/arm-smccc.h"
+#include <zephyr/arch/arm64/arm-smccc.h>
 
 /* SMC function IDs for Standard Service queries */
 #define ARM_STD_SMC_CALL_COUNT		0x8400ff00UL
diff --git a/tests/bluetooth/bt_crypto/src/test_bt_crypto.c b/tests/bluetooth/bt_crypto/src/test_bt_crypto.c
index 8f5aec3e36c..bddce1849c3 100644
--- a/tests/bluetooth/bt_crypto/src/test_bt_crypto.c
+++ b/tests/bluetooth/bt_crypto/src/test_bt_crypto.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/ztest_assert.h"
+#include <zephyr/ztest_assert.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bluetooth/controller/common/src/helper_pdu.c b/tests/bluetooth/controller/common/src/helper_pdu.c
index d952ccfb7ff..87454dda432 100644
--- a/tests/bluetooth/controller/common/src/helper_pdu.c
+++ b/tests/bluetooth/controller/common/src/helper_pdu.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/types.h"
-#include "zephyr/ztest.h"
+#include <zephyr/types.h>
+#include <zephyr/ztest.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/tests/bluetooth/controller/common/src/helper_util.c b/tests/bluetooth/controller/common/src/helper_util.c
index 0356fdc1846..d89126c7857 100644
--- a/tests/bluetooth/controller/common/src/helper_util.c
+++ b/tests/bluetooth/controller/common/src/helper_util.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/types.h"
-#include "zephyr/ztest.h"
+#include <zephyr/types.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 
 #include <zephyr/bluetooth/hci.h>
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull_central.c b/tests/bluetooth/controller/mock_ctrl/src/ull_central.c
index 763a09006eb..8cdf86b5db4 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ull_central.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ull_central.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include <zephyr/ztest.h>
 #include "util/util.h"
 #include "util/mem.h"
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c b/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c
index 52aa930c8fd..fb7a6f8f1c5 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include <zephyr/ztest.h>
 #include "util/util.h"
 #include "util/mem.h"
diff --git a/tests/bluetooth/tester/src/btp/btp_ias.h b/tests/bluetooth/tester/src/btp/btp_ias.h
index 295aea2871a..a2af9d35f59 100644
--- a/tests/bluetooth/tester/src/btp/btp_ias.h
+++ b/tests/bluetooth/tester/src/btp/btp_ias.h
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/bluetooth/services/ias.h"
+#include <zephyr/bluetooth/services/ias.h>
 #include <stdint.h>
 
 /* events */
diff --git a/tests/bluetooth/tester/src/btp_csis.c b/tests/bluetooth/tester/src/btp_csis.c
index c7c57dbf035..08e9b05723f 100644
--- a/tests/bluetooth/tester/src/btp_csis.c
+++ b/tests/bluetooth/tester/src/btp_csis.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/audio/csip.h>
 
 #include "btp/btp.h"
-#include "zephyr/sys/byteorder.h"
+#include <zephyr/sys/byteorder.h>
 
 #include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_csis
diff --git a/tests/bluetooth/tester/src/btp_has.c b/tests/bluetooth/tester/src/btp_has.c
index 76aa2d85acb..d33d51f54ea 100644
--- a/tests/bluetooth/tester/src/btp_has.c
+++ b/tests/bluetooth/tester/src/btp_has.c
@@ -8,8 +8,8 @@
 #include <zephyr/bluetooth/audio/has.h>
 
 #include "btp/btp.h"
-#include "zephyr/sys/byteorder.h"
-#include "zephyr/arch/common/ffs.h"
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/arch/common/ffs.h>
 #include <stdint.h>
 
 #include <zephyr/logging/log.h>
diff --git a/tests/bluetooth/tester/src/btp_ias.c b/tests/bluetooth/tester/src/btp_ias.c
index d8750948858..58d0aa71f64 100644
--- a/tests/bluetooth/tester/src/btp_ias.c
+++ b/tests/bluetooth/tester/src/btp_ias.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/services/ias.h>
 
 #include "btp/btp.h"
-#include "zephyr/sys/byteorder.h"
+#include <zephyr/sys/byteorder.h>
 #include <stdint.h>
 
 #include <zephyr/logging/log.h>
diff --git a/tests/bluetooth/tester/src/btp_vcp.c b/tests/bluetooth/tester/src/btp_vcp.c
index ac3f1b92dc7..ef8f2b9c97c 100644
--- a/tests/bluetooth/tester/src/btp_vcp.c
+++ b/tests/bluetooth/tester/src/btp_vcp.c
@@ -12,8 +12,8 @@
 #include <zephyr/bluetooth/testing.h>
 #include <zephyr/bluetooth/audio/vcp.h>
 #include <zephyr/bluetooth/audio/aics.h>
-#include "zephyr/bluetooth/audio/vocs.h"
-#include "zephyr/sys/util.h"
+#include <zephyr/bluetooth/audio/vocs.h>
+#include <zephyr/sys/util.h>
 
 #include <../../subsys/bluetooth/audio/micp_internal.h>
 #include <../../subsys/bluetooth/audio/aics_internal.h>
diff --git a/tests/bsim/bluetooth/audio/src/ias_client_test.c b/tests/bsim/bluetooth/audio/src/ias_client_test.c
index 2c5dbd40bd0..6c435fb5cc6 100644
--- a/tests/bsim/bluetooth/audio/src/ias_client_test.c
+++ b/tests/bsim/bluetooth/audio/src/ias_client_test.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #ifdef CONFIG_BT_IAS_CLIENT
 
-#include "zephyr/bluetooth/services/ias.h"
+#include <zephyr/bluetooth/services/ias.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;
diff --git a/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h
index 90a77be66e3..a28a046800e 100644
--- a/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/adv/resume/src/bs_bt_utils.h
@@ -10,7 +10,7 @@
 #include "bs_types.h"
 #include "bstests.h"
 #include "time_machine.h"
-#include "zephyr/sys/__assert.h"
+#include <zephyr/sys/__assert.h>
 
 #include <errno.h>
 
diff --git a/tests/bsim/bluetooth/host/adv/resume/src/dut.c b/tests/bsim/bluetooth/host/adv/resume/src/dut.c
index 4a58e9f5cad..fac6d919e24 100644
--- a/tests/bsim/bluetooth/host/adv/resume/src/dut.c
+++ b/tests/bsim/bluetooth/host/adv/resume/src/dut.c
@@ -5,10 +5,10 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/bluetooth.h"
-#include "zephyr/bluetooth/conn.h"
-#include "zephyr/toolchain/gcc.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/toolchain/gcc.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/adv/resume/src/tester.c b/tests/bsim/bluetooth/host/adv/resume/src/tester.c
index 3c6bae7f4a7..9cb5854f260 100644
--- a/tests/bsim/bluetooth/host/adv/resume/src/tester.c
+++ b/tests/bsim/bluetooth/host/adv/resume/src/tester.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <stdint.h>
 
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/settings.c b/tests/bsim/bluetooth/host/gatt/settings/src/settings.c
index c87a8470883..2aebd77f05f 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/settings.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/settings.c
@@ -11,7 +11,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 #include "errno.h"
 #include "argparse.h"
 
diff --git a/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c b/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
index 1648e030be5..ed425febe3c 100644
--- a/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
+++ b/tests/bsim/bluetooth/host/privacy/legacy/src/tester.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 #include <stdint.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c
index eae8dc61515..e125f88c615 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 #include <stdint.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
index 1013fad20fe..b3718eb769d 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/bs_bt_utils.h
@@ -10,7 +10,7 @@
 #include "bs_types.h"
 #include "bstests.h"
 #include "time_machine.h"
-#include "zephyr/sys/__assert.h"
+#include <zephyr/sys/__assert.h>
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
index 0ea460ab122..164646fe79c 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/central.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <stdint.h>
 
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
index 7dca9913dd7..e0e6a81fe93 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
@@ -5,10 +5,10 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/bluetooth.h"
-#include "zephyr/bluetooth/conn.h"
-#include "zephyr/toolchain/gcc.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/toolchain/gcc.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
index 1013fad20fe..b3718eb769d 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/bs_bt_utils.h
@@ -10,7 +10,7 @@
 #include "bs_types.h"
 #include "bstests.h"
 #include "time_machine.h"
-#include "zephyr/sys/__assert.h"
+#include <zephyr/sys/__assert.h>
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
index e1e8e0efc4d..26f3bee4710 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/central.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <stdint.h>
 
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
index fb3527b7ef2..c6baf98c689 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
@@ -5,10 +5,10 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/bluetooth.h"
-#include "zephyr/bluetooth/conn.h"
-#include "zephyr/toolchain/gcc.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/toolchain/gcc.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
index fc440c6bec8..c16d9cb9676 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/bs_bt_utils.h
@@ -10,7 +10,7 @@
 #include "bs_types.h"
 #include "bstests.h"
 #include "time_machine.h"
-#include "zephyr/sys/__assert.h"
+#include <zephyr/sys/__assert.h>
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
index f31261b68c0..4e0052310d3 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/central.c
@@ -5,8 +5,8 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <stdint.h>
 
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
index 5e11d6ac712..8cd01f194ec 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
@@ -5,10 +5,10 @@
  */
 
 #include "bs_bt_utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/bluetooth.h"
-#include "zephyr/bluetooth/conn.h"
-#include "zephyr/toolchain/gcc.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/toolchain/gcc.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
index f6e22658e33..15c9fa69cfd 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/central/src/central.c
@@ -6,8 +6,8 @@
 
 #include "bs_bt_utils.h"
 #include "utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/conn.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include <stdint.h>
 
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h b/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
index 13dab52399c..2b4b4a48911 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/common/bs_bt_utils.h
@@ -10,7 +10,7 @@
 #include "bs_types.h"
 #include "bstests.h"
 #include "time_machine.h"
-#include "zephyr/sys/__assert.h"
+#include <zephyr/sys/__assert.h>
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
index daac93e5b4e..bbdfc055021 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
@@ -6,10 +6,10 @@
 
 #include "bs_bt_utils.h"
 #include "utils.h"
-#include "zephyr/bluetooth/addr.h"
-#include "zephyr/bluetooth/bluetooth.h"
-#include "zephyr/bluetooth/conn.h"
-#include "zephyr/toolchain/gcc.h"
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/toolchain/gcc.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h b/tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h
index 04b94c80294..576aa68fa11 100644
--- a/tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h
+++ b/tests/bsim/bluetooth/ll/edtt/common/edtt_driver.h
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include "zephyr/types.h"
+#include <zephyr/types.h>
 
 #define EDTTT_NONBLOCK 0
 #define EDTTT_BLOCK 1
diff --git a/tests/drivers/input/gpio_keys/src/main.c b/tests/drivers/input/gpio_keys/src/main.c
index aa86f5f05e3..b5764d7283a 100644
--- a/tests/drivers/input/gpio_keys/src/main.c
+++ b/tests/drivers/input/gpio_keys/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/sys/util.h"
+#include <zephyr/sys/util.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio/gpio_emul.h>
 #include <zephyr/kernel.h>
diff --git a/tests/drivers/spi/spi_loopback/src/spi_rtio.c b/tests/drivers/spi/spi_loopback/src/spi_rtio.c
index 5c1bb4a356d..be52fc8c3ee 100644
--- a/tests/drivers/spi/spi_loopback/src/spi_rtio.c
+++ b/tests/drivers/spi/spi_loopback/src/spi_rtio.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "zephyr/devicetree.h"
+#include <zephyr/devicetree.h>
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_rtio_loopback);
diff --git a/tests/kernel/spinlock/src/spinlock_error_case.c b/tests/kernel/spinlock/src/spinlock_error_case.c
index 4dd09c7f217..f40bc86f89d 100644
--- a/tests/kernel/spinlock/src/spinlock_error_case.c
+++ b/tests/kernel/spinlock/src/spinlock_error_case.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include "zephyr/ztest_test_new.h"
+#include <zephyr/ztest_test_new.h>
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/spinlock.h>
diff --git a/tests/subsys/modem/modem_ppp/src/main.c b/tests/subsys/modem/modem_ppp/src/main.c
index ee60385163c..27fe6bf64d5 100644
--- a/tests/subsys/modem/modem_ppp/src/main.c
+++ b/tests/subsys/modem/modem_ppp/src/main.c
@@ -11,8 +11,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_pkt.h>
-#include "zephyr/net/net_l2.h"
-#include "zephyr/net/ppp.h"
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/ppp.h>
 #include <zephyr/sys/crc.h>
 #include <string.h>