From 041042627a750d7a141ce2392630464a24be39b5 Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabiobaltieri@google.com>
Date: Mon, 9 May 2022 16:00:03 +0000
Subject: 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>
---
 common/i2c_controller.c                                |  2 +-
 common/timer.c                                         |  2 +-
 driver/tcpm/it83xx_pd.h                                |  2 +-
 driver/tcpm/nct38xx.c                                  |  4 ++--
 include/atomic_t.h                                     |  2 +-
 include/common.h                                       |  4 ++--
 include/compile_time_macros.h                          |  2 +-
 include/fan.h                                          |  2 +-
 include/gpio.h                                         |  2 +-
 include/util.h                                         |  2 +-
 zephyr/app/ec/ec_app_main.c                            |  8 ++++----
 zephyr/app/ec/main_shim.c                              |  2 +-
 zephyr/drivers/cros_displight/cros_displight.c         |  6 +++---
 zephyr/drivers/cros_flash/cros_flash_it8xxx2.c         |  6 +++---
 zephyr/drivers/cros_flash/cros_flash_npcx.c            | 10 +++++-----
 zephyr/drivers/cros_flash/cros_flash_xec.c             | 10 +++++-----
 zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c           | 12 ++++++------
 zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c          |  8 ++++----
 zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c           |  8 ++++----
 zephyr/drivers/cros_kblight/pwm_kblight.c              |  6 +++---
 zephyr/drivers/cros_rtc/cros_rtc_npcx.c                |  6 +++---
 zephyr/drivers/cros_rtc/cros_rtc_xec.c                 |  6 +++---
 zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c            | 10 +++++-----
 zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c        | 10 +++++-----
 zephyr/drivers/cros_shi/cros_shi_it8xxx2.c             | 12 ++++++------
 zephyr/drivers/cros_shi/cros_shi_npcx.c                | 12 ++++++------
 zephyr/drivers/cros_system/cros_system_it8xxx2.c       |  6 +++---
 zephyr/drivers/cros_system/cros_system_npcx.c          | 10 +++++-----
 zephyr/drivers/cros_system/cros_system_xec.c           |  8 ++++----
 zephyr/emul/emul_bb_retimer.c                          | 10 +++++-----
 zephyr/emul/emul_bma255.c                              | 10 +++++-----
 zephyr/emul/emul_bmi.c                                 | 10 +++++-----
 zephyr/emul/emul_bmi160.c                              | 10 +++++-----
 zephyr/emul/emul_bmi260.c                              | 10 +++++-----
 zephyr/emul/emul_clock_control.c                       |  8 ++++----
 zephyr/emul/emul_common_i2c.c                          | 10 +++++-----
 zephyr/emul/emul_flash.c                               |  8 ++++----
 zephyr/emul/emul_isl923x.c                             | 12 ++++++------
 zephyr/emul/emul_kb_raw.c                              |  6 +++---
 zephyr/emul/emul_lis2dw12.c                            | 12 ++++++------
 zephyr/emul/emul_ln9310.c                              | 16 ++++++++--------
 zephyr/emul/emul_pi3usb9201.c                          | 10 +++++-----
 zephyr/emul/emul_smart_battery.c                       | 10 +++++-----
 zephyr/emul/emul_sn5s330.c                             | 16 ++++++++--------
 zephyr/emul/emul_syv682x.c                             | 14 +++++++-------
 zephyr/emul/emul_tcs3400.c                             | 10 +++++-----
 zephyr/emul/i2c_mock.c                                 |  4 ++--
 zephyr/emul/tcpc/emul_ps8xxx.c                         | 10 +++++-----
 zephyr/emul/tcpc/emul_tcpci.c                          | 12 ++++++------
 zephyr/emul/tcpc/emul_tcpci_partner_common.c           |  6 +++---
 zephyr/emul/tcpc/emul_tcpci_partner_drp.c              |  6 +++---
 zephyr/emul/tcpc/emul_tcpci_partner_faulty_snk.c       |  6 +++---
 zephyr/emul/tcpc/emul_tcpci_partner_snk.c              |  6 +++---
 zephyr/emul/tcpc/emul_tcpci_partner_src.c              |  6 +++---
 zephyr/include/ap_power/ap_power.h                     |  2 +-
 zephyr/include/ap_power/ap_power_interface.h           |  2 +-
 zephyr/include/drivers/cros_flash.h                    |  4 ++--
 zephyr/include/drivers/cros_kb_raw.h                   |  6 +++---
 zephyr/include/drivers/cros_rtc.h                      |  4 ++--
 zephyr/include/drivers/cros_shi.h                      |  4 ++--
 zephyr/include/drivers/cros_system.h                   |  4 ++--
 zephyr/include/dt-bindings/gpio_defines.h              |  2 +-
 zephyr/include/emul/emul_bb_retimer.h                  |  6 +++---
 zephyr/include/emul/emul_bma255.h                      |  6 +++---
 zephyr/include/emul/emul_bmi.h                         |  6 +++---
 zephyr/include/emul/emul_common_i2c.h                  |  6 +++---
 zephyr/include/emul/emul_isl923x.h                     |  6 +++---
 zephyr/include/emul/emul_lis2dw12.h                    |  4 ++--
 zephyr/include/emul/emul_ln9310.h                      |  2 +-
 zephyr/include/emul/emul_pi3usb9201.h                  |  6 +++---
 zephyr/include/emul/emul_smart_battery.h               |  6 +++---
 zephyr/include/emul/emul_sn5s330.h                     |  4 ++--
 zephyr/include/emul/emul_syv682x.h                     |  2 +-
 zephyr/include/emul/emul_tcs3400.h                     |  6 +++---
 zephyr/include/emul/i2c_mock.h                         |  4 ++--
 zephyr/include/emul/tcpc/emul_ps8xxx.h                 |  6 +++---
 zephyr/include/emul/tcpc/emul_tcpci.h                  |  6 +++---
 zephyr/include/emul/tcpc/emul_tcpci_partner_common.h   |  4 ++--
 zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h      |  2 +-
 .../include/emul/tcpc/emul_tcpci_partner_faulty_snk.h  |  2 +-
 zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h      |  2 +-
 zephyr/include/emul/tcpc/emul_tcpci_partner_src.h      |  2 +-
 zephyr/projects/brya/battery_present.c                 |  2 +-
 zephyr/projects/brya/include/gpio_map.h                |  2 +-
 zephyr/projects/brya/kblight_hooks.c                   |  2 +-
 zephyr/projects/corsola/include/gpio_map.h             |  2 +-
 zephyr/projects/corsola/include/i2c_map.h              |  2 +-
 zephyr/projects/corsola/src/board_chipset.c            |  4 ++--
 zephyr/projects/corsola/src/hibernate.c                |  2 +-
 zephyr/projects/corsola/src/krabby/hooks.c             |  4 ++--
 zephyr/projects/corsola/src/krabby/led.c               |  4 ++--
 zephyr/projects/corsola/src/usbc_config.c              |  2 +-
 zephyr/projects/corsola/src/variant_db_detection.c     |  2 +-
 .../herobrine/src/herobrine/alt_dev_replacement.c      |  2 +-
 zephyr/projects/herobrine/src/led.c                    |  2 +-
 zephyr/projects/herobrine/src/usb_pd_policy.c          |  2 +-
 zephyr/projects/herobrine/src/usbc_config.c            |  2 +-
 zephyr/projects/intelrvp/include/intel_rvp_board_id.h  |  2 +-
 zephyr/projects/intelrvp/src/intel_rvp_board_id.c      |  2 +-
 zephyr/projects/it8xxx2_evb/include/gpio_map.h         |  2 +-
 zephyr/projects/it8xxx2_evb/include/i2c_map.h          |  2 +-
 zephyr/projects/nissa/src/board_power.c                |  6 +++---
 zephyr/projects/nissa/src/common.c                     |  4 ++--
 zephyr/projects/nissa/src/craask/charger.c             |  2 +-
 zephyr/projects/nissa/src/craask/usbc.c                |  2 +-
 zephyr/projects/nissa/src/nereid/charger.c             |  2 +-
 zephyr/projects/nissa/src/nereid/usbc.c                |  2 +-
 zephyr/projects/nissa/src/nivviks/charger.c            |  2 +-
 zephyr/projects/nissa/src/nivviks/fan.c                |  6 +++---
 zephyr/projects/nissa/src/nivviks/form_factor.c        |  4 ++--
 zephyr/projects/nissa/src/nivviks/usbc.c               |  2 +-
 zephyr/projects/nissa/src/sub_board.c                  |  8 ++++----
 zephyr/projects/skyrim/include/gpio_map.h              |  2 +-
 zephyr/projects/skyrim/include_guybrush/gpio_map.h     |  2 +-
 zephyr/projects/skyrim/power_signals_guybrush.c        |  2 +-
 zephyr/projects/skyrim/usb_pd_policy.c                 |  2 +-
 zephyr/projects/skyrim/usbc_config.c                   |  2 +-
 zephyr/projects/trogdor/lazor/src/power.c              |  4 ++--
 zephyr/projects/trogdor/lazor/src/switchcap.c          |  2 +-
 zephyr/projects/trogdor/lazor/src/usb_pd_policy.c      |  2 +-
 zephyr/shim/chip/it8xxx2/clock.c                       | 12 ++++++------
 zephyr/shim/chip/it8xxx2/gpio.c                        |  8 ++++----
 zephyr/shim/chip/it8xxx2/keyboard_raw.c                |  6 +++---
 zephyr/shim/chip/it8xxx2/pinmux.c                      |  6 +++---
 zephyr/shim/chip/it8xxx2/power_policy.c                |  6 +++---
 zephyr/shim/chip/mchp/clock.c                          | 12 ++++++------
 zephyr/shim/chip/mchp/gpio.c                           |  8 ++++----
 zephyr/shim/chip/mchp/keyboard_raw.c                   |  6 +++---
 zephyr/shim/chip/mchp/system.c                         |  4 ++--
 zephyr/shim/chip/mchp/system_download_from_flash.c     |  2 +-
 zephyr/shim/chip/mchp/system_external_storage.c        |  4 ++--
 zephyr/shim/chip/npcx/clock.c                          | 12 ++++++------
 zephyr/shim/chip/npcx/gpio.c                           |  8 ++++----
 zephyr/shim/chip/npcx/keyboard_raw.c                   |  8 ++++----
 zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c      |  2 +-
 zephyr/shim/chip/npcx/power_policy.c                   |  6 +++---
 zephyr/shim/chip/npcx/shi.c                            |  8 ++++----
 zephyr/shim/chip/npcx/system.c                         |  4 ++--
 zephyr/shim/chip/npcx/system_download_from_flash.c     |  4 ++--
 zephyr/shim/chip/npcx/system_external_storage.c        |  4 ++--
 zephyr/shim/core/cortex-m/irq_command.c                |  2 +-
 zephyr/shim/core/cortex-m/mpu.c                        |  6 +++---
 zephyr/shim/include/atomic.h                           |  2 +-
 zephyr/shim/include/board.h                            |  2 +-
 zephyr/shim/include/builtin/assert.h                   |  2 +-
 zephyr/shim/include/charger/chg_bq25710.h              |  2 +-
 zephyr/shim/include/charger/chg_isl923x.h              |  2 +-
 zephyr/shim/include/charger/chg_isl9241.h              |  2 +-
 zephyr/shim/include/charger/chg_rt9490.h               |  2 +-
 zephyr/shim/include/charger/chg_sm5803.h               |  2 +-
 zephyr/shim/include/config_chip.h                      |  2 +-
 zephyr/shim/include/cros_cbi.h                         |  6 +++---
 zephyr/shim/include/gpio/gpio.h                        |  4 ++--
 zephyr/shim/include/gpio/gpio_int.h                    |  6 +++---
 zephyr/shim/include/hook_types.h                       |  2 +-
 zephyr/shim/include/i2c/i2c.h                          |  4 ++--
 zephyr/shim/include/motionsense_sensors.h              |  2 +-
 zephyr/shim/include/motionsense_sensors_defs.h         |  2 +-
 zephyr/shim/include/power/power.h                      |  4 ++--
 zephyr/shim/include/temp_sensor/temp_sensor.h          |  2 +-
 zephyr/shim/include/usbc/ppc.h                         |  4 ++--
 zephyr/shim/include/usbc/tcpc_fusb302.h                |  2 +-
 zephyr/shim/include/usbc/tcpc_it8xxx2.h                |  2 +-
 zephyr/shim/include/usbc/tcpc_ps8xxx.h                 |  2 +-
 zephyr/shim/include/usbc/tcpci.h                       |  2 +-
 zephyr/shim/include/usbc/usb_muxes.h                   |  4 ++--
 zephyr/shim/include/zephyr_adc.h                       |  2 +-
 zephyr/shim/include/zephyr_console_shim.h              |  2 +-
 zephyr/shim/include/zephyr_gpio_signal.h               |  4 ++--
 zephyr/shim/include/zephyr_hooks_shim.h                |  6 +++---
 zephyr/shim/include/zephyr_host_command.h              |  2 +-
 zephyr/shim/include/zephyr_write_protect.h             |  2 +-
 zephyr/shim/src/adc.c                                  |  6 +++---
 zephyr/shim/src/bc12.c                                 |  2 +-
 zephyr/shim/src/bc12_pi3usb9201.c                      |  2 +-
 zephyr/shim/src/bc12_rt9490.c                          |  2 +-
 zephyr/shim/src/cbi/cbi_eeprom.c                       |  4 ++--
 zephyr/shim/src/cbi/cros_cbi_fw_config.c               |  2 +-
 zephyr/shim/src/cbi/cros_cbi_ssfc.c                    |  2 +-
 zephyr/shim/src/charger.c                              |  2 +-
 zephyr/shim/src/console.c                              | 18 +++++++++---------
 zephyr/shim/src/console_buffer.c                       |  4 ++--
 zephyr/shim/src/crc.c                                  |  2 +-
 zephyr/shim/src/espi.c                                 | 12 ++++++------
 zephyr/shim/src/fan.c                                  | 10 +++++-----
 zephyr/shim/src/flash.c                                |  6 +++---
 zephyr/shim/src/gpio.c                                 |  8 ++++----
 zephyr/shim/src/gpio_id.c                              |  2 +-
 zephyr/shim/src/gpio_int.c                             |  8 ++++----
 zephyr/shim/src/hooks.c                                |  4 ++--
 zephyr/shim/src/host_command.c                         |  2 +-
 zephyr/shim/src/hwtimer.c                              |  4 ++--
 zephyr/shim/src/i2c.c                                  |  4 ++--
 zephyr/shim/src/ioex.c                                 |  6 +++---
 zephyr/shim/src/ioex_drv.c                             | 16 ++++++++--------
 zephyr/shim/src/keyboard_raw.c                         |  6 +++---
 zephyr/shim/src/keyscan.c                              |  2 +-
 zephyr/shim/src/led_driver/led.c                       |  6 +++---
 zephyr/shim/src/led_driver/led.h                       |  2 +-
 zephyr/shim/src/led_driver/led_gpio.c                  |  6 +++---
 zephyr/shim/src/led_driver/led_pwm.c                   |  6 +++---
 zephyr/shim/src/motionsense_sensors.c                  |  2 +-
 zephyr/shim/src/panic.c                                | 10 +++++-----
 zephyr/shim/src/power.c                                |  2 +-
 zephyr/shim/src/power_host_sleep_api.c                 |  2 +-
 zephyr/shim/src/ppc.c                                  |  2 +-
 zephyr/shim/src/pwm_hc.c                               |  8 ++++----
 zephyr/shim/src/pwm_led.c                              |  2 +-
 zephyr/shim/src/rtc.c                                  |  6 +++---
 zephyr/shim/src/switchcap_gpio.c                       |  4 ++--
 zephyr/shim/src/switchcap_ln9310.c                     |  4 ++--
 zephyr/shim/src/system.c                               |  6 +++---
 zephyr/shim/src/tasks.c                                |  8 ++++----
 zephyr/shim/src/tcpc.c                                 |  4 ++--
 zephyr/shim/src/tcpc_nct38xx.c                         |  4 ++--
 zephyr/shim/src/usb_muxes.c                            |  4 ++--
 zephyr/shim/src/usba.c                                 |  2 +-
 zephyr/shim/src/watchdog.c                             |  8 ++++----
 zephyr/subsys/ap_pwrseq/ap_events.c                    |  2 +-
 .../ap_pwrseq/include/ap_power_override_functions.h    |  2 +-
 zephyr/subsys/ap_pwrseq/include/power_signals.h        |  2 +-
 zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h    |  2 +-
 .../include/x86_non_dsx_common_pwrseq_sm_handler.h     |  4 ++--
 zephyr/subsys/ap_pwrseq/power_signals.c                |  8 ++++----
 zephyr/subsys/ap_pwrseq/signal_adc.c                   |  6 +++---
 zephyr/subsys/ap_pwrseq/signal_gpio.c                  |  2 +-
 zephyr/subsys/ap_pwrseq/signal_vw.c                    |  2 +-
 .../ap_pwrseq/x86_non_dsx_common_pwrseq_console.c      |  2 +-
 .../ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c   |  2 +-
 zephyr/test/ap_power/src/board.c                       |  2 +-
 zephyr/test/ap_power/src/events.c                      |  6 +++---
 zephyr/test/ap_power/src/main.c                        |  2 +-
 zephyr/test/ap_power/src/signals.c                     | 12 ++++++------
 zephyr/test/crc/main.c                                 |  2 +-
 zephyr/test/drivers/include/test/drivers/utils.h       |  4 ++--
 .../test/drivers/isl923x/src/console_cmd_amon_bmon.c   |  6 +++---
 zephyr/test/drivers/src/battery.c                      |  6 +++---
 zephyr/test/drivers/src/bb_retimer.c                   |  6 +++---
 zephyr/test/drivers/src/bc12.c                         |  8 ++++----
 zephyr/test/drivers/src/bma2x2.c                       |  2 +-
 zephyr/test/drivers/src/bmi160.c                       |  2 +-
 zephyr/test/drivers/src/bmi260.c                       |  2 +-
 zephyr/test/drivers/src/chargesplash.c                 |  2 +-
 zephyr/test/drivers/src/console_cmd/accelinfo.c        |  2 +-
 zephyr/test/drivers/src/console_cmd/accelinit.c        |  2 +-
 zephyr/test/drivers/src/console_cmd/accelrange.c       |  4 ++--
 zephyr/test/drivers/src/console_cmd/accelrate.c        |  2 +-
 zephyr/test/drivers/src/console_cmd/accelread.c        |  2 +-
 zephyr/test/drivers/src/console_cmd/accelres.c         |  2 +-
 zephyr/test/drivers/src/console_cmd/accelspoof.c       |  2 +-
 zephyr/test/drivers/src/console_cmd/charge_manager.c   |  2 +-
 zephyr/test/drivers/src/console_cmd/charge_state.c     |  2 +-
 zephyr/test/drivers/src/cros_cbi.c                     |  2 +-
 zephyr/test/drivers/src/espi.c                         |  2 +-
 zephyr/test/drivers/src/gpio.c                         |  8 ++++----
 zephyr/test/drivers/src/i2c_passthru.c                 |  2 +-
 zephyr/test/drivers/src/integration/usbc/usb.c         |  4 ++--
 .../test/drivers/src/integration/usbc/usb_alt_mode.c   |  4 ++--
 .../drivers/src/integration/usbc/usb_attach_src_snk.c  |  4 ++--
 .../src/integration/usbc/usb_malfunction_sink.c        |  2 +-
 zephyr/test/drivers/src/isl923x.c                      |  2 +-
 zephyr/test/drivers/src/keyboard_scan.c                |  6 +++---
 zephyr/test/drivers/src/lid_switch.c                   |  8 ++++----
 zephyr/test/drivers/src/lis2dw12.c                     |  2 +-
 zephyr/test/drivers/src/ln9310.c                       |  6 +++---
 zephyr/test/drivers/src/main.c                         |  2 +-
 zephyr/test/drivers/src/panic.c                        |  6 +++---
 zephyr/test/drivers/src/power_common.c                 |  8 ++++----
 zephyr/test/drivers/src/ppc_sn5s330.c                  |  8 ++++----
 zephyr/test/drivers/src/ppc_syv682c.c                  |  8 ++++----
 zephyr/test/drivers/src/ps8xxx.c                       |  2 +-
 zephyr/test/drivers/src/smart.c                        |  6 +++---
 zephyr/test/drivers/src/stm_mems_common.c              |  4 ++--
 zephyr/test/drivers/src/stubs.c                        |  2 +-
 zephyr/test/drivers/src/tcpci.c                        |  6 +++---
 zephyr/test/drivers/src/tcpci_test_common.c            |  2 +-
 zephyr/test/drivers/src/tcs3400.c                      |  2 +-
 zephyr/test/drivers/src/temp_sensor.c                  | 10 +++++-----
 zephyr/test/drivers/src/thermistor.c                   | 10 +++++-----
 zephyr/test/drivers/src/uart_hostcmd.c                 |  2 +-
 zephyr/test/drivers/src/usb_mux.c                      | 12 ++++++------
 zephyr/test/drivers/src/usb_pd_host_cmd.c              |  2 +-
 zephyr/test/drivers/src/utils.c                        |  6 +++---
 zephyr/test/drivers/src/vboot_hash.c                   |  2 +-
 zephyr/test/drivers/src/watchdog.c                     |  8 ++++----
 zephyr/test/i2c/src/main.c                             |  2 +-
 zephyr/test/i2c_dts/src/main.c                         |  4 ++--
 zephyr/test/system/test_system.c                       |  6 +++---
 zephyr/test/tasks/main.c                               |  2 +-
 289 files changed, 691 insertions(+), 691 deletions(-)

