zephyr: add a zephyr/ prefix to all zephyr includes

This adds a zephyr/ prefix to all #include path pointing to Zephyr
header files, so that we could drop LEGACY_INCLUD_PATH once all upstream
code has been converted.

Generated using something similar to the script in:

c7b5b3c419 samples: migrate includes to contain <zephyr/...> prefix

BRANCH=none
BUG=none
TEST=cq dry run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I5ba2c859fe10a34ea8d3a49a612132ea4d02f2cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3634345
Reviewed-by: Yuval Peress <peress@google.com>

51 files changed, 109 insertions, 109 deletions

diff --git a/zephyr/test/drivers/include/test/drivers/utils.h b/zephyr/test/drivers/include/test/drivers/utils.h
index 92ab8a69d7..f0e8f6b7a2 100644
--- a/zephyr/test/drivers/include/test/drivers/utils.h
+++ b/zephyr/test/drivers/include/test/drivers/utils.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_TEST_DRIVERS_INCLUDE_UTILS_H_
 #define ZEPHYR_TEST_DRIVERS_INCLUDE_UTILS_H_
 
-#include <drivers/emul.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <string.h>
 
 #include "charger.h"
diff --git a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
index b70d67a750..bdbdd083ba 100644
--- a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
+++ b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/adc.h>
-#include <drivers/adc/adc_emul.h>
-#include <shell/shell.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_emul.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "adc.h"
diff --git a/zephyr/test/drivers/src/battery.c b/zephyr/test/drivers/src/battery.c
index 71d45ac6af..e454262aa2 100644
--- a/zephyr/test/drivers/src/battery.c
+++ b/zephyr/test/drivers/src/battery.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "battery.h"
 #include "test/drivers/test_state.h"
diff --git a/zephyr/test/drivers/src/bb_retimer.c b/zephyr/test/drivers/src/bb_retimer.c
index 26a89860ff..dbe4d3143f 100644
--- a/zephyr/test/drivers/src/bb_retimer.c
+++ b/zephyr/test/drivers/src/bb_retimer.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "common.h"
 #include "ec_tasks.h"
diff --git a/zephyr/test/drivers/src/bc12.c b/zephyr/test/drivers/src/bc12.c
index df65d2f7a4..859f0c7405 100644
--- a/zephyr/test/drivers/src/bc12.c
+++ b/zephyr/test/drivers/src/bc12.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "emul/emul_pi3usb9201.h"
 
@@ -17,7 +17,7 @@
 #include "test/drivers/stubs.h"
 #include "test/drivers/test_state.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_drivers_bc12, LOG_LEVEL_DBG);
 
 #define EMUL_LABEL DT_NODELABEL(pi3usb9201_emul)
diff --git a/zephyr/test/drivers/src/bma2x2.c b/zephyr/test/drivers/src/bma2x2.c
index 4277ed1245..1995adc571 100644
--- a/zephyr/test/drivers/src/bma2x2.c
+++ b/zephyr/test/drivers/src/bma2x2.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/bmi160.c b/zephyr/test/drivers/src/bmi160.c
index 5578b4a796..56e38e6f9a 100644
--- a/zephyr/test/drivers/src/bmi160.c
+++ b/zephyr/test/drivers/src/bmi160.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/bmi260.c b/zephyr/test/drivers/src/bmi260.c
index 0146b37fe6..abcab72898 100644
--- a/zephyr/test/drivers/src/bmi260.c
+++ b/zephyr/test/drivers/src/bmi260.c
@@ -4,7 +4,7 @@
  */
 
 #include <fff.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/chargesplash.c b/zephyr/test/drivers/src/chargesplash.c
index 2ca1f12e45..3eec11bbe4 100644
--- a/zephyr/test/drivers/src/chargesplash.c
+++ b/zephyr/test/drivers/src/chargesplash.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <zephyr/drivers/gpio/gpio_emul.h>
 #include <zephyr/shell/shell.h>
diff --git a/zephyr/test/drivers/src/console_cmd/accelinfo.c b/zephyr/test/drivers/src/console_cmd/accelinfo.c
index fc090c8cba..e60d00b596 100644
--- a/zephyr/test/drivers/src/console_cmd/accelinfo.c
+++ b/zephyr/test/drivers/src/console_cmd/accelinfo.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "config.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelinit.c b/zephyr/test/drivers/src/console_cmd/accelinit.c
index 22c7556558..24538ef648 100644
--- a/zephyr/test/drivers/src/console_cmd/accelinit.c
+++ b/zephyr/test/drivers/src/console_cmd/accelinit.c
@@ -4,7 +4,7 @@
  */
 
 #include <fff.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "accelgyro.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelrange.c b/zephyr/test/drivers/src/console_cmd/accelrange.c
