tests: migrate includes to <zephyr/...>

In order to bring consistency in-tree, migrate all tests to the new
prefix <zephyr/...>. Note that the conversion has been scripted, refer
to #45388 for more details.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <ztest.h>
 #include <tc_util.h>
 

tests/arch/arm/arm_interrupt/src/arm_interrupt.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static volatile int test_flag;
 static volatile int expected_reason = -1;
@@ -377,7 +377,7 @@ void test_arm_interrupt(void)
 }
 
 #if defined(CONFIG_USERSPACE)
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscalls.h"
 
 void z_impl_test_arm_user_interrupt_syscall(void)

tests/arch/arm/arm_interrupt/src/test_syscalls.h

@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_arm_user_interrupt_syscall(void);
 

tests/arch/arm/arm_irq_advanced_features/src/arm_dynamic_direct_interrupts.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /* Offset for the Direct interrupt used in this test. */
 #define DIRECT_ISR_OFFSET (CONFIG_NUM_IRQS - 1)

tests/arch/arm/arm_irq_advanced_features/src/arm_irq_target_state.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if defined(CONFIG_ARM_SECURE_FIRMWARE) && \
 	defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)

tests/arch/arm/arm_irq_advanced_features/src/arm_zero_latency_irqs.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static volatile int test_flag;
 

tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c

@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/sections.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/sections.h>
 
 
 /*

tests/arch/arm/arm_mem_protect/src/main.c

@@ -3,8 +3,8 @@
  * Copyright (c) 2021 Lexmark International, Inc.
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
 
 ZTEST_BMEM char user_stack[256];

tests/arch/arm/arm_no_multithreading/src/main.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <sys/__assert.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if !defined(CONFIG_CPU_CORTEX_M)
   #error test can only run on Cortex-M MCUs

tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <linker/linker-defs.h>
-#include <syscall_handler.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/syscall_handler.h>
 
 static volatile int test_flag;
 

tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <ztest.h>
 #include <tc_util.h>
 

tests/arch/arm/arm_sw_vector_relay/src/arm_sw_vector_relay.c

@@ -5,11 +5,11 @@
  */
 
 #include <ztest.h>
-#include <linker/linker-defs.h>
-#include <syscall_handler.h>
-#include <toolchain.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/toolchain.h>
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 extern uint32_t _vector_table;
 extern uint32_t __vector_relay_handler;

tests/arch/arm/arm_thread_swap/src/arm_syscalls.c

@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short_arch.h>
 #include <ksched.h>
 
@@ -28,7 +28,7 @@
 static struct k_thread user_thread;
 static K_THREAD_STACK_DEFINE(user_thread_stack, 1024);
 
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include "test_syscalls.h"
 
 void z_impl_test_arm_user_syscall(void)

tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c

@@ -5,9 +5,9 @@
  */
 
 #include <ztest.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short_arch.h>
 #include <ksched.h>
 

tests/arch/arm/arm_thread_swap/src/test_syscalls.h

@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_arm_user_syscall(void);
 __syscall void test_arm_cpu_write_reg(void);

tests/arch/arm/arm_thread_swap_tz/src/main.c

@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <psa/crypto.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifndef EXC_RETURN_S
 /* bit [6] stack used to push registers: 0=Non-secure 1=Secure */

tests/arch/arm/arm_tz_wrap_func/src/main.c

@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <aarch32/cortex_m/tz_ns.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static bool expect_preface;
 static bool expect_postface;

tests/arch/arm64/arm64_gicv3_its/src/main.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <device.h>
-#include <drivers/interrupt_controller/gicv3_its.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 
 #define DT_DRV_COMPAT   arm_gic_v3_its
 

tests/arch/arm64/arm64_high_addresses/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #define USER_STACKSIZE	2048
 

tests/arch/arm64/arm64_psci/src/main.c

@@ -5,8 +5,8 @@
  */
 
 #include <ztest.h>