diff --git a/common/i2c_controller.c b/common/i2c_controller.c
index d4ba03fd07..7a0550a93e 100644
--- a/common/i2c_controller.c
+++ b/common/i2c_controller.c
@@ -24,7 +24,7 @@
 #include "virtual_battery.h"
 
 #ifdef CONFIG_ZEPHYR
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c/i2c.h"
 #endif /* CONFIG_ZEPHYR */
 
diff --git a/common/timer.c b/common/timer.c
index 8ca5014949..a8d02e7ece 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -17,7 +17,7 @@
 #include "watchdog.h"
 
 #ifdef CONFIG_ZEPHYR
-#include <kernel.h> /* For k_usleep() */
+#include <zephyr/kernel.h> /* For k_usleep() */
 #else
 extern __error("k_usleep() should only be called from Zephyr code")
 int32_t k_usleep(int32_t);
diff --git a/driver/tcpm/it83xx_pd.h b/driver/tcpm/it83xx_pd.h
index 0c613d67ae..9acd530e3d 100644
--- a/driver/tcpm/it83xx_pd.h
+++ b/driver/tcpm/it83xx_pd.h
@@ -383,7 +383,7 @@
 
 #if defined(CONFIG_USB_PD_TCPM_ITE_ON_CHIP) && defined(CONFIG_ZEPHYR)
 /* Use the Zephyr names here. When upstreaming we can update this */
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 
 #define IT83XX_GPIO_GPCRF4	GPCRF4
 #define IT83XX_GPIO_GPCRF5	GPCRF5
diff --git a/driver/tcpm/nct38xx.c b/driver/tcpm/nct38xx.c
index b00f4664f2..592a86929c 100644
--- a/driver/tcpm/nct38xx.c
+++ b/driver/tcpm/nct38xx.c
@@ -15,8 +15,8 @@
 #include "usb_common.h"
 
 #ifdef CONFIG_ZEPHYR
-#include <device.h>
-#include <drivers/gpio/gpio_nct38xx.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio/gpio_nct38xx.h>
 #include "usbc/tcpc_nct38xx.h"
 #endif
 
diff --git a/include/atomic_t.h b/include/atomic_t.h
index e35fc187bf..d7c1a99147 100644
--- a/include/atomic_t.h
+++ b/include/atomic_t.h
@@ -16,7 +16,7 @@ typedef long atomic_t;
 #endif
 typedef atomic_t atomic_val_t;
 #else
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 #endif
 
 #endif  /* __CROS_EC_ATOMIC_T_H */
diff --git a/include/common.h b/include/common.h
index 391000933b..33c9ab97c2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -15,8 +15,8 @@
 
 #ifdef CONFIG_ZEPHYR
 #include <fpu.h>
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 #ifdef CONFIG_ZTEST
 #define TEST_BUILD
 #endif /* CONFIG_ZTEST */