index 34c70db9e0..b78702e486 100644
--- a/zephyr/test/drivers/src/console_cmd/accelrange.c
+++ b/zephyr/test/drivers/src/console_cmd/accelrange.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
-#include <devicetree.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/devicetree.h>
 #include <ztest.h>
 
 #include "console.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelrate.c b/zephyr/test/drivers/src/console_cmd/accelrate.c
index 4019cdef62..6ae4b96343 100644
--- a/zephyr/test/drivers/src/console_cmd/accelrate.c
+++ b/zephyr/test/drivers/src/console_cmd/accelrate.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "console.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelread.c b/zephyr/test/drivers/src/console_cmd/accelread.c
index d1bc24aa45..8ab9407dfe 100644
--- a/zephyr/test/drivers/src/console_cmd/accelread.c
+++ b/zephyr/test/drivers/src/console_cmd/accelread.c
@@ -4,7 +4,7 @@
  */
 
 #include <fff.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "accelgyro.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelres.c b/zephyr/test/drivers/src/console_cmd/accelres.c
index f466a0e28e..72b52b1c58 100644
--- a/zephyr/test/drivers/src/console_cmd/accelres.c
+++ b/zephyr/test/drivers/src/console_cmd/accelres.c
@@ -4,7 +4,7 @@
  */
 
 #include <fff.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "accelgyro.h"
diff --git a/zephyr/test/drivers/src/console_cmd/accelspoof.c b/zephyr/test/drivers/src/console_cmd/accelspoof.c
index f8295e55f4..2d9887a2ab 100644
--- a/zephyr/test/drivers/src/console_cmd/accelspoof.c
+++ b/zephyr/test/drivers/src/console_cmd/accelspoof.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "console.h"
diff --git a/zephyr/test/drivers/src/console_cmd/charge_manager.c b/zephyr/test/drivers/src/console_cmd/charge_manager.c
index d0dd905c89..753d735126 100644
--- a/zephyr/test/drivers/src/console_cmd/charge_manager.c
+++ b/zephyr/test/drivers/src/console_cmd/charge_manager.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "charge_manager.h"
diff --git a/zephyr/test/drivers/src/console_cmd/charge_state.c b/zephyr/test/drivers/src/console_cmd/charge_state.c
index 1cc9db0db6..6641aea193 100644
--- a/zephyr/test/drivers/src/console_cmd/charge_state.c
+++ b/zephyr/test/drivers/src/console_cmd/charge_state.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <ztest.h>
 
 #include "charge_state.h"
diff --git a/zephyr/test/drivers/src/cros_cbi.c b/zephyr/test/drivers/src/cros_cbi.c
index 9acd6741ed..d0afdaecdb 100644
--- a/zephyr/test/drivers/src/cros_cbi.c
+++ b/zephyr/test/drivers/src/cros_cbi.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <ztest.h>
 
 #include "cros_cbi.h"
diff --git a/zephyr/test/drivers/src/espi.c b/zephyr/test/drivers/src/espi.c
index f8293b4591..91746e7c45 100644
--- a/zephyr/test/drivers/src/espi.c
+++ b/zephyr/test/drivers/src/espi.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "ec_commands.h"
diff --git a/zephyr/test/drivers/src/gpio.c b/zephyr/test/drivers/src/gpio.c
index 8e8b166092..e49222f08f 100644
--- a/zephyr/test/drivers/src/gpio.c
+++ b/zephyr/test/drivers/src/gpio.c
@@ -8,11 +8,11 @@
  * @brief Unit Tests for GPIO.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/gpio/gpio_emul.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/i2c_passthru.c b/zephyr/test/drivers/src/i2c_passthru.c
index 98bc181d84..bab6a15b28 100644
--- a/zephyr/test/drivers/src/i2c_passthru.c
+++ b/zephyr/test/drivers/src/i2c_passthru.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "ec_commands.h"
diff --git a/zephyr/test/drivers/src/integration/usbc/usb.c b/zephyr/test/drivers/src/integration/usbc/usb.c
index 3906447ee1..ac3bf55e39 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "battery_smart.h"
 #include "ec_commands.h"
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
index a019657bfd..a03688a007 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c
@@ -4,9 +4,9 @@
  */
 
 #include <stdint.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "ec_commands.h"
 #include "ec_tasks.h"
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
index 6c926e2583..f20c3eb5c3 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_attach_src_snk.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "ec_commands.h"
 #include "ec_tasks.h"
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c b/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c
index b536119360..6809aab70a 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_malfunction_sink.c
@@ -4,7 +4,7 @@
  */
 
 #include <stdint.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <ztest.h>
 
 #include "battery_smart.h"