-#include <drivers/pm_cpu_ops/psci.h>
-#include <drivers/pm_cpu_ops.h>
+#include <zephyr/drivers/pm_cpu_ops/psci.h>
+#include <zephyr/drivers/pm_cpu_ops.h>
 
 void test_psci_func(void)
 {

tests/arch/common/semihost/src/main.c

@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <arch/common/semihost.h>
+#include <zephyr/arch/common/semihost.h>
 
 static void test_file_ops(void)
 {

tests/arch/x86/cpu_scrubs_regs/src/main.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 #include <ztest.h>
 #include "test_syscalls.h"
 

tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h

@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 __syscall void test_cpu_write_reg(void);
 

tests/arch/x86/info/src/acpi.c

@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/acpi.h>
 
 static void vtd_dev_scope_info(struct acpi_dmar_dev_scope *dev_scope)
 {

tests/arch/x86/info/src/main.c

@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "info.h"
 
 __weak void multiboot(void)

tests/arch/x86/info/src/memmap.c

@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/memmap.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/memmap.h>
 
 void memmap(void)
 {

tests/arch/x86/info/src/multiboot.c

@@ -3,8 +3,8 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <arch/x86/multiboot.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/x86/multiboot.h>
 
 void multiboot(void)
 {

tests/arch/x86/info/src/timer.c

@@ -3,9 +3,9 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/counter.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
 
 #define NR_SAMPLES 10	/* sample timer 10 times */
 

tests/arch/x86/nmi/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
 

tests/arch/x86/pagetables/src/main.c

@@ -9,12 +9,12 @@
  * x86-specific tests for MMU features and page tables
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 #include <x86_mmu.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include <mmu.h>
 #include "main.h"
 

tests/arch/x86/static_idt/src/main.c

@@ -10,10 +10,10 @@
  *  Ensures interrupt and exception stubs are installed correctly.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <tc_util.h>
-#include <arch/x86/ia32/segmentation.h>
+#include <zephyr/arch/x86/ia32/segmentation.h>
 
 #include <kernel_internal.h>
 #if defined(__GNUC__)

tests/arch/xtensa_asm2/src/main.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <xtensa-asm2.h>
 
 #ifdef CONFIG_MULTITHREADING

tests/benchmarks/app_kernel/src/master.h

@@ -9,7 +9,7 @@
 #ifndef _MASTER_H
 #define _MASTER_H
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <stdio.h>
 
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 
 /* uncomment the define below to use floating point arithmetic */

tests/benchmarks/app_kernel/src/memmap_b.c

@@ -7,7 +7,7 @@
  */
 
 #include "master.h"
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #ifdef MEMMAP_BENCH
 

tests/benchmarks/app_kernel/src/receiver.h

@@ -9,7 +9,7 @@
 #ifndef _RECEIVER_H
 #define _RECEIVER_H
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "config.h"
 #include "memcfg.h"
 #include "master.h"

tests/benchmarks/cmsis_dsp/basicmath/src/f32.c

@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"

tests/benchmarks/cmsis_dsp/basicmath/src/q15.c

@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"

tests/benchmarks/cmsis_dsp/basicmath/src/q31.c

@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"

tests/benchmarks/cmsis_dsp/basicmath/src/q7.c

@@ -6,7 +6,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"

tests/benchmarks/cmsis_dsp/common/benchmark_common.h

@@ -8,12 +8,12 @@
 #define ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 
 #include <ztest.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_DWT)
 /* Use cycle counting on the Cortex-M devices that support DWT */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static ALWAYS_INLINE void benchmark_begin(uint32_t *irq_key, uint32_t *timestamp)
 {

tests/benchmarks/data_structure_perf/dlist_perf/src/dlist_perf.c

@@ -11,7 +11,7 @@
  */
 
 #include <ztest.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 #define NODE_SIZE 5
 

tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c

@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <sys/rb.h>
+#include <zephyr/sys/rb.h>
 
 #define TREE_SIZE 512
 /* zephyr can't do floating-point arithmetic,

tests/benchmarks/footprints/src/footprint.h

@@ -7,9 +7,9 @@
 #ifndef _FOOTPRINT_H_
 #define _FOOTPRINT_H_
 
-#include <kernel.h>
-#include <zephyr.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/app_memory/app_memdomain.h>
 
 K_THREAD_STACK_EXTERN(my_stack_area);
 K_THREAD_STACK_EXTERN(my_stack_area_0);

tests/benchmarks/footprints/src/heap.c

@@ -10,8 +10,8 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"

tests/benchmarks/footprints/src/libc.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"

tests/benchmarks/footprints/src/main.c

@@ -10,10 +10,10 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
-#include <sys/libc-hooks.h>
+#include <zephyr/sys/libc-hooks.h>
 #include "footprint.h"
 
 #ifdef CONFIG_USERSPACE

tests/benchmarks/footprints/src/mutex.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include "footprint.h"
 

tests/benchmarks/footprints/src/pm_device.c

@@ -9,9 +9,9 @@
  * @brief Stub driver to measure the footprint impact of power management
  *
  */
-#include <device.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #define DUMMY_PM_DRIVER_NAME	"dummy_pm_driver"
 #define DUMMY_DRIVER_NAME	"dummy_driver"

tests/benchmarks/footprints/src/semaphore.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"

tests/benchmarks/footprints/src/system_thread.c

@@ -10,8 +10,8 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"

tests/benchmarks/footprints/src/timer.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
 
 #include "footprint.h"

tests/benchmarks/footprints/src/userspace.c

@@ -9,11 +9,11 @@
  * @brief Measure time
  *
  */
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ksched.h>
-#include <syscall_handler.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/app_memory/app_memdomain.h>
 
 #include "footprint.h"
 #include "userspace.h"

tests/benchmarks/footprints/src/workq.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <zephyr.h>
-#include <syscall_handler.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
 
 #include "footprint.h"
 

tests/benchmarks/latency_measure/src/coop_ctx_switch.c

@@ -16,8 +16,8 @@
  * forth by yielding the cpu. When counter reaches the maximal value, threads
  * stop and the average time of context switch is displayed.
  */
-#include <kernel.h>
-#include <timing/timing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* number of context switches */

tests/benchmarks/latency_measure/src/heap_malloc_free.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 #define TEST_COUNT 100

tests/benchmarks/latency_measure/src/int_to_thread.c

@@ -14,10 +14,10 @@
  * handler back to the interrupted thread.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "utils.h"
 
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 static volatile int flag_var;
 

tests/benchmarks/latency_measure/src/int_to_thread_evt.c

@@ -15,8 +15,8 @@
  * interrupted.
  */
 
-#include <zephyr.h>
-#include <irq_offload.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/irq_offload.h>
 
 #include "utils.h"
 

tests/benchmarks/latency_measure/src/mutex_lock_unlock.c

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* the number of mutex lock/unlock cycles */

tests/benchmarks/latency_measure/src/sema_test_signal_release.c

@@ -12,8 +12,8 @@
  * mutex being tested.
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 /* the number of semaphore give/take cycles */

tests/benchmarks/latency_measure/src/thread.c

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include "utils.h"
 
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACK_SIZE)

tests/benchmarks/latency_measure/src/thread_switch_yield.c

@@ -11,8 +11,8 @@
  * context switch.
  */
 
-#include <zephyr.h>
-#include <timing/timing.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/timing/timing.h>
 #include <stdlib.h>
 #include "timestamp.h"
 #include "utils.h" /* PRINT () and other macros */

tests/benchmarks/latency_measure/src/utils.h

@@ -11,8 +11,8 @@
  * used in latency measurement.
  */
 
-#include <timing/timing.h>
-#include <sys/printk.h>
+#include <zephyr/timing/timing.h>
+#include <zephyr/sys/printk.h>
 #include <stdio.h>
 #include "timestamp.h"
 

tests/benchmarks/mbedtls/src/benchmark.c

@@ -69,12 +69,12 @@
 #include "mbedtls/error.h"
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <random/rand32.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/random/rand32.h>
 
 #include "kernel.h"
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define  MBEDTLS_PRINT ((int(*)(const char *, ...)) printk)
 
 static void my_debug(void *ctx, int level,

tests/benchmarks/sched/src/main.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <wait_q.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/wait_q.h>
 #include <ksched.h>
 
 /* This is a scheduler microbenchmark, designed to measure latencies

tests/benchmarks/sys_kernel/src/syskernel.c

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tc_util.h>
 
 #include "syskernel.h"

tests/benchmarks/sys_kernel/src/syskernel.h

@@ -12,7 +12,7 @@
 #include <timestamp.h>
 
 #include <stdio.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #define STACK_SIZE 2048
 #if CONFIG_SRAM_SIZE <= 32

tests/bluetooth/adv/src/main.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include <ztest.h>
 

tests/bluetooth/at/src/main.c

@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "subsys/bluetooth/host/at.h"
 

tests/bluetooth/bluetooth/src/bluetooth.c

@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <errno.h>
 #include <tc_util.h>
 #include <ztest.h>
 
-#include <bluetooth/bluetooth.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define EXPECTED_ERROR -ENOSYS
 

tests/bluetooth/bsim_bt/bsim_test_advx/src/main.c

@@ -9,11 +9,11 @@
 #include <stddef.h>
 
 #include <zephyr/types.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "ll.h"
 

tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c

@@ -14,15 +14,15 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/sys/byteorder.h>
 
 static struct bt_conn *default_conn;
 

tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c

@@ -14,18 +14,18 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/bas.h>
-#include <bluetooth/services/hrs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/bas.h>
+#include <zephyr/bluetooth/services/hrs.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 static struct bt_conn *default_conn;
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_broadcaster_test.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_client_test.c

@@ -6,9 +6,9 @@
 
 #ifdef CONFIG_BT_BASS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "../../../../../subsys/bluetooth/host/hci_core.h"
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/bass_test.c

@@ -5,7 +5,7 @@
  */
 
 #ifdef CONFIG_BT_BASS
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_sink_test.c

@@ -6,8 +6,8 @@
 
 #if defined(CONFIG_BT_AUDIO_BROADCAST_SINK)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/broadcast_source_test.c

@@ -6,8 +6,8 @@
 
 #if defined(CONFIG_BT_AUDIO_BROADCAST_SOURCE)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/common.h

@@ -20,14 +20,14 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys_clock.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys_clock.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #define WAIT_SECONDS 30                         /* seconds */
 #define WAIT_TIME (WAIT_SECONDS * USEC_PER_SEC) /* microseconds*/

tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifdef CONFIG_BT_CSIS_CLIENT
-#include <bluetooth/addr.h>
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/audio/csis.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_test.c

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifdef CONFIG_BT_CSIS
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/audio/csis.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/has_test.c

@@ -5,8 +5,8 @@
  */
 
 #ifdef CONFIG_BT_HAS
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/has.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/has.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/mcc_test.c

@@ -6,24 +6,24 @@
 
 #ifdef CONFIG_BT_MCC
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/sem.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/sem.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
-#include <bluetooth/audio/media_proxy.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/mcs_test.c

@@ -6,20 +6,20 @@
 
 #ifdef CONFIG_BT_MCS
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/media_controller_test.c

@@ -6,24 +6,24 @@
 
 #ifdef CONFIG_BT_MCS
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/sem.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/sem.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
-#include <bluetooth/audio/media_proxy.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/mics_client_test.c

@@ -6,8 +6,8 @@
 
 #ifdef CONFIG_BT_MICS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/mics.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_client_test.c

@@ -7,7 +7,7 @@
 
 #ifdef CONFIG_BT_TBS_CLIENT
 
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/tbs_test.c

@@ -6,7 +6,7 @@
  */
 
 #ifdef CONFIG_BT_TBS
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 #include "common.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_client_test.c

@@ -6,9 +6,9 @@
 
 #if defined(CONFIG_BT_AUDIO_UNICAST_CLIENT)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 #include "common.h"
 #include "unicast_common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_common.h

@@ -9,8 +9,8 @@
 #ifndef ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_UNICAST_COMMON_
 #define ZEPHYR_TEST_BSIM_BT_AUDIO_TEST_UNICAST_COMMON_
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 void print_hex(const uint8_t *ptr, size_t len);
 void print_codec(const struct bt_codec *codec);

tests/bluetooth/bsim_bt/bsim_test_audio/src/unicast_server_test.c

@@ -6,9 +6,9 @@
 
 #if defined(CONFIG_BT_AUDIO_UNICAST_SERVER)
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 #include "common.h"
 #include "unicast_common.h"
 

tests/bluetooth/bsim_bt/bsim_test_audio/src/vcs_client_test.c

@@ -6,8 +6,8 @@
 
 #ifdef CONFIG_BT_VCS_CLIENT
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/vcs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/vcs.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_eatt/src/common.h

@@ -9,13 +9,13 @@
 #include <stddef.h>
 
 #include <zephyr/types.h>
-#include <sys/printk.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 #include "bs_types.h"
 #include "bs_tracing.h"

tests/bluetooth/bsim_bt/bsim_test_eatt/src/main_reconfigure.c

@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 CREATE_FLAG(flag_reconfigured);
 

tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/client_test.c

@@ -14,10 +14,10 @@
  * on EATT channels.
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.c

@@ -5,7 +5,7 @@
  */
 
 #include "common.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_MODULE_NAME common
 

tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/common.h

@@ -16,13 +16,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 #include "bs_pc_backchannel.h"
 
 extern enum bst_result_t bst_result;

tests/bluetooth/bsim_bt/bsim_test_eatt_notif/src/server_test.c

@@ -5,8 +5,8 @@
  */
 
 #include "common.h"
-#include <bluetooth/conn.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/att.h>
 
 extern enum bst_result_t bst_result;
 

tests/bluetooth/bsim_bt/bsim_test_gatt/src/common.h

@@ -16,13 +16,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 extern enum bst_result_t bst_result;
 

tests/bluetooth/bsim_bt/bsim_test_gatt/src/gatt_client_test.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "common.h"
 

tests/bluetooth/bsim_bt/bsim_test_gatt_caching/src/common.h

@@ -17,13 +17,13 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 extern enum bst_result_t bst_result;