diff --git a/include/compile_time_macros.h b/include/compile_time_macros.h
index afb2c30d19..0151f1a391 100644
--- a/include/compile_time_macros.h
+++ b/include/compile_time_macros.h
@@ -14,7 +14,7 @@
 
 /* sys/util.h in zephyr provides equivalents to most of these macros */
 #ifdef CONFIG_ZEPHYR
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/include/fan.h b/include/fan.h
index 573cc89aba..87c8f4b7a6 100644
--- a/include/fan.h
+++ b/include/fan.h
@@ -11,7 +11,7 @@
 #ifdef CONFIG_ZEPHYR
 #ifdef CONFIG_PLATFORM_EC_FAN
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #define NODE_ID_AND_COMMA(node_id) node_id,
 enum fan_channel {
 #if DT_NODE_EXISTS(DT_INST(0, cros_ec_fans))
diff --git a/include/gpio.h b/include/gpio.h
index c6ff3e049f..a64ffd6926 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -20,7 +20,7 @@
  * conflicts
  */
 #ifdef CONFIG_ZEPHYR
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 /*
  * Some flag definitions are duplicated by our private devicetree binding
diff --git a/include/util.h b/include/util.h
index 3601ca6668..e39b81ccdf 100644
--- a/include/util.h
+++ b/include/util.h
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #ifdef CONFIG_ZEPHYR
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c
index c317eadbbe..2ff38fefc1 100644
--- a/zephyr/app/ec/ec_app_main.c
+++ b/zephyr/app/ec/ec_app_main.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <shell/shell_uart.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell_uart.h>
+#include <zephyr/zephyr.h>
 
 #include "ap_power/ap_pwrseq.h"
 #include "button.h"
diff --git a/zephyr/app/ec/main_shim.c b/zephyr/app/ec/main_shim.c
index a827e0101c..7e54c83295 100644
--- a/zephyr/app/ec/main_shim.c
+++ b/zephyr/app/ec/main_shim.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "ec_app_main.h"
 #include "host_command.h"
 
diff --git a/zephyr/drivers/cros_displight/cros_displight.c b/zephyr/drivers/cros_displight/cros_displight.c
index d54706d0c8..e730caf409 100644
--- a/zephyr/drivers/cros_displight/cros_displight.c
+++ b/zephyr/drivers/cros_displight/cros_displight.c
@@ -5,10 +5,10 @@
 
 #define DT_DRV_COMPAT cros_ec_displight
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <drivers/cros_displight.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 #include "common.h"
 #include "util.h"
diff --git a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
index cbfaba89a9..7be6ef86fb 100644
--- a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
+++ b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c
@@ -6,9 +6,9 @@
 #define DT_DRV_COMPAT ite_it8xxx2_cros_flash
 
 #include <drivers/cros_flash.h>
-#include <drivers/flash.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 
 #include "flash.h"
diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c
index 2a2fe57678..e0ffe9f348 100644
--- a/zephyr/drivers/cros_flash/cros_flash_npcx.c
+++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c
@@ -6,11 +6,11 @@
 #define DT_DRV_COMPAT nuvoton_npcx_cros_flash
 
 #include <drivers/cros_flash.h>
-#include <drivers/flash.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 
 #include "flash.h"
diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c
index aaa181c9bf..2424c2a499 100644
--- a/zephyr/drivers/cros_flash/cros_flash_xec.c
+++ b/zephyr/drivers/cros_flash/cros_flash_xec.c
@@ -6,11 +6,11 @@
 #define DT_DRV_COMPAT microchip_xec_cros_flash
 
 #include <drivers/cros_flash.h>
-#include <drivers/flash.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 
 #include "flash.h"
diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c
index d5b84cb0fd..49c80b2211 100644
--- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c
+++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c
@@ -7,11 +7,11 @@
 
 #include <assert.h>
 #include <drivers/cros_kb_raw.h>
-#include <drivers/clock_control.h>
-#include <drivers/gpio.h>
-#include <drivers/interrupt_controller/wuc_ite_it8xxx2.h>
-#include <dt-bindings/interrupt-controller/it8xxx2-wuc.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it8xxx2.h>
+#include <zephyr/dt-bindings/interrupt-controller/it8xxx2-wuc.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc_dt.h>
 #include <soc/ite_it8xxx2/reg_def_cros.h>
@@ -20,7 +20,7 @@
 #include "keyboard_raw.h"
 #include "task.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR);
 
 #define KEYBOARD_KSI_PIN_COUNT IT8XXX2_DT_INST_WUCCTRL_LEN(0)
diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c
index 74afdd0aed..492c0aae82 100644
--- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c
+++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c
@@ -6,10 +6,10 @@
 #define DT_DRV_COMPAT nuvoton_npcx_cros_kb_raw
 
 #include <assert.h>
-#include <dt-bindings/clock/npcx_clock.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
 #include <drivers/cros_kb_raw.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc/nuvoton_npcx/reg_def_cros.h>
 
@@ -18,7 +18,7 @@
 #include "soc_miwu.h"
 #include "task.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR);
 
 #ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED
diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c
index 0e6b6836b0..31dcfdd29d 100644
--- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c
+++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c
@@ -7,9 +7,9 @@
 
 #include <assert.h>
 #include <drivers/cros_kb_raw.h>
-#include <drivers/clock_control.h>
-#include <drivers/pinctrl.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #include <soc.h>
 #include <soc/microchip_xec/reg_def_cros.h>
 
@@ -17,7 +17,7 @@
 #include "keyboard_raw.h"
 #include "task.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR);
 
 #ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED
diff --git a/zephyr/drivers/cros_kblight/pwm_kblight.c b/zephyr/drivers/cros_kblight/pwm_kblight.c
index c58d6cae06..b57adff26d 100644
--- a/zephyr/drivers/cros_kblight/pwm_kblight.c
+++ b/zephyr/drivers/cros_kblight/pwm_kblight.c
@@ -5,9 +5,9 @@
 
 #define DT_DRV_COMPAT cros_ec_kblight_pwm
 
-#include <devicetree.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 #include "common.h"
 #include "keyboard_backlight.h"
diff --git a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c
index 0ecbe5f47c..3312ad899f 100644
--- a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c
+++ b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c
@@ -8,8 +8,8 @@
 
 #include <assert.h>
 #include <drivers/cros_rtc.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc/nuvoton_npcx/reg_def_cros.h>
 
@@ -17,7 +17,7 @@
 #include "soc_miwu.h"
 #include "task.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 #define NPCX_MTC_TTC_LOAD_DELAY_US 250 /* Delay after writing TTC */
diff --git a/zephyr/drivers/cros_rtc/cros_rtc_xec.c b/zephyr/drivers/cros_rtc/cros_rtc_xec.c
index 19e40f5753..ec8e0e6d07 100644
--- a/zephyr/drivers/cros_rtc/cros_rtc_xec.c
+++ b/zephyr/drivers/cros_rtc/cros_rtc_xec.c
@@ -7,15 +7,15 @@
 
 #include <assert.h>
 #include <drivers/cros_rtc.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc/microchip_xec/reg_def_cros.h>
 
 #include "ec_tasks.h"
 #include "task.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
index 3b213e21c8..e7821c1dac 100644
--- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
+++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c
@@ -6,17 +6,17 @@
 #define DT_DRV_COMPAT nxp_rtc_pcf85063a
 
 #include <assert.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/cros_rtc.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <rtc.h>
 #include <soc.h>
 
 #include "nxp_rtc_pcf85063a.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
index d5606a0469..661268ee9b 100644
--- a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
+++ b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c
@@ -6,17 +6,17 @@
 #define DT_DRV_COMPAT renesas_rtc_idt1337ag
 
 #include <assert.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/cros_rtc.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <rtc.h>
 #include <soc.h>
 
 #include "renesas_rtc_idt1337ag.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c
index c33686f334..3b52bb3d4f 100644
--- a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c
+++ b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c
@@ -5,15 +5,15 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_cros_shi
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <soc_dt.h>
-#include <drivers/pinmux.h>
-#include <dt-bindings/pinctrl/it8xxx2-pinctrl.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h>
 
 #include "chipset.h"
 #include "console.h"
diff --git a/zephyr/drivers/cros_shi/cros_shi_npcx.c b/zephyr/drivers/cros_shi/cros_shi_npcx.c
index 66ddee1957..396fddd5f3 100644
--- a/zephyr/drivers/cros_shi/cros_shi_npcx.c
+++ b/zephyr/drivers/cros_shi/cros_shi_npcx.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_cros_shi
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <assert.h>
-#include <dt-bindings/clock/npcx_clock.h>
-#include <drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
+#include <zephyr/drivers/clock_control.h>
 #include <drivers/cros_shi.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc/nuvoton_npcx/reg_def_cros.h>
 
diff --git a/zephyr/drivers/cros_system/cros_system_it8xxx2.c b/zephyr/drivers/cros_system/cros_system_it8xxx2.c
index 668caa9987..693b981e83 100644
--- a/zephyr/drivers/cros_system/cros_system_it8xxx2.c
+++ b/zephyr/drivers/cros_system/cros_system_it8xxx2.c
@@ -5,9 +5,9 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_gctrl
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <soc/ite_it8xxx2/reg_def_cros.h>
 
diff --git a/zephyr/drivers/cros_system/cros_system_npcx.c b/zephyr/drivers/cros_system/cros_system_npcx.c
index 879b792ee1..360d07b84f 100644
--- a/zephyr/drivers/cros_system/cros_system_npcx.c
+++ b/zephyr/drivers/cros_system/cros_system_npcx.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <drivers/gpio.h>
-#include <drivers/watchdog.h>
-#include <logging/log.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <soc/nuvoton_npcx/reg_def_cros.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "drivers/cros_system.h"
 #include "gpio/gpio_int.h"
diff --git a/zephyr/drivers/cros_system/cros_system_xec.c b/zephyr/drivers/cros_system/cros_system_xec.c
index 76b5c95362..8d0c8f864c 100644
--- a/zephyr/drivers/cros_system/cros_system_xec.c
+++ b/zephyr/drivers/cros_system/cros_system_xec.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <drivers/cros_system.h>
-#include <drivers/watchdog.h>
-#include <logging/log.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <soc/microchip_xec/reg_def_cros.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "system.h"
 #include "system_chip.h"
diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c
index 20a4fe3e42..9a3e0a7b6e 100644
--- a/zephyr/emul/emul_bb_retimer.c
+++ b/zephyr/emul/emul_bb_retimer.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT cros_bb_retimer_emul
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_bb_retimer);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_bb_retimer.h"
diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c
index 7342507164..cd790dbc99 100644
--- a/zephyr/emul/emul_bma255.c
+++ b/zephyr/emul/emul_bma255.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_bma255
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_bma255);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_bma255.h"
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index fcec77f22b..37dba43e6d 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_bmi
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_bmi);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_bmi.h"
diff --git a/zephyr/emul/emul_bmi160.c b/zephyr/emul/emul_bmi160.c
index 6518002179..9a2f4b5cf1 100644
--- a/zephyr/emul/emul_bmi160.c
+++ b/zephyr/emul/emul_bmi160.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_bmi
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_bmi160);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_bmi.h"
 
diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c
index 0b7789f74b..31da71316a 100644
--- a/zephyr/emul/emul_bmi260.c
+++ b/zephyr/emul/emul_bmi260.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_bmi
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_bmi260);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_bmi.h"
 
diff --git a/zephyr/emul/emul_clock_control.c b/zephyr/emul/emul_clock_control.c
index d8eadcca1c..397c4af32e 100644
--- a/zephyr/emul/emul_clock_control.c
+++ b/zephyr/emul/emul_clock_control.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT cros_clock_control_emul
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 
 #include "common.h"
 #include "emul/emul_clock_control.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_emul, CONFIG_CLOCK_CONTROL_EMUL_LOG_LEVEL);
 
 /** Data needed to maintain the current emulator state */
diff --git a/zephyr/emul/emul_common_i2c.c b/zephyr/emul/emul_common_i2c.c
index 0c11f8d8c9..ae603f924a 100644
--- a/zephyr/emul/emul_common_i2c.c
+++ b/zephyr/emul/emul_common_i2c.c
@@ -4,13 +4,13 @@
  */
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_common_i2c);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_common_i2c.h"
 
diff --git a/zephyr/emul/emul_flash.c b/zephyr/emul/emul_flash.c
index effba3fbc5..2fa88916f3 100644
--- a/zephyr/emul/emul_flash.c
+++ b/zephyr/emul/emul_flash.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT cros_ec_flash_emul
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_flash);
 
-#include <device.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
 #include <ec_commands.h>
 #include <drivers/cros_flash.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 struct flash_emul_data {};
 
diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c
index 1afaf4b40f..9896804f7f 100644
--- a/zephyr/emul/emul_isl923x.c
+++ b/zephyr/emul/emul_isl923x.c
@@ -5,12 +5,12 @@
 
 #define DT_DRV_COMPAT cros_isl923x_emul
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <ztest.h>
 
 #include "driver/charger/isl923x.h"
@@ -20,7 +20,7 @@
 #include "emul/emul_smart_battery.h"
 #include "i2c.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(isl923x_emul, CONFIG_ISL923X_EMUL_LOG_LEVEL);
 
 #define ISL923X_DATA_FROM_I2C_EMUL(_emul)                                    \
diff --git a/zephyr/emul/emul_kb_raw.c b/zephyr/emul/emul_kb_raw.c
index 0a5078ee23..238c9673bb 100644
--- a/zephyr/emul/emul_kb_raw.c
+++ b/zephyr/emul/emul_kb_raw.c
@@ -5,11 +5,11 @@
 
 #define DT_DRV_COMPAT cros_ec_kb_raw_emul
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_kb_raw);
 
-#include <device.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
 #include <drivers/cros_kb_raw.h>
 #include <keyboard_raw.h>
 
diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c
index a4eb064caf..38bf6572b1 100644
--- a/zephyr/emul/emul_lis2dw12.c
+++ b/zephyr/emul/emul_lis2dw12.c
@@ -5,19 +5,19 @@
 
 #define DT_DRV_COMPAT cros_lis2dw12_emul
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 #include "driver/accel_lis2dw12.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_lis2dw12.h"
 #include "i2c.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lis2dw12_emul, CONFIG_LIS2DW12_EMUL_LOG_LEVEL);
 
 #define LIS2DW12_DATA_FROM_I2C_EMUL(_emul)                                   \
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c
index 7ee2e2b0ea..f2f92154f4 100644
--- a/zephyr/emul/emul_ln9310.c
+++ b/zephyr/emul/emul_ln9310.c
@@ -5,21 +5,21 @@
 
 #define DT_DRV_COMPAT cros_ln9310_emul
 
-#include <device.h>
-#include <devicetree/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 #include "driver/ln9310.h"
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_ln9310.h"
 #include "i2c.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ln9310_emul, CONFIG_LN9310_EMUL_LOG_LEVEL);
 
 #define LN9310_DATA_FROM_I2C_EMUL(_emul)                                     \
diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c
index ac5b0b0968..9115a84515 100644
--- a/zephyr/emul/emul_pi3usb9201.c
+++ b/zephyr/emul/emul_pi3usb9201.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT zephyr_pi3usb9201_emul
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_pi3usb9201.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_pi3usb9201, LOG_LEVEL_DBG);
 
 #define EMUL_REG_COUNT (PI3USB9201_REG_HOST_STS + 1)
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c
index 43b46bc844..a6abd94054 100644
--- a/zephyr/emul/emul_smart_battery.c
+++ b/zephyr/emul/emul_smart_battery.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_smart_battery
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(smart_battery);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "emul/emul_common_i2c.h"
 #include "emul/emul_smart_battery.h"
diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c
index 00f53e03d7..8f8c3cd852 100644
--- a/zephyr/emul/emul_sn5s330.c
+++ b/zephyr/emul/emul_sn5s330.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT cros_sn5s330_emul
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
 #include <errno.h>
-#include <sys/__assert.h>
-#include <devicetree/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 
 #include "driver/ppc/sn5s330.h"
 #include "driver/ppc/sn5s330_public.h"
@@ -20,7 +20,7 @@
 #include "emul/emul_sn5s330.h"
 #include "i2c.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sn5s330_emul, CONFIG_SN5S330_EMUL_LOG_LEVEL);
 
 #define SN5S330_DATA_FROM_I2C_EMUL(_emul)                                    \
diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c
index 1fb79ad60f..9f5ad865bb 100644
--- a/zephyr/emul/emul_syv682x.c
+++ b/zephyr/emul/emul_syv682x.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT zephyr_syv682x_emul
 
-#include <device.h>
-#include <devicetree/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(syv682x);
 #include <stdint.h>
 #include <string.h>
diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index 11bdbde2c9..15a1bbe9c7 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -6,13 +6,13 @@
 #define DT_DRV_COMPAT zephyr_tcs3400
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul_tcs);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 #include <ztest.h>
 
 #include "emul/emul_common_i2c.h"
diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c
index 7c3722ad2e..e7750d5b72 100644
--- a/zephyr/emul/i2c_mock.c
+++ b/zephyr/emul/i2c_mock.c
@@ -5,10 +5,10 @@
 
 #define DT_DRV_COMPAT cros_i2c_mock
 
-#include <device.h>
+#include <zephyr/device.h>
 #include "emul/emul_common_i2c.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_mock, CONFIG_I2C_MOCK_LOG_LEVEL);
 
 struct i2c_emul *i2c_mock_to_i2c_emul(const struct emul *emul)
diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c
index e2d7b7d602..2fc372c9a7 100644
--- a/zephyr/emul/tcpc/emul_ps8xxx.c
+++ b/zephyr/emul/tcpc/emul_ps8xxx.c
@@ -5,13 +5,13 @@
 
 #define DT_DRV_COMPAT cros_ps8xxx_emul
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ps8xxx_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #include "tcpm/tcpci.h"
 
diff --git a/zephyr/emul/tcpc/emul_tcpci.c b/zephyr/emul/tcpc/emul_tcpci.c
index eb94aaae98..ac547be3c3 100644
--- a/zephyr/emul/tcpc/emul_tcpci.c
+++ b/zephyr/emul/tcpc/emul_tcpci.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT cros_tcpci_emul
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <ztest.h>
 
 #include "tcpm/tcpci.h"
diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_common.c b/zephyr/emul/tcpc/emul_tcpci_partner_common.c
index b8ad09f7e2..f6e59b7ab6 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_common.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_common.c
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_partner, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
 #include <stdlib.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c
index 59e35a829f..659faad1fb 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_drp_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "emul/tcpc/emul_tcpci.h"
diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_snk.c b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_snk.c
index e7f369102f..7e0c15e501 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_snk.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_snk.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_faulty_snk_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "emul/tcpc/emul_tcpci.h"
diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c
index 676a182b2f..fb314b54f3 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_snk_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "emul/tcpc/emul_tcpci.h"
diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_src.c b/zephyr/emul/tcpc/emul_tcpci_partner_src.c
index 6c106e86e7..e6a51bfc98 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_src.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_src.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tcpci_src_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
diff --git a/zephyr/include/ap_power/ap_power.h b/zephyr/include/ap_power/ap_power.h
index e1a3874ced..182e81ca4d 100644
--- a/zephyr/include/ap_power/ap_power.h
+++ b/zephyr/include/ap_power/ap_power.h
@@ -15,7 +15,7 @@
 #ifndef __AP_POWER_AP_POWER_H__
 #define __AP_POWER_AP_POWER_H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 /**
  * @brief AP power events for callback notification.