diff --git a/zephyr/test/drivers/src/isl923x.c b/zephyr/test/drivers/src/isl923x.c
index 5a86d9bb3a..12be885bfb 100644
--- a/zephyr/test/drivers/src/isl923x.c
+++ b/zephyr/test/drivers/src/isl923x.c
@@ -4,7 +4,7 @@
  */
 
 #include <ztest.h>
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include <fff.h>
 
 #include "battery.h"
diff --git a/zephyr/test/drivers/src/keyboard_scan.c b/zephyr/test/drivers/src/keyboard_scan.c
index 6d438c2b76..209c5320e0 100644
--- a/zephyr/test/drivers/src/keyboard_scan.c
+++ b/zephyr/test/drivers/src/keyboard_scan.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 #include <ztest.h>
-#include <drivers/emul.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <emul/emul_kb_raw.h>
 
 #include "test/drivers/test_state.h"
diff --git a/zephyr/test/drivers/src/lid_switch.c b/zephyr/test/drivers/src/lid_switch.c
index c4794741fb..42d91495f4 100644
--- a/zephyr/test/drivers/src/lid_switch.c
+++ b/zephyr/test/drivers/src/lid_switch.c
@@ -4,11 +4,11 @@
  */
 
 #include <ztest.h>
-#include <drivers/emul.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <lid_switch.h>
-#include <shell/shell_dummy.h>
+#include <zephyr/shell/shell_dummy.h>
 #include <console.h>
 
 #include "test/drivers/test_state.h"
diff --git a/zephyr/test/drivers/src/lis2dw12.c b/zephyr/test/drivers/src/lis2dw12.c
index 07faee0427..56f71cc406 100644
--- a/zephyr/test/drivers/src/lis2dw12.c
+++ b/zephyr/test/drivers/src/lis2dw12.c
@@ -4,7 +4,7 @@
  */
 
 #include <ztest.h>
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "driver/accel_lis2dw12.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_lis2dw12.h"
diff --git a/zephyr/test/drivers/src/ln9310.c b/zephyr/test/drivers/src/ln9310.c
index 9ff018fdba..e4bf37c4bd 100644
--- a/zephyr/test/drivers/src/ln9310.c
+++ b/zephyr/test/drivers/src/ln9310.c
@@ -4,10 +4,10 @@
  */
 
 #include <ztest.h>
-#include <drivers/emul.h>
-#include <kernel.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/kernel.h>
 #include <ztest_assert.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "driver/ln9310.h"
 #include "emul/emul_ln9310.h"
diff --git a/zephyr/test/drivers/src/main.c b/zephyr/test/drivers/src/main.c
index 062d8224bd..319d42e3ad 100644
--- a/zephyr/test/drivers/src/main.c
+++ b/zephyr/test/drivers/src/main.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include "ec_app_main.h"
 #include "test/drivers/test_state.h"
diff --git a/zephyr/test/drivers/src/panic.c b/zephyr/test/drivers/src/panic.c
index 3dba6e0cfd..2615c22156 100644
--- a/zephyr/test/drivers/src/panic.c
+++ b/zephyr/test/drivers/src/panic.c
@@ -8,10 +8,10 @@
  * @brief Unit Tests for panic.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/power_common.c b/zephyr/test/drivers/src/power_common.c
index a6d653db4a..03832b6c0c 100644
--- a/zephyr/test/drivers/src/power_common.c
+++ b/zephyr/test/drivers/src/power_common.c
@@ -4,10 +4,10 @@
  */
 
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include "chipset.h"
 #include "common.h"
diff --git a/zephyr/test/drivers/src/ppc_sn5s330.c b/zephyr/test/drivers/src/ppc_sn5s330.c
index bede67c52e..bd38f874f7 100644
--- a/zephyr/test/drivers/src/ppc_sn5s330.c
+++ b/zephyr/test/drivers/src/ppc_sn5s330.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/emul.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/emul.h>
 #include <ztest.h>
 #include <fff.h>
 
diff --git a/zephyr/test/drivers/src/ppc_syv682c.c b/zephyr/test/drivers/src/ppc_syv682c.c
index 0f3baa4a7f..9707f374ac 100644
--- a/zephyr/test/drivers/src/ppc_syv682c.c
+++ b/zephyr/test/drivers/src/ppc_syv682c.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <devicetree/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <fff.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <ztest_assert.h>
 
diff --git a/zephyr/test/drivers/src/ps8xxx.c b/zephyr/test/drivers/src/ps8xxx.c
index b30d9ef0c3..dc1695d793 100644
--- a/zephyr/test/drivers/src/ps8xxx.c
+++ b/zephyr/test/drivers/src/ps8xxx.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/smart.c b/zephyr/test/drivers/src/smart.c
index f80563a40f..3628a68d3e 100644
--- a/zephyr/test/drivers/src/smart.c
+++ b/zephyr/test/drivers/src/smart.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include "common.h"
 #include "console.h"