diff --git a/zephyr/include/ap_power/ap_power_interface.h b/zephyr/include/ap_power/ap_power_interface.h
index 8c85b21a09..b82ef053f7 100644
--- a/zephyr/include/ap_power/ap_power_interface.h
+++ b/zephyr/include/ap_power/ap_power_interface.h
@@ -26,7 +26,7 @@
 #ifndef __AP_POWER_AP_POWER_INTERFACE_H__
 #define __AP_POWER_AP_POWER_INTERFACE_H__
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /**
  * @brief System power states for Non Deep Sleep Well
diff --git a/zephyr/include/drivers/cros_flash.h b/zephyr/include/drivers/cros_flash.h
index d78f5de2de..1bad6bb682 100644
--- a/zephyr/include/drivers/cros_flash.h
+++ b/zephyr/include/drivers/cros_flash.h
@@ -16,8 +16,8 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_FLASH_H_
 #define ZEPHYR_INCLUDE_DRIVERS_CROS_FLASH_H_
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 /**
  * @brief CROS Flash Driver APIs
diff --git a/zephyr/include/drivers/cros_kb_raw.h b/zephyr/include/drivers/cros_kb_raw.h
index ca6cfbc486..db2d00bf76 100644
--- a/zephyr/include/drivers/cros_kb_raw.h
+++ b/zephyr/include/drivers/cros_kb_raw.h
@@ -22,9 +22,9 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_KB_RAW_H_
 #define ZEPHYR_INCLUDE_DRIVERS_CROS_KB_RAW_H_
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "gpio_signal.h"
 
diff --git a/zephyr/include/drivers/cros_rtc.h b/zephyr/include/drivers/cros_rtc.h
index 695aabef73..343cf0405e 100644
--- a/zephyr/include/drivers/cros_rtc.h
+++ b/zephyr/include/drivers/cros_rtc.h
@@ -16,8 +16,8 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_RTC_H_
 #define ZEPHYR_INCLUDE_DRIVERS_CROS_RTC_H_
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 /**
  * @brief CROS Real-Time Clock (RTC) Driver APIs
diff --git a/zephyr/include/drivers/cros_shi.h b/zephyr/include/drivers/cros_shi.h
index aab3507dd3..3d14e2c34f 100644
--- a/zephyr/include/drivers/cros_shi.h
+++ b/zephyr/include/drivers/cros_shi.h
@@ -18,8 +18,8 @@
  * @{
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 /**
  * @cond INTERNAL_HIDDEN
diff --git a/zephyr/include/drivers/cros_system.h b/zephyr/include/drivers/cros_system.h
index 99c6ba12a7..5b3d12ea58 100644
--- a/zephyr/include/drivers/cros_system.h
+++ b/zephyr/include/drivers/cros_system.h
@@ -18,8 +18,8 @@
  * @{
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 /**
  * @brief system_reset_cause enum
diff --git a/zephyr/include/dt-bindings/gpio_defines.h b/zephyr/include/dt-bindings/gpio_defines.h
index 5b04189a9f..fd63b5ac4a 100644
--- a/zephyr/include/dt-bindings/gpio_defines.h
+++ b/zephyr/include/dt-bindings/gpio_defines.h
@@ -6,7 +6,7 @@
 #ifndef DT_BINDINGS_GPIO_DEFINES_H_
 #define DT_BINDINGS_GPIO_DEFINES_H_
 
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 
 /*
  * The GPIO_INPUT and GPIO_OUTPUT defines are normally not available to
diff --git a/zephyr/include/emul/emul_bb_retimer.h b/zephyr/include/emul/emul_bb_retimer.h
index 5e1a5fbd9a..9c6a73c3f4 100644
--- a/zephyr/include/emul/emul_bb_retimer.h
+++ b/zephyr/include/emul/emul_bb_retimer.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_BB_RETIMER_H
 #define __EMUL_BB_RETIMER_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief BB retimer emulator backend API
diff --git a/zephyr/include/emul/emul_bma255.h b/zephyr/include/emul/emul_bma255.h
index d1253ba133..158d29cf97 100644
--- a/zephyr/include/emul/emul_bma255.h
+++ b/zephyr/include/emul/emul_bma255.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_BMA255_H
 #define __EMUL_BMA255_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief BMA255 emulator backend API
diff --git a/zephyr/include/emul/emul_bmi.h b/zephyr/include/emul/emul_bmi.h
index 98c52b574d..b04278bd5e 100644
--- a/zephyr/include/emul/emul_bmi.h
+++ b/zephyr/include/emul/emul_bmi.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_BMI_H
 #define __EMUL_BMI_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief BMI emulator backend API
diff --git a/zephyr/include/emul/emul_common_i2c.h b/zephyr/include/emul/emul_common_i2c.h
index a5ae0ba967..676308b027 100644
--- a/zephyr/include/emul/emul_common_i2c.h
+++ b/zephyr/include/emul/emul_common_i2c.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_COMMON_I2C_H
 #define __EMUL_COMMON_I2C_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief Common I2C API useb by emulators
diff --git a/zephyr/include/emul/emul_isl923x.h b/zephyr/include/emul/emul_isl923x.h
index b2cc97e83c..5842cdcf02 100644
--- a/zephyr/include/emul/emul_isl923x.h
+++ b/zephyr/include/emul/emul_isl923x.h
@@ -6,9 +6,9 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_ISL923X_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_ISL923X_H_
 
-#include <device.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
 
 /**
  * @brief Get the emulator's parent bus device
diff --git a/zephyr/include/emul/emul_lis2dw12.h b/zephyr/include/emul/emul_lis2dw12.h
index 31f5239c7d..c61751183e 100644
--- a/zephyr/include/emul/emul_lis2dw12.h
+++ b/zephyr/include/emul/emul_lis2dw12.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_LIS2DW12_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_LIS2DW12_H_
 
-#include <drivers/emul.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief The the i2c emulator pointer from the top level emul.
diff --git a/zephyr/include/emul/emul_ln9310.h b/zephyr/include/emul/emul_ln9310.h
index 402df04ad8..6f34a15f93 100644
--- a/zephyr/include/emul/emul_ln9310.h
+++ b/zephyr/include/emul/emul_ln9310.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_LN9310_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_LN9310_H_
 
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "driver/ln9310.h"
 #include <stdbool.h>
 
diff --git a/zephyr/include/emul/emul_pi3usb9201.h b/zephyr/include/emul/emul_pi3usb9201.h
index a4f9f7c550..93e87c20e0 100644
--- a/zephyr/include/emul/emul_pi3usb9201.h
+++ b/zephyr/include/emul/emul_pi3usb9201.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_PI3USB9201_H
 #define __EMUL_PI3USB9201_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 #define PI3USB9201_REG_CTRL_1 0x0
 #define PI3USB9201_REG_CTRL_2 0x1
diff --git a/zephyr/include/emul/emul_smart_battery.h b/zephyr/include/emul/emul_smart_battery.h
index 47d1ffd8f8..034cb6915b 100644
--- a/zephyr/include/emul/emul_smart_battery.h
+++ b/zephyr/include/emul/emul_smart_battery.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_SMART_BATTERY_H
 #define __EMUL_SMART_BATTERY_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 #include <stdint.h>
 
 /**
diff --git a/zephyr/include/emul/emul_sn5s330.h b/zephyr/include/emul/emul_sn5s330.h
index be849b31dd..cc5576819e 100644
--- a/zephyr/include/emul/emul_sn5s330.h
+++ b/zephyr/include/emul/emul_sn5s330.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_SN5S330_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_SN5S330_H_
 
-#include <drivers/emul.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief The i2c emulator pointer from the top level emul.
diff --git a/zephyr/include/emul/emul_syv682x.h b/zephyr/include/emul/emul_syv682x.h
index 3cf9d9e6de..f08960ccac 100644
--- a/zephyr/include/emul/emul_syv682x.h
+++ b/zephyr/include/emul/emul_syv682x.h
@@ -11,7 +11,7 @@
 #ifndef __EMUL_SYV682X_H
 #define __EMUL_SYV682X_H
 
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/i2c_emul.h>
 #include <stdint.h>
 
 /* Register info copied from syv682.h */
diff --git a/zephyr/include/emul/emul_tcs3400.h b/zephyr/include/emul/emul_tcs3400.h
index fe3a485e54..a026f2624a 100644
--- a/zephyr/include/emul/emul_tcs3400.h
+++ b/zephyr/include/emul/emul_tcs3400.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_TCS3400_H
 #define __EMUL_TCS3400_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief TCS3400 emulator backend API
diff --git a/zephyr/include/emul/i2c_mock.h b/zephyr/include/emul/i2c_mock.h
index f3836bb81e..e52c4e7440 100644
--- a/zephyr/include/emul/i2c_mock.h
+++ b/zephyr/include/emul/i2c_mock.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_I2C_MOCK_H_
 #define ZEPHYR_INCLUDE_EMUL_I2C_MOCK_H_
 
-#include <drivers/emul.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief reset the I2C mock.
diff --git a/zephyr/include/emul/tcpc/emul_ps8xxx.h b/zephyr/include/emul/tcpc/emul_ps8xxx.h
index 52045ba86d..aff21e94c7 100644
--- a/zephyr/include/emul/tcpc/emul_ps8xxx.h
+++ b/zephyr/include/emul/tcpc/emul_ps8xxx.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_PS8XXX_H
 #define __EMUL_PS8XXX_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /**
  * @brief PS8xxx emulator backend API
diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h
index 4180120d9d..9ad8cbd218 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci.h
@@ -12,9 +12,9 @@
 #ifndef __EMUL_TCPCI_H
 #define __EMUL_TCPCI_H
 
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 #include <usb_pd_tcpm.h>
 
 /**
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
index d190f105b6..61dd282d57 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
@@ -12,8 +12,8 @@
 #ifndef __EMUL_TCPCI_PARTNER_COMMON_H
 #define __EMUL_TCPCI_PARTNER_COMMON_H
 
-#include <drivers/emul.h>
-#include <kernel.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
index f85bd251fe..ea5669b9a4 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_DRP_H
 #define __EMUL_TCPCI_PARTNER_DRP_H
 
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "emul/tcpc/emul_tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_snk.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_snk.h
index 7162fc9181..9046aba0b3 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_snk.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_faulty_snk.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_FAULTY_SNK_H
 #define __EMUL_TCPCI_PARTNER_FAULTY_SNK_H
 
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "emul/tcpc/emul_tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
index 0c05768d31..a50f750a4a 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_SNK_H
 #define __EMUL_TCPCI_PARTNER_SNK_H
 
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci.h"
 #include "usb_pd.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
index c9280d78dd..c919db24c7 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_SRC_H
 #define __EMUL_TCPCI_PARTNER_SRC_H
 
-#include <drivers/emul.h>
+#include <zephyr/drivers/emul.h>
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci.h"
 #include "usb_pd.h"
diff --git a/zephyr/projects/brya/battery_present.c b/zephyr/projects/brya/battery_present.c
index 3eb2e0295f..5dc587293c 100644
--- a/zephyr/projects/brya/battery_present.c
+++ b/zephyr/projects/brya/battery_present.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "battery.h"
 #include "cbi.h"
diff --git a/zephyr/projects/brya/include/gpio_map.h b/zephyr/projects/brya/include/gpio_map.h
index 1859485918..98f3463132 100644
--- a/zephyr/projects/brya/include/gpio_map.h
+++ b/zephyr/projects/brya/include/gpio_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_GPIO_MAP_H
 #define __ZEPHYR_GPIO_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <gpio_signal.h>
 
 #define GPIO_ENTERING_RW	GPIO_UNIMPLEMENTED
diff --git a/zephyr/projects/brya/kblight_hooks.c b/zephyr/projects/brya/kblight_hooks.c
index c56aeb5907..e00d8953db 100644
--- a/zephyr/projects/brya/kblight_hooks.c
+++ b/zephyr/projects/brya/kblight_hooks.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <stdbool.h>
 
 #include <ap_power/ap_power.h>
diff --git a/zephyr/projects/corsola/include/gpio_map.h b/zephyr/projects/corsola/include/gpio_map.h
index 9831a32579..562671b685 100644
--- a/zephyr/projects/corsola/include/gpio_map.h
+++ b/zephyr/projects/corsola/include/gpio_map.h
@@ -7,7 +7,7 @@
 #define __ZEPHYR_GPIO_MAP_H
 
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <gpio_signal.h>
 
 #define GPIO_ENTERING_RW		GPIO_UNIMPLEMENTED
diff --git a/zephyr/projects/corsola/include/i2c_map.h b/zephyr/projects/corsola/include/i2c_map.h
index 898d5c398c..e2f6c53ed2 100644
--- a/zephyr/projects/corsola/include/i2c_map.h
+++ b/zephyr/projects/corsola/include/i2c_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_I2C_MAP_H
 #define __ZEPHYR_I2C_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #include "i2c/i2c.h"
 
diff --git a/zephyr/projects/corsola/src/board_chipset.c b/zephyr/projects/corsola/src/board_chipset.c
index b09d21ef3b..ca8f3b0507 100644
--- a/zephyr/projects/corsola/src/board_chipset.c
+++ b/zephyr/projects/corsola/src/board_chipset.c
@@ -5,9 +5,9 @@
 
 /* Corsola baseboard-chipset specific configuration */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <ap_power/ap_power.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include "gpio.h"
 
 static void board_backlight_handler(struct ap_power_ev_callback *cb,
diff --git a/zephyr/projects/corsola/src/hibernate.c b/zephyr/projects/corsola/src/hibernate.c
index 1161f0931f..afd22fd3e7 100644
--- a/zephyr/projects/corsola/src/hibernate.c
+++ b/zephyr/projects/corsola/src/hibernate.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "charger.h"
 #include "driver/charger/isl923x_public.h"
diff --git a/zephyr/projects/corsola/src/krabby/hooks.c b/zephyr/projects/corsola/src/krabby/hooks.c
index e91993be10..f6b748d6b1 100644
--- a/zephyr/projects/corsola/src/krabby/hooks.c
+++ b/zephyr/projects/corsola/src/krabby/hooks.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <init.h>
-#include <drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <ap_power/ap_power.h>
 #include "charger.h"
diff --git a/zephyr/projects/corsola/src/krabby/led.c b/zephyr/projects/corsola/src/krabby/led.c
index 23db221d77..c001615402 100644
--- a/zephyr/projects/corsola/src/krabby/led.c
+++ b/zephyr/projects/corsola/src/krabby/led.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 #include "board_led.h"
 #include "common.h"
diff --git a/zephyr/projects/corsola/src/usbc_config.c b/zephyr/projects/corsola/src/usbc_config.c
index 34c1f1f994..1f927dbc21 100644
--- a/zephyr/projects/corsola/src/usbc_config.c
+++ b/zephyr/projects/corsola/src/usbc_config.c
@@ -5,7 +5,7 @@
 
 /* Corsola baseboard-specific USB-C configuration */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <ap_power/ap_power.h>
 
 #include "adc.h"
diff --git a/zephyr/projects/corsola/src/variant_db_detection.c b/zephyr/projects/corsola/src/variant_db_detection.c
index fc8427fbc7..e5058bdcd5 100644
--- a/zephyr/projects/corsola/src/variant_db_detection.c
+++ b/zephyr/projects/corsola/src/variant_db_detection.c
@@ -4,7 +4,7 @@
  */
 
 /* Corsola daughter board detection */
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "console.h"
 #include "gpio/gpio_int.h"
diff --git a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c
index fe3f06fca5..1b5c1e3d92 100644
--- a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c
+++ b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "usbc/ppc.h"
 #include "hooks.h"
 #include "cros_board_info.h"
diff --git a/zephyr/projects/herobrine/src/led.c b/zephyr/projects/herobrine/src/led.c
index c97c26a63f..ac6092884d 100644
--- a/zephyr/projects/herobrine/src/led.c
+++ b/zephyr/projects/herobrine/src/led.c
@@ -5,7 +5,7 @@
  * Power and battery LED control.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "battery.h"
 #include "charge_manager.h"
diff --git a/zephyr/projects/herobrine/src/usb_pd_policy.c b/zephyr/projects/herobrine/src/usb_pd_policy.c
index 27fb56f56f..a2e353d7d4 100644
--- a/zephyr/projects/herobrine/src/usb_pd_policy.c
+++ b/zephyr/projects/herobrine/src/usb_pd_policy.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "charge_manager.h"
 #include "chipset.h"
diff --git a/zephyr/projects/herobrine/src/usbc_config.c b/zephyr/projects/herobrine/src/usbc_config.c
index e848e50fd7..41319a75e9 100644
--- a/zephyr/projects/herobrine/src/usbc_config.c
+++ b/zephyr/projects/herobrine/src/usbc_config.c
@@ -5,7 +5,7 @@
 
 /* Herobrine board-specific USB-C configuration */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "charger.h"
 #include "charger/isl923x_public.h"
diff --git a/zephyr/projects/intelrvp/include/intel_rvp_board_id.h b/zephyr/projects/intelrvp/include/intel_rvp_board_id.h
index 77ac4f9054..a527b19364 100644
--- a/zephyr/projects/intelrvp/include/intel_rvp_board_id.h
+++ b/zephyr/projects/intelrvp/include/intel_rvp_board_id.h
@@ -6,7 +6,7 @@
 #ifndef __INTEL_RVP_BOARD_ID_H
 #define __INTEL_RVP_BOARD_ID_H
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 extern const struct gpio_dt_spec bom_id_config[];
 
diff --git a/zephyr/projects/intelrvp/src/intel_rvp_board_id.c b/zephyr/projects/intelrvp/src/intel_rvp_board_id.c
index 15517953d2..d4172a468e 100644
--- a/zephyr/projects/intelrvp/src/intel_rvp_board_id.c
+++ b/zephyr/projects/intelrvp/src/intel_rvp_board_id.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "intel_rvp_board_id.h"
 
 #define DT_DRV_COMPAT intel_rvp_board_id
diff --git a/zephyr/projects/it8xxx2_evb/include/gpio_map.h b/zephyr/projects/it8xxx2_evb/include/gpio_map.h
index 5a1adb9dbd..b9d9026892 100644
--- a/zephyr/projects/it8xxx2_evb/include/gpio_map.h
+++ b/zephyr/projects/it8xxx2_evb/include/gpio_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_GPIO_MAP_H
 #define __ZEPHYR_GPIO_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <gpio_signal.h>
 
 #define GPIO_ENTERING_RW	GPIO_UNIMPLEMENTED
diff --git a/zephyr/projects/it8xxx2_evb/include/i2c_map.h b/zephyr/projects/it8xxx2_evb/include/i2c_map.h
index 9d1fc1ca36..49c492f6ba 100644
--- a/zephyr/projects/it8xxx2_evb/include/i2c_map.h
+++ b/zephyr/projects/it8xxx2_evb/include/i2c_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_CHROME_I2C_MAP_H
 #define __ZEPHYR_CHROME_I2C_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #include "config.h"
 
diff --git a/zephyr/projects/nissa/src/board_power.c b/zephyr/projects/nissa/src/board_power.c
index b81e28c0f4..b4906179ad 100644
--- a/zephyr/projects/nissa/src/board_power.c
+++ b/zephyr/projects/nissa/src/board_power.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <sys/atomic.h>
-#include <logging/log.h>
-#include <drivers/gpio.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
diff --git a/zephyr/projects/nissa/src/common.c b/zephyr/projects/nissa/src/common.c
index cd6c4fb502..ac1c775fc1 100644
--- a/zephyr/projects/nissa/src/common.c
+++ b/zephyr/projects/nissa/src/common.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <ap_power/ap_power.h>
 
 #include "battery.h"
@@ -19,7 +19,7 @@
 
 #include "nissa_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 #define PROCHOT_GPIO_ENUM \
diff --git a/zephyr/projects/nissa/src/craask/charger.c b/zephyr/projects/nissa/src/craask/charger.c
index 9479367d25..3fbbabec6b 100644
--- a/zephyr/projects/nissa/src/craask/charger.c
+++ b/zephyr/projects/nissa/src/craask/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/craask/usbc.c b/zephyr/projects/nissa/src/craask/usbc.c
index b4dbad582f..b5763b70d8 100644
--- a/zephyr/projects/nissa/src/craask/usbc.c
+++ b/zephyr/projects/nissa/src/craask/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/nereid/charger.c b/zephyr/projects/nissa/src/nereid/charger.c
index 2835944d39..a494988951 100644
--- a/zephyr/projects/nissa/src/nereid/charger.c
+++ b/zephyr/projects/nissa/src/nereid/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/nereid/usbc.c b/zephyr/projects/nissa/src/nereid/usbc.c
index fcf0ec56c8..3a28aa63fa 100644
--- a/zephyr/projects/nissa/src/nereid/usbc.c
+++ b/zephyr/projects/nissa/src/nereid/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/nivviks/charger.c b/zephyr/projects/nissa/src/nivviks/charger.c
index 8e97926aaa..5a8bbe0e7a 100644
--- a/zephyr/projects/nissa/src/nivviks/charger.c
+++ b/zephyr/projects/nissa/src/nivviks/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/nivviks/fan.c b/zephyr/projects/nissa/src/nivviks/fan.c
index ce5935e924..b177c6eab1 100644
--- a/zephyr/projects/nissa/src/nivviks/fan.c
+++ b/zephyr/projects/nissa/src/nivviks/fan.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "cros_cbi.h"
 #include "fan.h"
diff --git a/zephyr/projects/nissa/src/nivviks/form_factor.c b/zephyr/projects/nissa/src/nivviks/form_factor.c
index 21fc0057d2..16132e4a6c 100644
--- a/zephyr/projects/nissa/src/nivviks/form_factor.c
+++ b/zephyr/projects/nissa/src/nivviks/form_factor.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 #include "accelgyro.h"
 #include "cros_cbi.h"
diff --git a/zephyr/projects/nissa/src/nivviks/usbc.c b/zephyr/projects/nissa/src/nivviks/usbc.c
index fa9a4cfaa7..7184e86789 100644
--- a/zephyr/projects/nissa/src/nivviks/usbc.c
+++ b/zephyr/projects/nissa/src/nivviks/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/sub_board.c b/zephyr/projects/nissa/src/sub_board.c
index cb6894e38c..0081269195 100644
--- a/zephyr/projects/nissa/src/sub_board.c
+++ b/zephyr/projects/nissa/src/sub_board.c
@@ -6,10 +6,10 @@
 /* Nissa sub-board hardware configuration */
 
 #include <ap_power/ap_power.h>
-#include <drivers/gpio.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/printk.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
 
 #include "driver/tcpm/tcpci.h"
 #include "gpio/gpio_int.h"
diff --git a/zephyr/projects/skyrim/include/gpio_map.h b/zephyr/projects/skyrim/include/gpio_map.h
index 7821f8cae6..969549bc5d 100644
--- a/zephyr/projects/skyrim/include/gpio_map.h
+++ b/zephyr/projects/skyrim/include/gpio_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_GPIO_MAP_H
 #define __ZEPHYR_GPIO_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <gpio_signal.h>
 
 /* Power input signals */
diff --git a/zephyr/projects/skyrim/include_guybrush/gpio_map.h b/zephyr/projects/skyrim/include_guybrush/gpio_map.h
index f099c875be..22d0eb602e 100644
--- a/zephyr/projects/skyrim/include_guybrush/gpio_map.h
+++ b/zephyr/projects/skyrim/include_guybrush/gpio_map.h
@@ -6,7 +6,7 @@
 #ifndef __ZEPHYR_GPIO_MAP_H
 #define __ZEPHYR_GPIO_MAP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <gpio_signal.h>
 
 /* Power input signals */
diff --git a/zephyr/projects/skyrim/power_signals_guybrush.c b/zephyr/projects/skyrim/power_signals_guybrush.c
index d2b1ee2776..11110886f2 100644
--- a/zephyr/projects/skyrim/power_signals_guybrush.c
+++ b/zephyr/projects/skyrim/power_signals_guybrush.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "chipset.h"
 #include "config.h"
diff --git a/zephyr/projects/skyrim/usb_pd_policy.c b/zephyr/projects/skyrim/usb_pd_policy.c
index 0e4a75126e..1d6457278a 100644
--- a/zephyr/projects/skyrim/usb_pd_policy.c
+++ b/zephyr/projects/skyrim/usb_pd_policy.c
@@ -5,7 +5,7 @@
 
 /* Shared USB-C policy for Zork boards */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "charge_manager.h"
 #include "chipset.h"
diff --git a/zephyr/projects/skyrim/usbc_config.c b/zephyr/projects/skyrim/usbc_config.c
index 2ad60570d9..cb6fdde45f 100644
--- a/zephyr/projects/skyrim/usbc_config.c
+++ b/zephyr/projects/skyrim/usbc_config.c
@@ -5,7 +5,7 @@
 
 /* Guybrush family-specific USB-C configuration */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "cros_board_info.h"
 #include "cros_cbi.h"
diff --git a/zephyr/projects/trogdor/lazor/src/power.c b/zephyr/projects/trogdor/lazor/src/power.c
index 961b30b85d..ee4e1b3b8f 100644
--- a/zephyr/projects/trogdor/lazor/src/power.c
+++ b/zephyr/projects/trogdor/lazor/src/power.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <init.h>
-#include <drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <ap_power/ap_power.h>
 #include "power.h"
diff --git a/zephyr/projects/trogdor/lazor/src/switchcap.c b/zephyr/projects/trogdor/lazor/src/switchcap.c
index ed1f8a4284..6dc7c3fbab 100644
--- a/zephyr/projects/trogdor/lazor/src/switchcap.c
+++ b/zephyr/projects/trogdor/lazor/src/switchcap.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "common.h"
 #include "config.h"
diff --git a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
index 300bf46287..b94a65005a 100644
--- a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
+++ b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "charge_manager.h"
 #include "chipset.h"
diff --git a/zephyr/shim/chip/it8xxx2/clock.c b/zephyr/shim/chip/it8xxx2/clock.c
index 2bcf9e2899..0e7b7cb39e 100644
--- a/zephyr/shim/chip/it8xxx2/clock.c
+++ b/zephyr/shim/chip/it8xxx2/clock.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc/ite_it8xxx2/reg_def_cros.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "module_id.h"
 
diff --git a/zephyr/shim/chip/it8xxx2/gpio.c b/zephyr/shim/chip/it8xxx2/gpio.c
index 8fb8bee2cf..3baf128eab 100644
--- a/zephyr/shim/chip/it8xxx2/gpio.c
+++ b/zephyr/shim/chip/it8xxx2/gpio.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "gpio/gpio.h"
 
diff --git a/zephyr/shim/chip/it8xxx2/keyboard_raw.c b/zephyr/shim/chip/it8xxx2/keyboard_raw.c
index 0096798915..480d528e41 100644
--- a/zephyr/shim/chip/it8xxx2/keyboard_raw.c
+++ b/zephyr/shim/chip/it8xxx2/keyboard_raw.c
@@ -5,10 +5,10 @@
 
 /* Functions needed by keyboard scanner module for Chrome EC */
 
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "drivers/cros_kb_raw.h"
 #include "keyboard_raw.h"
diff --git a/zephyr/shim/chip/it8xxx2/pinmux.c b/zephyr/shim/chip/it8xxx2/pinmux.c
index 8699bd29ff..92e2996e32 100644
--- a/zephyr/shim/chip/it8xxx2/pinmux.c
+++ b/zephyr/shim/chip/it8xxx2/pinmux.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <init.h>
-#include <drivers/pinmux.h>
-#include <dt-bindings/pinctrl/it8xxx2-pinctrl.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h>
 #include <soc.h>
 
 #define SCL 0
diff --git a/zephyr/shim/chip/it8xxx2/power_policy.c b/zephyr/shim/chip/it8xxx2/power_policy.c
index e1d9ea7bb2..7c2e02e258 100644
--- a/zephyr/shim/chip/it8xxx2/power_policy.c
+++ b/zephyr/shim/chip/it8xxx2/power_policy.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <pm/pm.h>
-#include <pm/policy.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "system.h"
 
diff --git a/zephyr/shim/chip/mchp/clock.c b/zephyr/shim/chip/mchp/clock.c
index 715e65b98e..3bdb6e4f99 100644
--- a/zephyr/shim/chip/mchp/clock.c
+++ b/zephyr/shim/chip/mchp/clock.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/mchp_xec_pcr.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "clock_chip.h"
 #include "module_id.h"
diff --git a/zephyr/shim/chip/mchp/gpio.c b/zephyr/shim/chip/mchp/gpio.c
index f7e042d693..3a16b9639d 100644
--- a/zephyr/shim/chip/mchp/gpio.c
+++ b/zephyr/shim/chip/mchp/gpio.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include "gpio/gpio.h"
 
 LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR);
diff --git a/zephyr/shim/chip/mchp/keyboard_raw.c b/zephyr/shim/chip/mchp/keyboard_raw.c
index 462a18e5f3..0b9280aa41 100644
--- a/zephyr/shim/chip/mchp/keyboard_raw.c
+++ b/zephyr/shim/chip/mchp/keyboard_raw.c
@@ -5,10 +5,10 @@
 
 /* Functions needed by keyboard scanner module for Chrome EC */
 
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "drivers/cros_kb_raw.h"
 #include "keyboard_raw.h"
diff --git a/zephyr/shim/chip/mchp/system.c b/zephyr/shim/chip/mchp/system.c
index e7241ff2bf..f4e0d09d4d 100644
--- a/zephyr/shim/chip/mchp/system.c
+++ b/zephyr/shim/chip/mchp/system.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/bbram.h>
-#include <logging/log.h>
+#include <zephyr/drivers/bbram.h>
+#include <zephyr/logging/log.h>
 
 #include "system.h"
 #include "system_chip.h"