diff --git a/zephyr/test/drivers/src/stm_mems_common.c b/zephyr/test/drivers/src/stm_mems_common.c
index 358c20ee3d..fef0766c7d 100644
--- a/zephyr/test/drivers/src/stm_mems_common.c
+++ b/zephyr/test/drivers/src/stm_mems_common.c
@@ -4,8 +4,8 @@
  */
 
 #include <ztest.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <errno.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/stubs.c b/zephyr/test/drivers/src/stubs.c
index 35a6f70e4d..84ae387fb4 100644
--- a/zephyr/test/drivers/src/stubs.c
+++ b/zephyr/test/drivers/src/stubs.c
@@ -27,7 +27,7 @@
 #include "usbc_ppc.h"
 #include "charge_state_v2.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(stubs);
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
diff --git a/zephyr/test/drivers/src/tcpci.c b/zephyr/test/drivers/src/tcpci.c
index 972f9fd326..167744f3a9 100644
--- a/zephyr/test/drivers/src/tcpci.c
+++ b/zephyr/test/drivers/src/tcpci.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "common.h"
 #include "ec_tasks.h"
diff --git a/zephyr/test/drivers/src/tcpci_test_common.c b/zephyr/test/drivers/src/tcpci_test_common.c
index 41b0c2db99..ccd250e11f 100644
--- a/zephyr/test/drivers/src/tcpci_test_common.c
+++ b/zephyr/test/drivers/src/tcpci_test_common.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/tcs3400.c b/zephyr/test/drivers/src/tcs3400.c
index 8b29259244..66955481f7 100644
--- a/zephyr/test/drivers/src/tcs3400.c
+++ b/zephyr/test/drivers/src/tcs3400.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/temp_sensor.c b/zephyr/test/drivers/src/temp_sensor.c
index c9469476e1..1a49dba8ca 100644
--- a/zephyr/test/drivers/src/temp_sensor.c
+++ b/zephyr/test/drivers/src/temp_sensor.c
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/adc.h>
-#include <drivers/adc/adc_emul.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include <math.h>
 
diff --git a/zephyr/test/drivers/src/thermistor.c b/zephyr/test/drivers/src/thermistor.c
index bc7bc35214..e760e0cf33 100644
--- a/zephyr/test/drivers/src/thermistor.c
+++ b/zephyr/test/drivers/src/thermistor.c
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/adc.h>
-#include <drivers/adc/adc_emul.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_emul.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <temp_sensor.h>
 
 #include "common.h"
diff --git a/zephyr/test/drivers/src/uart_hostcmd.c b/zephyr/test/drivers/src/uart_hostcmd.c
index 82533639a5..0e68c440ce 100644
--- a/zephyr/test/drivers/src/uart_hostcmd.c
+++ b/zephyr/test/drivers/src/uart_hostcmd.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "console.h"
diff --git a/zephyr/test/drivers/src/usb_mux.c b/zephyr/test/drivers/src/usb_mux.c
index bd3024ae44..09aa3c47d6 100644
--- a/zephyr/test/drivers/src/usb_mux.c
+++ b/zephyr/test/drivers/src/usb_mux.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include "common.h"
 #include "ec_commands.h"
diff --git a/zephyr/test/drivers/src/usb_pd_host_cmd.c b/zephyr/test/drivers/src/usb_pd_host_cmd.c
index 520973a248..5eb589043c 100644
--- a/zephyr/test/drivers/src/usb_pd_host_cmd.c
+++ b/zephyr/test/drivers/src/usb_pd_host_cmd.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "ec_commands.h"
diff --git a/zephyr/test/drivers/src/utils.c b/zephyr/test/drivers/src/utils.c
index 4aa5f3d219..a19d4531f5 100644
--- a/zephyr/test/drivers/src/utils.c
+++ b/zephyr/test/drivers/src/utils.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
-#include <shell/shell_uart.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/shell/shell_uart.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "battery.h"
 #include "battery_smart.h"
diff --git a/zephyr/test/drivers/src/vboot_hash.c b/zephyr/test/drivers/src/vboot_hash.c
index aabffbbe74..ac23b95b02 100644
--- a/zephyr/test/drivers/src/vboot_hash.c
+++ b/zephyr/test/drivers/src/vboot_hash.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include <sha256.h>
 
diff --git a/zephyr/test/drivers/src/watchdog.c b/zephyr/test/drivers/src/watchdog.c
index acd8edc41a..d66ee77bd8 100644
--- a/zephyr/test/drivers/src/watchdog.c
+++ b/zephyr/test/drivers/src/watchdog.c
@@ -8,11 +8,11 @@
  * @brief Unit Tests for watchdog.
  */
 
-#include <device.h>
-#include <drivers/watchdog.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/watchdog.h>
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"