diff --git a/zephyr/shim/chip/mchp/system_download_from_flash.c b/zephyr/shim/chip/mchp/system_download_from_flash.c
index 1d576849d5..665db2cccd 100644
--- a/zephyr/shim/chip/mchp/system_download_from_flash.c
+++ b/zephyr/shim/chip/mchp/system_download_from_flash.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <dt-bindings/clock/npcx_clock.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
 #include <stdnoreturn.h>
 
 #include "common.h"
diff --git a/zephyr/shim/chip/mchp/system_external_storage.c b/zephyr/shim/chip/mchp/system_external_storage.c
index cf18ead7f6..2c7312db3a 100644
--- a/zephyr/shim/chip/mchp/system_external_storage.c
+++ b/zephyr/shim/chip/mchp/system_external_storage.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/syscon.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/syscon.h>
 
 #include "clock_chip.h"
 #include "common.h"
diff --git a/zephyr/shim/chip/npcx/clock.c b/zephyr/shim/chip/npcx/clock.c
index 8c8bad5596..ca89c7a4be 100644
--- a/zephyr/shim/chip/npcx/clock.c
+++ b/zephyr/shim/chip/npcx/clock.c
@@ -3,13 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/npcx_clock.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "clock_chip.h"
 #include "module_id.h"
diff --git a/zephyr/shim/chip/npcx/gpio.c b/zephyr/shim/chip/npcx/gpio.c
index 8fb8bee2cf..3baf128eab 100644
--- a/zephyr/shim/chip/npcx/gpio.c
+++ b/zephyr/shim/chip/npcx/gpio.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "gpio/gpio.h"
 
diff --git a/zephyr/shim/chip/npcx/keyboard_raw.c b/zephyr/shim/chip/npcx/keyboard_raw.c
index 0309839ad6..86d6af068b 100644
--- a/zephyr/shim/chip/npcx/keyboard_raw.c
+++ b/zephyr/shim/chip/npcx/keyboard_raw.c
@@ -5,12 +5,12 @@
 
 /* Functions needed by keyboard scanner module for Chrome EC */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <soc_gpio.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "drivers/cros_kb_raw.h"
 #include "keyboard_raw.h"
diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
index c5f337569a..c5ffd40fb5 100644
--- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
+++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdint.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "config_chip.h"
 #include "npcx_monitor.h"
 #include "registers.h"
diff --git a/zephyr/shim/chip/npcx/power_policy.c b/zephyr/shim/chip/npcx/power_policy.c
index c95fcc56d8..1e5a7b15ce 100644
--- a/zephyr/shim/chip/npcx/power_policy.c
+++ b/zephyr/shim/chip/npcx/power_policy.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
-#include <pm/pm.h>
-#include <pm/policy.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
 #include <soc.h>
 
 #include "console.h"
diff --git a/zephyr/shim/chip/npcx/shi.c b/zephyr/shim/chip/npcx/shi.c
index 4512e4ab9e..044343c7a8 100644
--- a/zephyr/shim/chip/npcx/shi.c
+++ b/zephyr/shim/chip/npcx/shi.c
@@ -5,11 +5,11 @@
 
 /* Functions needed by Serial Host Interface module for Chrome EC */
 
-#include <device.h>
-#include <dt-bindings/clock/npcx_clock.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <ap_power/ap_power.h>
 #include "chipset.h"
diff --git a/zephyr/shim/chip/npcx/system.c b/zephyr/shim/chip/npcx/system.c
index 9809e138d5..ae28749ec0 100644
--- a/zephyr/shim/chip/npcx/system.c
+++ b/zephyr/shim/chip/npcx/system.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/bbram.h>
-#include <logging/log.h>
+#include <zephyr/drivers/bbram.h>
+#include <zephyr/logging/log.h>
 
 #include "system.h"
 #include "system_chip.h"
diff --git a/zephyr/shim/chip/npcx/system_download_from_flash.c b/zephyr/shim/chip/npcx/system_download_from_flash.c
index 28ec22962c..f616dc6603 100644
--- a/zephyr/shim/chip/npcx/system_download_from_flash.c
+++ b/zephyr/shim/chip/npcx/system_download_from_flash.c
@@ -2,9 +2,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <dt-bindings/clock/npcx_clock.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
 #include <stdnoreturn.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 #include "common.h"
 #include "soc.h"
diff --git a/zephyr/shim/chip/npcx/system_external_storage.c b/zephyr/shim/chip/npcx/system_external_storage.c
index 5ef48ce5d4..96d13fd94e 100644
--- a/zephyr/shim/chip/npcx/system_external_storage.c
+++ b/zephyr/shim/chip/npcx/system_external_storage.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/syscon.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/syscon.h>
 
 #include "clock_chip.h"
 #include "common.h"
diff --git a/zephyr/shim/core/cortex-m/irq_command.c b/zephyr/shim/core/cortex-m/irq_command.c
index e130121509..911aeae946 100644
--- a/zephyr/shim/core/cortex-m/irq_command.c
+++ b/zephyr/shim/core/cortex-m/irq_command.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include "console.h"
 
 /* IRQ counters */
diff --git a/zephyr/shim/core/cortex-m/mpu.c b/zephyr/shim/core/cortex-m/mpu.c
index 24d7948143..5c0c3df6bd 100644
--- a/zephyr/shim/core/cortex-m/mpu.c
+++ b/zephyr/shim/core/cortex-m/mpu.c
@@ -6,9 +6,9 @@
 #include "config.h"
 #include "mpu.h"
 #include "logging/log.h"
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <arch/cpu.h>
-#include <init.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
 
 LOG_MODULE_REGISTER(shim_mpu, LOG_LEVEL_ERR);
 
diff --git a/zephyr/shim/include/atomic.h b/zephyr/shim/include/atomic.h
index ad534d116b..6b44bf02a5 100644
--- a/zephyr/shim/include/atomic.h
+++ b/zephyr/shim/include/atomic.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_ATOMIC_H
 #define __CROS_EC_ATOMIC_H
 
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
 static inline atomic_val_t atomic_clear_bits(atomic_t *addr, atomic_val_t bits)
 {
diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h
index 39d80a3495..1c8da8b209 100644
--- a/zephyr/shim/include/board.h
+++ b/zephyr/shim/include/board.h
@@ -6,7 +6,7 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "common.h"
 
 /* Included shimed version of gpio signal. */
diff --git a/zephyr/shim/include/builtin/assert.h b/zephyr/shim/include/builtin/assert.h
index 21a6c5b3d7..c3c43f2ba1 100644
--- a/zephyr/shim/include/builtin/assert.h
+++ b/zephyr/shim/include/builtin/assert.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_ASSERT_H
 #define __CROS_EC_ASSERT_H
 
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 #undef ASSERT
 #undef assert
diff --git a/zephyr/shim/include/charger/chg_bq25710.h b/zephyr/shim/include/charger/chg_bq25710.h
index ed6771014b..6458545946 100644
--- a/zephyr/shim/include/charger/chg_bq25710.h
+++ b/zephyr/shim/include/charger/chg_bq25710.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #if defined(CONFIG_PLATFORM_EC_CHARGER_BQ25720) || \
 	defined(CONFIG_PLATFORM_EC_CHARGER_BQ25710)
 #include "driver/charger/bq25710.h"
diff --git a/zephyr/shim/include/charger/chg_isl923x.h b/zephyr/shim/include/charger/chg_isl923x.h
index 0bf65b4f38..fea25e7391 100644
--- a/zephyr/shim/include/charger/chg_isl923x.h
+++ b/zephyr/shim/include/charger/chg_isl923x.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/charger/isl923x_public.h"
 
 #define ISL923X_CHG_COMPAT intersil_isl923x
diff --git a/zephyr/shim/include/charger/chg_isl9241.h b/zephyr/shim/include/charger/chg_isl9241.h
index 7eba9f3bc9..8e19e2643e 100644
--- a/zephyr/shim/include/charger/chg_isl9241.h
+++ b/zephyr/shim/include/charger/chg_isl9241.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/charger/isl9241_public.h"
 
 #define ISL9241_CHG_COMPAT intersil_isl9241
diff --git a/zephyr/shim/include/charger/chg_rt9490.h b/zephyr/shim/include/charger/chg_rt9490.h
index a51d056e12..03059078e9 100644
--- a/zephyr/shim/include/charger/chg_rt9490.h
+++ b/zephyr/shim/include/charger/chg_rt9490.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/charger/rt9490.h"
 
 #define RT9490_CHG_COMPAT richtek_rt9490
diff --git a/zephyr/shim/include/charger/chg_sm5803.h b/zephyr/shim/include/charger/chg_sm5803.h
index 5b2f947b8e..7e18a5554b 100644
--- a/zephyr/shim/include/charger/chg_sm5803.h
+++ b/zephyr/shim/include/charger/chg_sm5803.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/charger/sm5803.h"
 
 #define SM5803_CHG_COMPAT siliconmitus_sm5803
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 7b99af207d..7f176fc2eb 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_CONFIG_CHIP_H
 #define __CROS_EC_CONFIG_CHIP_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <autoconf.h>
 
 #define SENSOR_NODE			DT_PATH(motionsense_sensor)
diff --git a/zephyr/shim/include/cros_cbi.h b/zephyr/shim/include/cros_cbi.h
index e7f29ea831..40a2b9d8ec 100644
--- a/zephyr/shim/include/cros_cbi.h
+++ b/zephyr/shim/include/cros_cbi.h
@@ -6,9 +6,9 @@
 #ifndef __CROS_EC_CROS_CBI_H
 #define __CROS_EC_CROS_CBI_H
 
-#include <kernel.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
 /*
  * Macros are _INST_ types, so require DT_DRV_COMPAT to be defined.
diff --git a/zephyr/shim/include/gpio/gpio.h b/zephyr/shim/include/gpio/gpio.h
index 235d12cea3..6f92ed5795 100644
--- a/zephyr/shim/include/gpio/gpio.h
+++ b/zephyr/shim/include/gpio/gpio.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_H_
 #define ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_H_
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
 /*
  * Validate interrupt flags are valid for the Zephyr GPIO driver.
diff --git a/zephyr/shim/include/gpio/gpio_int.h b/zephyr/shim/include/gpio/gpio_int.h
index 10c9b14b6b..5cbddf76ca 100644
--- a/zephyr/shim/include/gpio/gpio_int.h
+++ b/zephyr/shim/include/gpio/gpio_int.h
@@ -6,9 +6,9 @@
 #ifndef ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_INT_H_
 #define ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_INT_H_
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 
 /*
  * Zephyr based interrupt handling.
diff --git a/zephyr/shim/include/hook_types.h b/zephyr/shim/include/hook_types.h
index 363fa01a94..bcd1d0119c 100644
--- a/zephyr/shim/include/hook_types.h
+++ b/zephyr/shim/include/hook_types.h
@@ -5,7 +5,7 @@
 #ifndef __CROS_EC_HOOK_TYPES_H_
 #define __CROS_EC_HOOK_TYPES_H_
 
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 
 /*
  * Some config macros are defined but without any value for some boards, so
diff --git a/zephyr/shim/include/i2c/i2c.h b/zephyr/shim/include/i2c/i2c.h
index a8fb01d2c7..c7e29e79e5 100644
--- a/zephyr/shim/include/i2c/i2c.h
+++ b/zephyr/shim/include/i2c/i2c.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_CHROME_I2C_I2C_H
 #define ZEPHYR_CHROME_I2C_I2C_H
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
 #ifdef CONFIG_PLATFORM_EC_I2C
 #if DT_NODE_EXISTS(DT_PATH(named_i2c_ports))
diff --git a/zephyr/shim/include/motionsense_sensors.h b/zephyr/shim/include/motionsense_sensors.h
index 0add50914a..f3bd6befe0 100644
--- a/zephyr/shim/include/motionsense_sensors.h
+++ b/zephyr/shim/include/motionsense_sensors.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_MOTIONSENSE_SENSORS_H
 #define __CROS_EC_MOTIONSENSE_SENSORS_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "motion_sense.h"
 
 extern struct motion_sensor_t motion_sensors_alt[];
diff --git a/zephyr/shim/include/motionsense_sensors_defs.h b/zephyr/shim/include/motionsense_sensors_defs.h
index 88ddcddca6..a9535d3b5d 100644
--- a/zephyr/shim/include/motionsense_sensors_defs.h
+++ b/zephyr/shim/include/motionsense_sensors_defs.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_MOTIONSENSE_SENSORS_DEFS_H
 #define __CROS_EC_MOTIONSENSE_SENSORS_DEFS_H
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #include "common.h"
 
diff --git a/zephyr/shim/include/power/power.h b/zephyr/shim/include/power/power.h
index 4c14d510e3..6ea2444705 100644
--- a/zephyr/shim/include/power/power.h
+++ b/zephyr/shim/include/power/power.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_CHROME_POWER_POWER_H
 #define ZEPHYR_CHROME_POWER_POWER_H
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 
 #define POWER_SIGNAL_LIST_NODE                                                \
 	DT_NODELABEL(power_signal_list)
diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h
index a2d0db7f2a..2c6eabe485 100644
--- a/zephyr/shim/include/temp_sensor/temp_sensor.h
+++ b/zephyr/shim/include/temp_sensor/temp_sensor.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_
 #define ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "include/temp_sensor.h"
 
 #ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR
diff --git a/zephyr/shim/include/usbc/ppc.h b/zephyr/shim/include/usbc/ppc.h
index 00c7c36c41..94aee49f36 100644
--- a/zephyr/shim/include/usbc/ppc.h
+++ b/zephyr/shim/include/usbc/ppc.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_CHROME_USBC_PPC_H
 #define ZEPHYR_CHROME_USBC_PPC_H
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include "usbc/ppc_rt1739.h"
 #include "usbc/ppc_sn5s330.h"
 #include "usbc/ppc_syv682x.h"
diff --git a/zephyr/shim/include/usbc/tcpc_fusb302.h b/zephyr/shim/include/usbc/tcpc_fusb302.h
index de184c1441..fefb54af7d 100644
--- a/zephyr/shim/include/usbc/tcpc_fusb302.h
+++ b/zephyr/shim/include/usbc/tcpc_fusb302.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/tcpm/fusb302.h"
 
 #define FUSB302_TCPC_COMPAT fairchild_fusb302
diff --git a/zephyr/shim/include/usbc/tcpc_it8xxx2.h b/zephyr/shim/include/usbc/tcpc_it8xxx2.h
index 7229cbb9a1..be275441d8 100644
--- a/zephyr/shim/include/usbc/tcpc_it8xxx2.h
+++ b/zephyr/shim/include/usbc/tcpc_it8xxx2.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/tcpm/it8xxx2_pd_public.h"
 
 #define IT8XXX2_TCPC_COMPAT ite_it8xxx2_tcpc
diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx.h b/zephyr/shim/include/usbc/tcpc_ps8xxx.h
index 786d6c5e4d..e42f806f3c 100644
--- a/zephyr/shim/include/usbc/tcpc_ps8xxx.h
+++ b/zephyr/shim/include/usbc/tcpc_ps8xxx.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/tcpm/ps8xxx_public.h"
 
 #define PS8XXX_COMPAT parade_ps8xxx
diff --git a/zephyr/shim/include/usbc/tcpci.h b/zephyr/shim/include/usbc/tcpci.h
index b51c66a449..35f706d09b 100644
--- a/zephyr/shim/include/usbc/tcpci.h
+++ b/zephyr/shim/include/usbc/tcpci.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #include "driver/tcpm/tcpci.h"
 
diff --git a/zephyr/shim/include/usbc/usb_muxes.h b/zephyr/shim/include/usbc/usb_muxes.h
index 731f1899a9..b3789cd6a1 100644
--- a/zephyr/shim/include/usbc/usb_muxes.h
+++ b/zephyr/shim/include/usbc/usb_muxes.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_CHROME_USBC_USB_MUXES_H
 #define ZEPHYR_CHROME_USBC_USB_MUXES_H
 
-#include <devicetree.h>
-#include <sys/util_macro.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
 #include "usb_mux.h"
 #include "usbc/it5205_usb_mux.h"
 #include "usbc/tcpci_usb_mux.h"
diff --git a/zephyr/shim/include/zephyr_adc.h b/zephyr/shim/include/zephyr_adc.h
index 1c8e06664b..aff6d7a5b6 100644
--- a/zephyr/shim/include/zephyr_adc.h
+++ b/zephyr/shim/include/zephyr_adc.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_ZEPHYR_ADC_H
 #define __CROS_EC_ZEPHYR_ADC_H
 
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 
 #ifdef CONFIG_PLATFORM_EC_ADC
 
diff --git a/zephyr/shim/include/zephyr_console_shim.h b/zephyr/shim/include/zephyr_console_shim.h
index b3c1f23922..5880c3f400 100644
--- a/zephyr/shim/include/zephyr_console_shim.h
+++ b/zephyr/shim/include/zephyr_console_shim.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_ZEPHYR_CONSOLE_SHIM_H
 #define __CROS_EC_ZEPHYR_CONSOLE_SHIM_H
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 struct zephyr_console_command {
 	/* Handler for the command.  argv[0] will be the command name. */
diff --git a/zephyr/shim/include/zephyr_gpio_signal.h b/zephyr/shim/include/zephyr_gpio_signal.h
index 265a7cdf9c..8949826987 100644
--- a/zephyr/shim/include/zephyr_gpio_signal.h
+++ b/zephyr/shim/include/zephyr_gpio_signal.h
@@ -8,8 +8,8 @@
 #endif
 #define __CROS_EC_ZEPHYR_GPIO_SIGNAL_H
 
-#include <devicetree.h>
-#include <toolchain.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/toolchain.h>
 
 /** @brief Returns the enum-name property as a token
  *
diff --git a/zephyr/shim/include/zephyr_hooks_shim.h b/zephyr/shim/include/zephyr_hooks_shim.h
index 7b56487076..1798a42aeb 100644
--- a/zephyr/shim/include/zephyr_hooks_shim.h
+++ b/zephyr/shim/include/zephyr_hooks_shim.h
@@ -8,9 +8,9 @@
 #endif
 #define __CROS_EC_ZEPHYR_HOOKS_SHIM_H
 
-#include <init.h>
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "cros_version.h"
diff --git a/zephyr/shim/include/zephyr_host_command.h b/zephyr/shim/include/zephyr_host_command.h
index 1f07ac34d2..cc67049614 100644
--- a/zephyr/shim/include/zephyr_host_command.h
+++ b/zephyr/shim/include/zephyr_host_command.h
@@ -10,7 +10,7 @@
 #endif
 #define __CROS_EC_ZEPHYR_HOST_COMMAND_H
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <stdbool.h>
 
 /* Initializes and runs the host command handler loop.  */
diff --git a/zephyr/shim/include/zephyr_write_protect.h b/zephyr/shim/include/zephyr_write_protect.h
index 3d82b2ec93..3af2fb3576 100644
--- a/zephyr/shim/include/zephyr_write_protect.h
+++ b/zephyr/shim/include/zephyr_write_protect.h
@@ -8,7 +8,7 @@
 
 #include "gpio/gpio_int.h"
 #include "gpio_signal.h"
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 /**
  * Check the WP state. The function depends on the alias 'gpio_wp'. It is used
diff --git a/zephyr/shim/src/adc.c b/zephyr/shim/src/adc.c
index 68babcc576..80cf60391d 100644
--- a/zephyr/shim/src/adc.c
+++ b/zephyr/shim/src/adc.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree/io-channels.h>
-#include <drivers/adc.h>
-#include <logging/log.h>
+#include <zephyr/devicetree/io-channels.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/logging/log.h>
 #include "adc.h"
 #include "zephyr_adc.h"
 
diff --git a/zephyr/shim/src/bc12.c b/zephyr/shim/src/bc12.c
index fc6dfb6aa9..3bdab5f16e 100644
--- a/zephyr/shim/src/bc12.c
+++ b/zephyr/shim/src/bc12.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "usbc/bc12_pi3usb9201.h"
 #include "usbc/bc12_rt1739.h"
 #include "usbc/bc12_rt9490.h"
diff --git a/zephyr/shim/src/bc12_pi3usb9201.c b/zephyr/shim/src/bc12_pi3usb9201.c
index 57e4ed7b61..aac8dcd0a0 100644
--- a/zephyr/shim/src/bc12_pi3usb9201.c
+++ b/zephyr/shim/src/bc12_pi3usb9201.c
@@ -5,7 +5,7 @@
 
 #define DT_DRV_COMPAT pericom_pi3usb9201
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "bc12/pi3usb9201_public.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
diff --git a/zephyr/shim/src/bc12_rt9490.c b/zephyr/shim/src/bc12_rt9490.c
index 68798241d5..abecfcfa3a 100644
--- a/zephyr/shim/src/bc12_rt9490.c
+++ b/zephyr/shim/src/bc12_rt9490.c
@@ -5,7 +5,7 @@
 
 #define DT_DRV_COMPAT richtek_rt9490_bc12
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "driver/charger/rt9490.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
diff --git a/zephyr/shim/src/cbi/cbi_eeprom.c b/zephyr/shim/src/cbi/cbi_eeprom.c
index 760defb22a..4b9d718ef0 100644
--- a/zephyr/shim/src/cbi/cbi_eeprom.c
+++ b/zephyr/shim/src/cbi/cbi_eeprom.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <drivers/eeprom.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "console.h"
 #include "cros_board_info.h"
diff --git a/zephyr/shim/src/cbi/cros_cbi_fw_config.c b/zephyr/shim/src/cbi/cros_cbi_fw_config.c
index b411f0ac7f..e94c950a0f 100644
--- a/zephyr/shim/src/cbi/cros_cbi_fw_config.c
+++ b/zephyr/shim/src/cbi/cros_cbi_fw_config.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "cros_board_info.h"
 #include "cros_cbi.h"
diff --git a/zephyr/shim/src/cbi/cros_cbi_ssfc.c b/zephyr/shim/src/cbi/cros_cbi_ssfc.c
index 2a4e591eb5..a2dc3ccf0a 100644
--- a/zephyr/shim/src/cbi/cros_cbi_ssfc.c
+++ b/zephyr/shim/src/cbi/cros_cbi_ssfc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "cros_board_info.h"
 #include "cros_cbi.h"
diff --git a/zephyr/shim/src/charger.c b/zephyr/shim/src/charger.c
index 506e140e00..08aa121a19 100644
--- a/zephyr/shim/src/charger.c
+++ b/zephyr/shim/src/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charger.h"
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "charger/chg_bq25710.h"
 #include "charger/chg_isl923x.h"
 #include "charger/chg_isl9241.h"
diff --git a/zephyr/shim/src/console.c b/zephyr/shim/src/console.c
index 002b6e1618..bedc7ca90b 100644
--- a/zephyr/shim/src/console.c
+++ b/zephyr/shim/src/console.c
@@ -3,19 +3,19 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <shell/shell.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/shell/shell.h>
 #ifdef CONFIG_SHELL_BACKEND_DUMMY /* nocheck */
-#include <shell/shell_dummy.h> /* nocheck */
+#include <zephyr/shell/shell_dummy.h> /* nocheck */
 #endif
-#include <shell/shell_uart.h>
+#include <zephyr/shell/shell_uart.h>
 #include <stdbool.h>
 #include <string.h>
-#include <sys/printk.h>
-#include <sys/ring_buffer.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 
 #include "console.h"
 #include "printf.h"
diff --git a/zephyr/shim/src/console_buffer.c b/zephyr/shim/src/console_buffer.c
index 739d1e2251..aaeb6dae68 100644
--- a/zephyr/shim/src/console_buffer.c
+++ b/zephyr/shim/src/console_buffer.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "console.h"
diff --git a/zephyr/shim/src/crc.c b/zephyr/shim/src/crc.c
index 5c726619ee..0c5a81a4dd 100644
--- a/zephyr/shim/src/crc.c
+++ b/zephyr/shim/src/crc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <sys/crc.h>
+#include <zephyr/sys/crc.h>
 
 #include "crc8.h"
 
diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c
index 9d6e6fbfce..ab7ac3cc97 100644
--- a/zephyr/shim/src/espi.c
+++ b/zephyr/shim/src/espi.c
@@ -4,13 +4,13 @@
  */
 
 #include <atomic.h>
-#include <device.h>
-#include <drivers/espi.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
diff --git a/zephyr/shim/src/fan.c b/zephyr/shim/src/fan.c
index 49afb0f508..3531941a08 100644
--- a/zephyr/shim/src/fan.c
+++ b/zephyr/shim/src/fan.c
@@ -5,11 +5,11 @@
 
 #define DT_DRV_COMPAT cros_ec_fans
 
-#include <drivers/gpio.h>
-#include <drivers/pwm.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <sys/util_macro.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "fan.h"
 #include "gpio_signal.h"
diff --git a/zephyr/shim/src/flash.c b/zephyr/shim/src/flash.c
index b5611839a8..9802b39c3a 100644
--- a/zephyr/shim/src/flash.c
+++ b/zephyr/shim/src/flash.c
@@ -4,9 +4,9 @@
  */
 
 #include <flash.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <drivers/flash.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/flash.h>
 
 #include "console.h"
 #include "drivers/cros_flash.h"
diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c
index 945c04a577..b0b05f6bff 100644
--- a/zephyr/shim/src/gpio.c
+++ b/zephyr/shim/src/gpio.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #ifdef __REQUIRE_ZEPHYR_GPIOS__
 #undef __REQUIRE_ZEPHYR_GPIOS__
diff --git a/zephyr/shim/src/gpio_id.c b/zephyr/shim/src/gpio_id.c
index 3a122ae376..b562f405bc 100644
--- a/zephyr/shim/src/gpio_id.c
+++ b/zephyr/shim/src/gpio_id.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #ifdef __REQUIRE_ZEPHYR_GPIOS__
 #undef __REQUIRE_ZEPHYR_GPIOS__
diff --git a/zephyr/shim/src/gpio_int.c b/zephyr/shim/src/gpio_int.c
index 9d7f71448f..6f13976acc 100644
--- a/zephyr/shim/src/gpio_int.c
+++ b/zephyr/shim/src/gpio_int.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #ifdef __REQUIRE_ZEPHYR_GPIOS__
 #undef __REQUIRE_ZEPHYR_GPIOS__
diff --git a/zephyr/shim/src/hooks.c b/zephyr/shim/src/hooks.c
index c680e18d20..07bf27f3b0 100644
--- a/zephyr/shim/src/hooks.c
+++ b/zephyr/shim/src/hooks.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
diff --git a/zephyr/shim/src/host_command.c b/zephyr/shim/src/host_command.c
index ee7f994fdb..7bf61ee551 100644
--- a/zephyr/shim/src/host_command.c
+++ b/zephyr/shim/src/host_command.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "host_command.h"
 #include "task.h"
diff --git a/zephyr/shim/src/hwtimer.c b/zephyr/shim/src/hwtimer.c
index 85c72c5c59..aaaf051d80 100644
--- a/zephyr/shim/src/hwtimer.c
+++ b/zephyr/shim/src/hwtimer.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "hwtimer.h"
 
diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c
index 6e0505921c..8d55876629 100644
--- a/zephyr/shim/src/i2c.c
+++ b/zephyr/shim/src/i2c.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <sys/util.h>
-#include <drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "console.h"
 #include "i2c.h"
diff --git a/zephyr/shim/src/ioex.c b/zephyr/shim/src/ioex.c
index c3bad885b0..8e1282d152 100644
--- a/zephyr/shim/src/ioex.c
+++ b/zephyr/shim/src/ioex.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <init.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include "common.h"
 #ifdef __REQUIRE_ZEPHYR_GPIOS__
 #undef __REQUIRE_ZEPHYR_GPIOS__
diff --git a/zephyr/shim/src/ioex_drv.c b/zephyr/shim/src/ioex_drv.c
index fcc489f30b..ccf142576d 100644
--- a/zephyr/shim/src/ioex_drv.c
+++ b/zephyr/shim/src/ioex_drv.c
@@ -6,20 +6,20 @@
 #define DT_DRV_COMPAT cros_ioex_port
 #define DT_DRV_COMPAT_CHIP cros_ioex_chip
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 #include <errno.h>
 #ifdef __REQUIRE_ZEPHYR_GPIOS__
 #undef __REQUIRE_ZEPHYR_GPIOS__
 #endif
 #include "gpio.h"
 #include <gpio/gpio_utils.h>
-#include <init.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 #include "common.h"
 #include "config.h"
 #include "i2c.h"
diff --git a/zephyr/shim/src/keyboard_raw.c b/zephyr/shim/src/keyboard_raw.c
index 474e1af5da..ef2dadb29c 100644
--- a/zephyr/shim/src/keyboard_raw.c
+++ b/zephyr/shim/src/keyboard_raw.c
@@ -5,10 +5,10 @@
 
 /* Functions needed by keyboard scanner module for Chrome EC */
 
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "drivers/cros_kb_raw.h"
 #include "keyboard_raw.h"
diff --git a/zephyr/shim/src/keyscan.c b/zephyr/shim/src/keyscan.c
index fa8fb11dd2..a5503ecb48 100644
--- a/zephyr/shim/src/keyscan.c
+++ b/zephyr/shim/src/keyscan.c
@@ -6,7 +6,7 @@
 #define DT_DRV_COMPAT cros_keyscan
 
 #include <assert.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #include "keyboard_scan.h"
diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c
index b48641bc8f..6498c6127e 100644
--- a/zephyr/shim/src/led_driver/led.c
+++ b/zephyr/shim/src/led_driver/led.c
@@ -5,7 +5,7 @@
  * Power and battery LED control.
  */
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "battery.h"
 #include "charge_manager.h"
@@ -20,8 +20,8 @@
 #include "system.h"
 #include "util.h"
 
-#include <devicetree.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_led, LOG_LEVEL_ERR);
 
 #define LED_COLOR_NODE  DT_PATH(led_colors)
diff --git a/zephyr/shim/src/led_driver/led.h b/zephyr/shim/src/led_driver/led.h
index f802142c18..9a64f64572 100644
--- a/zephyr/shim/src/led_driver/led.h
+++ b/zephyr/shim/src/led_driver/led.h
@@ -6,7 +6,7 @@
 #ifndef __CROS_EC_LED_H__
 #define __CROS_EC_LED_H__
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #define COMPAT_GPIO_LED cros_ec_gpio_led_pins
 #define COMPAT_PWM_LED  cros_ec_pwm_led_pins
diff --git a/zephyr/shim/src/led_driver/led_gpio.c b/zephyr/shim/src/led_driver/led_gpio.c
index 2395e4b510..f4a2058f6c 100644
--- a/zephyr/shim/src/led_driver/led_gpio.c
+++ b/zephyr/shim/src/led_driver/led_gpio.c
@@ -9,9 +9,9 @@
 #include "led.h"
 #include "util.h"
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(COMPAT_GPIO_LED)
 
diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c
index eee80243cb..74501e5b65 100644
--- a/zephyr/shim/src/led_driver/led_pwm.c
+++ b/zephyr/shim/src/led_driver/led_pwm.c
@@ -9,9 +9,9 @@
 #include "led.h"
 #include "util.h"
 
-#include <devicetree.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(COMPAT_PWM_LED)
 
diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c
index c720e8434e..f0b76adf33 100644
--- a/zephyr/shim/src/motionsense_sensors.c
+++ b/zephyr/shim/src/motionsense_sensors.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "common.h"
 #include "accelgyro.h"
 #include "cros_cbi.h"
diff --git a/zephyr/shim/src/panic.c b/zephyr/shim/src/panic.c
index 82091df10d..030bc60843 100644
--- a/zephyr/shim/src/panic.c
+++ b/zephyr/shim/src/panic.c
@@ -3,11 +3,11 @@
  * found in the LICENSE file.
  */
 
-#include <arch/cpu.h>
-#include <fatal.h>
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
-#include <zephyr.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/fatal.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/zephyr.h>
 
 #include "common.h"
 #include "panic.h"
diff --git a/zephyr/shim/src/power.c b/zephyr/shim/src/power.c
index 6d09dba9d3..49f820e567 100644
--- a/zephyr/shim/src/power.c
+++ b/zephyr/shim/src/power.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "console.h"
 #include "power.h"
diff --git a/zephyr/shim/src/power_host_sleep_api.c b/zephyr/shim/src/power_host_sleep_api.c
index d22f4fe4c4..1d283e1c3c 100644
--- a/zephyr/shim/src/power_host_sleep_api.c
+++ b/zephyr/shim/src/power_host_sleep_api.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <ap_power/ap_power_interface.h>
 #include <power_host_sleep.h>
diff --git a/zephyr/shim/src/ppc.c b/zephyr/shim/src/ppc.c
index a77f7aa656..c1bf3cb0fd 100644
--- a/zephyr/shim/src/ppc.c
+++ b/zephyr/shim/src/ppc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "usbc_ppc.h"
 #include "usbc/ppc_rt1739.h"
 #include "usbc/ppc_sn5s330.h"
diff --git a/zephyr/shim/src/pwm_hc.c b/zephyr/shim/src/pwm_hc.c
index 3aaba20bc4..00c8ddf69b 100644
--- a/zephyr/shim/src/pwm_hc.c
+++ b/zephyr/shim/src/pwm_hc.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 #include "common.h"
 #include "console.h"
diff --git a/zephyr/shim/src/pwm_led.c b/zephyr/shim/src/pwm_led.c
index 5a72a07395..09fbd009b4 100644
--- a/zephyr/shim/src/pwm_led.c
+++ b/zephyr/shim/src/pwm_led.c
@@ -6,7 +6,7 @@
 #define DT_DRV_COMPAT cros_ec_pwm_leds
 
 #include <string.h>
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
 
diff --git a/zephyr/shim/src/rtc.c b/zephyr/shim/src/rtc.c
index 002e60148d..9627089f2e 100644
--- a/zephyr/shim/src/rtc.c
+++ b/zephyr/shim/src/rtc.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
-#include <kernel.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/zephyr.h>
 
 #include "console.h"
 #include "drivers/cros_rtc.h"
diff --git a/zephyr/shim/src/switchcap_gpio.c b/zephyr/shim/src/switchcap_gpio.c
index 9d08a78917..18f8344943 100644
--- a/zephyr/shim/src/switchcap_gpio.c
+++ b/zephyr/shim/src/switchcap_gpio.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 #include "common.h"
 
 /* TODO(b/218600962): Consolidate switchcap code. */
diff --git a/zephyr/shim/src/switchcap_ln9310.c b/zephyr/shim/src/switchcap_ln9310.c
index 4dc7f0d7fe..bd8612fb2e 100644
--- a/zephyr/shim/src/switchcap_ln9310.c
+++ b/zephyr/shim/src/switchcap_ln9310.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 #include "common.h"
 #include "ln9310.h"
 
diff --git a/zephyr/shim/src/system.c b/zephyr/shim/src/system.c
index 11da1bcc46..807bbd50b0 100644
--- a/zephyr/shim/src/system.c
+++ b/zephyr/shim/src/system.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/bbram.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/bbram.h>
 #include <drivers/cros_system.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "common.h"
 #include "console.h"
diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c
index c1b91316a9..83fc410648 100644
--- a/zephyr/shim/src/tasks.c
+++ b/zephyr/shim/src/tasks.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <sys/atomic.h>
-#include <shell/shell.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/shell/shell.h>
 
 #include "common.h"
 #include "host_command.h"
diff --git a/zephyr/shim/src/tcpc.c b/zephyr/shim/src/tcpc.c
index 82f53d70d9..b560cdb837 100644
--- a/zephyr/shim/src/tcpc.c
+++ b/zephyr/shim/src/tcpc.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <sys/util.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
 #include "usb_pd_tcpm.h"
 #include "usb_pd.h"
 #include "usbc/tcpc_fusb302.h"
diff --git a/zephyr/shim/src/tcpc_nct38xx.c b/zephyr/shim/src/tcpc_nct38xx.c
index 9481961e5e..f8c73d1aa0 100644
--- a/zephyr/shim/src/tcpc_nct38xx.c
+++ b/zephyr/shim/src/tcpc_nct38xx.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
 #include "config.h"
 #include "usbc/tcpc_nct38xx.h"
diff --git a/zephyr/shim/src/usb_muxes.c b/zephyr/shim/src/usb_muxes.c
index e162478fec..9244f3cf68 100644
--- a/zephyr/shim/src/usb_muxes.c
+++ b/zephyr/shim/src/usb_muxes.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <sys/util_macro.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
 #include "usb_mux.h"
 #include "usbc/usb_muxes.h"
 
diff --git a/zephyr/shim/src/usba.c b/zephyr/shim/src/usba.c
index d3191a4f8d..e8e1ca373a 100644
--- a/zephyr/shim/src/usba.c
+++ b/zephyr/shim/src/usba.c
@@ -5,7 +5,7 @@
 
 #define DT_DRV_COMPAT cros_ec_usba_port_enable_pins
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "hooks.h"
 
 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
diff --git a/zephyr/shim/src/watchdog.c b/zephyr/shim/src/watchdog.c
index 56c301c404..afb385054b 100644
--- a/zephyr/shim/src/watchdog.c
+++ b/zephyr/shim/src/watchdog.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/watchdog.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 #include "config.h"
 #include "hooks.h"
diff --git a/zephyr/subsys/ap_pwrseq/ap_events.c b/zephyr/subsys/ap_pwrseq/ap_events.c
index 4631fdce49..d5b78c2c33 100644
--- a/zephyr/subsys/ap_pwrseq/ap_events.c
+++ b/zephyr/subsys/ap_pwrseq/ap_events.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
diff --git a/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h b/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h
index f6c0d8e310..6dae924d5a 100644
--- a/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h
+++ b/zephyr/subsys/ap_pwrseq/include/ap_power_override_functions.h
@@ -20,7 +20,7 @@
 #ifndef __AP_PWRSEQ_AP_POWER_BOARD_FUNCTIONS_H__
 #define __AP_PWRSEQ_AP_POWER_BOARD_FUNCTIONS_H__
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /**
  * @brief Force AP shutdown
diff --git a/zephyr/subsys/ap_pwrseq/include/power_signals.h b/zephyr/subsys/ap_pwrseq/include/power_signals.h
index bc2d79bd1e..8755f1005a 100644
--- a/zephyr/subsys/ap_pwrseq/include/power_signals.h
+++ b/zephyr/subsys/ap_pwrseq/include/power_signals.h
@@ -39,7 +39,7 @@
 #ifndef __AP_PWRSEQ_POWER_SIGNALS_H__
 #define __AP_PWRSEQ_POWER_SIGNALS_H__
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(intel_ap_pwrseq)
 
diff --git a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
index 202597da6d..526b0b6ca6 100644
--- a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
+++ b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
@@ -6,7 +6,7 @@
 #ifndef __X86_COMMON_PWRSEQ_H__
 #define __X86_COMMON_PWRSEQ_H__
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <ap_power/ap_power_interface.h>
 #include <ap_power_override_functions.h>
 #include <power_signals.h>
diff --git a/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h b/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h
index bac957a9f9..f874879f04 100644
--- a/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h
+++ b/zephyr/subsys/ap_pwrseq/include/x86_non_dsx_common_pwrseq_sm_handler.h
@@ -6,8 +6,8 @@
 #ifndef __X86_NON_DSX_COMMON_PWRSEQ_SM_HANDLER_H__
 #define __X86_NON_DSX_COMMON_PWRSEQ_SM_HANDLER_H__
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <ap_power/ap_power.h>
diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c
index 7df7b3ef00..f3405b4119 100644
--- a/zephyr/subsys/ap_pwrseq/power_signals.c
+++ b/zephyr/subsys/ap_pwrseq/power_signals.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <logging/log.h>
-#include <sys/atomic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
 
 #include <power_signals.h>
 
diff --git a/zephyr/subsys/ap_pwrseq/signal_adc.c b/zephyr/subsys/ap_pwrseq/signal_adc.c
index b2c0598c29..66babf5cb1 100644
--- a/zephyr/subsys/ap_pwrseq/signal_adc.c
+++ b/zephyr/subsys/ap_pwrseq/signal_adc.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <sys/atomic.h>
-#include <drivers/adc.h>
-#include <logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/logging/log.h>
 
 #include <power_signals.h>
 #include <signal_adc.h>
diff --git a/zephyr/subsys/ap_pwrseq/signal_gpio.c b/zephyr/subsys/ap_pwrseq/signal_gpio.c
index cd43db537e..9f8c3adb48 100644
--- a/zephyr/subsys/ap_pwrseq/signal_gpio.c
+++ b/zephyr/subsys/ap_pwrseq/signal_gpio.c
@@ -5,7 +5,7 @@
 
 #include <power_signals.h>
 #include <signal_gpio.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include "system.h"
 
 #define MY_COMPAT	intel_ap_pwrseq_gpio
diff --git a/zephyr/subsys/ap_pwrseq/signal_vw.c b/zephyr/subsys/ap_pwrseq/signal_vw.c
index d74c260ead..de2756c137 100644
--- a/zephyr/subsys/ap_pwrseq/signal_vw.c
+++ b/zephyr/subsys/ap_pwrseq/signal_vw.c
@@ -4,7 +4,7 @@
  */
 
 #include <atomic.h>
-#include <drivers/espi.h>
+#include <zephyr/drivers/espi.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
 #include "signal_vw.h"
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
index 2891f94a68..e52002c7de 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
index e8dcd902b7..f13a55c74a 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
diff --git a/zephyr/test/ap_power/src/board.c b/zephyr/test/ap_power/src/board.c
index 73bf0f9e49..5745f4008e 100644
--- a/zephyr/test/ap_power/src/board.c
+++ b/zephyr/test/ap_power/src/board.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include <ap_power_override_functions.h>
diff --git a/zephyr/test/ap_power/src/events.c b/zephyr/test/ap_power/src/events.c
index 1b4eb84bca..de695e945f 100644
--- a/zephyr/test/ap_power/src/events.c
+++ b/zephyr/test/ap_power/src/events.c
@@ -8,10 +8,10 @@
  * @brief Unit Tests for AP power events
  */
 
-#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 "ap_power/ap_power.h"
diff --git a/zephyr/test/ap_power/src/main.c b/zephyr/test/ap_power/src/main.c
index 0fa88536f6..761fcfd997 100644
--- a/zephyr/test/ap_power/src/main.c
+++ b/zephyr/test/ap_power/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_state.h"
diff --git a/zephyr/test/ap_power/src/signals.c b/zephyr/test/ap_power/src/signals.c
index debd459807..c2ccffb8c9 100644
--- a/zephyr/test/ap_power/src/signals.c
+++ b/zephyr/test/ap_power/src/signals.c
@@ -8,13 +8,13 @@
  * @brief Unit Tests for power signals API
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/espi.h>
-#include <drivers/espi_emul.h>
-#include <drivers/gpio/gpio_emul.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "power_signals.h"
diff --git a/zephyr/test/crc/main.c b/zephyr/test/crc/main.c
index 34fec7199a..50f7be79a0 100644
--- a/zephyr/test/crc/main.c
+++ b/zephyr/test/crc/main.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include "crc8.h"
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"
diff --git a/zephyr/test/i2c/src/main.c b/zephyr/test/i2c/src/main.c
index 091f2b8a81..dbe9878da5 100644
--- a/zephyr/test/i2c/src/main.c
+++ b/zephyr/test/i2c/src/main.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <ztest.h>
 
 #include "common.h"
diff --git a/zephyr/test/i2c_dts/src/main.c b/zephyr/test/i2c_dts/src/main.c
index ccd58dde67..7cb1052798 100644
--- a/zephyr/test/i2c_dts/src/main.c
+++ b/zephyr/test/i2c_dts/src/main.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <ztest.h>
 
 static void test_i2c_get_device(void)
diff --git a/zephyr/test/system/test_system.c b/zephyr/test/system/test_system.c
index 96befde553..ce83a684d1 100644
--- a/zephyr/test/system/test_system.c
+++ b/zephyr/test/system/test_system.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
-#include <drivers/bbram.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/bbram.h>
+#include <zephyr/logging/log.h>
 #include <ztest.h>
 
 #include "system.h"
diff --git a/zephyr/test/tasks/main.c b/zephyr/test/tasks/main.c
index 91216b9518..ebf271d9b7 100644
--- a/zephyr/test/tasks/main.c
+++ b/zephyr/test/tasks/main.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <ztest.h>
 
-- 
cgit v1.2.1