diff --git a/drivers/adc/adc_ads1x1x.c b/drivers/adc/adc_ads1x1x.c
index fd77b65986..0c90521089 100644
--- a/drivers/adc/adc_ads1x1x.c
+++ b/drivers/adc/adc_ads1x1x.c
@@ -6,14 +6,14 @@
  */
 
 #include <stdbool.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/adc.h>
-#include <logging/log.h>
-#include <drivers/i2c.h>
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
diff --git a/drivers/adc/adc_cc32xx.c b/drivers/adc/adc_cc32xx.c
index 19d4d4d61d..48b8b5e7de 100644
--- a/drivers/adc/adc_cc32xx.c
+++ b/drivers/adc/adc_cc32xx.c
@@ -8,10 +8,10 @@
 
 #include <errno.h>
 
-#include <drivers/adc.h>
-#include <device.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 /* Driverlib includes */
@@ -28,7 +28,7 @@
 #include "adc_context.h"
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_cc32xx);
 
 #define ISR_MASK (ADC_DMA_DONE | ADC_FIFO_OVERFLOW | ADC_FIFO_UNDERFLOW	\
diff --git a/drivers/adc/adc_common.c b/drivers/adc/adc_common.c
index df513f7d89..f2a2ac26d3 100644
--- a/drivers/adc/adc_common.c
+++ b/drivers/adc/adc_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 
 int adc_gain_invert(enum adc_gain gain,
 		    int32_t *value)
diff --git a/drivers/adc/adc_context.h b/drivers/adc/adc_context.h
index ea5a96c9ec..d0f020a35f 100644
--- a/drivers/adc/adc_context.h
+++ b/drivers/adc/adc_context.h
@@ -8,8 +8,8 @@
 #ifndef ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
 #define ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
 
-#include <drivers/adc.h>
-#include <sys/atomic.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/sys/atomic.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/adc/adc_emul.c b/drivers/adc/adc_emul.c
index c55e81e06f..133dfdfaf9 100644
--- a/drivers/adc/adc_emul.c
+++ b/drivers/adc/adc_emul.c
@@ -12,13 +12,13 @@
 
 #define DT_DRV_COMPAT zephyr_adc_emul
 
-#include <drivers/adc.h>
-#include <drivers/adc/adc_emul.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_emul.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(adc_emul, CONFIG_ADC_LOG_LEVEL);
 
diff --git a/drivers/adc/adc_handlers.c b/drivers/adc/adc_handlers.c
index 175ad4799b..cf6319a626 100644
--- a/drivers/adc/adc_handlers.c
+++ b/drivers/adc/adc_handlers.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/adc.h>
-#include <syscall_handler.h>
-#include <kernel.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/kernel.h>
 
 static inline int z_vrfy_adc_channel_setup(const struct device *dev,
 					   const struct adc_channel_cfg *user_channel_cfg)
diff --git a/drivers/adc/adc_ite_it8xxx2.c b/drivers/adc/adc_ite_it8xxx2.c
index 3602742316..f0025023c7 100644
--- a/drivers/adc/adc_ite_it8xxx2.c
+++ b/drivers/adc/adc_ite_it8xxx2.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT ite_it8xxx2_adc
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_ite_it8xxx2);
 
-#include <drivers/adc.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <soc_dt.h>
 #include <errno.h>
diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c
index e5f7dbc95d..3eb50a3e7f 100644
--- a/drivers/adc/adc_lmp90xxx.c
+++ b/drivers/adc/adc_lmp90xxx.c
@@ -9,17 +9,17 @@
  * @brief ADC driver for the LMP90xxx AFE.
  */
 
-#include <drivers/adc.h>
-#include <drivers/adc/lmp90xxx.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/lmp90xxx.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_lmp90xxx);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_mchp_xec.c b/drivers/adc/adc_mchp_xec.c
index c873efa3a8..94dc6e2c0f 100644
--- a/drivers/adc/adc_mchp_xec.c
+++ b/drivers/adc/adc_mchp_xec.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT microchip_xec_adc
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_mchp_xec);
 
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 #include <soc.h>
 #include <errno.h>
 
diff --git a/drivers/adc/adc_mchp_xec_v2.c b/drivers/adc/adc_mchp_xec_v2.c
index 981109b181..5b007bb664 100644
--- a/drivers/adc/adc_mchp_xec_v2.c
+++ b/drivers/adc/adc_mchp_xec_v2.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT microchip_xec_adc_v2
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_mchp_xec);
 
-#include <drivers/adc.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <errno.h>
 
diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c
index eeb8b856e0..c61b040b54 100644
--- a/drivers/adc/adc_mcp320x.c
+++ b/drivers/adc/adc_mcp320x.c
@@ -9,14 +9,14 @@
  * @brief ADC driver for the MCP3204/MCP3208 ADCs.
  */
 
-#include <drivers/adc.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(adc_mcp320x, CONFIG_ADC_LOG_LEVEL);
 
diff --git a/drivers/adc/adc_mcux_12b1msps_sar.c b/drivers/adc/adc_mcux_12b1msps_sar.c
index b1b84004d1..98b421fff8 100644
--- a/drivers/adc/adc_mcux_12b1msps_sar.c
+++ b/drivers/adc/adc_mcux_12b1msps_sar.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT nxp_mcux_12b1msps_sar
 
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 #include <fsl_adc.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_mcux_12b1msps_sar);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c
index 60f8da329d..c414861759 100644
--- a/drivers/adc/adc_mcux_adc12.c
+++ b/drivers/adc/adc_mcux_adc12.c
@@ -9,12 +9,12 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_adc12
 
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 #include <fsl_adc12.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_mcux_adc12);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c
index e53b1b7057..adef14c61b 100644
--- a/drivers/adc/adc_mcux_adc16.c
+++ b/drivers/adc/adc_mcux_adc16.c
@@ -7,16 +7,16 @@
 #define DT_DRV_COMPAT nxp_kinetis_adc16
 
 #include <errno.h>
-#include <drivers/adc.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/pinctrl.h>
 #ifdef CONFIG_ADC_MCUX_ADC16_ENABLE_EDMA
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #endif
 
 #include <fsl_adc16.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_mcux_adc16);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_mcux_lpadc.c b/drivers/adc/adc_mcux_lpadc.c
index d72c03fce6..7b33c1d71e 100644
--- a/drivers/adc/adc_mcux_lpadc.c
+++ b/drivers/adc/adc_mcux_lpadc.c
@@ -11,11 +11,11 @@
 #define DT_DRV_COMPAT nxp_lpc_lpadc
 
 #include <errno.h>
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 #include <fsl_lpadc.h>
 
 #if CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #if !defined(CONFIG_SOC_SERIES_IMX_RT11XX)
@@ -23,7 +23,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(nxp_mcux_lpadc);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_npcx.c b/drivers/adc/adc_npcx.c
index 0f3b03b133..79123783d2 100644
--- a/drivers/adc/adc_npcx.c
+++ b/drivers/adc/adc_npcx.c
@@ -7,16 +7,16 @@
 #define DT_DRV_COMPAT nuvoton_npcx_adc
 
 #include <assert.h>
-#include <drivers/adc.h>
-#include <drivers/adc/adc_npcx_threshold.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/adc/adc_npcx_threshold.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_npcx, CONFIG_ADC_LOG_LEVEL);
 
 /* ADC speed/delay values during initialization */
diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c
index f6af63d473..9731c0f88f 100644
--- a/drivers/adc/adc_nrfx_adc.c
+++ b/drivers/adc/adc_nrfx_adc.c
@@ -9,7 +9,7 @@
 #include <nrfx_adc.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_nrfx_adc);
 
 #define DT_DRV_COMPAT nordic_nrf_adc
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index bfa5e96b11..bc4ecc9dde 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -9,7 +9,7 @@
 #include <hal/nrf_saadc.h>
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_nrfx_saadc);
 
 #define DT_DRV_COMPAT nordic_nrf_saadc
diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c
index 600c485d11..f2acc61b6a 100644
--- a/drivers/adc/adc_sam0.c
+++ b/drivers/adc/adc_sam0.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT atmel_sam0_adc
 
 #include <soc.h>
-#include <drivers/adc.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_sam0, CONFIG_ADC_LOG_LEVEL);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
index 7538e35f2a..eefa9c445b 100644
--- a/drivers/adc/adc_sam_afec.c
+++ b/drivers/adc/adc_sam_afec.c
@@ -15,19 +15,19 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/adc.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_sam_afec);
 
 #define NUM_CHANNELS 12
diff --git a/drivers/adc/adc_shell.c b/drivers/adc/adc_shell.c
index 9343835c9e..11ed019e05 100644
--- a/drivers/adc/adc_shell.c
+++ b/drivers/adc/adc_shell.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <drivers/adc.h>
+#include <zephyr/drivers/adc.h>
 #include <ctype.h>
-#include <sys/util.h>
-#include <devicetree.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/devicetree.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(atmel_sam_afec)
 #define DT_DRV_COMPAT atmel_sam_afec
@@ -44,7 +44,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_shell);
 
 #define CMD_HELP_ACQ_TIME 			\
diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index 415e06fcb3..b444d306b4 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -12,11 +12,11 @@
 
 #include <errno.h>
 
-#include <drivers/adc.h>
-#include <drivers/pinctrl.h>
-#include <device.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_adc.h>
 #if defined(CONFIG_SOC_SERIES_STM32U5X)
@@ -27,10 +27,10 @@
 #include "adc_context.h"
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_stm32);
 
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 #if defined(CONFIG_SOC_SERIES_STM32F3X)
 #if defined(ADC1_V2_5)
diff --git a/drivers/adc/adc_test.c b/drivers/adc/adc_test.c
index 7943f304d7..90919d5215 100644
--- a/drivers/adc/adc_test.c
+++ b/drivers/adc/adc_test.c
@@ -12,9 +12,9 @@
 
 #define DT_DRV_COMPAT vnd_adc
 
-#include <drivers/adc.h>
-#include <device.h>
-#include <kernel.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 static int vnd_adc_channel_setup(const struct device *dev,
 				 const struct adc_channel_cfg *channel_cfg)
diff --git a/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
index 6b9836baaf..d1849fca1d 100644
--- a/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
index e4f07331b9..5c18bbf9e4 100644
--- a/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
index 65a8b65321..c5142dd14e 100644
--- a/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
index 5193ac73ef..3ba6acc236 100644
--- a/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
index f1c45ebbd0..da6f003d3c 100644
--- a/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
index 48674ee427..386bf3123d 100644
--- a/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
index c2d5fc0d4c..ebe69c5e5d 100644
--- a/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c b/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
index 9a8d624ce1..55d8b4cb04 100644
--- a/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
+++ b/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/decimation/pdm_decim_table.c b/drivers/audio/decimation/pdm_decim_table.c
index 9771ebff11..6d04cec590 100644
--- a/drivers/audio/decimation/pdm_decim_table.c
+++ b/drivers/audio/decimation/pdm_decim_table.c
@@ -10,7 +10,7 @@
 
 /* PDM decimation FIR filters */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "pdm_decim_fir.h"
 
diff --git a/drivers/audio/dmic_nrfx_pdm.c b/drivers/audio/dmic_nrfx_pdm.c
index d3cf0f0d43..9ca13d6f8d 100644
--- a/drivers/audio/dmic_nrfx_pdm.c
+++ b/drivers/audio/dmic_nrfx_pdm.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <audio/dmic.h>
-#include <drivers/clock_control/nrf_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/audio/dmic.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_pdm.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dmic_nrfx_pdm, CONFIG_AUDIO_DMIC_LOG_LEVEL);
 
 struct dmic_nrfx_pdm_drv_data {
diff --git a/drivers/audio/intel_dmic.c b/drivers/audio/intel_dmic.c
index 2ab139e13a..2d7dd1fa9e 100644
--- a/drivers/audio/intel_dmic.c
+++ b/drivers/audio/intel_dmic.c
@@ -13,12 +13,12 @@
 #define DT_DRV_COMPAT intel_dmic
 
 #include <errno.h>
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 
-#include <audio/dmic.h>
+#include <zephyr/audio/dmic.h>
 #include "intel_dmic.h"
 #include "decimation/pdm_decim_fir.h"
 
@@ -26,7 +26,7 @@
 #define DMA_CHANNEL_DMIC_RXB DT_INST_DMAS_CELL_BY_NAME(0, rx_b, channel)
 
 #define LOG_LEVEL CONFIG_AUDIO_DMIC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(audio_dmic);
 
 /*
diff --git a/drivers/audio/intel_dmic.h b/drivers/audio/intel_dmic.h
index e3012019dc..c49193fbb7 100644
--- a/drivers/audio/intel_dmic.h
+++ b/drivers/audio/intel_dmic.h
@@ -13,7 +13,7 @@
 #ifndef __INTEL_DMIC_H__
 #define __INTEL_DMIC_H__
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #define DMIC_HW_IOCLK		38400000
 
diff --git a/drivers/audio/mpxxdtyy-i2s.c b/drivers/audio/mpxxdtyy-i2s.c
index e65d8d3c6d..7e8e2ff438 100644
--- a/drivers/audio/mpxxdtyy-i2s.c
+++ b/drivers/audio/mpxxdtyy-i2s.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT st_mpxxdtyy
 
 #include "mpxxdtyy.h"
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 
 #define LOG_LEVEL CONFIG_AUDIO_DMIC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(mpxxdtyy);
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s)
diff --git a/drivers/audio/mpxxdtyy.c b/drivers/audio/mpxxdtyy.c
index a27fb2a14b..4be45e47c6 100644
--- a/drivers/audio/mpxxdtyy.c
+++ b/drivers/audio/mpxxdtyy.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT st_mpxxdtyy
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #include "mpxxdtyy.h"
 
 #define LOG_LEVEL CONFIG_AUDIO_DMIC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mpxxdtyy);
 
 #define CHANNEL_MASK	0x55
diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h
index 831043a4cf..75b02cf3c9 100644
--- a/drivers/audio/mpxxdtyy.h
+++ b/drivers/audio/mpxxdtyy.h
@@ -7,9 +7,9 @@
 #ifndef MPXXDTYY_H
 #define MPXXDTYY_H
 
-#include <audio/dmic.h>
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/audio/dmic.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include "OpenPDMFilter.h"
 
 #ifdef __cplusplus
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index 99e597e40a..3a890c9e91 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -8,17 +8,17 @@
 
 #include <errno.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <audio/codec.h>
+#include <zephyr/audio/codec.h>
 #include "tlv320dac310x.h"
 
 #define LOG_LEVEL CONFIG_AUDIO_CODEC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tlv320dac310x);
 
 #define CODEC_OUTPUT_VOLUME_MAX		0
diff --git a/drivers/bbram/bbram_emul.c b/drivers/bbram/bbram_emul.c
index d21f63b568..909f9f506b 100644
--- a/drivers/bbram/bbram_emul.c
+++ b/drivers/bbram/bbram_emul.c
@@ -5,10 +5,10 @@
 
 #define DT_DRV_COMPAT zephyr_bbram_emul
 
-#include <drivers/bbram.h>
+#include <zephyr/drivers/bbram.h>
 #include <string.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bbram, CONFIG_BBRAM_LOG_LEVEL);
 
 /** Device config */
diff --git a/drivers/bbram/bbram_it8xxx2.c b/drivers/bbram/bbram_it8xxx2.c
index 91689772b6..cf1ab0f966 100644
--- a/drivers/bbram/bbram_it8xxx2.c
+++ b/drivers/bbram/bbram_it8xxx2.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_bbram
 
-#include <drivers/bbram.h>
+#include <zephyr/drivers/bbram.h>
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bbram, CONFIG_BBRAM_LOG_LEVEL);
 
 #define BRAM_VALID_MAGIC        0x4252414D  /* "BRAM" */
diff --git a/drivers/bbram/bbram_npcx.c b/drivers/bbram/bbram_npcx.c
index ea40157d58..87c5166b77 100644
--- a/drivers/bbram/bbram_npcx.c
+++ b/drivers/bbram/bbram_npcx.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_bbram
 
-#include <drivers/bbram.h>
+#include <zephyr/drivers/bbram.h>
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bbram, CONFIG_BBRAM_LOG_LEVEL);
 
 /** Device config */
diff --git a/drivers/bbram/bbram_xec.c b/drivers/bbram/bbram_xec.c
index 83b68cfb91..5d3bb28681 100644
--- a/drivers/bbram/bbram_xec.c
+++ b/drivers/bbram/bbram_xec.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT microchip_xec_bbram
 
-#include <drivers/bbram.h>
+#include <zephyr/drivers/bbram.h>
 #include <errno.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bbram, CONFIG_BBRAM_LOG_LEVEL);
 
 /** Device config */
diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
index c317b9df54..5f58f2869c 100644
--- a/drivers/bluetooth/hci/h4.c
+++ b/drivers/bluetooth/hci/h4.c
@@ -9,18 +9,18 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include <zephyr.h>
-#include <arch/cpu.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/cpu.h>
 
-#include <init.h>
-#include <drivers/uart.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_driver
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
index f10073ab92..6eb313990c 100644
--- a/drivers/bluetooth/hci/h5.c
+++ b/drivers/bluetooth/hci/h5.c
@@ -9,19 +9,19 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <init.h>
-#include <drivers/uart.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <debug/stack.h>
-#include <sys/printk.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/printk.h>
 #include <string.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_driver
diff --git a/drivers/bluetooth/hci/hci_esp32.c b/drivers/bluetooth/hci/hci_esp32.c
index 0a866e2199..f53d767892 100644
--- a/drivers/bluetooth/hci/hci_esp32.c
+++ b/drivers/bluetooth/hci/hci_esp32.c
@@ -8,10 +8,10 @@
 #define LOG_MODULE_NAME bt_hci_driver_esp32
 #include "common/log.h"
 
-#include <init.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #include <esp_bt.h>
 
diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c
index 91ce0faf47..c83174093b 100644
--- a/drivers/bluetooth/hci/ipm_stm32wb.c
+++ b/drivers/bluetooth/hci/ipm_stm32wb.c
@@ -7,12 +7,12 @@
  */
 
 
-#include <init.h>
-#include <sys/util.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 #include "bluetooth/addr.h"
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 #include "app_conf.h"
 #include "stm32_wpan_common.h"
diff --git a/drivers/bluetooth/hci/rpmsg.c b/drivers/bluetooth/hci/rpmsg.c
index c3ac887c04..fe9cd72bb9 100644
--- a/drivers/bluetooth/hci/rpmsg.c
+++ b/drivers/bluetooth/hci/rpmsg.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
-#include <device.h>
-#include <ipc/ipc_service.h>
+#include <zephyr/device.h>
+#include <zephyr/ipc/ipc_service.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_hci_driver
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index 6ba2fa7fb1..26e6a30731 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -8,14 +8,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <init.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_driver
@@ -72,7 +72,7 @@ static K_KERNEL_STACK_DEFINE(spi_rx_stack, 512);
 static struct k_thread spi_rx_thread_data;
 
 #if defined(CONFIG_BT_DEBUG_HCI_DRIVER)
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 static inline void spi_dump_message(const uint8_t *pre, uint8_t *buf,
 				    uint8_t size)
 {
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
index d856f89e94..ce5ee887b4 100644
--- a/drivers/bluetooth/hci/userchan.c
+++ b/drivers/bluetooth/hci/userchan.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <init.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
 #include <errno.h>
 #include <stddef.h>
@@ -24,9 +24,9 @@
 #include "soc.h"
 #include "cmdline.h" /* native_posix command line options header */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_driver
diff --git a/drivers/can/can_common.c b/drivers/can/can_common.c
index f8550e77a8..bbb494af80 100644
--- a/drivers/can/can_common.c
+++ b/drivers/can/can_common.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
-#include <kernel.h>
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(can_common, CONFIG_CAN_LOG_LEVEL);
 
diff --git a/drivers/can/can_handlers.c b/drivers/can/can_handlers.c
index 646a952012..f7882398fd 100644
--- a/drivers/can/can_handlers.c
+++ b/drivers/can/can_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/can.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/can.h>
 
 static int z_vrfy_can_calc_timing(const struct device *dev, struct can_timing *res,
 				  uint32_t bitrate, uint16_t sample_pnt)
diff --git a/drivers/can/can_loopback.c b/drivers/can/can_loopback.c
index 3670721906..42539cc781 100644
--- a/drivers/can/can_loopback.c
+++ b/drivers/can/can_loopback.c
@@ -10,9 +10,9 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <drivers/can.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(can_loopback, CONFIG_CAN_LOG_LEVEL);
 
diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c
index 290488f6c6..a5c3c54b1b 100644
--- a/drivers/can/can_mcan.c
+++ b/drivers/can/can_mcan.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
-#include <kernel.h>
-#include <drivers/can.h>
-#include <drivers/can/transceiver.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/logging/log.h>
 
 #include "can_mcan.h"
 #include "can_mcan_priv.h"
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(can_mcan, CONFIG_CAN_LOG_LEVEL);
 #endif
 
 #if CONFIG_HAS_CMSIS_CORE_M
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if __DCACHE_PRESENT == 1
 #define CACHE_INVALIDATE(addr, size) SCB_InvalidateDCache_by_Addr((addr), (size))
diff --git a/drivers/can/can_mcan.h b/drivers/can/can_mcan.h
index 7245b8ced9..c723a7b78e 100644
--- a/drivers/can/can_mcan.h
+++ b/drivers/can/can_mcan.h
@@ -8,11 +8,11 @@
 #ifndef ZEPHYR_DRIVERS_CAN_MCAN_H_
 #define ZEPHYR_DRIVERS_CAN_MCAN_H_
 
-#include <kernel.h>
-#include <devicetree.h>
-#include <drivers/can.h>
+#include <zephyr/kernel.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/can.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <stdint.h>
 
 #ifdef CONFIG_CAN_MCUX_MCAN
diff --git a/drivers/can/can_mcan_priv.h b/drivers/can/can_mcan_priv.h
index 45712d1559..5d53af064c 100644
--- a/drivers/can/can_mcan_priv.h
+++ b/drivers/can/can_mcan_priv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_CAN_CAN_MCAN_PRIV_H_
 #define ZEPHYR_DRIVERS_CAN_CAN_MCAN_PRIV_H_
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 
 /*
  * Register Masks are taken from the stm32cube library and extended for
diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c
index 05be24fb47..6bf9a0279c 100644
--- a/drivers/can/can_mcp2515.c
+++ b/drivers/can/can_mcp2515.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT microchip_mcp2515
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/can/transceiver.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(can_mcp2515, CONFIG_CAN_LOG_LEVEL);
 
diff --git a/drivers/can/can_mcp2515.h b/drivers/can/can_mcp2515.h
index 6752c8e20f..7de5066db4 100644
--- a/drivers/can/can_mcp2515.h
+++ b/drivers/can/can_mcp2515.h
@@ -8,8 +8,8 @@
 #ifndef _MCP2515_H_
 #define _MCP2515_H_
 
-#include <drivers/gpio.h>
-#include <drivers/can.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/can.h>
 
 #define MCP2515_RX_CNT                   2
 /* Reduce the number of Tx buffers to 1 in order to avoid priority inversion. */
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c
index 4c90bbad7b..517d4d277c 100644
--- a/drivers/can/can_mcux_flexcan.c
+++ b/drivers/can/can_mcux_flexcan.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_flexcan
 
-#include <zephyr.h>
-#include <sys/atomic.h>
-#include <drivers/can.h>
-#include <drivers/can/transceiver.h>
-#include <drivers/clock_control.h>
-#include <device.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/byteorder.h>
 #include <fsl_flexcan.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 LOG_MODULE_REGISTER(can_mcux_flexcan, CONFIG_CAN_LOG_LEVEL);
diff --git a/drivers/can/can_mcux_mcan.c b/drivers/can/can_mcux_mcan.c
index 6f8bdf4598..04b54dd6c7 100644
--- a/drivers/can/can_mcux_mcan.c
+++ b/drivers/can/can_mcux_mcan.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/can.h>
-#include <drivers/clock_control.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/logging/log.h>
 
 #include "can_mcan.h"
 
diff --git a/drivers/can/can_rcar.c b/drivers/can/can_rcar.c
index c72c806e9c..7cce11e870 100644
--- a/drivers/can/can_rcar.c
+++ b/drivers/can/can_rcar.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT renesas_rcar_can
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <drivers/can.h>
-#include <drivers/can/transceiver.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
-#include <drivers/pinctrl.h>
-#include <logging/log.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(can_rcar, CONFIG_CAN_LOG_LEVEL);
 
diff --git a/drivers/can/can_sam.c b/drivers/can/can_sam.c
index 3f46442f1d..6309d4bd92 100644
--- a/drivers/can/can_sam.c
+++ b/drivers/can/can_sam.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #include "can_mcan.h"
 
diff --git a/drivers/can/can_shell.c b/drivers/can/can_shell.c
index 2cacb7b537..feebb6a48f 100644
--- a/drivers/can/can_shell.c
+++ b/drivers/can/can_shell.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
-#include <shell/shell.h>
-#include <drivers/can.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/can.h>
 #include <zephyr/types.h>
 #include <stdlib.h>
 
diff --git a/drivers/can/can_socketcan.c b/drivers/can/can_socketcan.c
index 25ab119783..7e8644b1a7 100644
--- a/drivers/can/can_socketcan.c
+++ b/drivers/can/can_socketcan.c
@@ -6,13 +6,13 @@
  *
  */
 
-#include <net/net_pkt.h>
-#include <net/socket_can.h>
-#include <drivers/can.h>
-#include <devicetree.h>
-#include <device.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/socket_can.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(can_socketcan, CONFIG_CAN_LOG_LEVEL);
 
 #define SEND_TIMEOUT K_MSEC(100)
diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
index dd628d7d01..08ff814610 100644
--- a/drivers/can/can_stm32.c
+++ b/drivers/can/can_stm32.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can/transceiver.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <drivers/pinctrl.h>
-#include <sys/util.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <drivers/can.h>
-#include <logging/log.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/logging/log.h>
 
 #include "can_stm32.h"
 
diff --git a/drivers/can/can_stm32.h b/drivers/can/can_stm32.h
index c240c218d3..7f064749cd 100644
--- a/drivers/can/can_stm32.h
+++ b/drivers/can/can_stm32.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
 #define ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
 
-#include <drivers/can.h>
+#include <zephyr/drivers/can.h>
 
 #define BIT_SEG_LENGTH(cfg) ((cfg)->prop_ts1 + (cfg)->ts2 + 1)
 
diff --git a/drivers/can/can_stm32fd.c b/drivers/can/can_stm32fd.c
index 26f8c9cdac..7bd9c02cdb 100644
--- a/drivers/can/can_stm32fd.c
+++ b/drivers/can/can_stm32fd.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
-#include <drivers/pinctrl.h>
-#include <kernel.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_bus.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "can_mcan.h"
 
diff --git a/drivers/can/can_stm32h7.c b/drivers/can/can_stm32h7.c
index 63a8cbcb7b..117185077e 100644
--- a/drivers/can/can_stm32h7.c
+++ b/drivers/can/can_stm32h7.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/can.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <drivers/pinctrl.h>
-#include <kernel.h>
+#include <zephyr/drivers/can.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/kernel.h>
 #include <stm32_ll_rcc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "can_mcan.h"
 
diff --git a/drivers/can/transceiver/can_transceiver_gpio.c b/drivers/can/transceiver/can_transceiver_gpio.c
index b0af4f7ff8..2e906a6db1 100644
--- a/drivers/can/transceiver/can_transceiver_gpio.c
+++ b/drivers/can/transceiver/can_transceiver_gpio.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT can_transceiver_gpio
 
-#include <device.h>
-#include <drivers/can/transceiver.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/can/transceiver.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(can_transceiver_gpio, CONFIG_CAN_LOG_LEVEL);
 
diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c
index 5ef5b6d795..a9300f5e6e 100644
--- a/drivers/clock_control/beetle_clock_control.c
+++ b/drivers/clock_control/beetle_clock_control.c
@@ -15,9 +15,9 @@
  */
 
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/arm_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/arm_clock_control.h>
 
 #define MAINCLK_BASE_FREQ 24000000
 
diff --git a/drivers/clock_control/clock_agilex.c b/drivers/clock_control/clock_agilex.c
index 00e74636fc..cc2f1b1cdc 100644
--- a/drivers/clock_control/clock_agilex.c
+++ b/drivers/clock_control/clock_agilex.c
@@ -5,10 +5,10 @@
  *
  */
 
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/clock_agilex_ll.h>
-#include <dt-bindings/clock/intel_socfpga_clock.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_agilex_ll.h>
+#include <zephyr/dt-bindings/clock/intel_socfpga_clock.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 
 LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
diff --git a/drivers/clock_control/clock_agilex_ll.c b/drivers/clock_control/clock_agilex_ll.c
index 99c76cc775..03779115e7 100644
--- a/drivers/clock_control/clock_agilex_ll.c
+++ b/drivers/clock_control/clock_agilex_ll.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <arch/common/sys_bitops.h>
-#include <drivers/clock_control/clock_agilex_ll.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/common/sys_bitops.h>
+#include <zephyr/drivers/clock_control/clock_agilex_ll.h>
 #include <socfpga_system_manager.h>
 
 /*
diff --git a/drivers/clock_control/clock_control_esp32.c b/drivers/clock_control/clock_control_esp32.c
index 40f3ccf043..53a62016f6 100644
--- a/drivers/clock_control/clock_control_esp32.c
+++ b/drivers/clock_control/clock_control_esp32.c
@@ -13,16 +13,16 @@
 #define DT_CPU_COMPAT cdns_tensilica_xtensa_lx6
 #undef CPU_RESET_REASON
 #define CPU_RESET_REASON SW_CPU_RESET
-#include <dt-bindings/clock/esp32_clock.h>
+#include <zephyr/dt-bindings/clock/esp32_clock.h>
 #include "esp32/rom/rtc.h"
 #include "soc/dport_reg.h"
 #elif defined(CONFIG_SOC_ESP32S2)
 #define DT_CPU_COMPAT cdns_tensilica_xtensa_lx7
-#include <dt-bindings/clock/esp32s2_clock.h>
+#include <zephyr/dt-bindings/clock/esp32s2_clock.h>
 #include "esp32s2/rom/rtc.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define DT_CPU_COMPAT espressif_riscv
-#include <dt-bindings/clock/esp32c3_clock.h>
+#include <zephyr/dt-bindings/clock/esp32c3_clock.h>
 #include "esp32c3/rom/rtc.h"
 #include <soc/soc_caps.h>
 #include <soc/soc.h>
@@ -34,7 +34,7 @@
 #include <soc/timer_group_reg.h>
 #include <hal/clk_gate_ll.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <driver/periph_ctrl.h>
 #include <hal/cpu_hal.h>
 
diff --git a/drivers/clock_control/clock_control_esp32c3.c b/drivers/clock_control/clock_control_esp32c3.c
index e46e24b010..4e827c859d 100644
--- a/drivers/clock_control/clock_control_esp32c3.c
+++ b/drivers/clock_control/clock_control_esp32c3.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT espressif_esp32_rtc
 
-#include <dt-bindings/clock/esp32c3_clock.h>
+#include <zephyr/dt-bindings/clock/esp32c3_clock.h>
 #include <hal/clk_gate_ll.h>
 #include <soc/soc_caps.h>
 #include <soc/soc.h>
@@ -14,7 +14,7 @@
 #include <rtc_clk_common.h>
 
 #include <soc.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <driver/periph_ctrl.h>
 
 static int clock_control_esp32_on(const struct device *dev,
diff --git a/drivers/clock_control/clock_control_litex.c b/drivers/clock_control/clock_control_litex.c
index 66b5d09302..fa881d7026 100644
--- a/drivers/clock_control/clock_control_litex.c
+++ b/drivers/clock_control/clock_control_litex.c
@@ -5,18 +5,18 @@
  */
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/clock_control_litex.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/clock_control_litex.h>
 #include "clock_control_litex.h"
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/sys/util.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(CLK_CTRL_LITEX, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
diff --git a/drivers/clock_control/clock_control_lpc11u6x.c b/drivers/clock_control/clock_control_lpc11u6x.c
index ed203789d6..226db693ba 100644
--- a/drivers/clock_control/clock_control_lpc11u6x.c
+++ b/drivers/clock_control/clock_control_lpc11u6x.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_lpc11u6x_syscon
 
-#include <devicetree.h>
-#include <device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/device.h>
 
-#include <drivers/clock_control/lpc11u6x_clock_control.h>
-#include <drivers/pinmux.h>
+#include <zephyr/drivers/clock_control/lpc11u6x_clock_control.h>
+#include <zephyr/drivers/pinmux.h>
 
 #include "clock_control_lpc11u6x.h"
 
diff --git a/drivers/clock_control/clock_control_mchp_xec.c b/drivers/clock_control/clock_control_mchp_xec.c
index ebad877208..a8731704a8 100644
--- a/drivers/clock_control/clock_control_mchp_xec.c
+++ b/drivers/clock_control/clock_control_mchp_xec.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT microchip_xec_pcr
 
 #include <soc.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <dt-bindings/clock/mchp_xec_pcr.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_xec, LOG_LEVEL_ERR);
 
 #define CLK32K_SIL_OSC_DELAY		256
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
index bf1659fb07..c78150b69e 100644
--- a/drivers/clock_control/clock_control_mcux_ccm.c
+++ b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT nxp_imx_ccm
 #include <errno.h>
 #include <soc.h>
-#include <sys/util.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/imx_ccm.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
 #ifdef CONFIG_SPI_MCUX_LPSPI
diff --git a/drivers/clock_control/clock_control_mcux_ccm_rev2.c b/drivers/clock_control/clock_control_mcux_ccm_rev2.c
index 817f1131ff..ae8dc2a86b 100644
--- a/drivers/clock_control/clock_control_mcux_ccm_rev2.c
+++ b/drivers/clock_control/clock_control_mcux_ccm_rev2.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT nxp_imx_ccm_rev2
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/imx_ccm_rev2.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/imx_ccm_rev2.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
 static int mcux_ccm_on(const struct device *dev,
diff --git a/drivers/clock_control/clock_control_mcux_mcg.c b/drivers/clock_control/clock_control_mcux_mcg.c
index 727a5b40f9..9f4d4cfbd2 100644
--- a/drivers/clock_control/clock_control_mcux_mcg.c
+++ b/drivers/clock_control/clock_control_mcux_mcg.c
@@ -9,13 +9,13 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_mcg
 
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/kinetis_mcg.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/kinetis_mcg.h>
 #include <soc.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_mcg);
 
 static int mcux_mcg_on(const struct device *dev,
diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c
index a2eb3dc005..109925899c 100644
--- a/drivers/clock_control/clock_control_mcux_pcc.c
+++ b/drivers/clock_control/clock_control_mcux_pcc.c
@@ -11,11 +11,11 @@
 
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_mcux_pcc);
 
 struct mcux_pcc_config {
diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c
index ca5325a4ff..40eba39629 100644
--- a/drivers/clock_control/clock_control_mcux_scg.c
+++ b/drivers/clock_control/clock_control_mcux_scg.c
@@ -9,13 +9,13 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_scg
 
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/kinetis_scg.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/kinetis_scg.h>
 #include <soc.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_scg);
 
 #define MCUX_SCG_CLOCK_NODE(name) DT_CHILD(DT_DRV_INST(0), name)
diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
index 575bb8419c..e4bc26366d 100644
--- a/drivers/clock_control/clock_control_mcux_sim.c
+++ b/drivers/clock_control/clock_control_mcux_sim.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT nxp_kinetis_sim
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/kinetis_sim.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/kinetis_sim.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
 static int mcux_sim_on(const struct device *dev,
diff --git a/drivers/clock_control/clock_control_mcux_syscon.c b/drivers/clock_control/clock_control_mcux_syscon.c
index d873a96b12..1ee608c994 100644
--- a/drivers/clock_control/clock_control_mcux_syscon.c
+++ b/drivers/clock_control/clock_control_mcux_syscon.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT nxp_lpc_syscon
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
 static int mcux_lpc_syscon_clock_control_on(const struct device *dev,
diff --git a/drivers/clock_control/clock_control_npcx.c b/drivers/clock_control/clock_control_npcx.c
index 6998fd9145..452889e11b 100644
--- a/drivers/clock_control/clock_control_npcx.c
+++ b/drivers/clock_control/clock_control_npcx.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT nuvoton_npcx_pcc
 
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/npcx_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_npcx, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
index 9527198cdd..ab9707a939 100644
--- a/drivers/clock_control/clock_control_nrf.c
+++ b/drivers/clock_control/clock_control_nrf.c
@@ -6,13 +6,13 @@
  */
 
 #include <soc.h>
-#include <sys/onoff.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/sys/onoff.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include "nrf_clock_calibration.h"
 #include <nrfx_clock.h>
-#include <logging/log.h>
-#include <shell/shell.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/shell/shell.h>
 
 LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 
diff --git a/drivers/clock_control/clock_control_rcar_cpg_mssr.c b/drivers/clock_control/clock_control_rcar_cpg_mssr.c
index 6794f6f6fc..1c9b2357eb 100644
--- a/drivers/clock_control/clock_control_rcar_cpg_mssr.c
+++ b/drivers/clock_control/clock_control_rcar_cpg_mssr.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT renesas_rcar_cpg_mssr
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
-#include <dt-bindings/clock/renesas_rcar_cpg.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/dt-bindings/clock/renesas_rcar_cpg.h>
 
 struct rcar_mssr_config {
 	uint32_t base_address;
diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c
index 38210d6f0e..c7956bef15 100644
--- a/drivers/clock_control/clock_control_rv32m1_pcc.c
+++ b/drivers/clock_control/clock_control_rv32m1_pcc.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT openisa_rv32m1_pcc
 #include <errno.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control);
 
 struct rv32m1_pcc_config {
diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
index 70e5063ac6..846972374d 100644
--- a/drivers/clock_control/clock_stm32_ll_common.c
+++ b/drivers/clock_control/clock_stm32_ll_common.c
@@ -11,10 +11,10 @@
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_system.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 /* Macros to fill up prescaler values */
diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c
index 4356a62a28..ef3982f8a7 100644
--- a/drivers/clock_control/clock_stm32_ll_h7.c
+++ b/drivers/clock_control/clock_stm32_ll_h7.c
@@ -12,9 +12,9 @@
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "stm32_hsem.h"
 
 /* Macros to fill up prescaler values */
diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c
index c5f909ffa8..6a8e1978f8 100644
--- a/drivers/clock_control/clock_stm32_ll_mp1.c
+++ b/drivers/clock_control/clock_stm32_ll_mp1.c
@@ -7,9 +7,9 @@
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 /**
  * @brief fill in AHB/APB buses configuration structure
diff --git a/drivers/clock_control/clock_stm32_ll_u5.c b/drivers/clock_control/clock_stm32_ll_u5.c
index 6b86767d20..267f636841 100644
--- a/drivers/clock_control/clock_stm32_ll_u5.c
+++ b/drivers/clock_control/clock_stm32_ll_u5.c
@@ -12,10 +12,10 @@
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
 #include <stm32_ll_system.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 /* Macros to fill up prescaler values */
 #define z_ahb_prescaler(v) LL_RCC_SYSCLK_DIV_ ## v
diff --git a/drivers/clock_control/clock_stm32f0_f3.c b/drivers/clock_control/clock_stm32f0_f3.c
index 235e59d706..f4bafff3d3 100644
--- a/drivers/clock_control/clock_stm32f0_f3.c
+++ b/drivers/clock_control/clock_stm32f0_f3.c
@@ -10,9 +10,9 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32f1.c b/drivers/clock_control/clock_stm32f1.c
index cf3b14c66c..41ff680e1f 100644
--- a/drivers/clock_control/clock_stm32f1.c
+++ b/drivers/clock_control/clock_stm32f1.c
@@ -10,9 +10,9 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32f2_f4_f7.c b/drivers/clock_control/clock_stm32f2_f4_f7.c
index e0b75bdea5..02ceccf8dd 100644
--- a/drivers/clock_control/clock_stm32f2_f4_f7.c
+++ b/drivers/clock_control/clock_stm32f2_f4_f7.c
@@ -10,9 +10,9 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32g0.c b/drivers/clock_control/clock_stm32g0.c
index e4353a5d65..c707f3fd35 100644
--- a/drivers/clock_control/clock_stm32g0.c
+++ b/drivers/clock_control/clock_stm32g0.c
@@ -11,9 +11,9 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32g4.c b/drivers/clock_control/clock_stm32g4.c
index f465d51e4a..8dfb3ccb18 100644
--- a/drivers/clock_control/clock_stm32g4.c
+++ b/drivers/clock_control/clock_stm32g4.c
@@ -10,9 +10,9 @@
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32l0_l1.c b/drivers/clock_control/clock_stm32l0_l1.c
index 37545f5b94..82f17d342b 100644
--- a/drivers/clock_control/clock_stm32l0_l1.c
+++ b/drivers/clock_control/clock_stm32l0_l1.c
@@ -10,9 +10,9 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 
 
diff --git a/drivers/clock_control/clock_stm32l4_l5_wb_wl.c b/drivers/clock_control/clock_stm32l4_l5_wb_wl.c
index a51e53b476..1ad3331525 100644
--- a/drivers/clock_control/clock_stm32l4_l5_wb_wl.c
+++ b/drivers/clock_control/clock_stm32l4_l5_wb_wl.c
@@ -11,9 +11,9 @@
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_utils.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 #include "stm32_hsem.h"
 
diff --git a/drivers/clock_control/nrf_clock_calibration.c b/drivers/clock_control/nrf_clock_calibration.c
index b9c43f892f..eb86301abb 100644
--- a/drivers/clock_control/nrf_clock_calibration.c
+++ b/drivers/clock_control/nrf_clock_calibration.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/sensor.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/clock_control.h>
 #include "nrf_clock_calibration.h"
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <nrfx_clock.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <stdlib.h>
 
 LOG_MODULE_DECLARE(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
diff --git a/drivers/clock_control/nrf_clock_calibration.h b/drivers/clock_control/nrf_clock_calibration.h
index 8071192b90..8ea6c95bb0 100644
--- a/drivers/clock_control/nrf_clock_calibration.h
+++ b/drivers/clock_control/nrf_clock_calibration.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CALIBRATION_H_
 #define ZEPHYR_DRIVERS_CLOCK_CONTROL_NRF_CLOCK_CALIBRATION_H_
 
-#include <sys/onoff.h>
+#include <zephyr/sys/onoff.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/console/gsm_mux.c b/drivers/console/gsm_mux.c
index 4bb2eae920..f614224477 100644
--- a/drivers/console/gsm_mux.c
+++ b/drivers/console/gsm_mux.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gsm_mux, CONFIG_GSM_MUX_LOG_LEVEL);
 
-#include <kernel.h>
-#include <sys/util.h>
-#include <sys/crc.h>
-#include <net/buf.h>
-#include <net/ppp.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/ppp.h>
 
 #include "uart_mux_internal.h"
 #include "gsm_mux.h"
diff --git a/drivers/console/ipm_console.c b/drivers/console/ipm_console.c
index 0c8f9d6519..29bd49e566 100644
--- a/drivers/console/ipm_console.c
+++ b/drivers/console/ipm_console.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/ipm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/ipm.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ipm_console, CONFIG_IPM_LOG_LEVEL);
 
 const struct device *ipm_dev;
diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c
index 1f54f18c8a..d1ccf1c485 100644
--- a/drivers/console/ipm_console_receiver.c
+++ b/drivers/console/ipm_console_receiver.c
@@ -8,13 +8,13 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <sys/ring_buffer.h>
-#include <sys/printk.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/printk.h>
 #include <stdio.h>
-#include <drivers/ipm.h>
-#include <drivers/console/ipm_console.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/console/ipm_console.h>
+#include <zephyr/sys/__assert.h>
 
 static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 {
diff --git a/drivers/console/ipm_console_sender.c b/drivers/console/ipm_console_sender.c
index b453cdffd2..b53b92aa65 100644
--- a/drivers/console/ipm_console_sender.c
+++ b/drivers/console/ipm_console_sender.c
@@ -8,10 +8,10 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <drivers/ipm.h>
-#include <drivers/console/ipm_console.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/console/ipm_console.h>
 
 static const struct device *ipm_console_device;
 
diff --git a/drivers/console/jailhouse_debug_console.c b/drivers/console/jailhouse_debug_console.c
index 29d6a61d09..3f924f0baa 100644
--- a/drivers/console/jailhouse_debug_console.c
+++ b/drivers/console/jailhouse_debug_console.c
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_STDOUT_CONSOLE)
 /**
diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c
index 3da9e49482..f9e92f90c4 100644
--- a/drivers/console/ram_console.c
+++ b/drivers/console/ram_console.c
@@ -7,10 +7,10 @@
  */
 
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 extern void __printk_hook_install(int (*fn)(int));
 extern void __stdout_hook_install(int (*fn)(int));
diff --git a/drivers/console/rtt_console.c b/drivers/console/rtt_console.c
index 59c86ad68a..a328988037 100644
--- a/drivers/console/rtt_console.c
+++ b/drivers/console/rtt_console.c
@@ -9,10 +9,10 @@
  */
 
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <SEGGER_RTT.h>
 
 extern void __printk_hook_install(int (*fn)(int));
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index a4167c0864..481479e89d 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -13,24 +13,24 @@
  * Hooks into the printk and fputc (for printf) modules. Poll driven.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <stdio.h>
 #include <zephyr/types.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <errno.h>
 #include <ctype.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <drivers/uart.h>
-#include <drivers/console/console.h>
-#include <drivers/console/uart_console.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sys/atomic.h>
-#include <sys/printk.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/console.h>
+#include <zephyr/drivers/console/uart_console.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/printk.h>
 #ifdef CONFIG_UART_CONSOLE_MCUMGR
 #include "mgmt/mcumgr/serial.h"
 #endif
diff --git a/drivers/console/uart_mcumgr.c b/drivers/console/uart_mcumgr.c
index aa676fd0b9..82669e5fce 100644
--- a/drivers/console/uart_mcumgr.c
+++ b/drivers/console/uart_mcumgr.c
@@ -10,10 +10,10 @@
  */
 
 #include <string.h>
-#include <kernel.h>
-#include <drivers/uart.h>
-#include <mgmt/mcumgr/serial.h>
-#include <drivers/console/uart_mcumgr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/mgmt/mcumgr/serial.h>
+#include <zephyr/drivers/console/uart_mcumgr.h>
 
 static const struct device *uart_mcumgr_dev;
 
diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c
index be1a05942f..a51daa3bec 100644
--- a/drivers/console/uart_mux.c
+++ b/drivers/console/uart_mux.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_mux, CONFIG_UART_MUX_LOG_LEVEL);
 
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <init.h>
-#include <syscall_handler.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/console/uart_mux.h>
-#include <sys/ring_buffer.h>
-#include <sys/util.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/uart_mux.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/atomic.h>
 
 #include "gsm_mux.h"
 
diff --git a/drivers/console/uart_mux_internal.h b/drivers/console/uart_mux_internal.h
index 4f0b507988..c40091ef45 100644
--- a/drivers/console/uart_mux_internal.h
+++ b/drivers/console/uart_mux_internal.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/console/uart_mux.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/console/uart_mux.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index 5c1dfd4d02..b60ac83a77 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -11,15 +11,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
-#include <drivers/console/uart_pipe.h>
-#include <sys/printk.h>
+#include <zephyr/drivers/console/uart_pipe.h>
+#include <zephyr/sys/printk.h>
 
 static const struct device *uart_pipe_dev;
 
diff --git a/drivers/console/xtensa_sim_console.c b/drivers/console/xtensa_sim_console.c
index d2ee2142cf..a2169dc6b6 100644
--- a/drivers/console/xtensa_sim_console.c
+++ b/drivers/console/xtensa_sim_console.c
@@ -4,8 +4,8 @@
  */
 
 #include <xtensa/simcall.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_STDOUT_CONSOLE)
 /**
diff --git a/drivers/counter/counter_cmos.c b/drivers/counter/counter_cmos.c
index 0833ed0a5b..8810e651f8 100644
--- a/drivers/counter/counter_cmos.c
+++ b/drivers/counter/counter_cmos.c
@@ -13,8 +13,8 @@
 
 #define DT_DRV_COMPAT motorola_mc146818
 
-#include <drivers/counter.h>
-#include <device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
 /* The "CMOS" device is accessed via an address latch and data port. */
diff --git a/drivers/counter/counter_esp32.c b/drivers/counter/counter_esp32.c
index 38ae0d55ad..3c69b931f1 100644
--- a/drivers/counter/counter_esp32.c
+++ b/drivers/counter/counter_esp32.c
@@ -14,14 +14,14 @@
 #include <hal/timer_types.h>
 #include <hal/timer_hal.h>
 #include <string.h>
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #ifndef CONFIG_SOC_ESP32C3
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #else
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #endif
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_counter, CONFIG_COUNTER_LOG_LEVEL);
 
 #ifdef CONFIG_SOC_ESP32C3
diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c
index 2cf2d7904c..9182d82465 100644
--- a/drivers/counter/counter_gecko_rtcc.c
+++ b/drivers/counter/counter_gecko_rtcc.c
@@ -9,14 +9,14 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <em_cmu.h>
 #include <em_rtcc.h>
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(counter_gecko, CONFIG_COUNTER_LOG_LEVEL);
 
 #define RTCC_MAX_VALUE       (_RTCC_CNT_MASK)
diff --git a/drivers/counter/counter_handlers.c b/drivers/counter/counter_handlers.c
index 17afcf6ff8..1ce9644114 100644
--- a/drivers/counter/counter_handlers.c
+++ b/drivers/counter/counter_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/counter.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/counter.h>
 
 /* For those APIs that just take one argument which is a counter driver
  * instance and return an integral value
diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c
index a3b1198855..cdfe263ea7 100644
--- a/drivers/counter/counter_imx_epit.c
+++ b/drivers/counter/counter_imx_epit.c
@@ -5,8 +5,8 @@
  */
 #define DT_DRV_COMPAT nxp_imx_epit
 
-#include <drivers/counter.h>
-#include <device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/device.h>
 #include "clock_freq.h"
 #include "epit.h"
 
diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
index fdb77eebca..dc1c2bb708 100644
--- a/drivers/counter/counter_ll_stm32_rtc.c
+++ b/drivers/counter/counter_ll_stm32_rtc.c
@@ -13,19 +13,19 @@
 
 #include <time.h>
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_exti.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_rtc.h>
-#include <drivers/counter.h>
-#include <sys/timeutil.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/sys/timeutil.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "stm32_hsem.h"
 
diff --git a/drivers/counter/counter_ll_stm32_timer.c b/drivers/counter/counter_ll_stm32_timer.c
index 6c024b4795..668cd7fa27 100644
--- a/drivers/counter/counter_ll_stm32_timer.c
+++ b/drivers/counter/counter_ll_stm32_timer.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT st_stm32_counter
 
-#include <drivers/counter.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <sys/atomic.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/sys/atomic.h>
 
 #include <stm32_ll_tim.h>
 #include <stm32_ll_rcc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(counter_timer_stm32, CONFIG_COUNTER_LOG_LEVEL);
 
 /** Maximum number of timer channels. */
diff --git a/drivers/counter/counter_mchp_xec.c b/drivers/counter/counter_mchp_xec.c
index 9deb81a714..28c4f338fc 100644
--- a/drivers/counter/counter_mchp_xec.c
+++ b/drivers/counter/counter_mchp_xec.c
@@ -22,10 +22,10 @@
  *   when the counters reach zero.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(counter_mchp_xec, CONFIG_COUNTER_LOG_LEVEL);
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <soc.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/drivers/counter/counter_mcux_ctimer.c b/drivers/counter/counter_mcux_ctimer.c
index 3e263c7de0..f4bfb8d923 100644
--- a/drivers/counter/counter_mcux_ctimer.c
+++ b/drivers/counter/counter_mcux_ctimer.c
@@ -5,11 +5,11 @@
  */
 #define DT_DRV_COMPAT nxp_lpc_ctimer
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_ctimer.h>
-#include <logging/log.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
 LOG_MODULE_REGISTER(mcux_ctimer, CONFIG_COUNTER_LOG_LEVEL);
 
 /* One of the CTimer channels is reserved to implement set_top_value API */
diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c
index 3093a2cf8a..2f8238baa5 100644
--- a/drivers/counter/counter_mcux_gpt.c
+++ b/drivers/counter/counter_mcux_gpt.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_imx_gpt
 
-#include <drivers/counter.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_gpt.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mcux_gpt, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/counter/counter_mcux_lpc_rtc.c b/drivers/counter/counter_mcux_lpc_rtc.c
index 8bf51e1e8a..5062be0da7 100644
--- a/drivers/counter/counter_mcux_lpc_rtc.c
+++ b/drivers/counter/counter_mcux_lpc_rtc.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT nxp_lpc_rtc
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_rtc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mcux_rtc, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c
index 8a90bbeca6..254a39dab4 100644
--- a/drivers/counter/counter_mcux_lptmr.c
+++ b/drivers/counter/counter_mcux_lptmr.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_lptmr
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_lptmr.h>
 
 struct mcux_lptmr_config {
diff --git a/drivers/counter/counter_mcux_pit.c b/drivers/counter/counter_mcux_pit.c
index ae98dcbe62..45115cc1e3 100644
--- a/drivers/counter/counter_mcux_pit.c
+++ b/drivers/counter/counter_mcux_pit.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_pit
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_pit.h>
 
 #define LOG_MODULE_NAME counter_pit
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_COUNTER_LOG_LEVEL);
 
 struct mcux_pit_config {
diff --git a/drivers/counter/counter_mcux_qtmr.c b/drivers/counter/counter_mcux_qtmr.c
index 3d39c6d4fe..55b46da851 100644
--- a/drivers/counter/counter_mcux_qtmr.c
+++ b/drivers/counter/counter_mcux_qtmr.c
@@ -13,10 +13,10 @@
  * channel is represented as an independent counter device.
  */
 
-#include <drivers/counter.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_qtmr.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mcux_qtmr, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c
index c23f2fac10..13b334f21b 100644
--- a/drivers/counter/counter_mcux_rtc.c
+++ b/drivers/counter/counter_mcux_rtc.c
@@ -7,9 +7,9 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_rtc
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_rtc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mcux_rtc, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/counter/counter_mcux_snvs.c b/drivers/counter/counter_mcux_snvs.c
index 4998885ca8..a36bb37dc0 100644
--- a/drivers/counter/counter_mcux_snvs.c
+++ b/drivers/counter/counter_mcux_snvs.c
@@ -5,7 +5,7 @@
  */
 
 #define DT_DRV_COMPAT nxp_imx_snvs_rtc
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mcux_snvs, CONFIG_COUNTER_LOG_LEVEL);
 
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(mcux_snvs, CONFIG_COUNTER_LOG_LEVEL);
 #define MCUX_SNVS_NUM_CHANNELS 1
 #endif
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <fsl_snvs_hp.h>
 
 #ifdef MCUX_SNVS_SRTC
diff --git a/drivers/counter/counter_native_posix.c b/drivers/counter/counter_native_posix.c
index 27e976b5fb..7545be1efe 100644
--- a/drivers/counter/counter_native_posix.c
+++ b/drivers/counter/counter_native_posix.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/counter.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
 #include <soc.h>
 #include <hw_counter.h>
 
diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c
index b00abc2d54..5d27c28bdd 100644
--- a/drivers/counter/counter_nrfx_rtc.c
+++ b/drivers/counter/counter_nrfx_rtc.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/counter.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <hal/nrf_rtc.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 #ifdef DPPI_PRESENT
 #include <nrfx_dppi.h>
 #else
@@ -15,7 +15,7 @@
 #endif
 
 #define LOG_MODULE_NAME counter_rtc
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_COUNTER_LOG_LEVEL);
 
 #define ERR(...) LOG_INST_ERR( \
diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index 8fa67b899f..72b7dfaf55 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include <hal/nrf_timer.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
 #define LOG_LEVEL CONFIG_COUNTER_LOG_LEVEL
 #define LOG_MODULE_NAME counter_timer
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
 
 #define TIMER_CLOCK 16000000
diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c
index cb3f5a28ca..d4a4ca227f 100644
--- a/drivers/counter/counter_sam0_tc32.c
+++ b/drivers/counter/counter_sam0_tc32.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT atmel_sam0_tc32
 
-#include <drivers/counter.h>
-#include <drivers/pinctrl.h>
-#include <device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(counter_sam0_tc32, CONFIG_COUNTER_LOG_LEVEL);
 
 struct counter_sam0_tc32_ch_data {
diff --git a/drivers/counter/counter_sam_tc.c b/drivers/counter/counter_sam_tc.c
index 43862b1e4a..656987509f 100644
--- a/drivers/counter/counter_sam_tc.c
+++ b/drivers/counter/counter_sam_tc.c
@@ -24,15 +24,15 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/counter.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(counter_sam_tc, CONFIG_COUNTER_LOG_LEVEL);
 
 #define MAX_ALARMS_PER_TC_CHANNEL 2
diff --git a/drivers/counter/counter_xlnx_axi_timer.c b/drivers/counter/counter_xlnx_axi_timer.c
index fcb4d9db16..1d273a9ff7 100644
--- a/drivers/counter/counter_xlnx_axi_timer.c
+++ b/drivers/counter/counter_xlnx_axi_timer.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT xlnx_xps_timer_1_00_a
 
-#include <device.h>
-#include <drivers/counter.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(xlnx_axi_timer, CONFIG_COUNTER_LOG_LEVEL);
 
 /* AXI Timer v2.0 registers offsets (See Xilinx PG079 for details) */
diff --git a/drivers/counter/dualtimer_cmsdk_apb.h b/drivers/counter/dualtimer_cmsdk_apb.h
index b30a8e39dc..c479579e3d 100644
--- a/drivers/counter/dualtimer_cmsdk_apb.h
+++ b/drivers/counter/dualtimer_cmsdk_apb.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_
 #define ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c
index 16f9eac943..fd06ee4ced 100644
--- a/drivers/counter/maxim_ds3231.c
+++ b/drivers/counter/maxim_ds3231.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT maxim_ds3231
 
-#include <device.h>
-#include <drivers/rtc/maxim_ds3231.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/timeutil.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/rtc/maxim_ds3231.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/timeutil.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_REGISTER(DS3231, CONFIG_COUNTER_LOG_LEVEL);
 
@@ -1300,7 +1300,7 @@ DEVICE_DT_INST_DEFINE(0, ds3231_init, NULL, &ds3231_0_data,
 
 #ifdef CONFIG_USERSPACE
 
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 int z_vrfy_maxim_ds3231_get_syncpoint(const struct device *dev,
 				      struct maxim_ds3231_syncpoint *syncpoint)
diff --git a/drivers/counter/rtc_mcp7940n.c b/drivers/counter/rtc_mcp7940n.c
index ea1ac984bc..41e64f87fd 100644
--- a/drivers/counter/rtc_mcp7940n.c
+++ b/drivers/counter/rtc_mcp7940n.c
@@ -7,15 +7,15 @@
 
 #define DT_DRV_COMPAT microchip_mcp7940n
 
-#include <device.h>
-#include <drivers/counter.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/rtc/mcp7940n.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/timeutil.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/rtc/mcp7940n.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/timeutil.h>
+#include <zephyr/sys/util.h>
 #include <time.h>
 
 LOG_MODULE_REGISTER(MCP7940N, CONFIG_COUNTER_LOG_LEVEL);
diff --git a/drivers/counter/timer_cmsdk_apb.h b/drivers/counter/timer_cmsdk_apb.h
index 1906677300..5086ec1cc8 100644
--- a/drivers/counter/timer_cmsdk_apb.h
+++ b/drivers/counter/timer_cmsdk_apb.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_
 #define ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c
index bf7e64bc2b..49b3241c60 100644
--- a/drivers/counter/timer_dtmr_cmsdk_apb.c
+++ b/drivers/counter/timer_dtmr_cmsdk_apb.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT arm_cmsdk_dtimer
 
-#include <drivers/counter.h>
-#include <device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/clock_control/arm_clock_control.h>
+#include <zephyr/drivers/clock_control/arm_clock_control.h>
 
 #include "dualtimer_cmsdk_apb.h"
 
diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c
index c757af2aa1..3559f3b393 100644
--- a/drivers/counter/timer_tmr_cmsdk_apb.c
+++ b/drivers/counter/timer_tmr_cmsdk_apb.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT arm_cmsdk_timer
 
-#include <drivers/counter.h>
-#include <device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/clock_control/arm_clock_control.h>
+#include <zephyr/drivers/clock_control/arm_clock_control.h>
 
 #include "timer_cmsdk_apb.h"
 
diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c
index f65db1e5ae..325bf8dc94 100644
--- a/drivers/crypto/crypto_ataes132a.c
+++ b/drivers/crypto/crypto_ataes132a.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/__assert.h>
-#include <crypto/crypto.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/crypto/crypto.h>
 
 #include "crypto_ataes132a_priv.h"
 
@@ -22,7 +22,7 @@
 #define CRYPTO_MAX_SESSION 16
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ataes132a);
 
 static struct ataes132a_driver_state ataes132a_state[CRYPTO_MAX_SESSION];
diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h
index 51392b43e1..b6fb0217b5 100644
--- a/drivers/crypto/crypto_ataes132a_priv.h
+++ b/drivers/crypto/crypto_ataes132a_priv.h
@@ -8,9 +8,9 @@
 #ifndef ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
 #define ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
 
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 
 /* Configuration Read Only Registers */
 #define ATAES_SERIALNUM_REG	0xF000
diff --git a/drivers/crypto/crypto_mtls_shim.c b/drivers/crypto/crypto_mtls_shim.c
index aa48ebee53..3107c649ab 100644
--- a/drivers/crypto/crypto_mtls_shim.c
+++ b/drivers/crypto/crypto_mtls_shim.c
@@ -9,10 +9,10 @@
  */
 
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <errno.h>
-#include <crypto/crypto.h>
+#include <zephyr/crypto/crypto.h>
 
 #if !defined(CONFIG_MBEDTLS_CFG_FILE)
 #include "mbedtls/config.h"
@@ -33,7 +33,7 @@
 		      CAP_NO_IV_PREFIX)
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mbedtls);
 
 struct mtls_shim_session {
diff --git a/drivers/crypto/crypto_nrf_ecb.c b/drivers/crypto/crypto_nrf_ecb.c
index 607286c58d..9fa354738a 100644
--- a/drivers/crypto/crypto_nrf_ecb.c
+++ b/drivers/crypto/crypto_nrf_ecb.c
@@ -5,8 +5,8 @@
  */
 
 #include <string.h>
-#include <crypto/crypto.h>
-#include <logging/log.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/logging/log.h>
 #include <hal/nrf_ecb.h>
 
 #define DT_DRV_COMPAT nordic_nrf_ecb
diff --git a/drivers/crypto/crypto_stm32.c b/drivers/crypto/crypto_stm32.c
index 69884308f8..5412357a13 100644
--- a/drivers/crypto/crypto_stm32.c
+++ b/drivers/crypto/crypto_stm32.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/__assert.h>
-#include <crypto/crypto.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "crypto_stm32_priv.h"
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(crypto_stm32);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_cryp)
diff --git a/drivers/crypto/crypto_tc_shim.c b/drivers/crypto/crypto_tc_shim.c
index a5166ebf8e..71616250be 100644
--- a/drivers/crypto/crypto_tc_shim.c
+++ b/drivers/crypto/crypto_tc_shim.c
@@ -14,11 +14,11 @@
 #include <tinycrypt/constants.h>
 #include <tinycrypt/utils.h>
 #include <string.h>
-#include <crypto/crypto.h>
+#include <zephyr/crypto/crypto.h>
 #include "crypto_tc_shim_priv.h"
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tinycrypt);
 
 #define CRYPTO_MAX_SESSION CONFIG_CRYPTO_TINYCRYPT_SHIM_MAX_SESSION
diff --git a/drivers/dac/dac_dacx0508.c b/drivers/dac/dac_dacx0508.c
index 2b05ccccad..159bbd2013 100644
--- a/drivers/dac/dac_dacx0508.c
+++ b/drivers/dac/dac_dacx0508.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/spi.h>
-#include <drivers/dac.h>
-#include <logging/log.h>
-#include <dt-bindings/dac/dacx0508.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/dt-bindings/dac/dacx0508.h>
 
 LOG_MODULE_REGISTER(dac_dacx0508, CONFIG_DAC_LOG_LEVEL);
 
diff --git a/drivers/dac/dac_dacx3608.c b/drivers/dac/dac_dacx3608.c
index 781b4f2f72..a8dfafad45 100644
--- a/drivers/dac/dac_dacx3608.c
+++ b/drivers/dac/dac_dacx3608.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/dac.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(dac_dacx3608, CONFIG_DAC_LOG_LEVEL);
 
diff --git a/drivers/dac/dac_gd32.c b/drivers/dac/dac_gd32.c
index 538b5d4d04..49282145a3 100644
--- a/drivers/dac/dac_gd32.c
+++ b/drivers/dac/dac_gd32.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT gd_gd32_dac
 
 #include <errno.h>
-#include <drivers/pinctrl.h>
-#include <drivers/dac.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/dac.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dac_gd32, CONFIG_DAC_LOG_LEVEL);
 
 /**
diff --git a/drivers/dac/dac_handlers.c b/drivers/dac/dac_handlers.c
index 59fe3a6e05..aa6660651e 100644
--- a/drivers/dac/dac_handlers.c
+++ b/drivers/dac/dac_handlers.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/dac.h>
-#include <syscall_handler.h>
-#include <kernel.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/kernel.h>
 
 static inline int z_vrfy_dac_channel_setup(const struct device *dev,
 					   const struct dac_channel_cfg *user_channel_cfg)
diff --git a/drivers/dac/dac_mcp4725.c b/drivers/dac/dac_mcp4725.c
index 5b305c81ca..90a192e7ca 100644
--- a/drivers/dac/dac_mcp4725.c
+++ b/drivers/dac/dac_mcp4725.c
@@ -5,10 +5,10 @@
  */
 #define DT_DRV_COMPAT microchip_mcp4725
 
-#include <zephyr.h>
-#include <drivers/i2c.h>
-#include <drivers/dac.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(dac_mcp4725, CONFIG_DAC_LOG_LEVEL);
 
diff --git a/drivers/dac/dac_mcp4728.c b/drivers/dac/dac_mcp4728.c
index c1c3d46e8e..c264720a21 100644
--- a/drivers/dac/dac_mcp4728.c
+++ b/drivers/dac/dac_mcp4728.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT microchip_mcp4728
 
-#include <zephyr.h>
-#include <drivers/dac.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(dac_mcp4728, CONFIG_DAC_LOG_LEVEL);
 
diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c
index 442c3a76b7..d099429c2d 100644
--- a/drivers/dac/dac_mcux_dac.c
+++ b/drivers/dac/dac_mcux_dac.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_dac
 
-#include <zephyr.h>
-#include <drivers/dac.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/logging/log.h>
 
 #include <fsl_dac.h>
 
diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c
index ccd2a929db..12e445f4e7 100644
--- a/drivers/dac/dac_mcux_dac32.c
+++ b/drivers/dac/dac_mcux_dac32.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_dac32
 
-#include <zephyr.h>
-#include <drivers/dac.h>
-#include <logging/log.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <fsl_dac32.h>
 
diff --git a/drivers/dac/dac_sam.c b/drivers/dac/dac_sam.c
index 67bd3d53ac..a76345e6ba 100644
--- a/drivers/dac/dac_sam.c
+++ b/drivers/dac/dac_sam.c
@@ -14,13 +14,13 @@
 #define DT_DRV_COMPAT atmel_sam_dac
 
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <device.h>
-#include <drivers/dac.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dac_sam, CONFIG_DAC_LOG_LEVEL);
 
 BUILD_ASSERT(IS_ENABLED(CONFIG_SOC_SERIES_SAME70) ||
diff --git a/drivers/dac/dac_sam0.c b/drivers/dac/dac_sam0.c
index 2a94c53bd0..2b96b8bc30 100644
--- a/drivers/dac/dac_sam0.c
+++ b/drivers/dac/dac_sam0.c
@@ -8,8 +8,8 @@
 
 #include <errno.h>
 
-#include <drivers/dac.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 /*
diff --git a/drivers/dac/dac_shell.c b/drivers/dac/dac_shell.c
index b80365f979..e334224723 100644
--- a/drivers/dac/dac_shell.c
+++ b/drivers/dac/dac_shell.c
@@ -9,8 +9,8 @@
  * @brief DAC shell commands.
  */
 
-#include <shell/shell.h>
-#include <drivers/dac.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/dac.h>
 #include <stdlib.h>
 
 struct args_index {
diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c
index c36397e94e..e6c492c7c7 100644
--- a/drivers/dac/dac_stm32.c
+++ b/drivers/dac/dac_stm32.c
@@ -8,19 +8,19 @@
 
 #include <errno.h>
 
-#include <drivers/dac.h>
-#include <drivers/pinctrl.h>
-#include <device.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/drivers/dac.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_dac.h>
 
 #define LOG_LEVEL CONFIG_DAC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dac_stm32);
 
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 /* some low-end MCUs have DAC with only one channel */
 #ifdef LL_DAC_CHANNEL_2
diff --git a/drivers/dai/intel/ssp/ssp.c b/drivers/dai/intel/ssp/ssp.c
index b3cc2729dc..39d74e6f08 100644
--- a/drivers/dai/intel/ssp/ssp.c
+++ b/drivers/dai/intel/ssp/ssp.c
@@ -7,10 +7,10 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <spinlock.h>
-#include <devicetree.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/devicetree.h>
 #define LOG_DOMAIN dai_intel_ssp
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include "ssp.h"
diff --git a/drivers/dai/intel/ssp/ssp.h b/drivers/dai/intel/ssp/ssp.h
index 01213d486e..d5915ce048 100644
--- a/drivers/dai/intel/ssp/ssp.h
+++ b/drivers/dai/intel/ssp/ssp.h
@@ -8,7 +8,7 @@
 #define __INTEL_DAI_DRIVER_SSP_H__
 
 #include <stdint.h>
-#include <drivers/dai.h>
+#include <zephyr/drivers/dai.h>
 #include "dai-params-intel-ipc3.h"
 #include "dai-params-intel-ipc4.h"
 
diff --git a/drivers/disk/flashdisk.c b/drivers/disk/flashdisk.c
index 686668ce21..62ad2babeb 100644
--- a/drivers/disk/flashdisk.c
+++ b/drivers/disk/flashdisk.c
@@ -6,13 +6,13 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <drivers/disk.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/disk.h>
 #include <errno.h>
-#include <init.h>
-#include <device.h>
-#include <drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
 
 #define SECTOR_SIZE CONFIG_DISK_FLASH_SECTOR_SIZE
 
diff --git a/drivers/disk/ramdisk.c b/drivers/disk/ramdisk.c
index 90c1e8e224..0cd1432c80 100644
--- a/drivers/disk/ramdisk.c
+++ b/drivers/disk/ramdisk.c
@@ -7,11 +7,11 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <drivers/disk.h>
+#include <zephyr/drivers/disk.h>
 #include <errno.h>
-#include <init.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(ramdisk, CONFIG_RAMDISK_LOG_LEVEL);
 
diff --git a/drivers/disk/sdmmc_sdhc.h b/drivers/disk/sdmmc_sdhc.h
index b0a0d056ff..894f6dde6c 100644
--- a/drivers/disk/sdmmc_sdhc.h
+++ b/drivers/disk/sdmmc_sdhc.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_INCLUDE_DISK_DRIVER_SDMMC_H_
 #define ZEPHYR_INCLUDE_DISK_DRIVER_SDMMC_H_
 
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 
 #define SDMMC_CLOCK_400KHZ (400000U)
 #define SD_CLOCK_25MHZ (25000000U)
diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c
index 3473382034..ef59b33578 100644
--- a/drivers/disk/sdmmc_stm32.c
+++ b/drivers/disk/sdmmc_stm32.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT st_stm32_sdmmc
 
-#include <devicetree.h>
-#include <drivers/disk.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/pinctrl.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/disk.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 #include <stm32_ll_rcc.h>
 
diff --git a/drivers/display/display_dummy.c b/drivers/display/display_dummy.c
index 91d186896c..af2320b0e2 100644
--- a/drivers/display/display_dummy.c
+++ b/drivers/display/display_dummy.c
@@ -8,8 +8,8 @@
 #define DT_DRV_COMPAT zephyr_dummy_dc
 
 #include <string.h>
-#include <drivers/display.h>
-#include <device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/device.h>
 
 struct dummy_display_config {
 	uint16_t height;
diff --git a/drivers/display/display_framebuf.c b/drivers/display/display_framebuf.c
index b0503fc579..1a87c0f4e7 100644
--- a/drivers/display/display_framebuf.c
+++ b/drivers/display/display_framebuf.c
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/display.h>
-#include <display/framebuf.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/display/framebuf.h>
 #include <string.h>
 
 static int framebuf_blanking_on(const struct device *dev)
diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c
index fce66c2c19..3c1b9c4972 100644
--- a/drivers/display/display_ili9340.c
+++ b/drivers/display/display_ili9340.c
@@ -7,7 +7,7 @@
 #include "display_ili9340.h"
 #include "display_ili9xxx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_ili9340, CONFIG_DISPLAY_LOG_LEVEL);
 
 int ili9340_regs_init(const struct device *dev)
diff --git a/drivers/display/display_ili9340.h b/drivers/display/display_ili9340.h
index 163030bbf9..50836b0301 100644
--- a/drivers/display/display_ili9340.h
+++ b/drivers/display/display_ili9340.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9340_H_
 #define ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9340_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 /* Commands/registers. */
 #define ILI9340_GAMSET 0x26
diff --git a/drivers/display/display_ili9341.c b/drivers/display/display_ili9341.c
index 00e0a37333..7efbf73c57 100644
--- a/drivers/display/display_ili9341.c
+++ b/drivers/display/display_ili9341.c
@@ -9,7 +9,7 @@
 #include "display_ili9341.h"
 #include "display_ili9xxx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_ili9341, CONFIG_DISPLAY_LOG_LEVEL);
 
 int ili9341_regs_init(const struct device *dev)
diff --git a/drivers/display/display_ili9341.h b/drivers/display/display_ili9341.h
index 9c6731c7d4..b2402eebe6 100644
--- a/drivers/display/display_ili9341.h
+++ b/drivers/display/display_ili9341.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9341_H_
 #define ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9341_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 /* Commands/registers. */
 #define ILI9341_GAMSET 0x26
diff --git a/drivers/display/display_ili9488.c b/drivers/display/display_ili9488.c
index d970b7fdc9..817e65e214 100644
--- a/drivers/display/display_ili9488.c
+++ b/drivers/display/display_ili9488.c
@@ -7,7 +7,7 @@
 #include "display_ili9488.h"
 #include "display_ili9xxx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_ili9488, CONFIG_DISPLAY_LOG_LEVEL);
 
 int ili9488_regs_init(const struct device *dev)
diff --git a/drivers/display/display_ili9488.h b/drivers/display/display_ili9488.h
index 44783ba4d5..8cb9f37b50 100644
--- a/drivers/display/display_ili9488.h
+++ b/drivers/display/display_ili9488.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9488_H_
 #define ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9488_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 /* Commands/registers. */
 #define ILI9488_FRMCTR1 0xB1
diff --git a/drivers/display/display_ili9xxx.c b/drivers/display/display_ili9xxx.c
index 387bbbdd5a..81e2d37b03 100644
--- a/drivers/display/display_ili9xxx.c
+++ b/drivers/display/display_ili9xxx.c
@@ -8,11 +8,11 @@
 
 #include "display_ili9xxx.h"
 
-#include <dt-bindings/display/ili9xxx.h>
-#include <drivers/display.h>
-#include <sys/byteorder.h>
+#include <zephyr/dt-bindings/display/ili9xxx.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_ili9xxx, CONFIG_DISPLAY_LOG_LEVEL);
 
 struct ili9xxx_data {
diff --git a/drivers/display/display_ili9xxx.h b/drivers/display/display_ili9xxx.h
index 1981b97b88..3f3fe867c8 100644
--- a/drivers/display/display_ili9xxx.h
+++ b/drivers/display/display_ili9xxx.h
@@ -9,9 +9,9 @@
 #ifndef ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9XXX_H_
 #define ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9XXX_H_
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 
 /* Commands/registers. */
 #define ILI9XXX_SWRESET 0x01
diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c
index 603acc3d54..c8f42e677d 100644
--- a/drivers/display/display_mcux_elcdif.c
+++ b/drivers/display/display_mcux_elcdif.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT nxp_imx_elcdif
 
-#include <drivers/display.h>
-#include <drivers/pinctrl.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/gpio.h>
 #include <fsl_elcdif.h>
 
 #ifdef CONFIG_HAS_MCUX_CACHE
 #include <fsl_cache.h>
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(display_mcux_elcdif, CONFIG_DISPLAY_LOG_LEVEL);
 
diff --git a/drivers/display/display_nrf_led_matrix.c b/drivers/display/display_nrf_led_matrix.c
index 3d4e4a7f96..5ed40ef245 100644
--- a/drivers/display/display_nrf_led_matrix.c
+++ b/drivers/display/display_nrf_led_matrix.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/display.h>
-#include <devicetree.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include <hal/nrf_timer.h>
 #ifdef PWM_PRESENT
 #include <hal/nrf_pwm.h>
@@ -16,7 +16,7 @@
 #include <nrfx_ppi.h>
 #endif
 #include <nrf_peripherals.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(nrf_led_matrix, CONFIG_DISPLAY_LOG_LEVEL);
 
 #define MATRIX_NODE  DT_INST(0, nordic_nrf_led_matrix)
diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c
index 5a0e021fce..f70613a34c 100644
--- a/drivers/display/display_sdl.c
+++ b/drivers/display/display_sdl.c
@@ -7,15 +7,15 @@
 
 #define DT_DRV_COMPAT zephyr_sdl_dc
 
-#include <drivers/display.h>
+#include <zephyr/drivers/display.h>
 
 #include <SDL.h>
 #include <string.h>
 #include <soc.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_sdl);
 
 struct sdl_display_config {
diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c
index 0c8c623e5f..3309b183f1 100644
--- a/drivers/display/display_st7735r.c
+++ b/drivers/display/display_st7735r.c
@@ -13,14 +13,14 @@
 
 #include "display_st7735r.h"
 
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
-#include <drivers/display.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/display.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_st7735r, CONFIG_DISPLAY_LOG_LEVEL);
 
 #define ST7735R_RESET_TIME              K_MSEC(1)
diff --git a/drivers/display/display_st7735r.h b/drivers/display/display_st7735r.h
index cdf849ea60..0411d53406 100644
--- a/drivers/display/display_st7735r.h
+++ b/drivers/display/display_st7735r.h
@@ -6,7 +6,7 @@
 #ifndef ST7735R_DISPLAY_DRIVER_H__
 #define ST7735R_DISPLAY_DRIVER_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define ST7735R_CMD_SW_RESET            0x01
 #define ST7735R_CMD_RDDID               0x04
diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c
index 656883851c..7d4eb679ba 100644
--- a/drivers/display/display_st7789v.c
+++ b/drivers/display/display_st7789v.c
@@ -12,15 +12,15 @@
 
 #include "display_st7789v.h"
 
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
-#include <drivers/display.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/display.h>
 
 #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_st7789v);
 
 struct st7789v_config {
diff --git a/drivers/display/display_st7789v.h b/drivers/display/display_st7789v.h
index 1e881d2b0c..e36f0fc6ca 100644
--- a/drivers/display/display_st7789v.h
+++ b/drivers/display/display_st7789v.h
@@ -6,7 +6,7 @@
 #ifndef ST7789V_DISPLAY_DRIVER_H__
 #define ST7789V_DISPLAY_DRIVER_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define ST7789V_CMD_SW_RESET			0x01
 
diff --git a/drivers/display/display_stm32_ltdc.c b/drivers/display/display_stm32_ltdc.c
index 6c2a017205..9516b78429 100644
--- a/drivers/display/display_stm32_ltdc.c
+++ b/drivers/display/display_stm32_ltdc.c
@@ -7,17 +7,17 @@
 #define DT_DRV_COMPAT st_stm32_ltdc
 
 #include <string.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <stm32_ll_rcc.h>
-#include <drivers/display.h>
-#include <drivers/gpio.h>
-#include <drivers/pinctrl.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <pm/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/pm/device.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(display_stm32_ltdc, CONFIG_DISPLAY_LOG_LEVEL);
 
 #if defined(CONFIG_STM32_LTDC_ARGB8888)
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(display_stm32_ltdc, CONFIG_DISPLAY_LOG_LEVEL);
 #endif /* CONFIG_STM32_LTDC_ARGB8888 */
 
 #if defined(CONFIG_HAS_CMSIS_CORE_M)
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #if __DCACHE_PRESENT == 1
 #define CACHE_INVALIDATE(addr, size)	SCB_InvalidateDCache_by_Addr((addr), (size))
diff --git a/drivers/display/gd7965.c b/drivers/display/gd7965.c
index b9a1f96607..f769162497 100644
--- a/drivers/display/gd7965.c
+++ b/drivers/display/gd7965.c
@@ -7,16 +7,16 @@
 #define DT_DRV_COMPAT gooddisplay_gd7965
 
 #include <string.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/display.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "gd7965_regs.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gd7965, CONFIG_DISPLAY_LOG_LEVEL);
 
 /**
diff --git a/drivers/display/ls0xx.c b/drivers/display/ls0xx.c
index 19fe574285..6fe1b4b442 100644
--- a/drivers/display/ls0xx.c
+++ b/drivers/display/ls0xx.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT   sharp_ls0xx
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ls0xx, CONFIG_DISPLAY_LOG_LEVEL);
 
 #include <string.h>
-#include <device.h>
-#include <drivers/display.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 
 /* Supports LS012B7DD01, LS012B7DD06, LS013B7DH03, LS013B7DH05
  * LS013B7DH06, LS027B7DH01A, LS032B7DD02, LS044Q7DH01
diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c
index 0a1336da41..41b807ad49 100644
--- a/drivers/display/mb_display.c
+++ b/drivers/display/mb_display.c
@@ -10,17 +10,17 @@
  * a suitable LED matrix controller driver.
  */
 
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
-#include <display/mb_display.h>
-#include <drivers/display.h>
+#include <zephyr/display/mb_display.h>
+#include <zephyr/drivers/display.h>
 
 #include "mb_font.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mb_disp, CONFIG_DISPLAY_LOG_LEVEL);
 
 #define MODE_MASK    BIT_MASK(16)
diff --git a/drivers/display/mb_font.c b/drivers/display/mb_font.c
index f4344102ea..64d03b5bbf 100644
--- a/drivers/display/mb_font.c
+++ b/drivers/display/mb_font.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <display/mb_display.h>
+#include <zephyr/display/mb_display.h>
 
 #include "mb_font.h"
 
diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c
index 9408ac4f95..a7c0929bb9 100644
--- a/drivers/display/ssd1306.c
+++ b/drivers/display/ssd1306.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT solomon_ssd1306fb
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL);
 
 #include <string.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/spi.h>
 
 #include "ssd1306_regs.h"
-#include <display/cfb.h>
+#include <zephyr/display/cfb.h>
 
 #if DT_INST_PROP(0, segment_remap) == 1
 #define SSD1306_PANEL_SEGMENT_REMAP	true
diff --git a/drivers/display/ssd16xx.c b/drivers/display/ssd16xx.c
index 0ac25cd58f..01060eed7f 100644
--- a/drivers/display/ssd16xx.c
+++ b/drivers/display/ssd16xx.c
@@ -7,19 +7,19 @@
 #define DT_DRV_COMPAT solomon_ssd16xxfb
 
 #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ssd16xx);
 
 #include <string.h>
-#include <device.h>
-#include <drivers/display.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "ssd16xx_regs.h"
-#include <display/cfb.h>
+#include <zephyr/display/cfb.h>
 
 /**
  * SSD1673, SSD1608, SSD1681, ILI3897 compatible EPD controller driver.
diff --git a/drivers/dma/dma_cavs_gpdma.c b/drivers/dma/dma_cavs_gpdma.c
index 5b2f6c6468..a92bce01b1 100644
--- a/drivers/dma/dma_cavs_gpdma.c
+++ b/drivers/dma/dma_cavs_gpdma.c
@@ -20,7 +20,7 @@
 #include "dma_dw_common.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_cavs_gpdma);
 
 
diff --git a/drivers/dma/dma_cavs_hda.c b/drivers/dma/dma_cavs_hda.c
index 2ebf17cb52..02bac09f34 100644
--- a/drivers/dma/dma_cavs_hda.c
+++ b/drivers/dma/dma_cavs_hda.c
@@ -22,7 +22,7 @@
  * communicate to or from the Host or Link. Each stream set is uni directional.
  */
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 
 #include "dma_cavs_hda.h"
 
diff --git a/drivers/dma/dma_cavs_hda.h b/drivers/dma/dma_cavs_hda.h
index 4915ff8765..5a1eb86052 100644
--- a/drivers/dma/dma_cavs_hda.h
+++ b/drivers/dma/dma_cavs_hda.h
@@ -9,7 +9,7 @@
 
 #define CAVS_HDA_MAX_CHANNELS DT_PROP(DT_NODELABEL(hda_host_out), dma_channels)
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 
 struct cavs_hda_dma_data {
 	struct dma_context ctx;
diff --git a/drivers/dma/dma_cavs_hda_host_in.c b/drivers/dma/dma_cavs_hda_host_in.c
index 6a6f52b29d..3d27e15882 100644
--- a/drivers/dma/dma_cavs_hda_host_in.c
+++ b/drivers/dma/dma_cavs_hda_host_in.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT intel_cavs_hda_host_in
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "dma_cavs_hda.h"
 
 static const struct dma_driver_api cavs_hda_dma_host_in_api = {
diff --git a/drivers/dma/dma_cavs_hda_host_out.c b/drivers/dma/dma_cavs_hda_host_out.c
index d4b51c8d74..a8a729b2d9 100644
--- a/drivers/dma/dma_cavs_hda_host_out.c
+++ b/drivers/dma/dma_cavs_hda_host_out.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT intel_cavs_hda_host_out
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "dma_cavs_hda.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_cavs_hda_dma_host_out);
 
 static const struct dma_driver_api cavs_hda_dma_host_out_api = {
diff --git a/drivers/dma/dma_cavs_hda_link_in.c b/drivers/dma/dma_cavs_hda_link_in.c
index 4878b240cf..3a43cd0aad 100644
--- a/drivers/dma/dma_cavs_hda_link_in.c
+++ b/drivers/dma/dma_cavs_hda_link_in.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT intel_cavs_hda_link_in
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "dma_cavs_hda.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_cavs_hda_dma_link_in);
 
 static const struct dma_driver_api cavs_hda_dma_link_in_api = {
diff --git a/drivers/dma/dma_cavs_hda_link_out.c b/drivers/dma/dma_cavs_hda_link_out.c
index 007a2fdfb6..7f384146ad 100644
--- a/drivers/dma/dma_cavs_hda_link_out.c
+++ b/drivers/dma/dma_cavs_hda_link_out.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT intel_cavs_hda_link_out
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "dma_cavs_hda.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_cavs_hda_dma_link_out);
 
 static const struct dma_driver_api cavs_hda_dma_link_out_api = {
diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c
index 66dcf4fc51..0f9b310678 100644
--- a/drivers/dma/dma_dw.c
+++ b/drivers/dma/dma_dw.c
@@ -10,14 +10,14 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/dma.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
 #include <soc.h>
 #include "dma_dw_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_dw, CONFIG_DMA_LOG_LEVEL);
 
 /* Device constant configuration parameters */
diff --git a/drivers/dma/dma_dw_common.c b/drivers/dma/dma_dw_common.c
index 56cc944256..749a508cc6 100644
--- a/drivers/dma/dma_dw_common.c
+++ b/drivers/dma/dma_dw_common.c
@@ -8,15 +8,15 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/dma.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
 #include <soc.h>
 #include "dma_dw_common.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_dw_common);
 
 /* number of tries to wait for reset */
diff --git a/drivers/dma/dma_dw_common.h b/drivers/dma/dma_dw_common.h
index 2750c3e0ba..a2b2f53b46 100644
--- a/drivers/dma/dma_dw_common.h
+++ b/drivers/dma/dma_dw_common.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_DMA_DMA_DW_COMMON_H_
 #define ZEPHYR_DRIVERS_DMA_DMA_DW_COMMON_H_
 
-#include <sys/atomic.h>
-#include <drivers/dma.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/dma.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/dma/dma_handlers.c b/drivers/dma/dma_handlers.c
index 6e74685e43..058cbbf462 100644
--- a/drivers/dma/dma_handlers.c
+++ b/drivers/dma/dma_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/dma.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/syscall_handler.h>
 
 /* Both of these APIs are assuming that the drive implementations are checking
  * the validity of the channel ID and returning -errno if it's bogus
diff --git a/drivers/dma/dma_iproc_pax_v1.c b/drivers/dma/dma_iproc_pax_v1.c
index 156bedec37..13b9364ee9 100644
--- a/drivers/dma/dma_iproc_pax_v1.c
+++ b/drivers/dma/dma_iproc_pax_v1.c
@@ -6,22 +6,22 @@
 
 #define DT_DRV_COMPAT brcm_iproc_pax_dma_v1
 
-#include <arch/cpu.h>
-#include <cache.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/cache.h>
 #include <errno.h>
-#include <init.h>
-#include <kernel.h>
-#include <linker/sections.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/sections.h>
 #include <soc.h>
 #include <string.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <drivers/dma.h>
-#include <drivers/pcie/endpoint/pcie_ep.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pcie/endpoint/pcie_ep.h>
 #include "dma_iproc_pax_v1.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_iproc_pax);
 
 /* Driver runtime data for PAX DMA and RM */
diff --git a/drivers/dma/dma_iproc_pax_v2.c b/drivers/dma/dma_iproc_pax_v2.c
index d67c4d9765..0ff6f91540 100644
--- a/drivers/dma/dma_iproc_pax_v2.c
+++ b/drivers/dma/dma_iproc_pax_v2.c
@@ -6,22 +6,22 @@
 
 #define DT_DRV_COMPAT brcm_iproc_pax_dma_v2
 
-#include <arch/cpu.h>
-#include <cache.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/cache.h>
 #include <errno.h>
-#include <init.h>
-#include <kernel.h>
-#include <linker/sections.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/sections.h>
 #include <soc.h>
 #include <string.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <drivers/dma.h>
-#include <drivers/pcie/endpoint/pcie_ep.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pcie/endpoint/pcie_ep.h>
 #include "dma_iproc_pax_v2.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_iproc_pax_v2);
 
 /* Driver runtime data for PAX DMA and RM */
diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c
index f21d7acfb2..cb56a3f26c 100644
--- a/drivers/dma/dma_mcux_edma.c
+++ b/drivers/dma/dma_mcux_edma.c
@@ -11,16 +11,16 @@
 
 #include <errno.h>
 #include <soc.h>
-#include <init.h>
-#include <kernel.h>
-#include <devicetree.h>
-#include <sys/atomic.h>
-#include <drivers/dma.h>
-#include <drivers/clock_control.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "dma_mcux_edma.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define DT_DRV_COMPAT nxp_mcux_edma
 
diff --git a/drivers/dma/dma_mcux_edma.h b/drivers/dma/dma_mcux_edma.h
index e654af73a3..019d1ed4d9 100644
--- a/drivers/dma/dma_mcux_edma.h
+++ b/drivers/dma/dma_mcux_edma.h
@@ -9,8 +9,8 @@
 #define DMA_MCUX_EDMA_H_
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
 #include <soc.h>
 #include <fsl_common.h>
 
diff --git a/drivers/dma/dma_mcux_lpc.c b/drivers/dma/dma_mcux_lpc.c
index 3aa67ec4f6..cd072d9dbf 100644
--- a/drivers/dma/dma_mcux_lpc.c
+++ b/drivers/dma/dma_mcux_lpc.c
@@ -7,13 +7,13 @@
 /**
  * @brief Common part of DMA drivers for some NXP SoC.
  */
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include <fsl_dma.h>
 #include <fsl_inputmux.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define DT_DRV_COMPAT nxp_lpc_dma
 
diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c
index a6ebdc8f10..3a38ac501e 100644
--- a/drivers/dma/dma_nios2_msgdma.c
+++ b/drivers/dma/dma_nios2_msgdma.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT altr_msgdma
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <soc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include <altera_common.h>
 #include "altera_msgdma_csr_regs.h"
 #include "altera_msgdma_descriptor_regs.h"
 #include "altera_msgdma.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_nios2, CONFIG_DMA_LOG_LEVEL);
 
 /* Device configuration parameters */
diff --git a/drivers/dma/dma_pl330.c b/drivers/dma/dma_pl330.c
index 7afd98d830..5bc161c512 100644
--- a/drivers/dma/dma_pl330.c
+++ b/drivers/dma/dma_pl330.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/dma.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <soc.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include "dma_pl330.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_pl330);
 
 #define BYTE_WIDTH(burst_size) (1 << (burst_size))
diff --git a/drivers/dma/dma_pl330.h b/drivers/dma/dma_pl330.h
index bf189b41a3..974b7aa661 100644
--- a/drivers/dma/dma_pl330.h
+++ b/drivers/dma/dma_pl330.h
@@ -7,7 +7,7 @@
 #ifndef DMA_PL330_H
 #define DMA_PL330_H
 
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 
 #define DT_DRV_COMPAT arm_dma_pl330
 /*
diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c
index 2b3af61d30..72ed294624 100644
--- a/drivers/dma/dma_sam0.c
+++ b/drivers/dma/dma_sam0.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT atmel_sam0_dmac
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_sam0, CONFIG_DMA_LOG_LEVEL);
 
 #define DMA_REGS	((Dmac *)DT_INST_REG_ADDR(0))
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index d5d4965e6d..28d79d566b 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -11,16 +11,16 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <soc.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include "dma_sam_xdmac.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_sam_xdmac);
 
 #define XDMAC_INT_ERR (XDMAC_CIE_RBIE | XDMAC_CIE_WBIE | XDMAC_CIE_ROIE)
diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c
index 4afce870f4..33f0d06ee8 100644
--- a/drivers/dma/dma_stm32.c
+++ b/drivers/dma/dma_stm32.c
@@ -13,11 +13,11 @@
 
 #include "dma_stm32.h"
 
-#include <init.h>
-#include <drivers/clock_control.h>
-#include <drivers/dma/dma_stm32.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_dma_v1)
diff --git a/drivers/dma/dma_stm32.h b/drivers/dma/dma_stm32.h
index 64b00fa7da..16e32e983a 100644
--- a/drivers/dma/dma_stm32.h
+++ b/drivers/dma/dma_stm32.h
@@ -9,8 +9,8 @@
 
 #include <soc.h>
 #include <stm32_ll_dma.h>
-#include <drivers/dma.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 /* Maximum data sent in single transfer (Bytes) */
 #define DMA_STM32_MAX_DATA_ITEMS	0xffff
diff --git a/drivers/dma/dma_stm32_v1.c b/drivers/dma/dma_stm32_v1.c
index 085bbd7bee..58b14b2d49 100644
--- a/drivers/dma/dma_stm32_v1.c
+++ b/drivers/dma/dma_stm32_v1.c
@@ -11,7 +11,7 @@
 #include "dma_stm32.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_stm32_v1);
 
 /* DMA burst length */
diff --git a/drivers/dma/dma_stm32_v2.c b/drivers/dma/dma_stm32_v2.c
index ae5c71d6d3..d63092c0b0 100644
--- a/drivers/dma/dma_stm32_v2.c
+++ b/drivers/dma/dma_stm32_v2.c
@@ -11,7 +11,7 @@
 #include "dma_stm32.h"
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dma_stm32_v2);
 
 
diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c
index d007c06a71..7972051878 100644
--- a/drivers/dma/dmamux_stm32.c
+++ b/drivers/dma/dmamux_stm32.c
@@ -13,14 +13,14 @@
 
 #include <soc.h>
 #include <stm32_ll_dmamux.h>
-#include <init.h>
-#include <drivers/dma.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 #include "dma_stm32.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dmamux_stm32, CONFIG_DMA_LOG_LEVEL);
 
 #define DT_DRV_COMPAT st_stm32_dmamux
diff --git a/drivers/ec_host_cmd_periph/ec_host_cmd_periph_handlers.c b/drivers/ec_host_cmd_periph/ec_host_cmd_periph_handlers.c
index 0d462950f7..fc89d8cab0 100644
--- a/drivers/ec_host_cmd_periph/ec_host_cmd_periph_handlers.c
+++ b/drivers/ec_host_cmd_periph/ec_host_cmd_periph_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/ec_host_cmd_periph.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/ec_host_cmd_periph.h>
+#include <zephyr/syscall_handler.h>
 
 static inline void
 z_vrfy_ec_host_cmd_periph_init(const struct device *dev,
diff --git a/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c b/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
index 74e7940dbb..5605d3b05a 100644
--- a/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
+++ b/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT zephyr_sim_ec_host_cmd_periph
 
-#include <device.h>
-#include <drivers/ec_host_cmd_periph.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/ec_host_cmd_periph.h>
 #include <string.h>
 
 #ifndef CONFIG_ARCH_POSIX
diff --git a/drivers/edac/edac_ibecc.c b/drivers/edac/edac_ibecc.c
index 3eedd15a68..ac5d04770d 100644
--- a/drivers/edac/edac_ibecc.c
+++ b/drivers/edac/edac_ibecc.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT intel_ibecc
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pcie/pcie.h>
 
-#include <drivers/edac.h>
+#include <zephyr/drivers/edac.h>
 #include "ibecc.h"
 
 /**
  * In the driver 64 bit registers are used and not all of then at the
  * moment may be correctly logged.
  */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(edac_ibecc, CONFIG_EDAC_LOG_LEVEL);
 
 #define DEVICE_NODE DT_NODELABEL(ibecc)
diff --git a/drivers/edac/shell.c b/drivers/edac/shell.c
index babf055fdc..79b05e9fb2 100644
--- a/drivers/edac/shell.c
+++ b/drivers/edac/shell.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdlib.h>
-#include <device.h>
-#include <shell/shell.h>
+#include <zephyr/device.h>
+#include <zephyr/shell/shell.h>
 
-#include <drivers/edac.h>
+#include <zephyr/drivers/edac.h>
 #include "ibecc.h"
 
 #define DEVICE_NAME DT_LABEL(DT_NODELABEL(ibecc))
diff --git a/drivers/eeprom/eeprom_at2x.c b/drivers/eeprom/eeprom_at2x.c
index 886febee84..2411eaf61b 100644
--- a/drivers/eeprom/eeprom_at2x.c
+++ b/drivers/eeprom/eeprom_at2x.c
@@ -9,15 +9,15 @@
  * @brief Driver for Atmel AT24 I2C and Atmel AT25 SPI EEPROMs.
  */
 
-#include <drivers/eeprom.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_at2x);
 
 /* AT25 instruction set */
diff --git a/drivers/eeprom/eeprom_emulator.c b/drivers/eeprom/eeprom_emulator.c
index 5cb98ad9d0..8c8942e804 100644
--- a/drivers/eeprom/eeprom_emulator.c
+++ b/drivers/eeprom/eeprom_emulator.c
@@ -57,11 +57,11 @@
 #define EEPROM_EMU_VERSION 0
 #define EEPROM_EMU_MAGIC 0x45454d55 /* EEMU in hex */
 
-#include <drivers/eeprom.h>
-#include <drivers/flash.h>
-#include <zephyr.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/zephyr.h>
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_emulator);
 
 struct eeprom_emu_config {
diff --git a/drivers/eeprom/eeprom_handlers.c b/drivers/eeprom/eeprom_handlers.c
index 34b4cc858f..79e00d3a6f 100644
--- a/drivers/eeprom/eeprom_handlers.c
+++ b/drivers/eeprom/eeprom_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/eeprom.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/eeprom.h>
 
 static inline int z_vrfy_eeprom_read(const struct device *dev, off_t offset,
 				     void *data, size_t len)
diff --git a/drivers/eeprom/eeprom_lpc11u6x.c b/drivers/eeprom/eeprom_lpc11u6x.c
index 9a5b72f459..52199754fa 100644
--- a/drivers/eeprom/eeprom_lpc11u6x.c
+++ b/drivers/eeprom/eeprom_lpc11u6x.c
@@ -16,11 +16,11 @@
  *       EEPROM functions.
  */
 
-#include <drivers/eeprom.h>
+#include <zephyr/drivers/eeprom.h>
 #include <iap.h>
 
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_lpc11u6x);
 
 struct eeprom_lpc11u6x_config {
diff --git a/drivers/eeprom/eeprom_shell.c b/drivers/eeprom/eeprom_shell.c
index 90dc9dae20..66fc2b03b9 100644
--- a/drivers/eeprom/eeprom_shell.c
+++ b/drivers/eeprom/eeprom_shell.c
@@ -10,8 +10,8 @@
  * @brief EEPROM shell commands.
  */
 
-#include <shell/shell.h>
-#include <drivers/eeprom.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/eeprom.h>
 #include <stdlib.h>
 
 struct args_index {
diff --git a/drivers/eeprom/eeprom_simulator.c b/drivers/eeprom/eeprom_simulator.c
index 8c9f207861..019ba5c778 100644
--- a/drivers/eeprom/eeprom_simulator.c
+++ b/drivers/eeprom/eeprom_simulator.c
@@ -7,13 +7,13 @@
 
 #define DT_DRV_COMPAT zephyr_sim_eeprom
 
-#include <device.h>
-#include <drivers/eeprom.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/eeprom.h>
 
-#include <init.h>
-#include <kernel.h>
-#include <sys/util.h>
-#include <stats/stats.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/stats/stats.h>
 #include <string.h>
 #include <errno.h>
 
@@ -27,7 +27,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_simulator);
 
 struct eeprom_sim_config {
diff --git a/drivers/eeprom/eeprom_stm32.c b/drivers/eeprom/eeprom_stm32.c
index 4d028c346c..3a1413f779 100644
--- a/drivers/eeprom/eeprom_stm32.c
+++ b/drivers/eeprom/eeprom_stm32.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT st_stm32_eeprom
 
-#include <drivers/eeprom.h>
+#include <zephyr/drivers/eeprom.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_stm32);
 
 K_MUTEX_DEFINE(lock);
diff --git a/drivers/eeprom/eeprom_tmp116.c b/drivers/eeprom/eeprom_tmp116.c
index 0180ca0b1b..3823e36253 100644
--- a/drivers/eeprom/eeprom_tmp116.c
+++ b/drivers/eeprom/eeprom_tmp116.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
-#include <drivers/eeprom.h>
-#include <drivers/sensor/tmp116.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/eeprom.h>
+#include <zephyr/drivers/sensor/tmp116.h>
 
 #define DT_DRV_COMPAT ti_tmp116_eeprom
 
diff --git a/drivers/entropy/entropy_b91_trng.c b/drivers/entropy/entropy_b91_trng.c
index 01cf034d97..7d719e01a2 100644
--- a/drivers/entropy/entropy_b91_trng.c
+++ b/drivers/entropy/entropy_b91_trng.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT telink_b91_trng
 
 #include <trng.h>
-#include <drivers/entropy.h>
+#include <zephyr/drivers/entropy.h>
 #include <string.h>
 
 
diff --git a/drivers/entropy/entropy_bt_hci.c b/drivers/entropy/entropy_bt_hci.c
index 815d6237b7..0ae7faa210 100644
--- a/drivers/entropy/entropy_bt_hci.c
+++ b/drivers/entropy/entropy_bt_hci.c
@@ -7,8 +7,8 @@
 
 #define DT_DRV_COMPAT zephyr_bt_hci_entropy
 
-#include <drivers/entropy.h>
-#include <bluetooth/hci.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/bluetooth/hci.h>
 #include <string.h>
 
 static int entropy_bt_init(const struct device *dev)
diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c
index 4e080153d8..f5e5e8860c 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_trng
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/entropy.h>
-#include <irq.h>
-#include <pm/policy.h>
-#include <pm/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/irq.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/pm/device.h>
 
-#include <sys/ring_buffer.h>
-#include <sys/sys_io.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/sys_io.h>
 
 #include <driverlib/prcm.h>
 #include <driverlib/trng.h>
diff --git a/drivers/entropy/entropy_esp32.c b/drivers/entropy/entropy_esp32.c
index c46d7258ee..359c67dda7 100644
--- a/drivers/entropy/entropy_esp32.c
+++ b/drivers/entropy/entropy_esp32.c
@@ -14,7 +14,7 @@
 #include <esp_system.h>
 #include <soc.h>
 #include <hal/cpu_hal.h>
-#include <drivers/entropy.h>
+#include <zephyr/drivers/entropy.h>
 
 static inline uint32_t entropy_esp32_get_u32(void)
 {
diff --git a/drivers/entropy/entropy_gecko_trng.c b/drivers/entropy/entropy_gecko_trng.c
index b71da09fd7..47855e3d60 100644
--- a/drivers/entropy/entropy_gecko_trng.c
+++ b/drivers/entropy/entropy_gecko_trng.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT silabs_gecko_trng
 
- #include <drivers/entropy.h>
+ #include <zephyr/drivers/entropy.h>
  #include <string.h>
  #include "soc.h"
  #include "em_cmu.h"
diff --git a/drivers/entropy/entropy_handlers.c b/drivers/entropy/entropy_handlers.c
index badbb8c4c7..7eb4dcba0c 100644
--- a/drivers/entropy/entropy_handlers.c
+++ b/drivers/entropy/entropy_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/entropy.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_entropy_get_entropy(const struct device *dev,
 					     uint8_t *buffer,
diff --git a/drivers/entropy/entropy_litex.c b/drivers/entropy/entropy_litex.c
index 32f9031a6d..767a3840d6 100644
--- a/drivers/entropy/entropy_litex.c
+++ b/drivers/entropy/entropy_litex.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT litex_prbs
 
-#include <device.h>
-#include <drivers/entropy.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define PRBS_STATUS     DT_INST_REG_ADDR(0)
 #define PRBS_WIDTH      DT_INST_REG_SIZE(0)
diff --git a/drivers/entropy/entropy_mcux_rng.c b/drivers/entropy/entropy_mcux_rng.c
index fe93f3ba5c..6103dd8767 100644
--- a/drivers/entropy/entropy_mcux_rng.c
+++ b/drivers/entropy/entropy_mcux_rng.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_lpc_rng
 
-#include <device.h>
-#include <drivers/entropy.h>
-#include <random/rand32.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/init.h>
 
 #include "fsl_rng.h"
 
diff --git a/drivers/entropy/entropy_mcux_rnga.c b/drivers/entropy/entropy_mcux_rnga.c
index 29ce509594..eaa70c107a 100644
--- a/drivers/entropy/entropy_mcux_rnga.c
+++ b/drivers/entropy/entropy_mcux_rnga.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_rnga
 
-#include <device.h>
-#include <drivers/entropy.h>
-#include <random/rand32.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/init.h>
 
 #include "fsl_rnga.h"
 
diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c
index 9950ecc6be..6705f8012a 100644
--- a/drivers/entropy/entropy_mcux_trng.c
+++ b/drivers/entropy/entropy_mcux_trng.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_trng
 
-#include <device.h>
-#include <drivers/entropy.h>
-#include <random/rand32.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/init.h>
 
 #include "fsl_trng.h"
 
diff --git a/drivers/entropy/entropy_neorv32_trng.c b/drivers/entropy/entropy_neorv32_trng.c
index c88965c0f4..269339adb9 100644
--- a/drivers/entropy/entropy_neorv32_trng.c
+++ b/drivers/entropy/entropy_neorv32_trng.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT neorv32_trng
 
-#include <device.h>
-#include <drivers/syscon.h>
-#include <drivers/entropy.h>
-#include <pm/device.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/syscon.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/sys_io.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(neorv32_trng, CONFIG_ENTROPY_LOG_LEVEL);
 
 /* TRNG CTRL register bits */
diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c
index 999532894e..57298c169e 100644
--- a/drivers/entropy/entropy_nrf5.c
+++ b/drivers/entropy/entropy_nrf5.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/entropy.h>
-#include <sys/atomic.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/sys/atomic.h>
 #include <soc.h>
 #include <hal/nrf_rng.h>
 
diff --git a/drivers/entropy/entropy_rv32m1_trng.c b/drivers/entropy/entropy_rv32m1_trng.c
index a4fce81315..3e12429d10 100644
--- a/drivers/entropy/entropy_rv32m1_trng.c
+++ b/drivers/entropy/entropy_rv32m1_trng.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT openisa_rv32m1_trng
 
-#include <device.h>
-#include <drivers/entropy.h>
-#include <random/rand32.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/init.h>
 
 #include "fsl_trng.h"
 
diff --git a/drivers/entropy/entropy_sam.c b/drivers/entropy/entropy_sam.c
index ea918c3e31..5688f26957 100644
--- a/drivers/entropy/entropy_sam.c
+++ b/drivers/entropy/entropy_sam.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT atmel_sam_trng
 
-#include <device.h>
-#include <drivers/entropy.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index 1b5af71ffc..dcbbf2cb67 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/drivers/entropy/entropy_stm32.c
@@ -9,23 +9,23 @@
 
 #define DT_DRV_COMPAT st_stm32_rng
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/entropy.h>
-#include <random/rand32.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 #include <errno.h>
 #include <soc.h>
-#include <pm/policy.h>
+#include <zephyr/pm/policy.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_rng.h>
 #include <stm32_ll_system.h>
-#include <sys/printk.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "stm32_hsem.h"
 
 #define IRQN		DT_INST_IRQN(0)
diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c
index c7e6b8419a..0a0b066bb7 100644
--- a/drivers/entropy/fake_entropy_native_posix.c
+++ b/drivers/entropy/fake_entropy_native_posix.c
@@ -14,12 +14,12 @@
 #define DT_DRV_COMPAT zephyr_native_posix_rng
 
 #include "device.h"
-#include <drivers/entropy.h>
+#include <zephyr/drivers/entropy.h>
 #include "init.h"
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arch/posix/posix_trace.h>
+#include <zephyr/arch/posix/posix_trace.h>
 #include "soc.h"
 #include "cmdline.h" /* native_posix command line options header */
 
diff --git a/drivers/espi/espi_emul.c b/drivers/espi/espi_emul.c
index ccd797b0a6..2b21b702ea 100644
--- a/drivers/espi/espi_emul.c
+++ b/drivers/espi/espi_emul.c
@@ -12,13 +12,13 @@
 #define DT_DRV_COMPAT zephyr_espi_emul_controller
 
 #define LOG_LEVEL CONFIG_ESPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(espi_emul_ctlr);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/espi.h>
-#include <drivers/espi_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_emul.h>
 #include "espi_utils.h"
 
 /** Working data for the controller */
diff --git a/drivers/espi/espi_handlers.c b/drivers/espi/espi_handlers.c
index 36c517df41..d6800fe0f6 100644
--- a/drivers/espi/espi_handlers.c
+++ b/drivers/espi/espi_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/espi.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/syscall_handler.h>
 
 
 static inline int z_vrfy_espi_config(const struct device *dev,
diff --git a/drivers/espi/espi_it8xxx2.c b/drivers/espi/espi_it8xxx2.c
index 86a3b170a3..2da59461e8 100644
--- a/drivers/espi/espi_it8xxx2.c
+++ b/drivers/espi/espi_it8xxx2.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT ite_it8xxx2_espi
 
 #include <assert.h>
-#include <drivers/espi.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include "soc_espi.h"
 #include "espi_utils.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(espi, CONFIG_ESPI_LOG_LEVEL);
 
 #define ESPI_IT8XXX2_GET_GCTRL_BASE \
diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c
index 331c59af4c..9af21cb92b 100644
--- a/drivers/espi/espi_mchp_xec.c
+++ b/drivers/espi/espi_mchp_xec.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT microchip_xec_espi
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/espi.h>
-#include <logging/log.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/logging/log.h>
 #include "espi_utils.h"
 
 /* Minimum delay before acknowledging a virtual wire */
diff --git a/drivers/espi/espi_mchp_xec_host_v2.c b/drivers/espi/espi_mchp_xec_host_v2.c
index 328bf86c55..c6f21cac70 100644
--- a/drivers/espi/espi_mchp_xec_host_v2.c
+++ b/drivers/espi/espi_mchp_xec_host_v2.c
@@ -7,16 +7,16 @@
 
 #define DT_DRV_COMPAT microchip_xec_espi_host_dev
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/espi.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
-#include <logging/log.h>
-#include <sys/sys_io.h>
-#include <sys/util.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/util.h>
 #include "espi_utils.h"
 #include "espi_mchp_xec_v2.h"
 
diff --git a/drivers/espi/espi_mchp_xec_v2.c b/drivers/espi/espi_mchp_xec_v2.c
index 99f880b690..390734276f 100644
--- a/drivers/espi/espi_mchp_xec_v2.c
+++ b/drivers/espi/espi_mchp_xec_v2.c
@@ -7,16 +7,16 @@
 
 #define DT_DRV_COMPAT microchip_xec_espi_v2
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/espi.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
-#include <logging/log.h>
-#include <sys/sys_io.h>
-#include <sys/util.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/util.h>
 #include "espi_utils.h"
 #include "espi_mchp_xec_v2.h"
 
diff --git a/drivers/espi/espi_mchp_xec_v2.h b/drivers/espi/espi_mchp_xec_v2.h
index c10e4bb8c6..263aacd02f 100644
--- a/drivers/espi/espi_mchp_xec_v2.h
+++ b/drivers/espi/espi_mchp_xec_v2.h
@@ -8,9 +8,9 @@
 #define ZEPHYR_DRIVERS_ESPI_MCHP_XEC_ESPI_V2_H_
 
 #include <stdint.h>
-#include <device.h>
-#include <drivers/espi.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define ESPI_XEC_V2_DEBUG	1
 
diff --git a/drivers/espi/espi_npcx.c b/drivers/espi/espi_npcx.c
index 745b48f46c..339646df63 100644
--- a/drivers/espi/espi_npcx.c
+++ b/drivers/espi/espi_npcx.c
@@ -7,17 +7,17 @@
 #define DT_DRV_COMPAT nuvoton_npcx_espi
 
 #include <assert.h>
-#include <drivers/espi.h>
-#include <drivers/gpio.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/espi/npcx_espi.h>
-#include <kernel.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/espi/npcx_espi.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include "espi_utils.h"
 #include "soc_host.h"
 #include "soc_miwu.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(espi, CONFIG_ESPI_LOG_LEVEL);
 
 struct espi_npcx_config {
diff --git a/drivers/espi/espi_saf_mchp_xec.c b/drivers/espi/espi_saf_mchp_xec.c
index d36ab312bd..6dd39b4f1b 100644
--- a/drivers/espi/espi_saf_mchp_xec.c
+++ b/drivers/espi/espi_saf_mchp_xec.c
@@ -7,12 +7,12 @@
 
 #define DT_DRV_COMPAT microchip_xec_espi_saf
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/espi.h>
-#include <drivers/espi_saf.h>
-#include <logging/log.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_saf.h>
+#include <zephyr/logging/log.h>
 
 #include "espi_utils.h"
 LOG_MODULE_REGISTER(espi_saf, CONFIG_ESPI_LOG_LEVEL);
diff --git a/drivers/espi/host_subs_npcx.c b/drivers/espi/host_subs_npcx.c
index 007e850338..9135308eb2 100644
--- a/drivers/espi/host_subs_npcx.c
+++ b/drivers/espi/host_subs_npcx.c
@@ -113,17 +113,17 @@
  */
 
 #include <assert.h>
-#include <drivers/espi.h>
-#include <drivers/gpio.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include "espi_utils.h"
 #include "soc_host.h"
 #include "soc_espi.h"
 #include "soc_miwu.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(host_sub_npcx, LOG_LEVEL_ERR);
 
 struct host_sub_npcx_config {
diff --git a/drivers/ethernet/dsa_ksz8xxx.c b/drivers/ethernet/dsa_ksz8xxx.c
index d9ca3c43a8..ebf31c303a 100644
--- a/drivers/ethernet/dsa_ksz8xxx.c
+++ b/drivers/ethernet/dsa_ksz8xxx.c
@@ -6,19 +6,19 @@
 
 #define LOG_MODULE_NAME dsa
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_ETHERNET_LOG_LEVEL);
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <sys/util.h>
-#include <net/ethernet.h>
-#include <linker/sections.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/linker/sections.h>
 
 #if defined(CONFIG_DSA_SPI)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #else
 #error "No communication bus defined"
 #endif
diff --git a/drivers/ethernet/eth.h b/drivers/ethernet/eth.h
index 6f15867747..06ba755846 100644
--- a/drivers/ethernet/eth.h
+++ b/drivers/ethernet/eth.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_ETHERNET_ETH_H_
 
 #include <zephyr/types.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
 /* helper macro to return mac address octet from local_mac_address prop */
 #define NODE_MAC_ADDR_OCTET(node, n) DT_PROP_BY_IDX(node, local_mac_address, n)
diff --git a/drivers/ethernet/eth_dwmac.c b/drivers/ethernet/eth_dwmac.c
index e3f5868a3d..1f9db989ff 100644
--- a/drivers/ethernet/eth_dwmac.c
+++ b/drivers/ethernet/eth_dwmac.c
@@ -9,13 +9,13 @@
 
 #define LOG_MODULE_NAME dwmac_core
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <sys/types.h>
-#include <zephyr.h>
-#include <cache.h>
-#include <net/ethernet.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/cache.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
 #include "eth_dwmac_priv.h"
diff --git a/drivers/ethernet/eth_dwmac_mmu.c b/drivers/ethernet/eth_dwmac_mmu.c
index 16bf467112..f402f8fb54 100644
--- a/drivers/ethernet/eth_dwmac_mmu.c
+++ b/drivers/ethernet/eth_dwmac_mmu.c
@@ -9,16 +9,16 @@
 
 #define LOG_MODULE_NAME dwmac_plat
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define DT_DRV_COMPAT snps_designware_ethernet
 
 #include <sys/types.h>
-#include <sys/mem_manage.h>
-#include <zephyr.h>
-#include <cache.h>
-#include <net/ethernet.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/cache.h>
+#include <zephyr/net/ethernet.h>
 
 #include "eth_dwmac_priv.h"
 
diff --git a/drivers/ethernet/eth_dwmac_stm32h7x.c b/drivers/ethernet/eth_dwmac_stm32h7x.c
index 84a7bee0d7..b16a0fb59a 100644
--- a/drivers/ethernet/eth_dwmac_stm32h7x.c
+++ b/drivers/ethernet/eth_dwmac_stm32h7x.c
@@ -11,19 +11,19 @@
 
 #define LOG_MODULE_NAME dwmac_plat
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* be compatible with the HAL-based driver here */
 #define DT_DRV_COMPAT st_stm32_ethernet
 
 #include <sys/types.h>
-#include <zephyr.h>
-#include <net/ethernet.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include "eth_dwmac_priv.h"
 
diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c
index f500b010ca..96476ba5b6 100644
--- a/drivers/ethernet/eth_e1000.c
+++ b/drivers/ethernet/eth_e1000.c
@@ -8,18 +8,18 @@
 
 #define LOG_MODULE_NAME eth_e1000
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <sys/types.h>
-#include <zephyr.h>
-#include <net/ethernet.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #include "eth_e1000_priv.h"
 
 #if defined(CONFIG_ETH_E1000_PTP_CLOCK)
-#include <drivers/ptp_clock.h>
+#include <zephyr/drivers/ptp_clock.h>
 
 #define PTP_INST_NODEID(n) DT_CHILD(DT_DRV_INST(n), ptp)
 #endif
diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c
index 194a9ac98e..7b272bcd6e 100644
--- a/drivers/ethernet/eth_enc28j60.c
+++ b/drivers/ethernet/eth_enc28j60.c
@@ -10,18 +10,18 @@
 #define LOG_MODULE_NAME eth_enc28j60
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
 #include "eth_enc28j60_priv.h"
diff --git a/drivers/ethernet/eth_enc28j60_priv.h b/drivers/ethernet/eth_enc28j60_priv.h
index 047876b7fd..823310ad4e 100644
--- a/drivers/ethernet/eth_enc28j60_priv.h
+++ b/drivers/ethernet/eth_enc28j60_priv.h
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #ifndef _ENC28J60_
 #define _ENC28J60_
diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c
index fd04b5a3f0..61bb50be84 100644
--- a/drivers/ethernet/eth_enc424j600.c
+++ b/drivers/ethernet/eth_enc424j600.c
@@ -9,15 +9,15 @@
 
 #define DT_DRV_COMPAT microchip_enc424j600
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
 #include "eth_enc424j600_priv.h"
diff --git a/drivers/ethernet/eth_enc424j600_priv.h b/drivers/ethernet/eth_enc424j600_priv.h
index 2c2dfb3f74..02f544c1ed 100644
--- a/drivers/ethernet/eth_enc424j600_priv.h
+++ b/drivers/ethernet/eth_enc424j600_priv.h
@@ -6,9 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #ifndef _ENC424J600_
 #define _ENC424J600_
diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c
index 5b4142ba36..4a545f5142 100644
--- a/drivers/ethernet/eth_gecko.c
+++ b/drivers/ethernet/eth_gecko.c
@@ -12,17 +12,17 @@
  * - no link monitoring through PHY interrupt
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eth_gecko, CONFIG_ETHERNET_LOG_LEVEL);
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 #include <em_cmu.h>
 
diff --git a/drivers/ethernet/eth_gecko_priv.h b/drivers/ethernet/eth_gecko_priv.h
index dcba3ba9a2..a6dda0011f 100644
--- a/drivers/ethernet/eth_gecko_priv.h
+++ b/drivers/ethernet/eth_gecko_priv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_GECKO_PRIV_H_
 #define ZEPHYR_DRIVERS_ETHERNET_ETH_GECKO_PRIV_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #define ETH_GECKO_MTU         NET_ETH_MTU
diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c
index 7708a75e82..e5aa7c46ef 100644
--- a/drivers/ethernet/eth_liteeth.c
+++ b/drivers/ethernet/eth_liteeth.c
@@ -9,18 +9,18 @@
 #define LOG_MODULE_NAME eth_liteeth
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stdbool.h>
-#include <net/ethernet.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include "eth.h"
 
diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
index 1d67b876cb..bc82cc8deb 100644
--- a/drivers/ethernet/eth_mcux.c
+++ b/drivers/ethernet/eth_mcux.c
@@ -19,25 +19,25 @@
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 #define RING_ID 0
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <device.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <sys/__assert.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 
 #if defined(CONFIG_PTP_CLOCK_MCUX)
-#include <drivers/ptp_clock.h>
+#include <zephyr/drivers/ptp_clock.h>
 #endif
 
 #if IS_ENABLED(CONFIG_NET_DSA)
-#include <net/dsa.h>
+#include <zephyr/net/dsa.h>
 #endif
 
 #include "fsl_enet.h"
@@ -46,12 +46,12 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include "fsl_enet_mdio.h"
 #if defined(CONFIG_NET_POWER_MANAGEMENT)
 #include "fsl_clock.h"
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #endif
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 #if defined(CONFIG_PINCTRL)
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #include "eth.h"
diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c
index 200a91d237..b8e680e7bb 100644
--- a/drivers/ethernet/eth_native_posix.c
+++ b/drivers/ethernet/eth_native_posix.c
@@ -14,25 +14,25 @@
 #define LOG_MODULE_NAME eth_posix
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <stddef.h>
 
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
-#include <drivers/ptp_clock.h>
-#include <net/gptp.h>
-#include <net/lldp.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/gptp.h>
+#include <zephyr/net/lldp.h>
 
 #include "eth_native_posix_priv.h"
 #include "eth.h"
diff --git a/drivers/ethernet/eth_native_posix_adapt.c b/drivers/ethernet/eth_native_posix_adapt.c
index 996b3fff6f..14f73d6916 100644
--- a/drivers/ethernet/eth_native_posix_adapt.c
+++ b/drivers/ethernet/eth_native_posix_adapt.c
@@ -25,7 +25,7 @@
 #include <sys/select.h>
 #include <net/if.h>
 #include <time.h>
-#include <arch/posix/posix_trace.h>
+#include <zephyr/arch/posix/posix_trace.h>
 
 #ifdef __linux
 #include <linux/if_tun.h>
@@ -37,14 +37,14 @@
 #define LOG_MODULE_NAME eth_posix_adapt
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr/types.h>
-#include <sys_clock.h>
+#include <zephyr/sys_clock.h>
 
 #if defined(CONFIG_NET_GPTP)
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 #endif
 
 #include "eth_native_posix_priv.h"
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
index 5e68cbad17..6c95a5c31c 100644
--- a/drivers/ethernet/eth_sam_gmac.c
+++ b/drivers/ethernet/eth_sam_gmac.c
@@ -27,22 +27,22 @@
 #define LOG_MODULE_NAME eth_sam
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <kernel.h>
-#include <device.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <net/phy.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/net/phy.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include "eth_sam_gmac_priv.h"
 
@@ -52,8 +52,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include "eth_sam0_gmac.h"
 #endif
 
-#include <drivers/ptp_clock.h>
-#include <net/gptp.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/gptp.h>
 
 #ifdef __DCACHE_PRESENT
 static bool dcache_enabled;
diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c
index 628d5644a5..c46c48d927 100644
--- a/drivers/ethernet/eth_smsc911x.c
+++ b/drivers/ethernet/eth_smsc911x.c
@@ -12,26 +12,26 @@
 #define LOG_MODULE_NAME eth_smsc911x
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/__assert.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/sys_io.h>
-#include <net/ethernet.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/net/ethernet.h>
 #include "ethernet/eth_stats.h"
 
 #ifdef CONFIG_SHARED_IRQ
-#include <shared_irq.h>
+#include <zephyr/shared_irq.h>
 #endif
 
 #include "eth_smsc911x_priv.h"
diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c
index c5af9a292f..b0057db039 100644
--- a/drivers/ethernet/eth_stellaris.c
+++ b/drivers/ethernet/eth_stellaris.c
@@ -9,13 +9,13 @@
 
 #define LOG_MODULE_NAME eth_stellaris
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <net/ethernet.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <device.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <ethernet/eth_stats.h>
 #include "eth_stellaris_priv.h"
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index 333f80d2ec..3401fd6576 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -10,27 +10,27 @@
 #define LOG_MODULE_NAME eth_stm32_hal
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <kernel.h>
-#include <device.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 #include <soc.h>
-#include <sys/printk.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #if defined(CONFIG_PTP_CLOCK_STM32_HAL)
-#include <drivers/ptp_clock.h>
+#include <zephyr/drivers/ptp_clock.h>
 #endif /* CONFIG_PTP_CLOCK_STM32_HAL */
 
 #include "eth.h"
diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h
index e40a3da284..765ddc35e1 100644
--- a/drivers/ethernet/eth_stm32_hal_priv.h
+++ b/drivers/ethernet/eth_stm32_hal_priv.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_
 #define ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #define ST_OUI_B0 0x00
diff --git a/drivers/ethernet/eth_w5500.c b/drivers/ethernet/eth_w5500.c
index c3298ccdfb..e3b1d23aa9 100644
--- a/drivers/ethernet/eth_w5500.c
+++ b/drivers/ethernet/eth_w5500.c
@@ -8,18 +8,18 @@
 
 #define DT_DRV_COMPAT	wiznet_w5500
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eth_w5500, CONFIG_ETHERNET_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
 #include "eth.h"
diff --git a/drivers/ethernet/eth_w5500_priv.h b/drivers/ethernet/eth_w5500_priv.h
index f689cabeb3..8d64229b42 100644
--- a/drivers/ethernet/eth_w5500_priv.h
+++ b/drivers/ethernet/eth_w5500_priv.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #ifndef _W5500_
 #define _W5500_
diff --git a/drivers/ethernet/eth_xlnx_gem.c b/drivers/ethernet/eth_xlnx_gem.c
index b7d772028d..4e7ac8182e 100644
--- a/drivers/ethernet/eth_xlnx_gem.c
+++ b/drivers/ethernet/eth_xlnx_gem.c
@@ -21,20 +21,20 @@
  *   RX Status and TX Status registers.
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <devicetree.h>
-#include <sys/__assert.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/__assert.h>
 
-#include <net/net_if.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 
 #include "eth_xlnx_gem_priv.h"
 
 #define LOG_MODULE_NAME eth_xlnx_gem
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 static int  eth_xlnx_gem_dev_init(const struct device *dev);
diff --git a/drivers/ethernet/eth_xlnx_gem_priv.h b/drivers/ethernet/eth_xlnx_gem_priv.h
index a2452a5bbe..3d2d716e4d 100644
--- a/drivers/ethernet/eth_xlnx_gem_priv.h
+++ b/drivers/ethernet/eth_xlnx_gem_priv.h
@@ -12,9 +12,9 @@
 
 #define DT_DRV_COMPAT xlnx_gem
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "phy_xlnx_gem.h"
 
diff --git a/drivers/ethernet/phy/phy_mii.c b/drivers/ethernet/phy/phy_mii.c
index 14a0a8e035..c7b22b0f65 100644
--- a/drivers/ethernet/phy/phy_mii.c
+++ b/drivers/ethernet/phy/phy_mii.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT ethernet_phy
 
 #include <errno.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/mdio.h>
-#include <net/phy.h>
-#include <net/mii.h>
+#include <zephyr/drivers/mdio.h>
+#include <zephyr/net/phy.h>
+#include <zephyr/net/mii.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(phy_mii, CONFIG_PHY_LOG_LEVEL);
 
 struct phy_mii_dev_config {
diff --git a/drivers/ethernet/phy_gecko.c b/drivers/ethernet/phy_gecko.c
index 6ea7decefd..e8412b1a20 100644
--- a/drivers/ethernet/phy_gecko.c
+++ b/drivers/ethernet/phy_gecko.c
@@ -8,11 +8,11 @@
 /* SiLabs Giant Gecko GG11 Ethernet PHY driver. */
 
 #include <errno.h>
-#include <kernel.h>
-#include <net/mii.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/mii.h>
 #include "phy_gecko.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eth_gecko_phy, CONFIG_ETHERNET_LOG_LEVEL);
 
 /* Maximum time to establish a link through auto-negotiation for
diff --git a/drivers/ethernet/phy_xlnx_gem.c b/drivers/ethernet/phy_xlnx_gem.c
index 8ce7925cd1..82e6cbf93f 100644
--- a/drivers/ethernet/phy_xlnx_gem.c
+++ b/drivers/ethernet/phy_xlnx_gem.c
@@ -12,14 +12,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
 #include "eth_xlnx_gem_priv.h"
 
 #define LOG_MODULE_NAME phy_xlnx_gem
 #define LOG_LEVEL CONFIG_ETHERNET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* Basic MDIO read / write functions for PHY access */
diff --git a/drivers/ethernet/phy_xlnx_gem.h b/drivers/ethernet/phy_xlnx_gem.h
index 245f9442d6..2a41d50cd7 100644
--- a/drivers/ethernet/phy_xlnx_gem.h
+++ b/drivers/ethernet/phy_xlnx_gem.h
@@ -10,7 +10,7 @@
 #ifndef _ZEPHYR_DRIVERS_ETHERNET_PHY_XLNX_GEM_H_
 #define _ZEPHYR_DRIVERS_ETHERNET_PHY_XLNX_GEM_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 /* Event codes used to indicate a particular state change to the driver */
diff --git a/drivers/flash/flash_esp32.c b/drivers/flash/flash_esp32.c
index a97b6d96b9..d849283414 100644
--- a/drivers/flash/flash_esp32.c
+++ b/drivers/flash/flash_esp32.c
@@ -22,12 +22,12 @@
 #include <spi_flash_defs.h>
 #include <esp_flash_encrypt.h>
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
 
 #if defined(CONFIG_SOC_ESP32)
@@ -50,7 +50,7 @@
 
 #include "soc/mmu.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_esp32, CONFIG_FLASH_LOG_LEVEL);
 
 struct flash_esp32_dev_config {
diff --git a/drivers/flash/flash_gecko.c b/drivers/flash/flash_gecko.c
index 5bbe983de0..aa3be96960 100644
--- a/drivers/flash/flash_gecko.c
+++ b/drivers/flash/flash_gecko.c
@@ -10,14 +10,14 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <em_msc.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_gecko);
 
 struct flash_gecko_data {
diff --git a/drivers/flash/flash_handlers.c b/drivers/flash/flash_handlers.c
index 02f98366cb..6ffb6c7fe4 100644
--- a/drivers/flash/flash_handlers.c
+++ b/drivers/flash/flash_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/flash.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/flash.h>
 
 static inline int z_vrfy_flash_read(const struct device *dev, off_t offset,
 				    void *data, size_t len)
diff --git a/drivers/flash/flash_ite_it8xxx2.c b/drivers/flash/flash_ite_it8xxx2.c
index 622e5185a7..e16889374c 100644
--- a/drivers/flash/flash_ite_it8xxx2.c
+++ b/drivers/flash/flash_ite_it8xxx2.c
@@ -10,16 +10,16 @@
 #define FLASH_WRITE_BLK_SZ DT_PROP(SOC_NV_FLASH_NODE, write_block_size)
 #define FLASH_ERASE_BLK_SZ DT_PROP(SOC_NV_FLASH_NODE, erase_block_size)
 
-#include <device.h>
-#include <drivers/flash.h>
-#include <init.h>
-#include <kernel.h>
-#include <linker/linker-defs.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/linker-defs.h>
 #include <soc.h>
 #include <string.h>
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_ite_it8xxx2);
 
 /* RAM code start address */
diff --git a/drivers/flash/flash_mcux_flexspi_hyperflash.c b/drivers/flash/flash_mcux_flexspi_hyperflash.c
index ab41410b94..7b34fe8f45 100644
--- a/drivers/flash/flash_mcux_flexspi_hyperflash.c
+++ b/drivers/flash/flash_mcux_flexspi_hyperflash.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_imx_flexspi_hyperflash
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /*
  * NOTE: If CONFIG_FLASH_MCUX_FLEXSPI_XIP is selected, Any external functions
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(flexspi_hyperflash, CONFIG_FLASH_LOG_LEVEL);
 #include <fsl_cache.h>
 #endif
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "memc_mcux_flexspi.h"
 
diff --git a/drivers/flash/flash_mcux_flexspi_mx25um51345g.c b/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
index d0d5152ae2..010d4fb8e2 100644
--- a/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
+++ b/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT	nxp_imx_flexspi_mx25um51345g
 
-#include <drivers/flash.h>
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 #include "spi_nor.h"
 #include "memc_mcux_flexspi.h"
 
diff --git a/drivers/flash/flash_mcux_flexspi_nor.c b/drivers/flash/flash_mcux_flexspi_nor.c
index 36967b739c..169558b1fa 100644
--- a/drivers/flash/flash_mcux_flexspi_nor.c
+++ b/drivers/flash/flash_mcux_flexspi_nor.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT	nxp_imx_flexspi_nor
 
-#include <drivers/flash.h>
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 #include "spi_nor.h"
 #include "memc_mcux_flexspi.h"
 
diff --git a/drivers/flash/flash_page_layout.c b/drivers/flash/flash_page_layout.c
index a667e2dd66..266957ec91 100644
--- a/drivers/flash/flash_page_layout.c
+++ b/drivers/flash/flash_page_layout.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 
 static int flash_get_page_info(const struct device *dev, off_t offs,
 			       uint32_t index, struct flash_pages_info *info)
diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c
index 2abc46e266..aceac8eca4 100644
--- a/drivers/flash/flash_sam.c
+++ b/drivers/flash/flash_sam.c
@@ -10,15 +10,15 @@
 #define FLASH_WRITE_BLK_SZ DT_PROP(SOC_NV_FLASH_NODE, write_block_size)
 #define FLASH_ERASE_BLK_SZ DT_PROP(SOC_NV_FLASH_NODE, erase_block_size)
 
-#include <device.h>
-#include <drivers/flash.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <string.h>
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_sam0);
 
 /*
diff --git a/drivers/flash/flash_sam0.c b/drivers/flash/flash_sam0.c
index c90e35ba1d..fddf64ed00 100644
--- a/drivers/flash/flash_sam0.c
+++ b/drivers/flash/flash_sam0.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT atmel_sam0_nvmctrl
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_sam0);
 
-#include <device.h>
-#include <drivers/flash.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/flash/flash_shell.c b/drivers/flash/flash_shell.c
index 8a467e4409..c6926456aa 100644
--- a/drivers/flash/flash_shell.c
+++ b/drivers/flash/flash_shell.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <devicetree.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/devicetree.h>
 
-#include <shell/shell.h>
-#include <sys/util.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/util.h>
 
 #include <stdlib.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
 
 /* Buffer is only needed for bytes that follow command and offset */
diff --git a/drivers/flash/flash_simulator.c b/drivers/flash/flash_simulator.c
index cf7200cc5f..9cd643904b 100644
--- a/drivers/flash/flash_simulator.c
+++ b/drivers/flash/flash_simulator.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT zephyr_sim_flash
 
-#include <device.h>
-#include <drivers/flash.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/util.h>
-#include <random/rand32.h>
-#include <stats/stats.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/stats/stats.h>
 #include <string.h>
 
 #ifdef CONFIG_ARCH_POSIX
@@ -488,7 +488,7 @@ void *z_impl_flash_simulator_get_memory(const struct device *dev,
 
 #ifdef CONFIG_USERSPACE
 
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 void *z_vrfy_flash_simulator_get_memory(const struct device *dev,
 				      size_t *mock_size)
diff --git a/drivers/flash/flash_stm32.c b/drivers/flash/flash_stm32.c
index 4dc690f662..0d952ef861 100644
--- a/drivers/flash/flash_stm32.c
+++ b/drivers/flash/flash_stm32.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 #define DT_DRV_COMPAT st_stm32_flash_controller
 
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "flash_stm32.h"
 #include "stm32_hsem.h"
diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h
index bac0d6aad6..a503d80d22 100644
--- a/drivers/flash/flash_stm32.h
+++ b/drivers/flash/flash_stm32.h
@@ -10,8 +10,8 @@
 
 #if DT_NODE_HAS_PROP(DT_INST(0, st_stm32_flash_controller), clocks) || \
 	DT_NODE_HAS_PROP(DT_INST(0, st_stm32h7_flash_controller), clocks)
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #endif
 
 struct flash_stm32_priv {
diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c
index 9e4c192d94..b347b12b70 100644
--- a/drivers/flash/flash_stm32_qspi.c
+++ b/drivers/flash/flash_stm32_qspi.c
@@ -8,17 +8,17 @@
 #define DT_DRV_COMPAT st_stm32_qspi_nor
 
 #include <errno.h>
-#include <kernel.h>
-#include <toolchain.h>
-#include <arch/common/ffs.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/common/ffs.h>
+#include <zephyr/sys/util.h>
 #include <soc.h>
-#include <drivers/pinctrl.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <drivers/flash.h>
-#include <drivers/dma.h>
-#include <drivers/dma/dma_stm32.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
 
 #if DT_INST_NODE_HAS_PROP(0, spi_bus_width) && \
 	DT_INST_PROP(0, spi_bus_width) == 4
@@ -29,14 +29,14 @@
 
 #define STM32_QSPI_RESET_GPIO DT_INST_NODE_HAS_PROP(0, reset_gpios)
 #if STM32_QSPI_RESET_GPIO
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #endif
 #include <stm32_ll_dma.h>
 
 #include "spi_nor.h"
 #include "jesd216.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_stm32_qspi, CONFIG_FLASH_LOG_LEVEL);
 
 #define STM32_QSPI_FIFO_THRESHOLD         8
diff --git a/drivers/flash/flash_stm32_v1.c b/drivers/flash/flash_stm32_v1.c
index f8fd59890e..236a234489 100644
--- a/drivers/flash/flash_stm32_v1.c
+++ b/drivers/flash/flash_stm32_v1.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_stm32generic, CONFIG_FLASH_LOG_LEVEL);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32f2x.c b/drivers/flash/flash_stm32f2x.c
index ad5f6706d5..f3781855f5 100644
--- a/drivers/flash/flash_stm32f2x.c
+++ b/drivers/flash/flash_stm32f2x.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32f4x.c b/drivers/flash/flash_stm32f4x.c
index b524a8fa67..c58ad3ad2a 100644
--- a/drivers/flash/flash_stm32f4x.c
+++ b/drivers/flash/flash_stm32f4x.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32f7x.c b/drivers/flash/flash_stm32f7x.c
index 1f82ff6d5a..ac8c674e12 100644
--- a/drivers/flash/flash_stm32f7x.c
+++ b/drivers/flash/flash_stm32f7x.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32g0x.c b/drivers/flash/flash_stm32g0x.c
index d1ef8d2474..3486ddf4a2 100644
--- a/drivers/flash/flash_stm32g0x.c
+++ b/drivers/flash/flash_stm32g0x.c
@@ -8,14 +8,14 @@
 
 #define LOG_DOMAIN flash_stm32g0
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32g4x.c b/drivers/flash/flash_stm32g4x.c
index 7f46bb0fd0..f0e036b72c 100644
--- a/drivers/flash/flash_stm32g4x.c
+++ b/drivers/flash/flash_stm32g4x.c
@@ -6,14 +6,14 @@
 
 #define LOG_DOMAIN flash_stm32g4
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_system.h>
 
diff --git a/drivers/flash/flash_stm32h7x.c b/drivers/flash/flash_stm32h7x.c
index 6365486c9d..c4ec73841c 100644
--- a/drivers/flash/flash_stm32h7x.c
+++ b/drivers/flash/flash_stm32h7x.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT st_stm32h7_flash_controller
 
-#include <sys/util.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32h7xx_ll_bus.h>
 #include <stm32h7xx_ll_utils.h>
@@ -21,7 +21,7 @@
 
 #define LOG_DOMAIN flash_stm32h7
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #define STM32H7_FLASH_MAX_ERASE_TIME    4000
diff --git a/drivers/flash/flash_stm32l4x.c b/drivers/flash/flash_stm32l4x.c
index 457c611353..39b5faebc6 100644
--- a/drivers/flash/flash_stm32l4x.c
+++ b/drivers/flash/flash_stm32l4x.c
@@ -8,14 +8,14 @@
 
 #define LOG_DOMAIN flash_stm32l4
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "flash_stm32.h"
diff --git a/drivers/flash/flash_stm32l5_u5.c b/drivers/flash/flash_stm32l5_u5.c
index bc0d010965..4d0e373ffc 100644
--- a/drivers/flash/flash_stm32l5_u5.c
+++ b/drivers/flash/flash_stm32l5_u5.c
@@ -6,14 +6,14 @@
 
 #define LOG_DOMAIN flash_stm32l5_u5
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_icache.h>
 #include <stm32_ll_system.h>
diff --git a/drivers/flash/flash_stm32wbx.c b/drivers/flash/flash_stm32wbx.c
index c55a8515f2..2cda850879 100644
--- a/drivers/flash/flash_stm32wbx.c
+++ b/drivers/flash/flash_stm32wbx.c
@@ -7,16 +7,16 @@
 
 #define LOG_DOMAIN flash_stm32wb
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 
 #include "flash_stm32.h"
 #include "stm32_hsem.h"
diff --git a/drivers/flash/jesd216.c b/drivers/flash/jesd216.c
index 36a38b7089..e17a7d0ba3 100644
--- a/drivers/flash/jesd216.c
+++ b/drivers/flash/jesd216.c
@@ -6,7 +6,7 @@
 
 
 #include <sys/types.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "jesd216.h"
 #include "spi_nor.h"
 
diff --git a/drivers/flash/jesd216.h b/drivers/flash/jesd216.h
index bc1fa6bad0..2be93bb557 100644
--- a/drivers/flash/jesd216.h
+++ b/drivers/flash/jesd216.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_DRIVERS_FLASH_JESD216_H_
 
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
 /* Following are structures and constants supporting the JEDEC Serial
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index 493708a79c..1d0250c9c0 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT nordic_qspi_nor
 
 #include <errno.h>
-#include <drivers/flash.h>
-#include <init.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/init.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(qspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
 #include "spi_nor.h"
@@ -1410,7 +1410,7 @@ void  z_impl_nrf_qspi_nor_base_clock_div_force(const struct device *dev,
 }
 
 #ifdef CONFIG_USERSPACE
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 void z_vrfy_nrf_qspi_nor_base_clock_div_force(const struct device *dev,
 					      bool force)
diff --git a/drivers/flash/soc_flash_b91.c b/drivers/flash/soc_flash_b91.c
index 3da4ea6a41..3a0cbad6b7 100644
--- a/drivers/flash/soc_flash_b91.c
+++ b/drivers/flash/soc_flash_b91.c
@@ -8,8 +8,8 @@
 #define FLASH_SIZE DT_REG_SIZE(DT_INST(0, soc_nv_flash))
 
 #include "flash.h"
-#include <device.h>
-#include <drivers/flash.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
 
 
 /* driver data structure */
diff --git a/drivers/flash/soc_flash_lpc.c b/drivers/flash/soc_flash_lpc.c
index 113366c2ac..df9a86c1b7 100644
--- a/drivers/flash/soc_flash_lpc.c
+++ b/drivers/flash/soc_flash_lpc.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include "flash_priv.h"
 
diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
index 58679fe375..5e8bd594c7 100644
--- a/drivers/flash/soc_flash_mcux.c
+++ b/drivers/flash/soc_flash_mcux.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include "flash_priv.h"
 
@@ -21,7 +21,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_mcux);
 
 
diff --git a/drivers/flash/soc_flash_nios2_qspi.c b/drivers/flash/soc_flash_nios2_qspi.c
index 3ffb289ac9..6cf1f94be4 100644
--- a/drivers/flash/soc_flash_nios2_qspi.c
+++ b/drivers/flash/soc_flash_nios2_qspi.c
@@ -9,20 +9,20 @@
  * Nios-II QSPI Controller HAL driver.
  */
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "flash_priv.h"
 #include "altera_generic_quad_spi_controller2_regs.h"
 #include "altera_generic_quad_spi_controller2.h"
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_nios2_qspi);
 
 /*
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index a3db47415e..2b81f5e9c9 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -8,11 +8,11 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <string.h>
 #include <nrfx_nvmc.h>
 #include <nrf_erratas.h>
@@ -20,7 +20,7 @@
 #include "soc_flash_nrf.h"
 
 #define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_nrf);
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, nordic_nrf51_flash_controller), okay)
diff --git a/drivers/flash/soc_flash_nrf.h b/drivers/flash/soc_flash_nrf.h
index 481144b395..419cea6af1 100644
--- a/drivers/flash/soc_flash_nrf.h
+++ b/drivers/flash/soc_flash_nrf.h
@@ -7,7 +7,7 @@
 #ifndef __SOC_FLASH_NRF_H__
 #define __SOC_FLASH_NRF_H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #define FLASH_OP_DONE    (0) /* 0 for compliance with the driver API. */
diff --git a/drivers/flash/soc_flash_nrf_ticker.c b/drivers/flash/soc_flash_nrf_ticker.c
index d90038002d..c060e883bf 100644
--- a/drivers/flash/soc_flash_nrf_ticker.c
+++ b/drivers/flash/soc_flash_nrf_ticker.c
@@ -6,15 +6,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #include "soc_flash_nrf.h"
 
-#include <sys/__assert.h>
-#include <bluetooth/hci.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/bluetooth/hci.h>
 #include "controller/hal/ticker.h"
 #include "controller/ticker/ticker.h"
 #include "controller/include/ll.h"
diff --git a/drivers/flash/soc_flash_rv32m1.c b/drivers/flash/soc_flash_rv32m1.c
index a80bc11878..7971bf1503 100644
--- a/drivers/flash/soc_flash_rv32m1.c
+++ b/drivers/flash/soc_flash_rv32m1.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT openisa_rv32m1_ftfe
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include "flash_priv.h"
 
diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c
index 1b629bee64..4aa9db53eb 100644
--- a/drivers/flash/spi_flash_at45.c
+++ b/drivers/flash/spi_flash_at45.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/flash.h>
-#include <drivers/spi.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(spi_flash_at45, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
index db5632c68a..3bd1cb362b 100644
--- a/drivers/flash/spi_nor.c
+++ b/drivers/flash/spi_nor.c
@@ -10,11 +10,11 @@
 #define DT_DRV_COMPAT jedec_spi_nor
 
 #include <errno.h>
-#include <drivers/flash.h>
-#include <drivers/spi.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "spi_nor.h"
 #include "jesd216.h"
diff --git a/drivers/flash/spi_nor.h b/drivers/flash/spi_nor.h
index 94525fb319..b1625e59ae 100644
--- a/drivers/flash/spi_nor.h
+++ b/drivers/flash/spi_nor.h
@@ -7,7 +7,7 @@
 #ifndef __SPI_NOR_H__
 #define __SPI_NOR_H__
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define SPI_NOR_MAX_ID_LEN	3
 
diff --git a/drivers/fpga/fpga_eos_s3.c b/drivers/fpga/fpga_eos_s3.c
index 5ee4fcf5b2..193f0de40e 100644
--- a/drivers/fpga/fpga_eos_s3.c
+++ b/drivers/fpga/fpga_eos_s3.c
@@ -6,8 +6,8 @@
 
 #include <errno.h>
 #include <string.h>
-#include <device.h>
-#include <drivers/fpga.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/fpga.h>
 #include "fpga_eos_s3.h"
 
 void eos_s3_fpga_enable_clk(void)
diff --git a/drivers/fpga/fpga_shell.c b/drivers/fpga/fpga_shell.c
index a2d3433314..7969e231c6 100644
--- a/drivers/fpga/fpga_shell.c
+++ b/drivers/fpga/fpga_shell.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
-#include <shell/shell.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
 #include <version.h>
 #include <stdlib.h>
-#include <drivers/fpga.h>
+#include <zephyr/drivers/fpga.h>
 
 static int parse_common_args(const struct shell *sh, char **argv,
 			     const struct device **dev)
diff --git a/drivers/fpga/fpga_zynqmp.c b/drivers/fpga/fpga_zynqmp.c
index 8dce633eb0..b284d85993 100644
--- a/drivers/fpga/fpga_zynqmp.c
+++ b/drivers/fpga/fpga_zynqmp.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT xlnx_fpga
 
-#include <device.h>
-#include <drivers/fpga.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/fpga.h>
 #include "fpga_zynqmp.h"
 #include <errno.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fpga_zynqmp);
 
 static void power_up_fpga(void)
diff --git a/drivers/gpio/gpio_andes_atcgpio100.c b/drivers/gpio/gpio_andes_atcgpio100.c
index fd333b5a4d..6e4483bc2c 100644
--- a/drivers/gpio/gpio_andes_atcgpio100.c
+++ b/drivers/gpio/gpio_andes_atcgpio100.c
@@ -10,13 +10,13 @@
 
 #include <errno.h>
 #include <stdbool.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/andestech-atcgpio100.h>
-#include <sys/util.h>
-#include <sys/sys_io.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/andestech-atcgpio100.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/sys_io.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_b91.c b/drivers/gpio/gpio_b91.c
index 573bc28db7..397b594e58 100644
--- a/drivers/gpio/gpio_b91.c
+++ b/drivers/gpio/gpio_b91.c
@@ -6,8 +6,8 @@
 
 #include "analog.h"
 
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include "gpio_utils.h"
 
 
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
index 8897385671..baeec28ceb 100644
--- a/drivers/gpio/gpio_cc13xx_cc26xx.c
+++ b/drivers/gpio/gpio_cc13xx_cc26xx.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_gpio
 
 #include <zephyr/types.h>
-#include <sys/__assert.h>
-#include <device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/ti-cc13xx-cc26xx-gpio.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/ti-cc13xx-cc26xx-gpio.h>
 
 #include <driverlib/gpio.h>
 #include <driverlib/interrupt.h>
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
index d276f922c4..e3ca0ff580 100644
--- a/drivers/gpio/gpio_cc32xx.c
+++ b/drivers/gpio/gpio_cc32xx.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT ti_cc32xx_gpio
 #include <errno.h>
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/sys_io.h>
 
 /* Driverlib includes */
 #include <inc/hw_types.h>
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index d696beda22..e17678a577 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT arm_cmsdk_gpio
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/clock_control/arm_clock_control.h>
+#include <zephyr/drivers/clock_control/arm_clock_control.h>
 
 #include "gpio_cmsdk_ahb.h"
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_cmsdk_ahb.h b/drivers/gpio/gpio_cmsdk_ahb.h
index 7f1c05eb0f..41bafa696d 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.h
+++ b/drivers/gpio/gpio_cmsdk_ahb.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/gpio/gpio_creg_gpio.c b/drivers/gpio/gpio_creg_gpio.c
index eb7888d592..3c935b2e72 100644
--- a/drivers/gpio/gpio_creg_gpio.c
+++ b/drivers/gpio/gpio_creg_gpio.c
@@ -8,15 +8,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(creg_gpio, CONFIG_GPIO_LOG_LEVEL);
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_cy8c95xx.c b/drivers/gpio/gpio_cy8c95xx.c
index 4fe1ac7430..9171efbdbf 100644
--- a/drivers/gpio/gpio_cy8c95xx.c
+++ b/drivers/gpio/gpio_cy8c95xx.c
@@ -8,15 +8,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cy8c95xx, CONFIG_GPIO_LOG_LEVEL);
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 2296f429cf..9da1f769d9 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -8,30 +8,30 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/snps-designware-gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/snps-designware-gpio.h>
 #include "gpio_dw.h"
 #include "gpio_utils.h"
 
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 #include <soc.h>
-#include <sys/sys_io.h>
-#include <init.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <drivers/clock_control.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/clock_control.h>
 
 #ifdef CONFIG_SHARED_IRQ
-#include <shared_irq.h>
+#include <zephyr/shared_irq.h>
 #endif
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 #endif
 
 #ifdef CONFIG_PM_DEVICE
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 #endif
 
 static int gpio_dw_port_set_bits_raw(const struct device *port, uint32_t mask);
diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h
index 0ab0a19e71..790d9f25ce 100644
--- a/drivers/gpio/gpio_dw.h
+++ b/drivers/gpio/gpio_dw.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_
 
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include "gpio_dw_registers.h"
 
 #ifdef __cplusplus
diff --git a/drivers/gpio/gpio_emul.c b/drivers/gpio/gpio_emul.c
index 36b9895c4f..52bae3faa1 100644
--- a/drivers/gpio/gpio_emul.c
+++ b/drivers/gpio/gpio_emul.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT zephyr_gpio_emul
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <pm/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/device.h>
 
 #include "gpio_utils.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_emul);
 
 #define GPIO_EMUL_INT_BITMASK						\
diff --git a/drivers/gpio/gpio_eos_s3.c b/drivers/gpio/gpio_eos_s3.c
index 52555b980c..866585892b 100644
--- a/drivers/gpio/gpio_eos_s3.c
+++ b/drivers/gpio/gpio_eos_s3.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT quicklogic_eos_s3_gpio
 
 #include <errno.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <eoss3_hal_gpio.h>
 #include <eoss3_hal_pads.h>
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index f50fc405d3..b01dc71254 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -17,20 +17,20 @@
 
 #include <soc.h>
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/espressif-esp32-gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/espressif-esp32-gpio.h>
 #ifdef CONFIG_SOC_ESP32C3
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #else
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #endif
-#include <kernel.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 
 #include "gpio_utils.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_esp32, CONFIG_LOG_DEFAULT_LEVEL);
 
 #ifdef CONFIG_SOC_ESP32C3
diff --git a/drivers/gpio/gpio_fxl6408.c b/drivers/gpio/gpio_fxl6408.c
index f9cf78aa49..c0d8261bdd 100644
--- a/drivers/gpio/gpio_fxl6408.c
+++ b/drivers/gpio/gpio_fxl6408.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 #include "gpio_utils.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(fxl6408, CONFIG_FXL6408_LOG_LEVEL);
 #define DT_DRV_COMPAT             fcs_fxl6408
diff --git a/drivers/gpio/gpio_gd32.c b/drivers/gpio/gpio_gd32.c
index 1dceb9d9a5..abd9cea225 100644
--- a/drivers/gpio/gpio_gd32.c
+++ b/drivers/gpio/gpio_gd32.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT gd_gd32_gpio
 
-#include <drivers/gpio.h>
-#include <drivers/interrupt_controller/gd32_exti.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/interrupt_controller/gd32_exti.h>
 #include <soc.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index fd05d6e8d8..e4d922c985 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT silabs_gecko_gpio_port
 
 #include <errno.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/drivers/gpio/gpio_handlers.c b/drivers/gpio/gpio_handlers.c
index 62fb8f5fc9..1ba245b4e7 100644
--- a/drivers/gpio/gpio_handlers.c
+++ b/drivers/gpio/gpio_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_gpio_pin_configure(const struct device *port,
 					    gpio_pin_t pin,
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index d64a83c456..dd3e4edb91 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT nxp_imx_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <gpio_imx.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_intel.c b/drivers/gpio/gpio_intel.c
index 52305bf5f9..ee5a305d07 100644
--- a/drivers/gpio/gpio_intel.c
+++ b/drivers/gpio/gpio_intel.c
@@ -20,12 +20,12 @@
  */
 
 #include <errno.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
-#include <sys/sys_io.h>
-#include <sys/__assert.h>
-#include <sys/slist.h>
-#include <sys/speculation.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/speculation.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_ite_it8xxx2.c b/drivers/gpio/gpio_ite_it8xxx2.c
index 0dfe7f1ee6..995129b493 100644
--- a/drivers/gpio/gpio_ite_it8xxx2.c
+++ b/drivers/gpio/gpio_ite_it8xxx2.c
@@ -5,14 +5,14 @@
  *
  */
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/ite-it8xxx2-gpio.h>
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/ite-it8xxx2-gpio.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "gpio_utils.h"
 
 #define DT_DRV_COMPAT ite_it8xxx2_gpio
diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c
index 7a85cd0987..12ac61771b 100644
--- a/drivers/gpio/gpio_litex.c
+++ b/drivers/gpio/gpio_litex.c
@@ -8,12 +8,12 @@
 #define DT_DRV_COMPAT litex_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c
index 4ac77748b9..fc1a75be95 100644
--- a/drivers/gpio/gpio_lmp90xxx.c
+++ b/drivers/gpio/gpio_lmp90xxx.c
@@ -11,14 +11,14 @@
 
 #define DT_DRV_COMPAT ti_lmp90xxx_gpio
 
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_lmp90xxx);
 
-#include <drivers/adc/lmp90xxx.h>
+#include <zephyr/drivers/adc/lmp90xxx.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c
index fcce47ffe5..11462a057c 100644
--- a/drivers/gpio/gpio_lpc11u6x.c
+++ b/drivers/gpio/gpio_lpc11u6x.c
@@ -15,11 +15,11 @@
  * @note See the UM10732 LPC11U6x/E6x user manual for register definitions.
  */
 
-#include <drivers/clock_control.h>
-#include <drivers/gpio.h>
-#include <drivers/pinmux.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinmux.h>
 
-#include <dt-bindings/pinctrl/lpc11u6x-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/lpc11u6x-pinctrl.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index a4fa9b51f2..911f9a168c 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT microchip_xec_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/sys_io.h>
 #include <soc.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_mchp_xec_v2.c b/drivers/gpio/gpio_mchp_xec_v2.c
index 558a1e68c3..d6caa24958 100644
--- a/drivers/gpio/gpio_mchp_xec_v2.c
+++ b/drivers/gpio/gpio_mchp_xec_v2.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT microchip_xec_gpio_v2
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/pinctrl/mchp-xec-pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/mchp-xec-pinctrl.h>
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_mcp230xx.c b/drivers/gpio/gpio_mcp230xx.c
index 6d305165cc..3d1a1b477e 100644
--- a/drivers/gpio/gpio_mcp230xx.c
+++ b/drivers/gpio/gpio_mcp230xx.c
@@ -11,17 +11,17 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "gpio_utils.h"
 #include "gpio_mcp23xxx.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp230xx);
 
 static int mcp230xx_read_port_regs(const struct device *dev, uint8_t reg, uint16_t *buf)
diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c
index ca9d5df8e7..2f2629bc46 100644
--- a/drivers/gpio/gpio_mcp23s17.c
+++ b/drivers/gpio/gpio_mcp23s17.c
@@ -12,18 +12,18 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #include "gpio_utils.h"
 #include "gpio_mcp23s17.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp23s17);
 
 /**
diff --git a/drivers/gpio/gpio_mcp23s17.h b/drivers/gpio/gpio_mcp23s17.h
index df7a3657e8..ef7ade2acd 100644
--- a/drivers/gpio/gpio_mcp23s17.h
+++ b/drivers/gpio/gpio_mcp23s17.h
@@ -11,10 +11,10 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MCP23S17_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_MCP23S17_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/gpio/gpio_mcp23sxx.c b/drivers/gpio/gpio_mcp23sxx.c
index 2c3d910112..bdfad2af7d 100644
--- a/drivers/gpio/gpio_mcp23sxx.c
+++ b/drivers/gpio/gpio_mcp23sxx.c
@@ -11,17 +11,17 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #include "gpio_utils.h"
 #include "gpio_mcp23xxx.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp23sxx);
 
 static int mcp23sxx_read_port_regs(const struct device *dev, uint8_t reg, uint16_t *buf)
diff --git a/drivers/gpio/gpio_mcp23xxx.c b/drivers/gpio/gpio_mcp23xxx.c
index 1546d9f444..5b159f6642 100644
--- a/drivers/gpio/gpio_mcp23xxx.c
+++ b/drivers/gpio/gpio_mcp23xxx.c
@@ -10,16 +10,16 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "gpio_utils.h"
 #include "gpio_mcp23xxx.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp23xxx);
 
 /**
diff --git a/drivers/gpio/gpio_mcp23xxx.h b/drivers/gpio/gpio_mcp23xxx.h
index 457e035790..f45b68d48e 100644
--- a/drivers/gpio/gpio_mcp23xxx.h
+++ b/drivers/gpio/gpio_mcp23xxx.h
@@ -11,14 +11,14 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MCP23XXX_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_MCP23XXX_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #ifdef CONFIG_GPIO_MCP230XX
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* CONFIG_GPIO_MCP230XX */
 #ifdef CONFIG_GPIO_MCP23SXX
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* CONFIG_GPIO_MCP23SXX */
 
 /* Register definitions */
diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c
index 38b6410c3b..5401c128f7 100644
--- a/drivers/gpio/gpio_mcux.c
+++ b/drivers/gpio/gpio_mcux.c
@@ -8,9 +8,9 @@
 #define DT_DRV_COMPAT nxp_kinetis_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/nxp-kinetis-gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/nxp-kinetis-gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index 37d374a2c0..4610c7898a 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT nxp_imx_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_gpio.h>
 
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 8f8c93a22e..2e3f595227 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -15,8 +15,8 @@
  */
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c
index 250f2c4950..f37aaa533b 100644
--- a/drivers/gpio/gpio_mmio32.c
+++ b/drivers/gpio/gpio_mmio32.c
@@ -26,7 +26,7 @@
  * gpio_port_write.
  */
 
-#include <drivers/gpio/gpio_mmio32.h>
+#include <zephyr/drivers/gpio/gpio_mmio32.h>
 #include <errno.h>
 
 static int gpio_mmio32_config(const struct device *dev,
diff --git a/drivers/gpio/gpio_nct38xx.c b/drivers/gpio/gpio_nct38xx.c
index 0a3b8faf5a..81e9289a1a 100644
--- a/drivers/gpio/gpio_nct38xx.c
+++ b/drivers/gpio/gpio_nct38xx.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT nuvoton_nct38xx_gpio
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_nct38xx.h>
-#include <kernel.h>
-#include <sys/util_macro.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_nct38xx.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "gpio_nct38xx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_ntc38xx, CONFIG_GPIO_LOG_LEVEL);
 
 void nct38xx_gpio_alert_handler(const struct device *dev)
diff --git a/drivers/gpio/gpio_nct38xx.h b/drivers/gpio/gpio_nct38xx.h
index e0def37f29..78b7466f6b 100644
--- a/drivers/gpio/gpio_nct38xx.h
+++ b/drivers/gpio/gpio_nct38xx.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_NCT38XX_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_NCT38XX_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 
 /* NCT38XX controller register */
 #define NCT38XX_REG_ALERT      0x10
diff --git a/drivers/gpio/gpio_nct38xx_alert.c b/drivers/gpio/gpio_nct38xx_alert.c
index c21544a048..a45b5cef2e 100644
--- a/drivers/gpio/gpio_nct38xx_alert.c
+++ b/drivers/gpio/gpio_nct38xx_alert.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT nuvoton_nct38xx_gpio_alert
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_nct38xx.h>
-#include <kernel.h>
-#include <sys/util_macro.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_nct38xx.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util_macro.h>
 
 #include "gpio_nct38xx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(gpio_ntc38xx, CONFIG_GPIO_LOG_LEVEL);
 
 /* Driver config */
diff --git a/drivers/gpio/gpio_nct38xx_port.c b/drivers/gpio/gpio_nct38xx_port.c
index f046cda622..429080c193 100644
--- a/drivers/gpio/gpio_nct38xx_port.c
+++ b/drivers/gpio/gpio_nct38xx_port.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT nuvoton_nct38xx_gpio_port
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "gpio_nct38xx.h"
 #include "gpio_utils.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(gpio_ntc38xx, CONFIG_GPIO_LOG_LEVEL);
 
 /* Driver config */
diff --git a/drivers/gpio/gpio_neorv32.c b/drivers/gpio/gpio_neorv32.c
index 150dde201d..b0078e91a1 100644
--- a/drivers/gpio/gpio_neorv32.c
+++ b/drivers/gpio/gpio_neorv32.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT neorv32_gpio
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/syscon.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/syscon.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_neorv32, CONFIG_GPIO_LOG_LEVEL);
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_npcx.c b/drivers/gpio/gpio_npcx.c
index 3f62aa2e27..e24692c813 100644
--- a/drivers/gpio/gpio_npcx.c
+++ b/drivers/gpio/gpio_npcx.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_gpio
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 
 #include "gpio_utils.h"
 #include "soc_gpio.h"
 #include "soc_miwu.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_npcx, LOG_LEVEL_ERR);
 
 /* GPIO module instances declarations */
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index d0251fcce9..916eae77fd 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -7,8 +7,8 @@
 
 #include <nrfx_gpiote.h>
 #include <string.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/nordic-nrf-gpio.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/nordic-nrf-gpio.h>
 #include "gpio_utils.h"
 
 struct gpio_nrfx_data {
diff --git a/drivers/gpio/gpio_pca953x.c b/drivers/gpio/gpio_pca953x.c
index ad30d16db9..5b42d5b433 100644
--- a/drivers/gpio/gpio_pca953x.c
+++ b/drivers/gpio/gpio_pca953x.c
@@ -10,15 +10,15 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pca953x, CONFIG_GPIO_LOG_LEVEL);
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c
index d42b6d6fdc..ad4676e4a8 100644
--- a/drivers/gpio/gpio_pca95xx.c
+++ b/drivers/gpio/gpio_pca95xx.c
@@ -13,18 +13,18 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "gpio_utils.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_pca95xx);
 
 /* Register definitions */
diff --git a/drivers/gpio/gpio_pcal6408a.c b/drivers/gpio/gpio_pcal6408a.c
index 8d74851f7f..1a8cd2dafd 100644
--- a/drivers/gpio/gpio_pcal6408a.c
+++ b/drivers/gpio/gpio_pcal6408a.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_pcal6408a
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 #include "gpio_utils.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcal6408a, CONFIG_GPIO_LOG_LEVEL);
 
 enum {
diff --git a/drivers/gpio/gpio_psoc6.c b/drivers/gpio/gpio_psoc6.c
index f22de5a6da..64d30810c2 100644
--- a/drivers/gpio/gpio_psoc6.c
+++ b/drivers/gpio/gpio_psoc6.c
@@ -8,18 +8,18 @@
 #define DT_DRV_COMPAT cypress_psoc6_gpio
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "gpio_utils.h"
 #include "cy_gpio.h"
 #include "cy_sysint.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_psoc6);
 
 typedef void (*config_func_t)(const struct device *dev);
diff --git a/drivers/gpio/gpio_rcar.c b/drivers/gpio/gpio_rcar.c
index 3200c09f34..cc3f6d4471 100644
--- a/drivers/gpio/gpio_rcar.c
+++ b/drivers/gpio/gpio_rcar.c
@@ -8,12 +8,12 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_rpi_pico.c b/drivers/gpio/gpio_rpi_pico.c
index 63c7089aff..7c09b47263 100644
--- a/drivers/gpio/gpio_rpi_pico.c
+++ b/drivers/gpio/gpio_rpi_pico.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 /* pico-sdk includes */
 #include <hardware/gpio.h>
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
index 12397296e2..a34fbb7840 100644
--- a/drivers/gpio/gpio_rv32m1.c
+++ b/drivers/gpio/gpio_rv32m1.c
@@ -9,12 +9,12 @@
 #define DT_DRV_COMPAT openisa_rv32m1_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c
index 51713b580c..cfa5295ec0 100644
--- a/drivers/gpio/gpio_sam.c
+++ b/drivers/gpio/gpio_sam.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT atmel_sam_gpio
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/atmel-sam-gpio.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/atmel-sam-gpio.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 7e9a06f486..3b915bc29e 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -8,11 +8,11 @@
 #define DT_DRV_COMPAT atmel_sam0_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/gpio/atmel-sam0-gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/gpio/atmel-sam0-gpio.h>
 #include <soc.h>
-#include <drivers/interrupt_controller/sam0_eic.h>
+#include <zephyr/drivers/interrupt_controller/sam0_eic.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_sam4l.c b/drivers/gpio/gpio_sam4l.c
index 39142bc2d8..4240435da5 100644
--- a/drivers/gpio/gpio_sam4l.c
+++ b/drivers/gpio/gpio_sam4l.c
@@ -8,11 +8,11 @@
 #define DT_DRV_COMPAT atmel_sam4l_gpio
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c
index 1f43a43cfb..af70a2e152 100644
--- a/drivers/gpio/gpio_shell.c
+++ b/drivers/gpio/gpio_shell.c
@@ -7,15 +7,15 @@
  * Use "device list" command for GPIO port names
  */
 
-#include <sys/printk.h>
-#include <shell/shell.h>
-#include <init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <stdio.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 
diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c
index 9ce9790606..39e28baa8e 100644
--- a/drivers/gpio/gpio_sifive.c
+++ b/drivers/gpio/gpio_sifive.c
@@ -11,11 +11,11 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index bb3e594667..3c617770a0 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT ti_stellaris_gpio
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 #include <soc.h>
-#include <sys/sys_io.h>
+#include <zephyr/sys/sys_io.h>
 #include "gpio_utils.h"
 
 typedef void (*config_func_t)(const struct device *dev);
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 24f4371296..fa7898b944 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -8,22 +8,22 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_exti.h>
 #include <stm32_ll_gpio.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_system.h>
-#include <drivers/gpio.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <pinmux/pinmux_stm32.h>
-#include <drivers/pinmux.h>
-#include <sys/util.h>
-#include <drivers/interrupt_controller/exti_stm32.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/interrupt_controller/exti_stm32.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
 #include "stm32_hsem.h"
 #include "gpio_stm32.h"
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 6b310d25ff..a048da25e9 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -11,9 +11,9 @@
  * @file header for STM32 GPIO
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <pinmux/pinmux_stm32.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 /* GPIO buses definitions */
 
diff --git a/drivers/gpio/gpio_stmpe1600.c b/drivers/gpio/gpio_stmpe1600.c
index 0c2cd7d7e3..0b6a12f109 100644
--- a/drivers/gpio/gpio_stmpe1600.c
+++ b/drivers/gpio/gpio_stmpe1600.c
@@ -11,18 +11,18 @@
  */
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "gpio_utils.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(stmpe1600);
 
 /* Register definitions */
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index d264cb361b..3996a730f9 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -11,17 +11,17 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/gpio/gpio_sx1509b.h>
-#include <dt-bindings/gpio/semtech-sx1509b.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/gpio/gpio_sx1509b.h>
+#include <zephyr/dt-bindings/gpio/semtech-sx1509b.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sx1509b, CONFIG_GPIO_LOG_LEVEL);
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_test.c b/drivers/gpio/gpio_test.c
index 3c3cbb110a..0a821be593 100644
--- a/drivers/gpio/gpio_test.c
+++ b/drivers/gpio/gpio_test.c
@@ -12,7 +12,7 @@
 
 #define DT_DRV_COMPAT vnd_gpio
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 static int vnd_gpio_pin_configure(const struct device *port,
 				  gpio_pin_t pin,
diff --git a/drivers/gpio/gpio_xlnx_axi.c b/drivers/gpio/gpio_xlnx_axi.c
index cbd7c36811..68d807f328 100644
--- a/drivers/gpio/gpio_xlnx_axi.c
+++ b/drivers/gpio/gpio_xlnx_axi.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT xlnx_xps_gpio_1_00_a
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/sys_io.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_xlnx_ps.c b/drivers/gpio/gpio_xlnx_ps.c
index 0a80b92876..001ce2d58b 100644
--- a/drivers/gpio/gpio_xlnx_ps.c
+++ b/drivers/gpio/gpio_xlnx_ps.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include "gpio_utils.h"
 #include "gpio_xlnx_ps.h"
 #include "gpio_xlnx_ps_bank.h"
 
 #define LOG_MODULE_NAME gpio_xlnx_ps
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define DT_DRV_COMPAT xlnx_ps_gpio
diff --git a/drivers/gpio/gpio_xlnx_ps_bank.c b/drivers/gpio/gpio_xlnx_ps_bank.c
index baf1d97237..3e0071c83e 100644
--- a/drivers/gpio/gpio_xlnx_ps_bank.c
+++ b/drivers/gpio/gpio_xlnx_ps_bank.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 #include "gpio_utils.h"
 #include "gpio_xlnx_ps_bank.h"
 
 #define LOG_MODULE_NAME gpio_xlnx_ps_bank
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #define DT_DRV_COMPAT xlnx_ps_gpio_bank
diff --git a/drivers/hwinfo/hwinfo_esp32.c b/drivers/hwinfo/hwinfo_esp32.c
index eaa9fa813c..cd6a6de076 100644
--- a/drivers/hwinfo/hwinfo_esp32.c
+++ b/drivers/hwinfo/hwinfo_esp32.c
@@ -7,7 +7,7 @@
 
 #include <soc/efuse_reg.h>
 
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 
 ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
diff --git a/drivers/hwinfo/hwinfo_gecko.c b/drivers/hwinfo/hwinfo_gecko.c
index 207662b40b..f12d57da1b 100644
--- a/drivers/hwinfo/hwinfo_gecko.c
+++ b/drivers/hwinfo/hwinfo_gecko.c
@@ -7,9 +7,9 @@
 
 #include <em_system.h>
 #include <em_rmu.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #if defined(RMU_RSTCAUSE_BODUNREGRST) || defined(RMU_RSTCAUSE_BODREGRST) || \
     defined(RMU_RSTCAUSE_AVDDBOD) || defined(RMU_RSTCAUSE_DVDDBOD) || \
diff --git a/drivers/hwinfo/hwinfo_handlers.c b/drivers/hwinfo/hwinfo_handlers.c
index 845782f933..dd411f265d 100644
--- a/drivers/hwinfo/hwinfo_handlers.c
+++ b/drivers/hwinfo/hwinfo_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/hwinfo.h>
 
 ssize_t z_vrfy_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
diff --git a/drivers/hwinfo/hwinfo_imxrt.c b/drivers/hwinfo/hwinfo_imxrt.c
index ba51249164..79cc613d51 100644
--- a/drivers/hwinfo/hwinfo_imxrt.c
+++ b/drivers/hwinfo/hwinfo_imxrt.c
@@ -5,9 +5,9 @@
  */
 
 #include <soc.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 struct imxrt_uid {
 	uint32_t id[2];
diff --git a/drivers/hwinfo/hwinfo_litex.c b/drivers/hwinfo/hwinfo_litex.c
index dc3351bbf3..f354feed7a 100644
--- a/drivers/hwinfo/hwinfo_litex.c
+++ b/drivers/hwinfo/hwinfo_litex.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT litex_dna0
 
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <soc.h>
 #include <string.h>
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 
 ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
diff --git a/drivers/hwinfo/hwinfo_mcux_rcm.c b/drivers/hwinfo/hwinfo_mcux_rcm.c
index 7a08a2eab4..e7dfcd6c33 100644
--- a/drivers/hwinfo/hwinfo_mcux_rcm.c
+++ b/drivers/hwinfo/hwinfo_mcux_rcm.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/hwinfo.h>
-#include <logging/log.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/logging/log.h>
 #include <fsl_rcm.h>
 
 LOG_MODULE_REGISTER(hwinfo_rcm, CONFIG_HWINFO_LOG_LEVEL);
diff --git a/drivers/hwinfo/hwinfo_mcux_sim.c b/drivers/hwinfo/hwinfo_mcux_sim.c
index 1299d0afdd..7e462f6154 100644
--- a/drivers/hwinfo/hwinfo_mcux_sim.c
+++ b/drivers/hwinfo/hwinfo_mcux_sim.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <fsl_sim.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #if defined(SIM_UIDH)
 #define HWINFO_DEVICE_ID_LENGTH_H 1
diff --git a/drivers/hwinfo/hwinfo_mcux_src.c b/drivers/hwinfo/hwinfo_mcux_src.c
index 12656cb205..ecd64edabc 100644
--- a/drivers/hwinfo/hwinfo_mcux_src.c
+++ b/drivers/hwinfo/hwinfo_mcux_src.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT nxp_imx_src
 
 #include <soc.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include <fsl_src.h>
 
diff --git a/drivers/hwinfo/hwinfo_mcux_syscon.c b/drivers/hwinfo/hwinfo_mcux_syscon.c
index 5b4e79a27c..633bc42ed1 100644
--- a/drivers/hwinfo/hwinfo_mcux_syscon.c
+++ b/drivers/hwinfo/hwinfo_mcux_syscon.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT nxp_lpc_uid
 
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index 9f181e4a8e..2a79f1d0c0 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -5,10 +5,10 @@
  */
 
 #include <soc.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <hal/nrf_ficr.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #ifndef CONFIG_BOARD_QEMU_CORTEX_M0
 #include <helpers/nrfx_reset_reason.h>
 #endif
diff --git a/drivers/hwinfo/hwinfo_psoc6.c b/drivers/hwinfo/hwinfo_psoc6.c
index ede3be28ac..93b9ab32e5 100644
--- a/drivers/hwinfo/hwinfo_psoc6.c
+++ b/drivers/hwinfo/hwinfo_psoc6.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT cypress_psoc6_uid
 
-#include <device.h>
-#include <drivers/hwinfo.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/hwinfo/hwinfo_rpi_pico.c b/drivers/hwinfo/hwinfo_rpi_pico.c
index 2527adda99..89d5cb5654 100644
--- a/drivers/hwinfo/hwinfo_rpi_pico.c
+++ b/drivers/hwinfo/hwinfo_rpi_pico.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <hardware/flash.h>
 #include <hardware/structs/vreg_and_chip_reset.h>
 
diff --git a/drivers/hwinfo/hwinfo_sam.c b/drivers/hwinfo/hwinfo_sam.c
index fc46c5d2b0..4f8709b9d7 100644
--- a/drivers/hwinfo/hwinfo_sam.c
+++ b/drivers/hwinfo/hwinfo_sam.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/hwinfo.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/hwinfo/hwinfo_sam0.c b/drivers/hwinfo/hwinfo_sam0.c
index 96e73b5311..03dd3b4e61 100644
--- a/drivers/hwinfo/hwinfo_sam0.c
+++ b/drivers/hwinfo/hwinfo_sam0.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT atmel_sam0_id
 
 #include <soc.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 struct sam0_uid {
 	uint32_t id[4];
diff --git a/drivers/hwinfo/hwinfo_sam4l.c b/drivers/hwinfo/hwinfo_sam4l.c
index d542209a20..0698798f1c 100644
--- a/drivers/hwinfo/hwinfo_sam4l.c
+++ b/drivers/hwinfo/hwinfo_sam4l.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT atmel_sam4l_uid
 
-#include <device.h>
-#include <drivers/hwinfo.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/hwinfo/hwinfo_sam_rstc.c b/drivers/hwinfo/hwinfo_sam_rstc.c
index 57adaf5292..6b58593035 100644
--- a/drivers/hwinfo/hwinfo_sam_rstc.c
+++ b/drivers/hwinfo/hwinfo_sam_rstc.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT atmel_sam_rstc
 
-#include <device.h>
-#include <drivers/hwinfo.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
diff --git a/drivers/hwinfo/hwinfo_shell.c b/drivers/hwinfo/hwinfo_shell.c
index 4b96b930d5..187207a835 100644
--- a/drivers/hwinfo/hwinfo_shell.c
+++ b/drivers/hwinfo/hwinfo_shell.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
-#include <shell/shell.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <zephyr/types.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 static int cmd_get_device_id(const struct shell *sh, size_t argc, char **argv)
 {
diff --git a/drivers/hwinfo/hwinfo_stm32.c b/drivers/hwinfo/hwinfo_stm32.c
index 9f67259221..aa62fed71a 100644
--- a/drivers/hwinfo/hwinfo_stm32.c
+++ b/drivers/hwinfo/hwinfo_stm32.c
@@ -7,9 +7,9 @@
 #include <soc.h>
 #include <stm32_ll_utils.h>
 #include <stm32_ll_rcc.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 struct stm32_uid {
 	uint32_t id[3];
diff --git a/drivers/hwinfo/hwinfo_weak_impl.c b/drivers/hwinfo/hwinfo_weak_impl.c
index 97f6a0af61..c951d639ae 100644
--- a/drivers/hwinfo/hwinfo_weak_impl.c
+++ b/drivers/hwinfo/hwinfo_weak_impl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 
 ssize_t __weak z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
diff --git a/drivers/i2c/i2c-priv.h b/drivers/i2c/i2c-priv.h
index f1bf19e913..9b85c85f95 100644
--- a/drivers/i2c/i2c-priv.h
+++ b/drivers/i2c/i2c-priv.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_I2C_I2C_PRIV_H_
 #define ZEPHYR_DRIVERS_I2C_I2C_PRIV_H_
 
-#include <drivers/i2c.h>
-#include <dt-bindings/i2c/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/logging/log.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/i2c/i2c_b91.c b/drivers/i2c/i2c_b91.c
index dc6572ddc0..2623ce3b9f 100644
--- a/drivers/i2c/i2c_b91.c
+++ b/drivers/i2c/i2c_b91.c
@@ -9,12 +9,12 @@
 #include "i2c.h"
 #include "clock.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_telink);
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c-priv.h"
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /* I2C configuration structure */
 struct i2c_b91_cfg {
diff --git a/drivers/i2c/i2c_bitbang.c b/drivers/i2c/i2c_bitbang.c
index 85765d660c..b92583c888 100644
--- a/drivers/i2c/i2c_bitbang.c
+++ b/drivers/i2c/i2c_bitbang.c
@@ -18,8 +18,8 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 /*
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index f2eb0c971b..7f980bc763 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_i2c
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
-#include <pm/device.h>
-#include <pm/policy.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_cc13xx_cc26xx);
 
 #include <driverlib/i2c.h>
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index a72283b5d6..b7df185597 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -8,9 +8,9 @@
 
 #define DT_DRV_COMPAT ti_cc32xx_i2c
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
 
 /* Driverlib includes */
@@ -21,7 +21,7 @@
 #include <driverlib/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_cc32xx);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_common.c b/drivers/i2c/i2c_common.c
index 15971ac12c..765285d80b 100644
--- a/drivers/i2c/i2c_common.c
+++ b/drivers/i2c/i2c_common.c
@@ -8,10 +8,10 @@
 
 #include <stdio.h>
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c);
 
 void i2c_dump_msgs(const char *name, const struct i2c_msg *msgs,
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index c5473c32c7..93738ae1bd 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -11,31 +11,31 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <init.h>
-#include <pm/device.h>
-#include <arch/cpu.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/arch/cpu.h>
 #include <string.h>
 
 #if defined(CONFIG_PINCTRL)
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #include <soc.h>
 #include <errno.h>
-#include <sys/sys_io.h>
+#include <zephyr/sys/sys_io.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 #endif
 
 #include "i2c_dw.h"
 #include "i2c_dw_registers.h"
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_dw);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h
index a7cc35aca8..90a3c028ec 100644
--- a/drivers/i2c/i2c_dw.h
+++ b/drivers/i2c/i2c_dw.h
@@ -8,14 +8,14 @@
 #ifndef ZEPHYR_DRIVERS_I2C_I2C_DW_H_
 #define ZEPHYR_DRIVERS_I2C_I2C_DW_H_
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <stdbool.h>
 
 #define DT_DRV_COMPAT snps_designware_i2c
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie)
 BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "DW I2C in DT needs CONFIG_PCIE");
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/drivers/i2c/i2c_emul.c b/drivers/i2c/i2c_emul.c
index c0e290fa2e..cc8d3c0fb5 100644
--- a/drivers/i2c/i2c_emul.c
+++ b/drivers/i2c/i2c_emul.c
@@ -12,13 +12,13 @@
 #define DT_DRV_COMPAT zephyr_i2c_emul_controller
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_emul_ctlr);
 
-#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 "i2c-priv.h"
 
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index d89ab049ae..20ca09e2bd 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -17,15 +17,15 @@
 
 #include <soc.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/pinctrl.h>
-#include <drivers/i2c.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_esp32, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_gd32.c b/drivers/i2c/i2c_gd32.c
index aa5a3cda00..89f46d2fd9 100644
--- a/drivers/i2c/i2c_gd32.c
+++ b/drivers/i2c/i2c_gd32.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT gd_gd32_i2c
 
 #include <errno.h>
-#include <kernel.h>
-#include <devicetree.h>
-#include <drivers/pinctrl.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_gd32, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index 234caf4170..b7f03d5a38 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -7,15 +7,15 @@
 #define DT_DRV_COMPAT silabs_gecko_i2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 #include <em_cmu.h>
 #include <em_i2c.h>
 #include <em_gpio.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_gecko);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c
index 5a19e1f176..157212dc2b 100644
--- a/drivers/i2c/i2c_gpio.c
+++ b/drivers/i2c/i2c_gpio.c
@@ -26,12 +26,12 @@
  * SCL pin may be a push/pull output.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_gpio);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_handlers.c b/drivers/i2c/i2c_handlers.c
index cff24c522e..04ea242fa5 100644
--- a/drivers/i2c/i2c_handlers.c
+++ b/drivers/i2c/i2c_handlers.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <string.h>
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_i2c_configure(const struct device *dev,
 				       uint32_t dev_config)
diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c
index a5017e84ec..8640a33c95 100644
--- a/drivers/i2c/i2c_imx.c
+++ b/drivers/i2c/i2c_imx.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT fsl_imx21_i2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
 #include <i2c_imx.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_imx);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_ite_enhance.c b/drivers/i2c/i2c_ite_enhance.c
index a6445bac09..2462229471 100644
--- a/drivers/i2c/i2c_ite_enhance.c
+++ b/drivers/i2c/i2c_ite_enhance.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ite_enhance_i2c
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ite_enhance, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_ite_it8xxx2.c b/drivers/i2c/i2c_ite_it8xxx2.c
index bafbfd78ff..9f5879f1ec 100644
--- a/drivers/i2c/i2c_ite_it8xxx2.c
+++ b/drivers/i2c/i2c_ite_it8xxx2.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_i2c
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ite_it8xxx2, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c
index abcc51d5f9..e8729ffa3e 100644
--- a/drivers/i2c/i2c_litex.c
+++ b/drivers/i2c/i2c_litex.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT litex_i2c
 
-#include <device.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 #define SCL_BIT_POS                0
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index dcee6a5af3..8fd742bf58 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -5,20 +5,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_i2c.h>
 #include <stm32_ll_rcc.h>
 #include <errno.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ll_stm32);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index 5bf10cce39..e3f1c97ddc 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -8,18 +8,18 @@
  *
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_i2c.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ll_stm32_v1);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index c07733fae8..ff76229d31 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -9,18 +9,18 @@
  *
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_i2c.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_ll_stm32_v2);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_lpc11u6x.c b/drivers/i2c/i2c_lpc11u6x.c
index 1d7873427a..4072cc316c 100644
--- a/drivers/i2c/i2c_lpc11u6x.c
+++ b/drivers/i2c/i2c_lpc11u6x.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_lpc11u6x_i2c
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/pinmux.h>
-#include <drivers/clock_control.h>
-#include <dt-bindings/pinctrl/lpc11u6x-pinctrl.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/pinctrl/lpc11u6x-pinctrl.h>
 #include "i2c_lpc11u6x.h"
 
 #define DEV_BASE(dev) (((struct lpc11u6x_i2c_config *)(dev->config))->base)
diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c
index c24e4abceb..69dba22b46 100644
--- a/drivers/i2c/i2c_mchp_xec.c
+++ b/drivers/i2c/i2c_mchp_xec.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT microchip_xec_i2c
 
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_mchp, CONFIG_I2C_LOG_LEVEL);
 
 #define SPEED_100KHZ_BUS    0
diff --git a/drivers/i2c/i2c_mchp_xec_v2.c b/drivers/i2c/i2c_mchp_xec_v2.c
index 75d0e03e08..3842ba638c 100644
--- a/drivers/i2c/i2c_mchp_xec_v2.c
+++ b/drivers/i2c/i2c_mchp_xec_v2.c
@@ -7,17 +7,17 @@
 
 #define DT_DRV_COMPAT microchip_xec_i2c_v2
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <errno.h>
-#include <drivers/clock_control.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <drivers/pinctrl.h>
-#include <sys/printk.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_mchp, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c
index d2e16d549f..990d8a35b8 100644
--- a/drivers/i2c/i2c_mcux.c
+++ b/drivers/i2c/i2c_mcux.c
@@ -7,15 +7,15 @@
 #define DT_DRV_COMPAT nxp_kinetis_i2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
 #include <fsl_i2c.h>
 #include <fsl_clock.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_mcux);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c
index a8574de33c..dcb54082d9 100644
--- a/drivers/i2c/i2c_mcux_flexcomm.c
+++ b/drivers/i2c/i2c_mcux_flexcomm.c
@@ -8,14 +8,14 @@
 #define DT_DRV_COMPAT nxp_lpc_i2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_i2c.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mcux_flexcomm);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
index 1126af8c01..229f2511e9 100644
--- a/drivers/i2c/i2c_mcux_lpi2c.c
+++ b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -8,15 +8,15 @@
 #define DT_DRV_COMPAT nxp_imx_lpi2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_lpi2c.h>
 
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif /* CONFIG_PINCTRL */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mcux_lpi2c);
 
 
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 3f2f6de4f5..05be4924f5 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT altr_nios2_i2c
 
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <altera_common.h>
 #include "altera_avalon_i2c.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_nios2);
 
 #define NIOS2_I2C_TIMEOUT_USEC		1000
diff --git a/drivers/i2c/i2c_npcx_controller.c b/drivers/i2c/i2c_npcx_controller.c
index 7ed1d4fbd0..c11a566424 100644
--- a/drivers/i2c/i2c_npcx_controller.c
+++ b/drivers/i2c/i2c_npcx_controller.c
@@ -67,11 +67,11 @@
  */
 
 #include <assert.h>
-#include <drivers/clock_control.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_npcx, LOG_LEVEL_ERR);
 
 /* I2C controller mode */
diff --git a/drivers/i2c/i2c_npcx_controller.h b/drivers/i2c/i2c_npcx_controller.h
index 1ee3a0f8b4..0e63c4c918 100644
--- a/drivers/i2c/i2c_npcx_controller.h
+++ b/drivers/i2c/i2c_npcx_controller.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_I2C_I2C_NPCX_CONTROLLER_H_
 #define ZEPHYR_DRIVERS_I2C_I2C_NPCX_CONTROLLER_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/i2c/i2c_npcx_port.c b/drivers/i2c/i2c_npcx_port.c
index ef39e29b31..1164cea00c 100644
--- a/drivers/i2c/i2c_npcx_port.c
+++ b/drivers/i2c/i2c_npcx_port.c
@@ -29,12 +29,12 @@
  */
 
 #include <assert.h>
-#include <drivers/clock_control.h>
-#include <drivers/i2c.h>
-#include <dt-bindings/i2c/i2c.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_npcx_port, LOG_LEVEL_ERR);
 
 #include "i2c_npcx_controller.h"
diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c
index f377e16cfb..42dccc3d85 100644
--- a/drivers/i2c/i2c_nrfx_twi.c
+++ b/drivers/i2c/i2c_nrfx_twi.c
@@ -5,14 +5,14 @@
  */
 
 
-#include <drivers/i2c.h>
-#include <dt-bindings/i2c/i2c.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_twi.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_nrfx_twi, CONFIG_I2C_LOG_LEVEL);
 
 #define I2C_TRANSFER_TIMEOUT_MSEC		K_MSEC(500)
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 21d930e381..35c33106d8 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -5,15 +5,15 @@
  */
 
 
-#include <drivers/i2c.h>
-#include <dt-bindings/i2c/i2c.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/dt-bindings/i2c/i2c.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_twim.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
 
 #define I2C_TRANSFER_TIMEOUT_MSEC		K_MSEC(500)
diff --git a/drivers/i2c/i2c_rcar.c b/drivers/i2c/i2c_rcar.c
index 7b153d422a..b41a627bbd 100644
--- a/drivers/i2c/i2c_rcar.c
+++ b/drivers/i2c/i2c_rcar.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT renesas_rcar_i2c
 
 #include <errno.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
-#include <drivers/i2c.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_rcar);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
index c6b54f5b51..105da661ee 100644
--- a/drivers/i2c/i2c_rv32m1_lpi2c.c
+++ b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT openisa_rv32m1_lpi2c
 
-#include <drivers/i2c.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_lpi2c.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 LOG_MODULE_REGISTER(rv32m1_lpi2c);
diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c
index 22bba48abd..4c0b20a490 100644
--- a/drivers/i2c/i2c_sam0.c
+++ b/drivers/i2c/i2c_sam0.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT atmel_sam0_i2c
 
 #include <errno.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/i2c.h>
-#include <drivers/dma.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sam0, CONFIG_I2C_LOG_LEVEL);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_sam4l_twim.c b/drivers/i2c/i2c_sam4l_twim.c
index 1e9a020046..b6ffdca36e 100644
--- a/drivers/i2c/i2c_sam4l_twim.c
+++ b/drivers/i2c/i2c_sam4l_twim.c
@@ -16,16 +16,16 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sam_twim);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index 959cff06c2..0d98185e5b 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -15,17 +15,17 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <stdbool.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sam_twi);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index 3597403dca..1d25adb5fd 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -14,16 +14,16 @@
 
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/i2c.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sam_twihs);
 
 #include "i2c-priv.h"
diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c
index f844cdab2c..8ef32d7bb8 100644
--- a/drivers/i2c/i2c_sbcon.c
+++ b/drivers/i2c/i2c_sbcon.c
@@ -14,9 +14,9 @@
  * hardware state of two-bit serial interfaces like I2C.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include "i2c_bitbang.h"
 
 /* SBCon hardware registers layout */
diff --git a/drivers/i2c/i2c_shell.c b/drivers/i2c/i2c_shell.c
index e1d22dadd0..6cdfe17845 100644
--- a/drivers/i2c/i2c_shell.c
+++ b/drivers/i2c/i2c_shell.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <shell/shell.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_shell, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define I2C_DEVICE_PREFIX "I2C_"
diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c
index 6bce780650..69c9b2ba2e 100644
--- a/drivers/i2c/i2c_sifive.c
+++ b/drivers/i2c/i2c_sifive.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT sifive_i2c0
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_sifive);
 
-#include <device.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
 #include <soc.h>
-#include <sys/sys_io.h>
+#include <zephyr/sys/sys_io.h>
 
 #include "i2c-priv.h"
 
diff --git a/drivers/i2c/i2c_tca954x.c b/drivers/i2c/i2c_tca954x.c
index 7112588698..70baf676ac 100644
--- a/drivers/i2c/i2c_tca954x.c
+++ b/drivers/i2c/i2c_tca954x.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 #include <stdint.h>
 
 LOG_MODULE_REGISTER(tca954x, CONFIG_I2C_LOG_LEVEL);
diff --git a/drivers/i2c/i2c_test.c b/drivers/i2c/i2c_test.c
index 27fbfcdd95..53274f6efd 100644
--- a/drivers/i2c/i2c_test.c
+++ b/drivers/i2c/i2c_test.c
@@ -9,8 +9,8 @@
  * devices for the "vnd,i2c" devicetree compatible used in test code.
  */
 
-#include <zephyr.h>
-#include <drivers/i2c.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/i2c.h>
 
 #define DT_DRV_COMPAT vnd_i2c
 
diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c
index 66fbc6820b..04b7d1a883 100644
--- a/drivers/i2c/slave/eeprom_slave.c
+++ b/drivers/i2c/slave/eeprom_slave.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT atmel_at24
 
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <string.h>
-#include <drivers/i2c/slave/eeprom.h>
+#include <zephyr/drivers/i2c/slave/eeprom.h>
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_slave);
 
 struct i2c_eeprom_slave_data {
diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c
index 8bbc2d15e8..1c75ba8c61 100644
--- a/drivers/i2s/i2s_cavs.c
+++ b/drivers/i2s/i2s_cavs.c
@@ -16,18 +16,18 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/dma.h>
-#include <drivers/i2s.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/i2s.h>
 #include <soc.h>
 #include "i2s_cavs.h"
 
 #define LOG_DOMAIN dev_i2s_cavs
 #define LOG_LEVEL CONFIG_I2S_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 /* length of the buffer queue */
diff --git a/drivers/i2s/i2s_common.c b/drivers/i2s/i2s_common.c
index 180c0f26c8..00edfe2083 100644
--- a/drivers/i2s/i2s_common.c
+++ b/drivers/i2s/i2s_common.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <drivers/i2s.h>
+#include <zephyr/drivers/i2s.h>
 
 int z_impl_i2s_buf_read(const struct device *dev, void *buf, size_t *size)
 {
diff --git a/drivers/i2s/i2s_handlers.c b/drivers/i2s/i2s_handlers.c
index 0bd3d4dc31..ccad337eed 100644
--- a/drivers/i2s/i2s_handlers.c
+++ b/drivers/i2s/i2s_handlers.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <syscall_handler.h>
-#include <drivers/i2s.h>
+#include <zephyr/kernel.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/i2s.h>
 
 
 static inline int z_vrfy_i2s_configure(const struct device *dev,
diff --git a/drivers/i2s/i2s_litex.c b/drivers/i2s/i2s_litex.c
index 88a8584c37..fe75eecce0 100644
--- a/drivers/i2s/i2s_litex.c
+++ b/drivers/i2s/i2s_litex.c
@@ -5,13 +5,13 @@
  */
 
 #include <string.h>
-#include <drivers/i2s.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/sys/byteorder.h>
 #include <soc.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
 #include "i2s_litex.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(i2s_litex);
 
diff --git a/drivers/i2s/i2s_litex.h b/drivers/i2s/i2s_litex.h
index 08d89ab6d5..f4dbc040b0 100644
--- a/drivers/i2s/i2s_litex.h
+++ b/drivers/i2s/i2s_litex.h
@@ -7,9 +7,9 @@
 #ifndef _I2S_LITEI2S__H
 #define _I2S_LITEI2S__H
 
-#include <device.h>
-#include <drivers/i2s.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/devicetree.h>
 
 /* i2s register offsets*/
 #define I2S_EV_STATUS_REG_OFFSET 0x0
diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c
index 0b200c476a..3325dae88a 100644
--- a/drivers/i2s/i2s_ll_stm32.c
+++ b/drivers/i2s/i2s_ll_stm32.c
@@ -7,18 +7,18 @@
 #define DT_DRV_COMPAT st_stm32_i2s
 
 #include <string.h>
-#include <drivers/dma.h>
-#include <drivers/i2s.h>
-#include <drivers/dma/dma_stm32.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
 #include <soc.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_spi.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include "i2s_ll_stm32.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2s_ll_stm32);
 
 /* FIXME change to
diff --git a/drivers/i2s/i2s_mcux_flexcomm.c b/drivers/i2s/i2s_mcux_flexcomm.c
index 8fe5ca337a..0223d9cbc5 100644
--- a/drivers/i2s/i2s_mcux_flexcomm.c
+++ b/drivers/i2s/i2s_mcux_flexcomm.c
@@ -8,14 +8,14 @@
 #define DT_DRV_COMPAT nxp_lpc_i2s
 
 #include <string.h>
-#include <drivers/dma.h>
-#include <drivers/i2s.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_i2s.h>
 #include <fsl_dma.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 LOG_MODULE_REGISTER(i2s_mcux_flexcomm);
diff --git a/drivers/i2s/i2s_mcux_sai.c b/drivers/i2s/i2s_mcux_sai.c
index af756ea0ef..f5d6257ed9 100644
--- a/drivers/i2s/i2s_mcux_sai.c
+++ b/drivers/i2s/i2s_mcux_sai.c
@@ -11,24 +11,24 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/dma.h>
-#include <drivers/i2s.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/i2s.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <drivers/clock_control.h>
-#include <dt-bindings/clock/imx_ccm.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <soc.h>
 
 #include "i2s_mcux_sai.h"
 
 #define LOG_DOMAIN dev_i2s_mcux
 #define LOG_LEVEL CONFIG_I2S_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
diff --git a/drivers/i2s/i2s_mcux_sai.h b/drivers/i2s/i2s_mcux_sai.h
index 6961254f93..3599320d11 100644
--- a/drivers/i2s/i2s_mcux_sai.h
+++ b/drivers/i2s/i2s_mcux_sai.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <fsl_sai.h>
 #include <fsl_edma.h>
 
diff --git a/drivers/i2s/i2s_nrfx.c b/drivers/i2s/i2s_nrfx.c
index f1a10dba87..bcd23621b2 100644
--- a/drivers/i2s/i2s_nrfx.c
+++ b/drivers/i2s/i2s_nrfx.c
@@ -5,13 +5,13 @@
  */
 
 #include <stdlib.h>
-#include <drivers/i2s.h>
-#include <drivers/clock_control/nrf_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_i2s.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2s_nrfx, CONFIG_I2S_LOG_LEVEL);
 
 struct stream_cfg {
diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c
index d34b8eb6aa..440948645c 100644
--- a/drivers/i2s/i2s_sam_ssc.c
+++ b/drivers/i2s/i2s_sam_ssc.c
@@ -21,18 +21,18 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/dma.h>
-#include <drivers/i2s.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/i2s.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #define LOG_DOMAIN dev_i2s_sam_ssc
 #define LOG_LEVEL CONFIG_I2S_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #if __DCACHE_PRESENT == 1
diff --git a/drivers/ieee802154/ieee802154_b91.c b/drivers/ieee802154/ieee802154_b91.c
index 5cc4624c6a..379a373498 100644
--- a/drivers/ieee802154/ieee802154_b91.c
+++ b/drivers/ieee802154/ieee802154_b91.c
@@ -16,13 +16,13 @@
 #define LOG_LEVEL LOG_LEVEL_NONE
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <random/rand32.h>
-#include <net/ieee802154_radio.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/net/ieee802154_radio.h>
 #if defined(CONFIG_NET_L2_OPENTHREAD)
-#include <net/openthread.h>
+#include <zephyr/net/openthread.h>
 #endif
 
 #include "ieee802154_b91.h"
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
index 1da07a1502..aeb51ab279 100644
--- a/drivers/ieee802154/ieee802154_cc1200.c
+++ b/drivers/ieee802154/ieee802154_cc1200.c
@@ -11,28 +11,28 @@
 #define LOG_MODULE_NAME ieee802154_cc1200
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
 
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_cc1200.h"
 #include "ieee802154_cc1200_rf.h"
diff --git a/drivers/ieee802154/ieee802154_cc1200.h b/drivers/ieee802154/ieee802154_cc1200.h
index ae85d97f28..544bf5a605 100644
--- a/drivers/ieee802154/ieee802154_cc1200.h
+++ b/drivers/ieee802154/ieee802154_cc1200.h
@@ -9,12 +9,12 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_
 
-#include <linker/sections.h>
-#include <sys/atomic.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
-#include <drivers/ieee802154/cc1200.h>
+#include <zephyr/drivers/ieee802154/cc1200.h>
 
 /* Compile time config structure
  *******************************
diff --git a/drivers/ieee802154/ieee802154_cc1200_rf.h b/drivers/ieee802154/ieee802154_cc1200_rf.h
index 0512b36ded..8135fcad3c 100644
--- a/drivers/ieee802154/ieee802154_cc1200_rf.h
+++ b/drivers/ieee802154/ieee802154_cc1200_rf.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_RF_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_RF_H_
 
-#include <drivers/ieee802154/cc1200.h>
+#include <zephyr/drivers/ieee802154/cc1200.h>
 
 #define CC1200_RF_NON_EXT_SPACE_REGS	42
 #define CC1200_RF_EXT_SPACE_REGS	58
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
index 46da9e89d1..eb7c5d67c8 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
@@ -6,18 +6,18 @@
  */
 
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ieee802154_cc13xx_cc26xx);
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <net/ieee802154_radio.h>
-#include <net/ieee802154.h>
-#include <net/net_pkt.h>
-#include <random/rand32.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/random/rand32.h>
 #include <string.h>
-#include <sys/sys_io.h>
+#include <zephyr/sys/sys_io.h>
 
 #include <driverlib/rf_ieee_mailbox.h>
 #include <driverlib/rfc.h>
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
index 636b30dc55..584ffa19a2 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC13XX_CC26XX_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC13XX_CC26XX_H_
 
-#include <kernel.h>
-#include <net/net_if.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_if.h>
 
 #include <ti/drivers/rf/RF.h>
 
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c
index c27f95b366..d7c5e30e60 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c
@@ -5,19 +5,19 @@
  */
 
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ieee802154_cc13xx_cc26xx_subg);
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <net/ieee802154_radio.h>
-#include <net/ieee802154.h>
-#include <net/net_pkt.h>
-#include <random/rand32.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/random/rand32.h>
 #include <string.h>
-#include <sys/sys_io.h>
-#include <sys/crc.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/crc.h>
 
 #include <driverlib/rf_mailbox.h>
 #include <driverlib/rf_prop_mailbox.h>
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.h b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.h
index 7135d4426f..f0441cd6da 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.h
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.h
@@ -8,8 +8,8 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC13XX_CC26XX_SUBG_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC13XX_CC26XX_SUBG_H_
 
-#include <kernel.h>
-#include <net/net_if.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_if.h>
 
 #include <ti/drivers/rf/RF.h>
 
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index 4408827166..70f4d212a5 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -11,34 +11,34 @@
 #define LOG_MODULE_NAME ieee802154_cc2520
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
 
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #ifdef CONFIG_IEEE802154_CC2520_CRYPTO
 
-#include <crypto/crypto.h>
-#include <crypto/cipher.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/crypto/cipher.h>
 
 #endif /* CONFIG_IEEE802154_CC2520_CRYPTO */
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_cc2520.h"
 
diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h
index 06c1feb266..cebbc5936c 100644
--- a/drivers/ieee802154/ieee802154_cc2520.h
+++ b/drivers/ieee802154/ieee802154_cc2520.h
@@ -9,10 +9,10 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_
 
-#include <linker/sections.h>
-#include <sys/atomic.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 /* Compile time config structure
  *******************************
diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c
index 8bb716a23c..034614e802 100644
--- a/drivers/ieee802154/ieee802154_dw1000.c
+++ b/drivers/ieee802154/ieee802154_dw1000.c
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(dw1000, LOG_LEVEL_INF);
 
 #include <errno.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
-#include <debug/stack.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/debug/stack.h>
 #include <math.h>
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 #include "ieee802154_dw1000_regs.h"
 
 #define DT_DRV_COMPAT decawave_dw1000
diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c
index 6761105d04..e8f338f73a 100644
--- a/drivers/ieee802154/ieee802154_kw41z.c
+++ b/drivers/ieee802154/ieee802154_kw41z.c
@@ -9,24 +9,24 @@
 #define LOG_MODULE_NAME ieee802154_kw41z
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <irq.h>
-#include <net/ieee802154_radio.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <sys/byteorder.h>
-#include <random/rand32.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/random/rand32.h>
 
 #include "fsl_xcvr.h"
 
 #if defined(CONFIG_NET_L2_OPENTHREAD)
-#include <net/openthread.h>
+#include <zephyr/net/openthread.h>
 #endif
 
 
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
index af57116936..b7814d6dc7 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.c
+++ b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -11,28 +11,28 @@
 #define LOG_MODULE_NAME ieee802154_mcr20a
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
 
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
-#include <debug/stack.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/debug/stack.h>
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_mcr20a.h"
 #include "MCR20Overwrites.h"
diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h
index 6e7a2b56c4..47357b2aee 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.h
+++ b/drivers/ieee802154/ieee802154_mcr20a.h
@@ -10,9 +10,9 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_
 
-#include <linker/sections.h>
-#include <sys/atomic.h>
-#include <drivers/spi.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/drivers/spi.h>
 
 struct mcr20a_config {
 	struct spi_dt_spec bus;
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
index c64f67de4f..44c7af7073 100644
--- a/drivers/ieee802154/ieee802154_nrf5.c
+++ b/drivers/ieee802154/ieee802154_nrf5.c
@@ -13,32 +13,32 @@
 #define LOG_LEVEL LOG_LEVEL_NONE
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
 
 #include <soc.h>
 #include <soc_secure.h>
-#include <device.h>
-#include <init.h>
-#include <debug/stack.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
 #if defined(CONFIG_NET_L2_OPENTHREAD)
-#include <net/openthread.h>
+#include <zephyr/net/openthread.h>
 #endif
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_nrf5.h"
 #include "nrf_802154.h"
diff --git a/drivers/ieee802154/ieee802154_nrf5.h b/drivers/ieee802154/ieee802154_nrf5.h
index aa3686cb48..e79d1204a2 100644
--- a/drivers/ieee802154/ieee802154_nrf5.h
+++ b/drivers/ieee802154/ieee802154_nrf5.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_NRF5_H_
 #define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_NRF5_H_
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #define NRF5_FCS_LENGTH   (2)
 #define NRF5_PSDU_LENGTH  (125)
diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c
index c21f34bb51..a668f92ab4 100644
--- a/drivers/ieee802154/ieee802154_rf2xx.c
+++ b/drivers/ieee802154/ieee802154_rf2xx.c
@@ -11,38 +11,38 @@
 #define LOG_MODULE_NAME ieee802154_rf2xx
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 #include <stdio.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/debug/stack.h>
 
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <random/rand32.h>
-#include <linker/sections.h>
-#include <sys/atomic.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/atomic.h>
 
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_rf2xx.h"
 #include "ieee802154_rf2xx_regs.h"
 #include "ieee802154_rf2xx_iface.h"
 
 #if defined(CONFIG_NET_L2_OPENTHREAD)
-#include <net/openthread.h>
+#include <zephyr/net/openthread.h>
 
 #define RF2XX_OT_PSDU_LENGTH              1280
 
diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.c b/drivers/ieee802154/ieee802154_rf2xx_iface.c
index 13df5a7f36..2df6ca2f8c 100644
--- a/drivers/ieee802154/ieee802154_rf2xx_iface.c
+++ b/drivers/ieee802154/ieee802154_rf2xx_iface.c
@@ -9,16 +9,16 @@
 #define LOG_MODULE_NAME ieee802154_rf2xx_iface
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_rf2xx.h"
 #include "ieee802154_rf2xx_regs.h"
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
index d25c62720e..3442b43136 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.c
+++ b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -7,22 +7,22 @@
 #define LOG_MODULE_NAME ieee802154_uart_pipe
 #define LOG_LEVEL CONFIG_IEEE802154_DRIVER_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
-#include <device.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/random/rand32.h>
 
-#include <drivers/console/uart_pipe.h>
-#include <net/ieee802154_radio.h>
+#include <zephyr/drivers/console/uart_pipe.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_uart_pipe.h"
 
diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
index 333235edb7..fc62f46a14 100644
--- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
@@ -16,10 +16,10 @@
  * interrupt unit. The ARCv2 interrupt unit is highly programmable.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 /*
  * @brief Initialize the interrupt unit device driver
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index 7119d0a996..3ebd676e9f 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT intel_cavs_intc
 
-#include <device.h>
-#include <irq_nextlevel.h>
+#include <zephyr/device.h>
+#include <zephyr/irq_nextlevel.h>
 #include "intc_cavs.h"
 
 #if defined(CONFIG_SMP) && (CONFIG_MP_NUM_CPUS > 1)
diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c
index 6fdc86c9e3..ba0969a844 100644
--- a/drivers/interrupt_controller/intc_dw.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -13,8 +13,8 @@
  * This implementation works only when sw_isr_table is enabled in zephyr
  */
 
-#include <device.h>
-#include <irq_nextlevel.h>
+#include <zephyr/device.h>
+#include <zephyr/irq_nextlevel.h>
 #include "intc_dw.h"
 #include <soc.h>
 
diff --git a/drivers/interrupt_controller/intc_esp32.c b/drivers/interrupt_controller/intc_esp32.c
index 8b9dc9746c..5539af4daa 100644
--- a/drivers/interrupt_controller/intc_esp32.c
+++ b/drivers/interrupt_controller/intc_esp32.c
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <soc.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include "esp_attr.h"
 #include <hal/cpu_hal.h>
 #include <hal/interrupt_controller_hal.h>
 #include <limits.h>
 #include <assert.h>
 #include "soc/soc.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_intc, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define ETS_INTERNAL_TIMER0_INTR_NO 6
diff --git a/drivers/interrupt_controller/intc_esp32c3.c b/drivers/interrupt_controller/intc_esp32c3.c
index d075172cf9..2cfe1b5185 100644
--- a/drivers/interrupt_controller/intc_esp32c3.c
+++ b/drivers/interrupt_controller/intc_esp32c3.c
@@ -14,14 +14,14 @@
 #include <assert.h>
 #include "soc/soc.h"
 #include <soc.h>
-#include <zephyr.h>
-#include <drivers/interrupt_controller/intc_esp32c3.h>
-#include <sw_isr_table.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/sw_isr_table.h>
 #include <riscv/interrupt.h>
 
 #define ESP32C3_INTC_DEFAULT_PRIO			15
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_esp32c3, CONFIG_LOG_DEFAULT_LEVEL);
 
 /*
diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
index 41c18ba6ef..9178eba865 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -20,11 +20,11 @@
 
 #define EXTI_NODE DT_INST(0, st_stm32_exti)
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stm32_ll_exti.h>
-#include <sys/__assert.h>
-#include <drivers/interrupt_controller/exti_stm32.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/interrupt_controller/exti_stm32.h>
 
 #include "stm32_hsem.h"
 
diff --git a/drivers/interrupt_controller/intc_gd32_exti.c b/drivers/interrupt_controller/intc_gd32_exti.c
index f107ede707..27c42778b5 100644
--- a/drivers/interrupt_controller/intc_gd32_exti.c
+++ b/drivers/interrupt_controller/intc_gd32_exti.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT gd_gd32_exti
 
-#include <device.h>
-#include <drivers/interrupt_controller/gd32_exti.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gd32_exti.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <sys/util_macro.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
 
 /** Unsupported line indicator */
 #define EXTI_NOTSUP 0xFFU
diff --git a/drivers/interrupt_controller/intc_gic.c b/drivers/interrupt_controller/intc_gic.c
index 7893fc3f9b..acf1b71fbd 100644
--- a/drivers/interrupt_controller/intc_gic.c
+++ b/drivers/interrupt_controller/intc_gic.c
@@ -10,10 +10,10 @@
  * NOTE: This driver implements the GICv1 and GICv2 interfaces.
  */
 
-#include <devicetree.h>
-#include <sw_isr_table.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 
 #define CPU_REG_ID(cpu_node_id) DT_REG_ADDR(cpu_node_id),
 static const uint64_t cpu_mpid_list[] = {
diff --git a/drivers/interrupt_controller/intc_gicv3.c b/drivers/interrupt_controller/intc_gicv3.c
index 071ec40d04..4f878f898d 100644
--- a/drivers/interrupt_controller/intc_gicv3.c
+++ b/drivers/interrupt_controller/intc_gicv3.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/__assert.h>
-#include <sw_isr_table.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 #include "intc_gic_common_priv.h"
 #include "intc_gicv3_priv.h"
 
diff --git a/drivers/interrupt_controller/intc_gicv3_its.c b/drivers/interrupt_controller/intc_gicv3_its.c
index e9ab069290..30733c04e5 100644
--- a/drivers/interrupt_controller/intc_gicv3_its.c
+++ b/drivers/interrupt_controller/intc_gicv3_its.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_gicv3_its, LOG_LEVEL_ERR);
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/interrupt_controller/gicv3_its.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 
 #include "intc_gic_common_priv.h"
 #include "intc_gicv3_priv.h"
diff --git a/drivers/interrupt_controller/intc_gicv3_priv.h b/drivers/interrupt_controller/intc_gicv3_priv.h
index c3b7d249e4..e7d1704307 100644
--- a/drivers/interrupt_controller/intc_gicv3_priv.h
+++ b/drivers/interrupt_controller/intc_gicv3_priv.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_INCLUDE_DRIVERS_INTC_GICV3_PRIV_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <sys/atomic.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/atomic.h>
 
 /* Cache and Share ability for ITS & Redistributor LPI state tables */
 #define GIC_BASER_CACHE_NGNRNE		0x0UL /* Device-nGnRnE */
diff --git a/drivers/interrupt_controller/intc_intel_vtd.c b/drivers/interrupt_controller/intc_intel_vtd.c
index 9048146881..0f4f90648b 100644
--- a/drivers/interrupt_controller/intc_intel_vtd.c
+++ b/drivers/interrupt_controller/intc_intel_vtd.c
@@ -7,23 +7,23 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <cache.h>
+#include <zephyr/cache.h>
 
-#include <arch/x86/intel_vtd.h>
-#include <drivers/interrupt_controller/intel_vtd.h>
-#include <drivers/interrupt_controller/ioapic.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <drivers/pcie/msi.h>
+#include <zephyr/arch/x86/intel_vtd.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/pcie/msi.h>
 
 #include <kernel_arch_func.h>
 
diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c
index dd205f5264..f509c6a3c2 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -52,17 +52,17 @@
  *
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <device.h>
-#include <pm/device.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
 #include <string.h>
 
-#include <drivers/interrupt_controller/ioapic.h> /* public API declarations */
-#include <drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
+#include <zephyr/drivers/interrupt_controller/ioapic.h> /* public API declarations */
+#include <zephyr/drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
 #include "intc_ioapic_priv.h"
 
 DEVICE_MMIO_TOPLEVEL_STATIC(ioapic_regs, DT_DRV_INST(0));
@@ -89,7 +89,7 @@ DEVICE_MMIO_TOPLEVEL_STATIC(ioapic_regs, DT_DRV_INST(0));
 static __pinned_bss uint32_t ioapic_rtes;
 
 #ifdef CONFIG_PM_DEVICE
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 
 #define BITS_PER_IRQ  4
 #define IOAPIC_BITFIELD_HI_LO	0
@@ -119,8 +119,8 @@ static void IoApicRedUpdateLo(unsigned int irq, uint32_t value,
 #if defined(CONFIG_INTEL_VTD_ICTL) &&				\
 	!defined(CONFIG_INTEL_VTD_ICTL_XAPIC_PASSTHROUGH)
 
-#include <drivers/interrupt_controller/intel_vtd.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/arch/x86/acpi.h>
 
 static const struct device *vtd;
 static uint16_t ioapic_id;
diff --git a/drivers/interrupt_controller/intc_irqmp.c b/drivers/interrupt_controller/intc_irqmp.c
index 982799d515..b15ec8fff3 100644
--- a/drivers/interrupt_controller/intc_irqmp.c
+++ b/drivers/interrupt_controller/intc_irqmp.c
@@ -16,8 +16,8 @@
 
 #define DT_DRV_COMPAT gaisler_irqmp
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 
 /*
  * Register description for IRQMP and IRQAMP interrupt controllers
diff --git a/drivers/interrupt_controller/intc_ite_it8xxx2.c b/drivers/interrupt_controller/intc_ite_it8xxx2.c
index a780011222..9e338d86e1 100644
--- a/drivers/interrupt_controller/intc_ite_it8xxx2.c
+++ b/drivers/interrupt_controller/intc_ite_it8xxx2.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sw_isr_table.h>
 #include "intc_ite_it8xxx2.h"
 
 #define MAX_REGISR_IRQ_NUM		8
diff --git a/drivers/interrupt_controller/intc_ite_it8xxx2.h b/drivers/interrupt_controller/intc_ite_it8xxx2.h
index 8cef428b9e..2b1ac2d3bf 100644
--- a/drivers/interrupt_controller/intc_ite_it8xxx2.h
+++ b/drivers/interrupt_controller/intc_ite_it8xxx2.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_
 #define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_
 
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 #include <soc.h>
 
 #endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_ */
diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c
index 817a02cb05..7d548fa95e 100644
--- a/drivers/interrupt_controller/intc_loapic.c
+++ b/drivers/interrupt_controller/intc_loapic.c
@@ -7,21 +7,21 @@
  * driver for x86 CPU local APIC (as an interrupt controller)
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
-#include <pm/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/pm/device.h>
 #include <zephyr/types.h>
 #include <string.h>
-#include <sys/__assert.h>
-#include <arch/x86/msr.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/arch/x86/msr.h>
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <drivers/interrupt_controller/loapic.h> /* public API declarations */
-#include <device.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h> /* public API declarations */
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 
 /* Local APIC Version Register Bits */
 
@@ -62,7 +62,7 @@
 #define LOPIC_SSPND_BITS_PER_IRQ  1  /* Just the one for enable disable*/
 #define LOPIC_SUSPEND_BITS_REQD (ROUND_UP((LOAPIC_IRQ_COUNT * LOPIC_SSPND_BITS_PER_IRQ), 32))
 #ifdef CONFIG_PM_DEVICE
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 __pinned_bss
 uint32_t loapic_suspend_buf[LOPIC_SUSPEND_BITS_REQD / 32] = {0};
 #endif
diff --git a/drivers/interrupt_controller/intc_mchp_ecia_xec.c b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
index 485d4959ec..53582f330b 100644
--- a/drivers/interrupt_controller/intc_mchp_ecia_xec.c
+++ b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
@@ -12,14 +12,14 @@
 
 #define DT_DRV_COMPAT microchip_xec_ecia
 
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <device.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
 
 /* defined at the SoC layer */
 #define MCHP_FIRST_GIRQ			MCHP_FIRST_GIRQ_NOS
diff --git a/drivers/interrupt_controller/intc_miwu.c b/drivers/interrupt_controller/intc_miwu.c
index 9285925f00..a9bb95f5d4 100644
--- a/drivers/interrupt_controller/intc_miwu.c
+++ b/drivers/interrupt_controller/intc_miwu.c
@@ -46,17 +46,17 @@
  *
  */
 
-#include <device.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <irq_nextlevel.h>
-#include <drivers/gpio.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/irq_nextlevel.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "soc_miwu.h"
 #include "soc_gpio.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_miwu, LOG_LEVEL_ERR);
 
 /* MIWU module instances forward declaration */
diff --git a/drivers/interrupt_controller/intc_nuclei_eclic.c b/drivers/interrupt_controller/intc_nuclei_eclic.c
index 8b36867448..c36f692119 100644
--- a/drivers/interrupt_controller/intc_nuclei_eclic.c
+++ b/drivers/interrupt_controller/intc_nuclei_eclic.c
@@ -8,13 +8,13 @@
  * @brief Driver for Nuclie's Extended Core Interrupt Controller
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 union CLICCFG {
 	struct {
diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c
index 68c7ed11a0..ebef795f7a 100644
--- a/drivers/interrupt_controller/intc_plic.c
+++ b/drivers/interrupt_controller/intc_plic.c
@@ -12,12 +12,12 @@
  *        for RISC-V processors
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 #define PLIC_MAX_PRIO	DT_INST_PROP(0, riscv_max_priority)
 #define PLIC_PRIO	DT_INST_REG_ADDR_BY_NAME(0, prio)
diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
index 7327a1eda3..d881df9944 100644
--- a/drivers/interrupt_controller/intc_rv32m1_intmux.c
+++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c
@@ -22,14 +22,14 @@
  * associated IRQ numbers to work with this driver.
  */
 
-#include <kernel.h>
-#include <drivers/clock_control.h>
-#include <init.h>
-#include <irq.h>
-#include <irq_nextlevel.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/irq_nextlevel.h>
+#include <zephyr/sw_isr_table.h>
 #include <soc.h>
-#include <dt-bindings/interrupt-controller/openisa-intmux.h>
+#include <zephyr/dt-bindings/interrupt-controller/openisa-intmux.h>
 
 /*
  * CHn_VEC registers are offset by a value that is convenient if
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index b4f3f56bbd..0fe48d84ba 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT atmel_sam0_eic
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/interrupt_controller/sam0_eic.h>
+#include <zephyr/drivers/interrupt_controller/sam0_eic.h>
 #include "intc_sam0_eic_priv.h"
 
 struct sam0_eic_line_assignment {
diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c
index 8678e884a2..05f91ba89f 100644
--- a/drivers/interrupt_controller/intc_shared_irq.c
+++ b/drivers/interrupt_controller/intc_shared_irq.c
@@ -8,14 +8,14 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <shared_irq.h>
-#include <init.h>
-#include <sys/sys_io.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/shared_irq.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/sys_io.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 #endif
 
 typedef void (*shared_irq_config_irq_t)(void);
diff --git a/drivers/interrupt_controller/intc_swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c
index b3358c8013..a21973ae2f 100644
--- a/drivers/interrupt_controller/intc_swerv_pic.c
+++ b/drivers/interrupt_controller/intc_swerv_pic.c
@@ -10,10 +10,10 @@
  * @brief SweRV EH1 PIC driver
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/sw_isr_table.h>
 
 #define SWERV_PIC_MAX_NUM	CONFIG_NUM_IRQS
 #define SWERV_PIC_MAX_ID	(SWERV_PIC_MAX_NUM + RISCV_MAX_GENERIC_IRQ)
diff --git a/drivers/interrupt_controller/intc_system_apic.c b/drivers/interrupt_controller/intc_system_apic.c
index 3f85b832c2..b9ad0b70bb 100644
--- a/drivers/interrupt_controller/intc_system_apic.c
+++ b/drivers/interrupt_controller/intc_system_apic.c
@@ -10,14 +10,14 @@
  *
  */
 
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/ioapic.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <irq.h>
-#include <linker/sections.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/irq.h>
+#include <zephyr/linker/sections.h>
 
 #define IS_IOAPIC_IRQ(irq)  (irq < z_loapic_irq_base())
 #define HARDWARE_IRQ_LIMIT ((z_loapic_irq_base() + LOAPIC_IRQ_COUNT) - 1)
diff --git a/drivers/interrupt_controller/intc_vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c
index 7673c11a37..b164bf3ebe 100644
--- a/drivers/interrupt_controller/intc_vexriscv_litex.c
+++ b/drivers/interrupt_controller/intc_vexriscv_litex.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT litex_eth0
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <irq.h>
-#include <device.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
 #define IRQ_MASK		DT_REG_ADDR_BY_NAME(DT_INST(0, vexriscv_intc0), irq_mask)
diff --git a/drivers/interrupt_controller/wuc_ite_it8xxx2.c b/drivers/interrupt_controller/wuc_ite_it8xxx2.c
index c048d51ec4..9e34720271 100644
--- a/drivers/interrupt_controller/wuc_ite_it8xxx2.c
+++ b/drivers/interrupt_controller/wuc_ite_it8xxx2.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_wuc
 
-#include <device.h>
-#include <drivers/interrupt_controller/wuc_ite_it8xxx2.h>
-#include <dt-bindings/interrupt-controller/it8xxx2-wuc.h>
-#include <kernel.h>
+#include <zephyr/device.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_common.h>
 #include <stdlib.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wuc_ite_it8xxx2, CONFIG_INTC_LOG_LEVEL);
 
 /* Driver config */
diff --git a/drivers/ipm/ipm_cavs_host.c b/drivers/ipm/ipm_cavs_host.c
index 84184f4437..c2a3102710 100644
--- a/drivers/ipm/ipm_cavs_host.c
+++ b/drivers/ipm/ipm_cavs_host.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2022, Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
-#include <drivers/ipm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/ipm.h>
 #include <cavs-mem.h>
 #include <cavs-shim.h>
 #include <cavs_ipc.h>
diff --git a/drivers/ipm/ipm_cavs_idc.c b/drivers/ipm/ipm_cavs_idc.c
index 9d0398cd94..dd402862f7 100644
--- a/drivers/ipm/ipm_cavs_idc.c
+++ b/drivers/ipm/ipm_cavs_idc.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT intel_cavs_idc
 
 #include <stdint.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/ipm.h>
-#include <arch/common/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/arch/common/sys_io.h>
 
 #include <soc.h>
 
diff --git a/drivers/ipm/ipm_handlers.c b/drivers/ipm/ipm_handlers.c
index 490d2c19b1..647f87c543 100644
--- a/drivers/ipm/ipm_handlers.c
+++ b/drivers/ipm/ipm_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/ipm.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/ipm.h>
 
 static inline int z_vrfy_ipm_send(const struct device *dev, int wait,
 				  uint32_t id,
diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c
index 52ed43396b..3aba7594f1 100644
--- a/drivers/ipm/ipm_imx.c
+++ b/drivers/ipm/ipm_imx.c
@@ -8,9 +8,9 @@
 
 #include <errno.h>
 #include <string.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/ipm.h>
+#include <zephyr/drivers/ipm.h>
 #if IS_ENABLED(CONFIG_IPM_IMX_REV2)
 #include "fsl_mu.h"
 #else
diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c
index 9433ef3d4b..47a838ad1e 100644
--- a/drivers/ipm/ipm_mcux.c
+++ b/drivers/ipm/ipm_mcux.c
@@ -7,8 +7,8 @@
 #define DT_DRV_COMPAT nxp_lpc_mailbox
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/ipm.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/ipm.h>
 #include <fsl_mailbox.h>
 #include <fsl_clock.h>
 #include <soc.h>
diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c
index 808c22e406..baf1eb6297 100644
--- a/drivers/ipm/ipm_mhu.c
+++ b/drivers/ipm/ipm_mhu.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT arm_mhu
 
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include "ipm_mhu.h"
 
diff --git a/drivers/ipm/ipm_mhu.h b/drivers/ipm/ipm_mhu.h
index 6ebd6b25b3..14c651da4a 100644
--- a/drivers/ipm/ipm_mhu.h
+++ b/drivers/ipm/ipm_mhu.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_IPM_IPM_MHU_H_
 #define ZEPHYR_DRIVERS_IPM_IPM_MHU_H_
 
-#include <kernel.h>
-#include <drivers/ipm.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/ipm/ipm_nrfx_ipc.c b/drivers/ipm/ipm_nrfx_ipc.c
index 6a9e4db7b1..5530f25703 100644
--- a/drivers/ipm/ipm_nrfx_ipc.c
+++ b/drivers/ipm/ipm_nrfx_ipc.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT nordic_nrf_ipc
 
 #include <string.h>
-#include <drivers/ipm.h>
+#include <zephyr/drivers/ipm.h>
 #include <nrfx_ipc.h>
 #include "ipm_nrfx_ipc.h"
 
 #define LOG_LEVEL CONFIG_IPM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ipm_nrfx_ipc);
 
 struct ipm_nrf_data {
diff --git a/drivers/ipm/ipm_stm32_hsem.c b/drivers/ipm/ipm_stm32_hsem.c
index 6a129e1882..2ce992574f 100644
--- a/drivers/ipm/ipm_stm32_hsem.c
+++ b/drivers/ipm/ipm_stm32_hsem.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT st_stm32_hsem_mailbox
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <drivers/ipm.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 #include "stm32_hsem.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ipm_stm32_hsem, CONFIG_IPM_LOG_LEVEL);
 
 #define HSEM_CPU1                   1
diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c
index 7b913f52be..f2c93c44a4 100644
--- a/drivers/ipm/ipm_stm32_ipcc.c
+++ b/drivers/ipm/ipm_stm32_ipcc.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT st_stm32_ipcc_mailbox
 
-#include <drivers/clock_control.h>
-#include <device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/ipm.h>
+#include <zephyr/drivers/ipm.h>
 #include <soc.h>
 #include <stm32_ll_ipcc.h>
 
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ipm_stm32_ipcc, CONFIG_IPM_LOG_LEVEL);
 
 #define MBX_STRUCT(dev)					\
diff --git a/drivers/kscan/kscan_cst816s.c b/drivers/kscan/kscan_cst816s.c
index d6ce97ece9..ee370f881d 100644
--- a/drivers/kscan/kscan_cst816s.c
+++ b/drivers/kscan/kscan_cst816s.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT hynitron_cst816s
 
-#include <sys/byteorder.h>
-#include <drivers/kscan.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(cst816s, CONFIG_KSCAN_LOG_LEVEL);
 
diff --git a/drivers/kscan/kscan_ft5336.c b/drivers/kscan/kscan_ft5336.c
index 23f14cb006..00d69eddde 100644
--- a/drivers/kscan/kscan_ft5336.c
+++ b/drivers/kscan/kscan_ft5336.c
@@ -8,11 +8,11 @@
 
 #define DT_DRV_COMPAT focaltech_ft5336
 
-#include <drivers/kscan.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ft5336, CONFIG_KSCAN_LOG_LEVEL);
 
 /* FT5336 used registers */
diff --git a/drivers/kscan/kscan_handlers.c b/drivers/kscan/kscan_handlers.c
index 955d8f7f37..b2d36ba394 100644
--- a/drivers/kscan/kscan_handlers.c
+++ b/drivers/kscan/kscan_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/kscan.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_kscan_config(const struct device *dev,
 				      kscan_callback_t callback_isr)
diff --git a/drivers/kscan/kscan_ht16k33.c b/drivers/kscan/kscan_ht16k33.c
index 7434211f52..68681592df 100644
--- a/drivers/kscan/kscan_ht16k33.c
+++ b/drivers/kscan/kscan_ht16k33.c
@@ -11,10 +11,10 @@
  * @brief Keyscan driver for the HT16K33 I2C LED driver
  */
 
-#include <zephyr.h>
-#include <drivers/kscan.h>
-#include <drivers/led/ht16k33.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/led/ht16k33.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(kscan_ht16k33, CONFIG_KSCAN_LOG_LEVEL);
 
diff --git a/drivers/kscan/kscan_ite_it8xxx2.c b/drivers/kscan/kscan_ite_it8xxx2.c
index cc0e5b8dae..bb273f13f9 100644
--- a/drivers/kscan/kscan_ite_it8xxx2.c
+++ b/drivers/kscan/kscan_ite_it8xxx2.c
@@ -5,19 +5,19 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_kscan
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/interrupt_controller/wuc_ite_it8xxx2.h>
-#include <drivers/kscan.h>
-#include <drivers/pinctrl.h>
-#include <dt-bindings/interrupt-controller/it8xxx2-wuc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it8xxx2.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/interrupt-controller/it8xxx2-wuc.h>
 #include <errno.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc_dt.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_LEVEL CONFIG_KSCAN_LOG_LEVEL
 LOG_MODULE_REGISTER(kscan_ite_it8xxx2);
 
diff --git a/drivers/kscan/kscan_mchp_xec.c b/drivers/kscan/kscan_mchp_xec.c
index 1e74193866..ebcd4d0783 100644
--- a/drivers/kscan/kscan_mchp_xec.c
+++ b/drivers/kscan/kscan_mchp_xec.c
@@ -6,21 +6,21 @@
 
 #define DT_DRV_COMPAT microchip_xec_kscan
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 #ifdef CONFIG_SOC_SERIES_MEC172X
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #endif
-#include <drivers/kscan.h>
+#include <zephyr/drivers/kscan.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <sys/atomic.h>
-#include <logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_KSCAN_LOG_LEVEL
 LOG_MODULE_REGISTER(kscan_mchp_xec);
diff --git a/drivers/kscan/kscan_sdl.c b/drivers/kscan/kscan_sdl.c
index ce2a52d6ae..e1e7922471 100644
--- a/drivers/kscan/kscan_sdl.c
+++ b/drivers/kscan/kscan_sdl.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/logging/log.h>
 
 #include <SDL.h>
 
diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
index 8094b6a9b6..6d248c50b6 100644
--- a/drivers/led/ht16k33.c
+++ b/drivers/led/ht16k33.c
@@ -11,13 +11,13 @@
  * @brief LED driver for the HT16K33 I2C LED driver with keyscan
  */
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/led.h>
-#include <drivers/led/ht16k33.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/drivers/led/ht16k33.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(ht16k33, CONFIG_LED_LOG_LEVEL);
 
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index bd20193c67..895855c522 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -11,12 +11,12 @@
  * @brief GPIO driven LEDs
  */
 
-#include <drivers/led.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <zephyr.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led_gpio, CONFIG_LED_LOG_LEVEL);
 
 struct led_gpio_config {
diff --git a/drivers/led/led_handlers.c b/drivers/led/led_handlers.c
index 8008818bec..a3a37fb49e 100644
--- a/drivers/led/led_handlers.c
+++ b/drivers/led/led_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/led.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/led.h>
 
 static inline int z_vrfy_led_blink(const struct device *dev, uint32_t led,
 				   uint32_t delay_on, uint32_t delay_off)
diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c
index 213f6b74ac..41767dabd7 100644
--- a/drivers/led/led_pwm.c
+++ b/drivers/led/led_pwm.c
@@ -11,14 +11,14 @@
  * @brief PWM driven LEDs
  */
 
-#include <drivers/led.h>
-#include <drivers/pwm.h>
-#include <device.h>
-#include <pm/device.h>
-#include <zephyr.h>
-#include <sys/math_extras.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/math_extras.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led_pwm, CONFIG_LED_LOG_LEVEL);
 
 struct led_pwm_config {
diff --git a/drivers/led/led_shell.c b/drivers/led/led_shell.c
index f12b11e089..013c5d49ab 100644
--- a/drivers/led/led_shell.c
+++ b/drivers/led/led_shell.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <drivers/led.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/led.h>
 #include <stdlib.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led_shell);
 
 #define MAX_CHANNEL_ARGS 8
diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c
index 6d48c61625..9f133f7fc6 100644
--- a/drivers/led/lp3943.c
+++ b/drivers/led/lp3943.c
@@ -19,13 +19,13 @@
  *   values for a LED will affect other LEDs also.
  */
 
-#include <drivers/i2c.h>
-#include <drivers/led.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lp3943);
 
 #include "led_context.h"
diff --git a/drivers/led/lp503x.c b/drivers/led/lp503x.c
index b6bdd55e86..a8243062cc 100644
--- a/drivers/led/lp503x.c
+++ b/drivers/led/lp503x.c
@@ -11,14 +11,14 @@
  * @brief LP503x LED controller
  */
 
-#include <drivers/i2c.h>
-#include <drivers/led.h>
-#include <drivers/led/lp503x.h>
-#include <device.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/drivers/led/lp503x.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lp503x);
 
 #define LP503X_DEVICE_CONFIG0		0
diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c
index 3ef8fe48d0..eb8906b36b 100644
--- a/drivers/led/lp5562.c
+++ b/drivers/led/lp5562.c
@@ -30,13 +30,13 @@
  * communication between the host MCU and the driver.
  */
 
-#include <drivers/i2c.h>
-#include <drivers/led.h>
-#include <device.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lp5562);
 
 #include "led_context.h"
diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c
index 339ead8907..b328769444 100644
--- a/drivers/led/pca9633.c
+++ b/drivers/led/pca9633.c
@@ -11,13 +11,13 @@
  * @brief LED driver for the PCA9633 I2C LED driver (7-bit slave address 0x62)
  */
 
-#include <drivers/i2c.h>
-#include <drivers/led.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pca9633);
 
 #include "led_context.h"
diff --git a/drivers/led/tlc59108.c b/drivers/led/tlc59108.c
index 0fe6fb8286..e58051810e 100644
--- a/drivers/led/tlc59108.c
+++ b/drivers/led/tlc59108.c
@@ -12,11 +12,11 @@
  * @brief LED driver for the TLC59108 I2C LED driver
  */
 
-#include <drivers/i2c.h>
-#include <drivers/led.h>
-#include <sys/util.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(tlc59108, CONFIG_LED_LOG_LEVEL);
 
diff --git a/drivers/led_strip/apa102.c b/drivers/led_strip/apa102.c
index aa4d86f478..8586dff8f8 100644
--- a/drivers/led_strip/apa102.c
+++ b/drivers/led_strip/apa102.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT apa_apa102
 
 #include <errno.h>
-#include <drivers/led_strip.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/led_strip.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 struct apa102_config {
 	struct spi_dt_spec bus;
diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c
index 0fee0878d1..b148f8d5c8 100644
--- a/drivers/led_strip/lpd880x.c
+++ b/drivers/led_strip/lpd880x.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/led_strip.h>
+#include <zephyr/drivers/led_strip.h>
 
 #include <errno.h>
 #include <string.h>
@@ -16,13 +16,13 @@
 #endif
 
 #define LOG_LEVEL CONFIG_LED_STRIP_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lpd880x);
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 
 /*
  * LPD880X SPI master configuration:
diff --git a/drivers/led_strip/tlc5971.c b/drivers/led_strip/tlc5971.c
index d8c4980342..9482f6ec86 100644
--- a/drivers/led_strip/tlc5971.c
+++ b/drivers/led_strip/tlc5971.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ti_tlc5971
 
-#include <zephyr.h>
-#include <drivers/spi.h>
-#include <drivers/led_strip.h>
-#include <drivers/led_strip/tlc5971.h>
-#include <dt-bindings/led/led.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/led_strip.h>
+#include <zephyr/drivers/led_strip/tlc5971.h>
+#include <zephyr/dt-bindings/led/led.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tlc5971, CONFIG_LED_STRIP_LOG_LEVEL);
 
 struct tlc5971_config {
diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c
index b0c05c8a30..25f498cde3 100644
--- a/drivers/led_strip/ws2812_gpio.c
+++ b/drivers/led_strip/ws2812_gpio.c
@@ -8,21 +8,21 @@
 
 #define DT_DRV_COMPAT worldsemi_ws2812_gpio
 
-#include <drivers/led_strip.h>
+#include <zephyr/drivers/led_strip.h>
 
 #include <string.h>
 
 #define LOG_LEVEL CONFIG_LED_STRIP_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ws2812_gpio);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
-#include <dt-bindings/led/led.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/dt-bindings/led/led.h>
 
 struct ws2812_gpio_cfg {
 	struct gpio_dt_spec in_gpio;
diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c
index 5a6aa890d9..ce2df4a02d 100644
--- a/drivers/led_strip/ws2812_spi.c
+++ b/drivers/led_strip/ws2812_spi.c
@@ -8,20 +8,20 @@
 
 #define DT_DRV_COMPAT worldsemi_ws2812_spi
 
-#include <drivers/led_strip.h>
+#include <zephyr/drivers/led_strip.h>
 
 #include <string.h>
 
 #define LOG_LEVEL CONFIG_LED_STRIP_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ws2812_spi);
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <sys/math_extras.h>
-#include <sys/util.h>
-#include <dt-bindings/led/led.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/dt-bindings/led/led.h>
 
 /* spi-one-frame and spi-zero-frame in DT are for 8-bit frames. */
 #define SPI_FRAME_BITS 8
diff --git a/drivers/lora/hal_common.c b/drivers/lora/hal_common.c
index 9344b211b5..40e53bc8d3 100644
--- a/drivers/lora/hal_common.c
+++ b/drivers/lora/hal_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <timer.h>
 
diff --git a/drivers/lora/shell.c b/drivers/lora/shell.c
index 781a3b5e6f..3a0248f61a 100644
--- a/drivers/lora/shell.c
+++ b/drivers/lora/shell.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/lora.h>
+#include <zephyr/drivers/lora.h>
 #include <inttypes.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/drivers/lora/sx126x.c b/drivers/lora/sx126x.c
index 23eb1114ec..9944080840 100644
--- a/drivers/lora/sx126x.c
+++ b/drivers/lora/sx126x.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/lora.h>
-#include <drivers/spi.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/zephyr.h>
 
 #include <sx126x/sx126x.h>
 
 #include "sx12xx_common.h"
 #include "sx126x_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sx126x, CONFIG_LORA_LOG_LEVEL);
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(semtech_sx1261) +
diff --git a/drivers/lora/sx126x_common.h b/drivers/lora/sx126x_common.h
index 7e4888ab89..5475936563 100644
--- a/drivers/lora/sx126x_common.h
+++ b/drivers/lora/sx126x_common.h
@@ -10,9 +10,9 @@
 #define ZEPHYR_DRIVERS_SX126X_COMMON_H_
 
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <drivers/lora.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/drivers/spi.h>
 
 #include <sx126x/sx126x.h>
 
diff --git a/drivers/lora/sx126x_standalone.c b/drivers/lora/sx126x_standalone.c
index 60f46c6319..f072afd9b6 100644
--- a/drivers/lora/sx126x_standalone.c
+++ b/drivers/lora/sx126x_standalone.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 #include "sx126x_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(sx126x, CONFIG_LORA_LOG_LEVEL);
 
 static const struct gpio_dt_spec sx126x_gpio_reset = GPIO_DT_SPEC_INST_GET(
diff --git a/drivers/lora/sx126x_stm32wl.c b/drivers/lora/sx126x_stm32wl.c
index ddab9cac73..3cd5439dea 100644
--- a/drivers/lora/sx126x_stm32wl.c
+++ b/drivers/lora/sx126x_stm32wl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "sx126x_common.h"
 
@@ -12,7 +12,7 @@
 #include <stm32wlxx_ll_pwr.h>
 #include <stm32wlxx_ll_rcc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(sx126x, CONFIG_LORA_LOG_LEVEL);
 
 void sx126x_reset(struct sx126x_data *dev_data)
diff --git a/drivers/lora/sx127x.c b/drivers/lora/sx127x.c
index 153a65ad53..ae91bfa602 100644
--- a/drivers/lora/sx127x.c
+++ b/drivers/lora/sx127x.c
@@ -5,14 +5,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/lora.h>
-#include <drivers/spi.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/zephyr.h>
 
 #include "sx12xx_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sx127x, CONFIG_LORA_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(semtech_sx1272)
diff --git a/drivers/lora/sx12xx_common.c b/drivers/lora/sx12xx_common.c
index 76c15cd692..62a7364794 100644
--- a/drivers/lora/sx12xx_common.c
+++ b/drivers/lora/sx12xx_common.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/lora.h>
-#include <logging/log.h>
-#include <sys/atomic.h>
-#include <zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/zephyr.h>
 
 /* LoRaMac-node specific includes */
 #include <radio.h>
diff --git a/drivers/lora/sx12xx_common.h b/drivers/lora/sx12xx_common.h
index acee7524e7..d8602eb758 100644
--- a/drivers/lora/sx12xx_common.h
+++ b/drivers/lora/sx12xx_common.h
@@ -9,9 +9,9 @@
 #define ZEPHYR_DRIVERS_SX12XX_COMMON_H_
 
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <drivers/lora.h>
-#include <device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/lora.h>
+#include <zephyr/device.h>
 
 int __sx12xx_configure_pin(const struct gpio_dt_spec *gpio, gpio_flags_t flags);
 
diff --git a/drivers/mbox/mbox_handlers.c b/drivers/mbox/mbox_handlers.c
index 0b231e0dd7..55b2b010c8 100644
--- a/drivers/mbox/mbox_handlers.c
+++ b/drivers/mbox/mbox_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/mbox.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/mbox.h>
 
 static inline int z_vrfy_mbox_send(const struct mbox_channel *channel,
 				   const struct mbox_msg *msg)
diff --git a/drivers/mbox/mbox_nrfx_ipc.c b/drivers/mbox/mbox_nrfx_ipc.c
index 9a40196a1b..c8dbb84590 100644
--- a/drivers/mbox/mbox_nrfx_ipc.c
+++ b/drivers/mbox/mbox_nrfx_ipc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/mbox.h>
+#include <zephyr/drivers/mbox.h>
 #include <nrfx_ipc.h>
 
 #define LOG_LEVEL CONFIG_MBOX_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mbox_nrfx_ipc);
 
 #define DT_DRV_COMPAT nordic_mbox_nrf_ipc
diff --git a/drivers/mdio/mdio_sam.c b/drivers/mdio/mdio_sam.c
index 9313f24e12..a723f89a1b 100644
--- a/drivers/mdio/mdio_sam.c
+++ b/drivers/mdio/mdio_sam.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT atmel_sam_mdio
 
 #include <errno.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/mdio.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/mdio.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mdio_sam, CONFIG_MDIO_LOG_LEVEL);
 
 /* GMAC */
diff --git a/drivers/mdio/mdio_shell.c b/drivers/mdio/mdio_shell.c
index 5dfb4fb12f..01ce0847b7 100644
--- a/drivers/mdio/mdio_shell.c
+++ b/drivers/mdio/mdio_shell.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <drivers/mdio.h>
+#include <zephyr/drivers/mdio.h>
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mdio_shell, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define MDIO_DEVICE "MDIO"
diff --git a/drivers/memc/memc_mcux_flexspi.c b/drivers/memc/memc_mcux_flexspi.c
index 29c6c66ffc..1728092f8d 100644
--- a/drivers/memc/memc_mcux_flexspi.c
+++ b/drivers/memc/memc_mcux_flexspi.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT	nxp_imx_flexspi
 
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #include "memc_mcux_flexspi.h"
diff --git a/drivers/memc/memc_mcux_flexspi.h b/drivers/memc/memc_mcux_flexspi.h
index eeffa5fc04..63c5921e04 100644
--- a/drivers/memc/memc_mcux_flexspi.h
+++ b/drivers/memc/memc_mcux_flexspi.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <sys/types.h>
 #include <fsl_flexspi.h>
 
diff --git a/drivers/memc/memc_mcux_flexspi_hyperram.c b/drivers/memc/memc_mcux_flexspi_hyperram.c
index 4af3cd65e4..0783f1b4ab 100644
--- a/drivers/memc/memc_mcux_flexspi_hyperram.c
+++ b/drivers/memc/memc_mcux_flexspi_hyperram.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT   nxp_imx_flexspi_hyperram
 
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 
 #include "memc_mcux_flexspi.h"
 
diff --git a/drivers/memc/memc_stm32.c b/drivers/memc/memc_stm32.c
index 8fe425efe7..e13898e792 100644
--- a/drivers/memc/memc_stm32.c
+++ b/drivers/memc/memc_stm32.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(memc_stm32, CONFIG_MEMC_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_fmc)
diff --git a/drivers/memc/memc_stm32_nor_psram.c b/drivers/memc/memc_stm32_nor_psram.c
index 06d7065cb9..023e71f5d4 100644
--- a/drivers/memc/memc_stm32_nor_psram.c
+++ b/drivers/memc/memc_stm32_nor_psram.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT st_stm32_fmc_nor_psram
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <errno.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(memc_stm32_nor_psram, CONFIG_MEMC_LOG_LEVEL);
 
 /** SRAM base register offset, see FMC_Bank1_R_BASE */
diff --git a/drivers/memc/memc_stm32_sdram.c b/drivers/memc/memc_stm32_sdram.c
index 9daed53340..e3dda55d68 100644
--- a/drivers/memc/memc_stm32_sdram.c
+++ b/drivers/memc/memc_stm32_sdram.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT st_stm32_fmc_sdram
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(memc_stm32_sdram, CONFIG_MEMC_LOG_LEVEL);
 
 /** SDRAM controller register offset. */
diff --git a/drivers/misc/ft8xx/ft8xx.c b/drivers/misc/ft8xx/ft8xx.c
index eaaf15500b..b465118a5d 100644
--- a/drivers/misc/ft8xx/ft8xx.c
+++ b/drivers/misc/ft8xx/ft8xx.c
@@ -6,19 +6,19 @@
 
 #define DT_DRV_COMPAT ftdi_ft800
 
-#include <drivers/misc/ft8xx/ft8xx.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx.h>
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include <device.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
-#include <drivers/misc/ft8xx/ft8xx_copro.h>
-#include <drivers/misc/ft8xx/ft8xx_common.h>
-#include <drivers/misc/ft8xx/ft8xx_dl.h>
-#include <drivers/misc/ft8xx/ft8xx_memory.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_copro.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_common.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_dl.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_memory.h>
 
 #include "ft8xx_drv.h"
 #include "ft8xx_host_commands.h"
diff --git a/drivers/misc/ft8xx/ft8xx_common.c b/drivers/misc/ft8xx/ft8xx_common.c
index 49081dca2a..ebf2d11cd9 100644
--- a/drivers/misc/ft8xx/ft8xx_common.c
+++ b/drivers/misc/ft8xx/ft8xx_common.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/misc/ft8xx/ft8xx_common.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_common.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include "ft8xx_drv.h"
 
 void ft8xx_wr8(uint32_t address, uint8_t data)
diff --git a/drivers/misc/ft8xx/ft8xx_copro.c b/drivers/misc/ft8xx/ft8xx_copro.c
index f9aa1e2407..d1f1f82c66 100644
--- a/drivers/misc/ft8xx/ft8xx_copro.c
+++ b/drivers/misc/ft8xx/ft8xx_copro.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/misc/ft8xx/ft8xx_copro.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_copro.h>
 
 #include <stdint.h>
 #include <string.h>
 
-#include <drivers/misc/ft8xx/ft8xx_common.h>
-#include <drivers/misc/ft8xx/ft8xx_memory.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_common.h>
+#include <zephyr/drivers/misc/ft8xx/ft8xx_memory.h>
 #include "ft8xx_drv.h"
 
 #define FT800_RAM_CMD_SIZE 4096UL
diff --git a/drivers/misc/ft8xx/ft8xx_drv.c b/drivers/misc/ft8xx/ft8xx_drv.c
index eb90900995..65afb0224b 100644
--- a/drivers/misc/ft8xx/ft8xx_drv.c
+++ b/drivers/misc/ft8xx/ft8xx_drv.c
@@ -6,10 +6,10 @@
 
 #include "ft8xx_drv.h"
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_MODULE_NAME ft8xx_drv
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
diff --git a/drivers/misc/ft8xx/ft8xx_drv.h b/drivers/misc/ft8xx/ft8xx_drv.h
index d742c31fcb..46632f6964 100644
--- a/drivers/misc/ft8xx/ft8xx_drv.h
+++ b/drivers/misc/ft8xx/ft8xx_drv.h
@@ -14,8 +14,8 @@
 
 #include <stdint.h>
 
-#include <drivers/gpio.h>
-#include <device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c b/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c
index d9533aa213..5b026fe6e3 100644
--- a/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c
+++ b/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c
@@ -7,13 +7,13 @@
 
 #define DT_DRV_COMPAT seeed_grove_lcd_rgb
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/misc/grove_lcd/grove_lcd.h>
-#include <kernel.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/misc/grove_lcd/grove_lcd.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(grove_lcd, CONFIG_GROVE_LCD_RGB_LOG_LEVEL);
 
 #define GROVE_RGB_BACKLIGHT_ADDR	(0x62)
diff --git a/drivers/mm/mm_drv_common.c b/drivers/mm/mm_drv_common.c
index 2913a9dae4..a1504e2824 100644
--- a/drivers/mm/mm_drv_common.c
+++ b/drivers/mm/mm_drv_common.c
@@ -16,14 +16,14 @@
  * weak functions so they can be overridden by the driver.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <toolchain.h>
-#include <sys/__assert.h>
-#include <sys/check.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/util.h>
 
-#include <drivers/mm/system_mm.h>
+#include <zephyr/drivers/mm/system_mm.h>
 
 #include "mm_drv_common.h"
 
diff --git a/drivers/mm/mm_drv_common.h b/drivers/mm/mm_drv_common.h
index beee192e6d..6e2e44c06f 100644
--- a/drivers/mm/mm_drv_common.h
+++ b/drivers/mm/mm_drv_common.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SYSTEM_MM_DRV_COMMON_H_
 #define ZEPHYR_DRIVERS_SYSTEM_MM_DRV_COMMON_H_
 
-#include <kernel.h>
-#include <toolchain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
 
-#include <drivers/mm/system_mm.h>
+#include <zephyr/drivers/mm/system_mm.h>
 
 extern struct k_spinlock sys_mm_drv_common_lock;
 
diff --git a/drivers/mm/mm_drv_intel_adsp_tlb.c b/drivers/mm/mm_drv_intel_adsp_tlb.c
index 5d1de41179..62cbe1a594 100644
--- a/drivers/mm/mm_drv_intel_adsp_tlb.c
+++ b/drivers/mm/mm_drv_intel_adsp_tlb.c
@@ -22,18 +22,18 @@
 
 #define DT_DRV_COMPAT intel_adsp_tlb
 
-#include <device.h>
-#include <kernel.h>
-#include <spinlock.h>
-#include <sys/__assert.h>
-#include <sys/check.h>
-#include <sys/mem_manage.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/sys/util.h>
 
 #include <soc.h>
 #include <cavs-mem.h>
 
-#include <drivers/mm/system_mm.h>
+#include <zephyr/drivers/mm/system_mm.h>
 #include "mm_drv_common.h"
 
 DEVICE_MMIO_TOPLEVEL_STATIC(tlb_regs, DT_DRV_INST(0));
diff --git a/drivers/modem/gsm_ppp.c b/drivers/modem/gsm_ppp.c
index 1273594f2a..ce0237e20e 100644
--- a/drivers/modem/gsm_ppp.c
+++ b/drivers/modem/gsm_ppp.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT zephyr_gsm_ppp
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_gsm, CONFIG_MODEM_LOG_LEVEL);
 
 #include <stdlib.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/ring_buffer.h>
-#include <sys/util.h>
-#include <net/ppp.h>
-#include <drivers/modem/gsm_ppp.h>
-#include <drivers/uart.h>
-#include <drivers/console/uart_mux.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/ppp.h>
+#include <zephyr/drivers/modem/gsm_ppp.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/uart_mux.h>
 
 #include "modem_context.h"
 #include "modem_iface_uart.h"
diff --git a/drivers/modem/hl7800.c b/drivers/modem/hl7800.c
index 67013914b0..9b5c8a59fb 100644
--- a/drivers/modem/hl7800.c
+++ b/drivers/modem/hl7800.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT swir_hl7800
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_hl7800, CONFIG_MODEM_LOG_LEVEL);
 
 #include <zephyr/types.h>
@@ -14,19 +14,19 @@ LOG_MODULE_REGISTER(modem_hl7800, CONFIG_MODEM_LOG_LEVEL);
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <pm/device.h>
-#include <drivers/uart.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/uart.h>
 
-#include <net/net_context.h>
-#include <net/net_if.h>
-#include <net/net_offload.h>
-#include <net/net_pkt.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dns_resolve.h>
 #if defined(CONFIG_NET_IPV6)
 #include "ipv6.h"
 #endif
@@ -38,11 +38,11 @@ LOG_MODULE_REGISTER(modem_hl7800, CONFIG_MODEM_LOG_LEVEL);
 #endif
 
 #ifdef CONFIG_MODEM_HL7800_FW_UPDATE
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #endif
 
 #include "modem_receiver.h"
-#include <drivers/modem/hl7800.h>
+#include <zephyr/drivers/modem/hl7800.h>
 
 #define PREFIXED_SWITCH_CASE_RETURN_STRING(prefix, val)                        \
 	case prefix##_##val: {                                                 \
diff --git a/drivers/modem/modem_cmd_handler.c b/drivers/modem/modem_cmd_handler.c
index 04f6b76c24..d86a294185 100644
--- a/drivers/modem/modem_cmd_handler.c
+++ b/drivers/modem/modem_cmd_handler.c
@@ -10,12 +10,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_cmd_handler, CONFIG_MODEM_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "modem_context.h"
 #include "modem_cmd_handler.h"
diff --git a/drivers/modem/modem_cmd_handler.h b/drivers/modem/modem_cmd_handler.h
index 485ffb67ea..237b53713e 100644
--- a/drivers/modem/modem_cmd_handler.h
+++ b/drivers/modem/modem_cmd_handler.h
@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_CMD_HANDLER_H_
 #define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_CMD_HANDLER_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "modem_context.h"
 
diff --git a/drivers/modem/modem_context.c b/drivers/modem/modem_context.c
index aeb1c6fe72..12d907b565 100644
--- a/drivers/modem/modem_context.c
+++ b/drivers/modem/modem_context.c
@@ -11,10 +11,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_context, CONFIG_MODEM_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "modem_context.h"
 
diff --git a/drivers/modem/modem_context.h b/drivers/modem/modem_context.h
index b622d9f1a0..1aa8fa7774 100644
--- a/drivers/modem/modem_context.h
+++ b/drivers/modem/modem_context.h
@@ -14,11 +14,11 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_CONTEXT_H_
 #define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_CONTEXT_H_
 
-#include <kernel.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <sys/ring_buffer.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/drivers/gpio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/modem/modem_iface_uart.c b/drivers/modem/modem_iface_uart.c
index 1890d47d19..c837b21476 100644
--- a/drivers/modem/modem_iface_uart.c
+++ b/drivers/modem/modem_iface_uart.c
@@ -10,11 +10,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_iface_uart, CONFIG_MODEM_LOG_LEVEL);
 
-#include <kernel.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/uart.h>
 
 #include "modem_context.h"
 #include "modem_iface_uart.h"
diff --git a/drivers/modem/modem_iface_uart.h b/drivers/modem/modem_iface_uart.h
index 93140b695e..bdd32946f5 100644
--- a/drivers/modem/modem_iface_uart.h
+++ b/drivers/modem/modem_iface_uart.h
@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_IFACE_UART_H_
 #define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_IFACE_UART_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/modem/modem_pin.c b/drivers/modem/modem_pin.c
index d81a1e71e1..e854af4622 100644
--- a/drivers/modem/modem_pin.c
+++ b/drivers/modem/modem_pin.c
@@ -11,8 +11,8 @@
  */
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "modem_context.h"
 
diff --git a/drivers/modem/modem_receiver.c b/drivers/modem/modem_receiver.c
index 051a04f302..351c6cbfaa 100644
--- a/drivers/modem/modem_receiver.c
+++ b/drivers/modem/modem_receiver.c
@@ -11,12 +11,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <drivers/uart.h>
-#include <pm/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/pm/device.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(mdm_receiver, CONFIG_MODEM_LOG_LEVEL);
 
diff --git a/drivers/modem/modem_receiver.h b/drivers/modem/modem_receiver.h
index cfe5c7c6e0..b4b60a78ae 100644
--- a/drivers/modem/modem_receiver.h
+++ b/drivers/modem/modem_receiver.h
@@ -14,8 +14,8 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
 #define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
 
-#include <kernel.h>
-#include <sys/ring_buffer.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/ring_buffer.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/modem/modem_shell.c b/drivers/modem/modem_shell.c
index cd1c8873fb..d3b7c9790f 100644
--- a/drivers/modem/modem_shell.c
+++ b/drivers/modem/modem_shell.c
@@ -12,14 +12,14 @@
 
 #define LOG_MODULE_NAME modem_shell
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <string.h>
-#include <device.h>
-#include <shell/shell.h>
-#include <drivers/console/uart_mux.h>
+#include <zephyr/device.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/console/uart_mux.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 struct modem_shell_user_data {
 	const struct shell *shell;
diff --git a/drivers/modem/modem_socket.c b/drivers/modem/modem_socket.c
index 799d7f25a4..4fb57b3d7e 100644
--- a/drivers/modem/modem_socket.c
+++ b/drivers/modem/modem_socket.c
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/fdtable.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/fdtable.h>
 
 #include "modem_socket.h"
 
diff --git a/drivers/modem/modem_socket.h b/drivers/modem/modem_socket.h
index d617e59978..6701d99e4e 100644
--- a/drivers/modem/modem_socket.h
+++ b/drivers/modem/modem_socket.h
@@ -13,9 +13,9 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_SOCKET_H_
 #define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_SOCKET_H_
 
-#include <kernel.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
 
 #include "sockets_internal.h"
 
diff --git a/drivers/modem/quectel-bg9x.c b/drivers/modem/quectel-bg9x.c
index 219683546e..fa2988fa21 100644
--- a/drivers/modem/quectel-bg9x.c
+++ b/drivers/modem/quectel-bg9x.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT quectel_bg9x
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_quectel_bg9x, CONFIG_MODEM_LOG_LEVEL);
 
 #include "quectel-bg9x.h"
diff --git a/drivers/modem/quectel-bg9x.h b/drivers/modem/quectel-bg9x.h
index 1e9588ceb6..3322ef5fc3 100644
--- a/drivers/modem/quectel-bg9x.h
+++ b/drivers/modem/quectel-bg9x.h
@@ -7,17 +7,17 @@
 #ifndef QUECTEL_BG9X_H
 #define QUECTEL_BG9X_H
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <net/net_if.h>
-#include <net/net_offload.h>
-#include <net/socket_offload.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/socket_offload.h>
 
 #include "modem_context.h"
 #include "modem_socket.h"
diff --git a/drivers/modem/simcom-sim7080.c b/drivers/modem/simcom-sim7080.c
index 2e148553a0..700eb7972a 100644
--- a/drivers/modem/simcom-sim7080.c
+++ b/drivers/modem/simcom-sim7080.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT simcom_sim7080
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_simcom_sim7080, CONFIG_MODEM_LOG_LEVEL);
 
-#include <drivers/modem/simcom-sim7080.h>
+#include <zephyr/drivers/modem/simcom-sim7080.h>
 #include "simcom-sim7080.h"
 
 #define SMS_TP_UDHI_HEADER 0x40
diff --git a/drivers/modem/simcom-sim7080.h b/drivers/modem/simcom-sim7080.h
index c756801f53..5eb4feffd6 100644
--- a/drivers/modem/simcom-sim7080.h
+++ b/drivers/modem/simcom-sim7080.h
@@ -7,21 +7,21 @@
 #ifndef SIMCOM_SIM7080_H
 #define SIMCOM_SIM7080_H
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <drivers/modem/simcom-sim7080.h>
-#include <device.h>
-#include <devicetree.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/modem/simcom-sim7080.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
 #include <string.h>
 
-#include <net/net_if.h>
-#include <net/net_offload.h>
-#include <net/socket_offload.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/socket_offload.h>
 
 #include "modem_context.h"
 #include "modem_cmd_handler.h"
diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
index df61da72c7..e01616726b 100644
--- a/drivers/modem/ublox-sara-r4.c
+++ b/drivers/modem/ublox-sara-r4.c
@@ -6,21 +6,21 @@
 
 #define DT_DRV_COMPAT u_blox_sara_r4
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modem_ublox_sara_r4, CONFIG_MODEM_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <fcntl.h>
 
-#include <net/net_if.h>
-#include <net/net_offload.h>
-#include <net/socket_offload.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/socket_offload.h>
 
 #if defined(CONFIG_MODEM_UBLOX_SARA_AUTODETECT_APN)
 #include <stdio.h>
@@ -38,7 +38,7 @@ LOG_MODULE_REGISTER(modem_ublox_sara_r4, CONFIG_MODEM_LOG_LEVEL);
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 #include "tls_internal.h"
-#include <net/tls_credentials.h>
+#include <zephyr/net/tls_credentials.h>
 #endif
 
 /* pin settings */
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index 5af634ced6..cd847e0d0f 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -8,7 +8,7 @@
 
 #define LOG_DOMAIN modem_wncm14a2a
 #define LOG_LEVEL CONFIG_MODEM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include <zephyr/types.h>
@@ -16,16 +16,16 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <device.h>
-#include <init.h>
-#include <random/rand32.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/net_context.h>
-#include <net/net_if.h>
-#include <net/net_offload.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/net_pkt.h>
 #if defined(CONFIG_NET_IPV6)
 #include "ipv6.h"
 #endif
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index e2aefcc32d..eb25a2c076 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -14,16 +14,16 @@
 #define LOG_MODULE_NAME netlo
 #define LOG_LEVEL CONFIG_NET_LOOPBACK_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <net/net_pkt.h>
-#include <net/buf.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/loopback.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/loopback.h>
 
-#include <net/dummy.h>
+#include <zephyr/net/dummy.h>
 
 int loopback_dev_init(const struct device *dev)
 {
diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c
index 34643b5db1..0abc60d4bf 100644
--- a/drivers/net/ppp.c
+++ b/drivers/net/ppp.c
@@ -12,26 +12,26 @@
  */
 
 #define LOG_LEVEL CONFIG_NET_PPP_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ppp, LOG_LEVEL);
 
 #include <stdio.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <stdbool.h>
 #include <errno.h>
 #include <stddef.h>
-#include <net/ppp.h>
-#include <net/buf.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <sys/ring_buffer.h>
-#include <sys/crc.h>
-#include <drivers/uart.h>
-#include <drivers/console/uart_mux.h>
-#include <random/rand32.h>
+#include <zephyr/net/ppp.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/uart_mux.h>
+#include <zephyr/random/rand32.h>
 
 #include "../../subsys/net/ip/net_stats.h"
 #include "../../subsys/net/ip/net_private.h"
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index dca7900eee..9556cc099d 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -14,25 +14,25 @@
 #define LOG_MODULE_NAME slip
 #define LOG_LEVEL CONFIG_SLIP_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <stdbool.h>
 #include <errno.h>
 #include <stddef.h>
-#include <sys/util.h>
-#include <net/ethernet.h>
-#include <net/buf.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/dummy.h>
-#include <drivers/console/uart_pipe.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/dummy.h>
+#include <zephyr/drivers/console/uart_pipe.h>
+#include <zephyr/random/rand32.h>
 
 #define SLIP_END     0300
 #define SLIP_ESC     0333
diff --git a/drivers/neural_net/intel_gna.c b/drivers/neural_net/intel_gna.c
index a6094d1084..cf3bd519ba 100644
--- a/drivers/neural_net/intel_gna.c
+++ b/drivers/neural_net/intel_gna.c
@@ -15,16 +15,16 @@
 
 #define DT_DRV_COMPAT intel_gna
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <device.h>
-#include <drivers/gna.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gna.h>
 
 #include <memory.h>
 #include "intel_gna.h"
 
 #define LOG_LEVEL CONFIG_NEURAL_NET_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(neural_net);
 
 #if LOG_LEVEL >= LOG_LEVEL_DBG
diff --git a/drivers/pcie/endpoint/pcie_ep_common.c b/drivers/pcie/endpoint/pcie_ep_common.c
index 0a79946df8..56f359f733 100644
--- a/drivers/pcie/endpoint/pcie_ep_common.c
+++ b/drivers/pcie/endpoint/pcie_ep_common.c
@@ -5,9 +5,9 @@
  *
  */
 
-#include <drivers/pcie/endpoint/pcie_ep.h>
+#include <zephyr/drivers/pcie/endpoint/pcie_ep.h>
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /*
  * During DEVICE_TO_HOST data transfer, in order to make sure that all
diff --git a/drivers/pcie/endpoint/pcie_ep_iproc.c b/drivers/pcie/endpoint/pcie_ep_iproc.c
index b60962c7c6..e70795561c 100644
--- a/drivers/pcie/endpoint/pcie_ep_iproc.c
+++ b/drivers/pcie/endpoint/pcie_ep_iproc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/dma.h>
-#include <drivers/pcie/endpoint/pcie_ep.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pcie/endpoint/pcie_ep.h>
 
 #define LOG_LEVEL CONFIG_PCIE_EP_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(iproc_pcie);
 
 #include "pcie_ep_iproc.h"
diff --git a/drivers/pcie/endpoint/pcie_ep_iproc.h b/drivers/pcie/endpoint/pcie_ep_iproc.h
index fcbaaafc5c..e28d606256 100644
--- a/drivers/pcie/endpoint/pcie_ep_iproc.h
+++ b/drivers/pcie/endpoint/pcie_ep_iproc.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_H_
 
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "pcie_ep_iproc_regs.h"
 
diff --git a/drivers/pcie/endpoint/pcie_ep_iproc_msi.c b/drivers/pcie/endpoint/pcie_ep_iproc_msi.c
index c0baee8813..fa79723287 100644
--- a/drivers/pcie/endpoint/pcie_ep_iproc_msi.c
+++ b/drivers/pcie/endpoint/pcie_ep_iproc_msi.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pcie/endpoint/pcie_ep.h>
-#include <logging/log.h>
+#include <zephyr/drivers/pcie/endpoint/pcie_ep.h>
+#include <zephyr/logging/log.h>
 
 #include "pcie_ep_iproc.h"
 
diff --git a/drivers/pcie/host/controller.c b/drivers/pcie/host/controller.c
index 4efca978e2..80d5c2213a 100644
--- a/drivers/pcie/host/controller.c
+++ b/drivers/pcie/host/controller.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcie_core, LOG_LEVEL_INF);
 
-#include <kernel.h>
-#include <drivers/pcie/pcie.h>
-#include <drivers/pcie/controller.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/controller.h>
 
 #if CONFIG_PCIE_MSI
-#include <drivers/pcie/msi.h>
+#include <zephyr/drivers/pcie/msi.h>
 #endif
 
 /* arch agnostic PCIe API implementation */
diff --git a/drivers/pcie/host/msi.c b/drivers/pcie/host/msi.c
index f98d0fa6a3..89cb94af01 100644
--- a/drivers/pcie/host/msi.c
+++ b/drivers/pcie/host/msi.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/pcie/msi.h>
-#include <drivers/pcie/cap.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/pcie/msi.h>
+#include <zephyr/drivers/pcie/cap.h>
 
 /* functions documented in include/drivers/pcie/msi.h */
 
@@ -38,7 +38,7 @@ static uint32_t pcie_msi_base(pcie_bdf_t bdf, bool *msi)
 
 #ifdef CONFIG_PCIE_MSI_MULTI_VECTOR
 
-#include <sys/mem_manage.h>
+#include <zephyr/sys/mem_manage.h>
 
 __weak uint8_t arch_pcie_msi_vectors_allocate(unsigned int priority,
 					      msi_vector_t *vectors,
diff --git a/drivers/pcie/host/pcie.c b/drivers/pcie/host/pcie.c
index b3f3f67bbc..f2e4b0d8c0 100644
--- a/drivers/pcie/host/pcie.c
+++ b/drivers/pcie/host/pcie.c
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcie, LOG_LEVEL_ERR);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 
 #if CONFIG_PCIE_MSI
-#include <drivers/pcie/msi.h>
+#include <zephyr/drivers/pcie/msi.h>
 #endif
 
 #ifdef CONFIG_PCIE_CONTROLLER
-#include <drivers/pcie/controller.h>
+#include <zephyr/drivers/pcie/controller.h>
 #endif
 
 /* functions documented in drivers/pcie/pcie.h */
diff --git a/drivers/pcie/host/pcie_ecam.c b/drivers/pcie/host/pcie_ecam.c
index 5b140c251a..36e9995029 100644
--- a/drivers/pcie/host/pcie_ecam.c
+++ b/drivers/pcie/host/pcie_ecam.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcie_ecam, LOG_LEVEL_ERR);
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/pcie/pcie.h>
-#include <drivers/pcie/controller.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/controller.h>
 #ifdef CONFIG_GIC_V3_ITS
-#include <drivers/interrupt_controller/gicv3_its.h>
+#include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 #endif
 
 #define DT_DRV_COMPAT pci_host_ecam_generic
diff --git a/drivers/pcie/host/ptm.c b/drivers/pcie/host/ptm.c
index f9ae09ea76..7ebd9230f4 100644
--- a/drivers/pcie/host/ptm.c
+++ b/drivers/pcie/host/ptm.c
@@ -5,18 +5,18 @@
  */
 
 #define LOG_LEVEL CONFIG_PCIE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcie);
 
 #include <errno.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #include "ptm.h"
 
 static int pcie_ptm_root_setup(const struct device *dev, uint32_t base)
diff --git a/drivers/pcie/host/ptm.h b/drivers/pcie/host/ptm.h
index 0462eaa083..c2e4dfb7b4 100644
--- a/drivers/pcie/host/ptm.h
+++ b/drivers/pcie/host/ptm.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_PCIE_HOST_PTM_H_
 #define ZEPHYR_DRIVERS_PCIE_HOST_PTM_H_
 
-#include <drivers/pcie/pcie.h>
-#include <drivers/pcie/cap.h>
+#include <zephyr/drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/cap.h>
 
 #define PTM_CAP_REG_OFFSET 0x04U
 
diff --git a/drivers/pcie/host/shell.c b/drivers/pcie/host/shell.c
index df45f97c18..25b9d0e1c4 100644
--- a/drivers/pcie/host/shell.c
+++ b/drivers/pcie/host/shell.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/pcie/pcie.h>
 
 #ifdef CONFIG_PCIE_MSI
-#include <drivers/pcie/msi.h>
-#include <drivers/pcie/cap.h>
+#include <zephyr/drivers/pcie/msi.h>
+#include <zephyr/drivers/pcie/cap.h>
 #endif
 
 static void show_msi(const struct shell *shell, pcie_bdf_t bdf)
diff --git a/drivers/peci/peci_handlers.c b/drivers/peci/peci_handlers.c
index f7b55e083b..39147019d1 100644
--- a/drivers/peci/peci_handlers.c
+++ b/drivers/peci/peci_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/peci.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/peci.h>
+#include <zephyr/syscall_handler.h>
 
 
 static inline int z_vrfy_peci_config(const struct device *dev,
diff --git a/drivers/peci/peci_ite_it8xxx2.c b/drivers/peci/peci_ite_it8xxx2.c
index e017b64b09..acb1a6d155 100644
--- a/drivers/peci/peci_ite_it8xxx2.c
+++ b/drivers/peci/peci_ite_it8xxx2.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT ite_peci_it8xxx2
 
-#include <drivers/gpio.h>
-#include <drivers/pinctrl.h>
-#include <drivers/peci.h>
-#include <kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/peci.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <device.h>
-#include <drivers/peci.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/peci.h>
 #include <soc.h>
 #include <soc_dt.h>
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_REGISTER(peci_ite_it8xxx2, CONFIG_PECI_LOG_LEVEL);
 
diff --git a/drivers/peci/peci_mchp_xec.c b/drivers/peci/peci_mchp_xec.c
index 6bb1552746..fff0abe74b 100644
--- a/drivers/peci/peci_mchp_xec.c
+++ b/drivers/peci/peci_mchp_xec.c
@@ -7,17 +7,17 @@
 #define DT_DRV_COMPAT microchip_xec_peci
 
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 #ifdef CONFIG_SOC_SERIES_MEC172X
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #endif
-#include <drivers/peci.h>
+#include <zephyr/drivers/peci.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 #include <soc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(peci_mchp_xec, CONFIG_PECI_LOG_LEVEL);
 
 /* Maximum PECI core clock is the main clock 48Mhz */
diff --git a/drivers/pinctrl/common.c b/drivers/pinctrl/common.c
index d2d2652910..bbd0af1d7f 100644
--- a/drivers/pinctrl/common.c
+++ b/drivers/pinctrl/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 int pinctrl_lookup_state(const struct pinctrl_dev_config *config, uint8_t id,
 			 const struct pinctrl_state **state)
diff --git a/drivers/pinctrl/pfc_rcar.c b/drivers/pinctrl/pfc_rcar.c
index 0298953f54..10d4871ad2 100644
--- a/drivers/pinctrl/pfc_rcar.c
+++ b/drivers/pinctrl/pfc_rcar.c
@@ -7,10 +7,10 @@
 
 #define DT_DRV_COMPAT renesas_rcar_pfc
 
-#include <devicetree.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define PFC_REG_BASE  DT_INST_REG_ADDR(0)
 #define PFC_RCAR_PMMR 0x0
diff --git a/drivers/pinctrl/pinctrl_b91.c b/drivers/pinctrl/pinctrl_b91.c
index 27a22eb36e..fcf2bece9b 100644
--- a/drivers/pinctrl/pinctrl_b91.c
+++ b/drivers/pinctrl/pinctrl_b91.c
@@ -5,8 +5,8 @@
  */
 
 #include "analog.h"
-#include <drivers/pinctrl.h>
-#include <dt-bindings/pinctrl/b91-pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/b91-pinctrl.h>
 
 #define DT_DRV_COMPAT telink_b91_pinctrl
 
diff --git a/drivers/pinctrl/pinctrl_cc13xx_cc26xx.c b/drivers/pinctrl/pinctrl_cc13xx_cc26xx.c
index 2e362d48ba..e8aeb66005 100644
--- a/drivers/pinctrl/pinctrl_cc13xx_cc26xx.c
+++ b/drivers/pinctrl/pinctrl_cc13xx_cc26xx.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_pinctrl
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <driverlib/ioc.h>
 
diff --git a/drivers/pinctrl/pinctrl_esp32.c b/drivers/pinctrl/pinctrl_esp32.c
index 261550fcf3..956039317a 100644
--- a/drivers/pinctrl/pinctrl_esp32.c
+++ b/drivers/pinctrl/pinctrl_esp32.c
@@ -9,8 +9,8 @@
 #include <hal/rtc_io_hal.h>
 
 #include <soc.h>
-#include <drivers/pinctrl.h>
-#include <drivers/pinctrl/pinctrl_esp32_common.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl/pinctrl_esp32_common.h>
 
 #ifdef CONFIG_SOC_ESP32C3
 /* gpio structs in esp32c3 series are different from xtensa ones */
diff --git a/drivers/pinctrl/pinctrl_gd32_af.c b/drivers/pinctrl/pinctrl_gd32_af.c
index 77a04f3e5c..2978460887 100644
--- a/drivers/pinctrl/pinctrl_gd32_af.c
+++ b/drivers/pinctrl/pinctrl_gd32_af.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 BUILD_ASSERT((GD32_PUPD_NONE == GPIO_PUPD_NONE) &&
diff --git a/drivers/pinctrl/pinctrl_gd32_afio.c b/drivers/pinctrl/pinctrl_gd32_afio.c
index 46f35a4173..5a41d03b46 100644
--- a/drivers/pinctrl/pinctrl_gd32_afio.c
+++ b/drivers/pinctrl/pinctrl_gd32_afio.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 /** AFIO DT node */
diff --git a/drivers/pinctrl/pinctrl_kinetis.c b/drivers/pinctrl/pinctrl_kinetis.c
index 78df9c4b90..e542775b33 100644
--- a/drivers/pinctrl/pinctrl_kinetis.c
+++ b/drivers/pinctrl/pinctrl_kinetis.c
@@ -7,7 +7,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_pinmux
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <fsl_clock.h>
 
 /* Port register addresses. */
diff --git a/drivers/pinctrl/pinctrl_lpc_iocon.c b/drivers/pinctrl/pinctrl_lpc_iocon.c
index 0fbd1ccea0..9de630da90 100644
--- a/drivers/pinctrl/pinctrl_lpc_iocon.c
+++ b/drivers/pinctrl/pinctrl_lpc_iocon.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <fsl_clock.h>
 
 #define OFFSET(mux) (((mux) & 0xFFF00000) >> 20)
diff --git a/drivers/pinctrl/pinctrl_mchp_xec.c b/drivers/pinctrl/pinctrl_mchp_xec.c
index 05fece9528..e2ef8134ff 100644
--- a/drivers/pinctrl/pinctrl_mchp_xec.c
+++ b/drivers/pinctrl/pinctrl_mchp_xec.c
@@ -9,7 +9,7 @@
 
 #define DT_DRV_COMPAT microchip_xec_pinctrl
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 /* Microchip XEC: each GPIO pin has two 32-bit control register.
diff --git a/drivers/pinctrl/pinctrl_mcux_rt.c b/drivers/pinctrl/pinctrl_mcux_rt.c
index 79c81812de..1bc096df46 100644
--- a/drivers/pinctrl/pinctrl_mcux_rt.c
+++ b/drivers/pinctrl/pinctrl_mcux_rt.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_mcux_rt_pinctrl
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <fsl_iomuxc.h>
 #include <fsl_gpio.h>
diff --git a/drivers/pinctrl/pinctrl_nrf.c b/drivers/pinctrl/pinctrl_nrf.c
index 55f1c7fedd..601b2570a1 100644
--- a/drivers/pinctrl/pinctrl_nrf.c
+++ b/drivers/pinctrl/pinctrl_nrf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <hal/nrf_gpio.h>
 
diff --git a/drivers/pinctrl/pinctrl_rpi_pico.c b/drivers/pinctrl/pinctrl_rpi_pico.c
index 8a51cd4e6b..6d68ac32c1 100644
--- a/drivers/pinctrl/pinctrl_rpi_pico.c
+++ b/drivers/pinctrl/pinctrl_rpi_pico.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /* pico-sdk includes */
 #include <hardware/gpio.h>
diff --git a/drivers/pinctrl/pinctrl_sam.c b/drivers/pinctrl/pinctrl_sam.c
index e446cbbe2d..d00c3b580b 100644
--- a/drivers/pinctrl/pinctrl_sam.c
+++ b/drivers/pinctrl/pinctrl_sam.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc_gpio.h>
 
 /** Utility macro that expands to the GPIO port address if it exists */
diff --git a/drivers/pinctrl/pinctrl_sam0.c b/drivers/pinctrl/pinctrl_sam0.c
index 12adfc2a16..37e3a3b4b6 100644
--- a/drivers/pinctrl/pinctrl_sam0.c
+++ b/drivers/pinctrl/pinctrl_sam0.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc_port.h>
 
 /** Utility macro that expands to the PORT port address if it exists */
diff --git a/drivers/pinctrl/pinctrl_sifive.c b/drivers/pinctrl/pinctrl_sifive.c
index 29a1055989..bf5c1e17c6 100644
--- a/drivers/pinctrl/pinctrl_sifive.c
+++ b/drivers/pinctrl/pinctrl_sifive.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT sifive_pinctrl
 
-#include <devicetree.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #define PINCTRL_BASE_ADDR	DT_INST_REG_ADDR(0)
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 101a13d4e5..a27595120e 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <gpio/gpio_stm32.h>
 
 #include <stm32_ll_bus.h>
diff --git a/drivers/pinmux/pinmux_hsdk.c b/drivers/pinmux/pinmux_hsdk.c
index dd23a9bacc..6751ce2b7d 100644
--- a/drivers/pinmux/pinmux_hsdk.c
+++ b/drivers/pinmux/pinmux_hsdk.c
@@ -7,8 +7,8 @@
 #define DT_DRV_COMPAT snps_creg_gpio_mux_hsdk
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/pinmux.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinmux.h>
 #include <soc.h>
 
 #define creg_gpio_mux_reg	(*(volatile uint32_t *)DT_INST_REG_ADDR(0))
diff --git a/drivers/pinmux/pinmux_intel_s1000.c b/drivers/pinmux/pinmux_intel_s1000.c
index 9c6eab7a5c..5d7a0a7831 100644
--- a/drivers/pinmux/pinmux_intel_s1000.c
+++ b/drivers/pinmux/pinmux_intel_s1000.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT intel_s1000_pinmux
 
-#include <kernel.h>
-#include <drivers/pinmux.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/pinmux.h>
 #include <iomux.h>
 
 static volatile uint32_t *iomux_ctrl_regs = (volatile uint32_t *)DT_INST_REG_ADDR(0);
diff --git a/drivers/pinmux/pinmux_lpc11u6x.c b/drivers/pinmux/pinmux_lpc11u6x.c
index 369e6d6e33..10f92bc5ac 100644
--- a/drivers/pinmux/pinmux_lpc11u6x.c
+++ b/drivers/pinmux/pinmux_lpc11u6x.c
@@ -20,7 +20,7 @@
  * of pins information.
  */
 
-#include <drivers/pinmux.h>
+#include <zephyr/drivers/pinmux.h>
 
 struct pinmux_lpc11u6x_config {
 	uint8_t port;
diff --git a/drivers/pinmux/pinmux_mchp_xec.c b/drivers/pinmux/pinmux_mchp_xec.c
index bf44cd77bd..1e795b1d9c 100644
--- a/drivers/pinmux/pinmux_mchp_xec.c
+++ b/drivers/pinmux/pinmux_mchp_xec.c
@@ -5,11 +5,11 @@
  */
 
 #include <errno.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/pinmux.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/pinmux.h>
 #include <soc.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #define DT_DRV_COMPAT microchip_xec_pinmux
 
diff --git a/drivers/pinmux/pinmux_mcux.c b/drivers/pinmux/pinmux_mcux.c
index e4754578da..16cd0c51ba 100644
--- a/drivers/pinmux/pinmux_mcux.c
+++ b/drivers/pinmux/pinmux_mcux.c
@@ -7,8 +7,8 @@
 #define DT_DRV_COMPAT nxp_kinetis_pinmux
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/pinmux.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinmux.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 
diff --git a/drivers/pinmux/pinmux_mcux_lpc.c b/drivers/pinmux/pinmux_mcux_lpc.c
index 1043f4a484..7c87e35deb 100644
--- a/drivers/pinmux/pinmux_mcux_lpc.c
+++ b/drivers/pinmux/pinmux_mcux_lpc.c
@@ -8,8 +8,8 @@
 
 #include <stdint.h>
 #include <errno.h>
-#include <device.h>
-#include <drivers/pinmux.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinmux.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 #include <fsl_device_registers.h>
diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c
index 1cc5225417..470544c966 100644
--- a/drivers/pinmux/pinmux_rv32m1.c
+++ b/drivers/pinmux/pinmux_rv32m1.c
@@ -8,8 +8,8 @@
 #define DT_DRV_COMPAT openisa_rv32m1_pinmux
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/pinmux.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinmux.h>
 
 #include <fsl_common.h>
 #include <fsl_clock.h>
diff --git a/drivers/pinmux/pinmux_stm32.c b/drivers/pinmux/pinmux_stm32.c
index 4599d658fd..dc873ff8f0 100644
--- a/drivers/pinmux/pinmux_stm32.c
+++ b/drivers/pinmux/pinmux_stm32.c
@@ -13,15 +13,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_gpio.h>
 #include <stm32_ll_system.h>
-#include <drivers/pinmux.h>
+#include <zephyr/drivers/pinmux.h>
 #include <gpio/gpio_stm32.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <pinmux/pinmux_stm32.h>
 
 const struct device * const gpio_ports[STM32_PORTS_MAX] = {
diff --git a/drivers/pinmux/pinmux_stm32.h b/drivers/pinmux/pinmux_stm32.h
index acfceaeb8c..4e3ee42f96 100644
--- a/drivers/pinmux/pinmux_stm32.h
+++ b/drivers/pinmux/pinmux_stm32.h
@@ -12,11 +12,11 @@
 #define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32_H_
 
 #include <zephyr/types.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-#include <dt-bindings/pinctrl/stm32f1-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/stm32f1-pinctrl.h>
 #else
-#include <dt-bindings/pinctrl/stm32-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/stm32-pinctrl.h>
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
 
 #ifdef __cplusplus
diff --git a/drivers/pm_cpu_ops/pm_cpu_ops_psci.c b/drivers/pm_cpu_ops/pm_cpu_ops_psci.c
index 0fc85acb0a..f849916ce0 100644
--- a/drivers/pm_cpu_ops/pm_cpu_ops_psci.c
+++ b/drivers/pm_cpu_ops/pm_cpu_ops_psci.c
@@ -7,17 +7,17 @@
 #define DT_DRV_COMPAT arm_psci_0_2
 
 #define LOG_LEVEL CONFIG_PM_CPU_OPS_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psci);
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <drivers/pm_cpu_ops.h>
+#include <zephyr/drivers/pm_cpu_ops.h>
 #include "pm_cpu_ops_psci.h"
 
 static struct psci psci_data;
diff --git a/drivers/pm_cpu_ops/pm_cpu_ops_psci.h b/drivers/pm_cpu_ops/pm_cpu_ops_psci.h
index 388af524bb..f06b369ee4 100644
--- a/drivers/pm_cpu_ops/pm_cpu_ops_psci.h
+++ b/drivers/pm_cpu_ops/pm_cpu_ops_psci.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_PSCI_PSCI_H_
 #define ZEPHYR_DRIVERS_PSCI_PSCI_H_
 
-#include <drivers/pm_cpu_ops/psci.h>
+#include <zephyr/drivers/pm_cpu_ops/psci.h>
 
 #ifdef CONFIG_64BIT
 #define PSCI_FN_NATIVE(version, name)		PSCI_##version##_FN64_##name
diff --git a/drivers/pm_cpu_ops/pm_cpu_ops_weak_impl.c b/drivers/pm_cpu_ops/pm_cpu_ops_weak_impl.c
index fc88c0fa10..6ea25d00f9 100644
--- a/drivers/pm_cpu_ops/pm_cpu_ops_weak_impl.c
+++ b/drivers/pm_cpu_ops/pm_cpu_ops_weak_impl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 int __weak pm_cpu_on(unsigned long cpuid, uintptr_t entry_point)
 {
diff --git a/drivers/ps2/ps2_handlers.c b/drivers/ps2/ps2_handlers.c
index 5d85f9a563..71d1181a2d 100644
--- a/drivers/ps2/ps2_handlers.c
+++ b/drivers/ps2/ps2_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/ps2.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/ps2.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_ps2_config(const struct device *dev,
 				    ps2_callback_t callback_isr)
diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c
index 12664b8065..c9b43a7ea4 100644
--- a/drivers/ps2/ps2_mchp_xec.c
+++ b/drivers/ps2/ps2_mchp_xec.c
@@ -7,19 +7,19 @@
 
 #define DT_DRV_COMPAT microchip_xec_ps2
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 #ifdef CONFIG_SOC_SERIES_MEC172X
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #endif
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <drivers/ps2.h>
+#include <zephyr/drivers/ps2.h>
 #include <soc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_PS2_LOG_LEVEL
 LOG_MODULE_REGISTER(ps2_mchp_xec);
diff --git a/drivers/ps2/ps2_npcx_channel.c b/drivers/ps2/ps2_npcx_channel.c
index 9fc6057007..bd1f2fbfe3 100644
--- a/drivers/ps2/ps2_npcx_channel.c
+++ b/drivers/ps2/ps2_npcx_channel.c
@@ -16,11 +16,11 @@
  *
  */
 
-#include <drivers/clock_control.h>
-#include <drivers/ps2.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/ps2.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ps2_npcx_channel, CONFIG_PS2_LOG_LEVEL);
 
 #include "ps2_npcx_controller.h"
diff --git a/drivers/ps2/ps2_npcx_controller.c b/drivers/ps2/ps2_npcx_controller.c
index f94bee3ae9..b32f447db7 100644
--- a/drivers/ps2/ps2_npcx_controller.c
+++ b/drivers/ps2/ps2_npcx_controller.c
@@ -15,11 +15,11 @@
  * The hardware accelerator mechanism is shared by four PS/2 channels.
  */
 
-#include <drivers/clock_control.h>
-#include <drivers/ps2.h>
-#include <dt-bindings/clock/npcx_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/ps2.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ps2_npcx_ctrl, CONFIG_PS2_LOG_LEVEL);
 
 #define NPCX_PS2_CH_COUNT 4
diff --git a/drivers/ps2/ps2_npcx_controller.h b/drivers/ps2/ps2_npcx_controller.h
index d8e57e8823..6b2ab56b4d 100644
--- a/drivers/ps2/ps2_npcx_controller.h
+++ b/drivers/ps2/ps2_npcx_controller.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_PS2_PS2_NPCX_CONTROLLER_H_
 #define ZEPHYR_DRIVERS_PS2_PS2_NPCX_CONTROLLER_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/ptp_clock/ptp_clock.c b/drivers/ptp_clock/ptp_clock.c
index c59d8bacf8..ba0d7e373e 100644
--- a/drivers/ptp_clock/ptp_clock.c
+++ b/drivers/ptp_clock/ptp_clock.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/ptp_clock.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/ptp_clock.h>
 
 #ifdef CONFIG_USERSPACE
 int z_vrfy_ptp_clock_get(const struct device *dev,
diff --git a/drivers/pwm/pwm_b91.c b/drivers/pwm/pwm_b91.c
index 014b0be6e1..b65e39fe94 100644
--- a/drivers/pwm/pwm_b91.c
+++ b/drivers/pwm/pwm_b91.c
@@ -8,8 +8,8 @@
 
 #include "pwm.h"
 #include "clock.h"
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
 
 
 #define PWM_PCLK_SPEED      DT_INST_PROP(0, clock_frequency)
diff --git a/drivers/pwm/pwm_capture.c b/drivers/pwm/pwm_capture.c
index 5fc77ecfe2..15d417ac60 100644
--- a/drivers/pwm/pwm_capture.c
+++ b/drivers/pwm/pwm_capture.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(pwm_capture, CONFIG_PWM_LOG_LEVEL);
 
diff --git a/drivers/pwm/pwm_gd32.c b/drivers/pwm/pwm_gd32.c
index dff89c2596..407c41edbb 100644
--- a/drivers/pwm/pwm_gd32.c
+++ b/drivers/pwm/pwm_gd32.c
@@ -8,12 +8,12 @@
 
 #include <errno.h>
 
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_gd32, CONFIG_PWM_LOG_LEVEL);
 
 /** PWM data. */
diff --git a/drivers/pwm/pwm_gecko.c b/drivers/pwm/pwm_gecko.c
index d3752bfe45..c31d853002 100644
--- a/drivers/pwm/pwm_gecko.c
+++ b/drivers/pwm/pwm_gecko.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT silabs_gecko_pwm
 
-#include <drivers/pwm.h>
-#include <dt-bindings/pwm/pwm.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
 #include "em_cmu.h"
 #include "em_timer.h"
 
diff --git a/drivers/pwm/pwm_handlers.c b/drivers/pwm/pwm_handlers.c
index d355e1c77f..9993b24cf7 100644
--- a/drivers/pwm/pwm_handlers.c
+++ b/drivers/pwm/pwm_handlers.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <syscall_handler.h>
-#include <drivers/pwm.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/drivers/pwm.h>
 
 static inline int z_vrfy_pwm_set_cycles(const struct device *dev,
 					uint32_t channel, uint32_t period,
diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c
index 291b52a750..1bec93af1b 100644
--- a/drivers/pwm/pwm_imx.c
+++ b/drivers/pwm/pwm_imx.c
@@ -5,12 +5,12 @@
  */
 
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 #include <device_imx.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_imx);
 
 #define PWM_PWMSR_FIFOAV_4WORDS	0x4
diff --git a/drivers/pwm/pwm_ite_it8xxx2.c b/drivers/pwm/pwm_ite_it8xxx2.c
index 1ffd120ffe..11ec55c2d6 100644
--- a/drivers/pwm/pwm_ite_it8xxx2.c
+++ b/drivers/pwm/pwm_ite_it8xxx2.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_pwm
 
-#include <device.h>
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
-#include <dt-bindings/pwm/it8xxx2_pwm.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/dt-bindings/pwm/it8xxx2_pwm.h>
 #include <errno.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc_dt.h>
 #include <stdlib.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_ite_it8xxx2, CONFIG_PWM_LOG_LEVEL);
 
 #define PWM_CTRX_MIN	100
diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c
index cad7b9b1ec..d3838cb129 100644
--- a/drivers/pwm/pwm_led_esp32.c
+++ b/drivers/pwm/pwm_led_esp32.c
@@ -12,13 +12,13 @@
 #include <esp32/rom/gpio.h>
 #include <soc/gpio_sig_map.h>
 #include <soc/ledc_reg.h>
-#include <drivers/gpio/gpio_esp32.h>
+#include <zephyr/drivers/gpio/gpio_esp32.h>
 
 #include <soc.h>
 #include <errno.h>
-#include <drivers/pwm.h>
-#include <kernel.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
 #include <string.h>
 
 #define PWM_ESP32_HSCH_HPOINT(i) (LEDC_HSCH0_HPOINT_REG + (0x14 * i))
@@ -383,8 +383,8 @@ int pwm_led_esp32_init(const struct device *dev)
 }
 
 /* Initialization for PWM_LED_ESP32 */
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 #define CH_HS_TIMER(i) ((CONFIG_PWM_LED_ESP32_HS_CH ## i ## _TIMER) & 0x2)
 #define CH_HS_GPIO(i) ((CONFIG_PWM_LED_ESP32_HS_CH ## i ## _GPIO) & 0xfff)
diff --git a/drivers/pwm/pwm_litex.c b/drivers/pwm/pwm_litex.c
index 61994a6fbd..28633736a8 100644
--- a/drivers/pwm/pwm_litex.c
+++ b/drivers/pwm/pwm_litex.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT litex_pwm
 
-#include <device.h>
-#include <drivers/pwm.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pwm.h>
 #include <zephyr/types.h>
 
 #define REG_EN_ENABLE             0x1
diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c
index 8dfb907924..742b203a3c 100644
--- a/drivers/pwm/pwm_mchp_xec.c
+++ b/drivers/pwm/pwm_mchp_xec.c
@@ -9,22 +9,22 @@
 
 #include <errno.h>
 
-#include <device.h>
+#include <zephyr/device.h>
 #ifdef CONFIG_SOC_SERIES_MEC172X
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #endif
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <errno.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stdlib.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mchp_xec, CONFIG_PWM_LOG_LEVEL);
 
 /* Minimal on/off are 1 & 1 both are incremented, so 4.
diff --git a/drivers/pwm/pwm_mcux.c b/drivers/pwm/pwm_mcux.c
index 59bcf55eba..a7fcb7f9ed 100644
--- a/drivers/pwm/pwm_mcux.c
+++ b/drivers/pwm/pwm_mcux.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT nxp_imx_pwm
 
 #include <errno.h>
-#include <drivers/pwm.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/clock_control.h>
 #include <soc.h>
 #include <fsl_pwm.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mcux);
 
 #define CHANNEL_COUNT 2
diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c
index 4df8effae8..de27b38e24 100644
--- a/drivers/pwm/pwm_mcux_ftm.c
+++ b/drivers/pwm/pwm_mcux_ftm.c
@@ -7,16 +7,16 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_ftm_pwm
 
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 #include <fsl_ftm.h>
 #include <fsl_clock.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mcux_ftm);
 
 #define MAX_CHANNELS ARRAY_SIZE(FTM0->CONTROLS)
diff --git a/drivers/pwm/pwm_mcux_pwt.c b/drivers/pwm/pwm_mcux_pwt.c
index ec46051a2c..5beec23d89 100644
--- a/drivers/pwm/pwm_mcux_pwt.c
+++ b/drivers/pwm/pwm_mcux_pwt.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_pwt
 
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 #include <fsl_pwt.h>
 #include <fsl_clock.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mcux_pwt, CONFIG_PWM_LOG_LEVEL);
 
 /* Number of PWT input ports */
diff --git a/drivers/pwm/pwm_mcux_sctimer.c b/drivers/pwm/pwm_mcux_sctimer.c
index 523134d75d..bd4c045cc9 100644
--- a/drivers/pwm/pwm_mcux_sctimer.c
+++ b/drivers/pwm/pwm_mcux_sctimer.c
@@ -8,15 +8,15 @@
 #define DT_DRV_COMPAT nxp_sctimer_pwm
 
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <fsl_sctimer.h>
 #include <fsl_clock.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mcux_sctimer);
 
 #define CHANNEL_COUNT FSL_FEATURE_SCT_NUMBER_OF_OUTPUTS
diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c
index 06dfcfec23..4b4d4ac0bb 100644
--- a/drivers/pwm/pwm_mcux_tpm.c
+++ b/drivers/pwm/pwm_mcux_tpm.c
@@ -10,16 +10,16 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_tpm
 
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 #include <fsl_tpm.h>
 #include <fsl_clock.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_mcux_tpm);
 
 #define MAX_CHANNELS ARRAY_SIZE(TPM0->CONTROLS)
diff --git a/drivers/pwm/pwm_npcx.c b/drivers/pwm/pwm_npcx.c
index 9ec4f6c32d..1d1688faa7 100644
--- a/drivers/pwm/pwm_npcx.c
+++ b/drivers/pwm/pwm_npcx.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT nuvoton_npcx_pwm
 
 #include <assert.h>
-#include <drivers/pwm.h>
-#include <dt-bindings/clock/npcx_clock.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/dt-bindings/clock/npcx_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_npcx, LOG_LEVEL_ERR);
 
 /* 16-bit period cycles/prescaler in NPCX PWM modules */
diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c
index 023f78e482..439110d941 100644
--- a/drivers/pwm/pwm_nrf5_sw.c
+++ b/drivers/pwm/pwm_nrf5_sw.c
@@ -7,15 +7,15 @@
 #define DT_DRV_COMPAT nordic_nrf_sw_pwm
 
 #include <soc.h>
-#include <drivers/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include <nrfx_gpiote.h>
 #include <nrfx_ppi.h>
 #include <hal/nrf_gpio.h>
 #include <nrf_peripherals.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_nrf5_sw);
 
 #define GENERATOR_NODE	DT_INST_PHANDLE(0, generator)
diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 847e4261cf..a2aea7c134 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <nrfx_pwm.h>
-#include <drivers/pwm.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <hal/nrf_gpio.h>
 #include <stdbool.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_nrfx);
 
 #define PWM_NRFX_CH_POLARITY_MASK          BIT(15)
diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c
index a24ec18438..cb2c7b8272 100644
--- a/drivers/pwm/pwm_rv32m1_tpm.c
+++ b/drivers/pwm/pwm_rv32m1_tpm.c
@@ -9,18 +9,18 @@
 
 #define DT_DRV_COMPAT openisa_rv32m1_tpm
 
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
-#include <drivers/pwm.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 #include <fsl_tpm.h>
 #include <fsl_clock.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_rv32m1_tpm);
 
 #define MAX_CHANNELS ARRAY_SIZE(TPM0->CONTROLS)
diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c
index daec03f5fe..b4ed0d6baf 100644
--- a/drivers/pwm/pwm_sam.c
+++ b/drivers/pwm/pwm_sam.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT atmel_sam_pwm
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_sam);
 
 struct sam_pwm_config {
diff --git a/drivers/pwm/pwm_sam0_tcc.c b/drivers/pwm/pwm_sam0_tcc.c
index 0b8c96e2b0..efa603a26f 100644
--- a/drivers/pwm/pwm_sam0_tcc.c
+++ b/drivers/pwm/pwm_sam0_tcc.c
@@ -11,10 +11,10 @@
 
 #define DT_DRV_COMPAT atmel_sam0_tcc_pwm
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 /* Static configuration */
diff --git a/drivers/pwm/pwm_shell.c b/drivers/pwm/pwm_shell.c
index 6f8a25d415..26895df879 100644
--- a/drivers/pwm/pwm_shell.c
+++ b/drivers/pwm/pwm_shell.c
@@ -9,8 +9,8 @@
  * @brief PWM shell commands.
  */
 
-#include <shell/shell.h>
-#include <drivers/pwm.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/pwm.h>
 #include <stdlib.h>
 
 struct args_index {
diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c
index 58d7ec0c67..aee7ec471c 100644
--- a/drivers/pwm/pwm_sifive.c
+++ b/drivers/pwm/pwm_sifive.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT sifive_pwm0
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(pwm_sifive, CONFIG_PWM_LOG_LEVEL);
 
-#include <sys/sys_io.h>
-#include <device.h>
-#include <drivers/pinctrl.h>
-#include <drivers/pwm.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/pwm.h>
 #include <soc.h>
 
 /* Macros */
diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c
index 97aa03f6ea..42c9d250ae 100644
--- a/drivers/pwm/pwm_stm32.c
+++ b/drivers/pwm/pwm_stm32.c
@@ -12,16 +12,16 @@
 #include <soc.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_tim.h>
-#include <drivers/pwm.h>
-#include <drivers/pinctrl.h>
-#include <device.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <dt-bindings/pwm/stm32_pwm.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/dt-bindings/pwm/stm32_pwm.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pwm_stm32, CONFIG_PWM_LOG_LEVEL);
 
 /* L0 series MCUs only have 16-bit timers and don't have below macro defined */
diff --git a/drivers/pwm/pwm_test.c b/drivers/pwm/pwm_test.c
index 5cab1bd08e..a51fc1235d 100644
--- a/drivers/pwm/pwm_test.c
+++ b/drivers/pwm/pwm_test.c
@@ -10,8 +10,8 @@
  * devices for the "vnd,pwm" devicetree compatible used in test code.
  */
 
-#include <zephyr.h>
-#include <drivers/pwm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/pwm.h>
 
 #define DT_DRV_COMPAT vnd_pwm
 
diff --git a/drivers/pwm/pwm_xlnx_axi_timer.c b/drivers/pwm/pwm_xlnx_axi_timer.c
index c50aace887..eca64efd3d 100644
--- a/drivers/pwm/pwm_xlnx_axi_timer.c
+++ b/drivers/pwm/pwm_xlnx_axi_timer.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT xlnx_xps_timer_1_00_a_pwm
 
-#include <device.h>
-#include <drivers/pwm.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(xlnx_axi_timer_pwm, CONFIG_PWM_LOG_LEVEL);
 
 /* AXI Timer v2.0 registers offsets (See Xilinx PG079 for details) */
diff --git a/drivers/regulator/regulator_fixed.c b/drivers/regulator/regulator_fixed.c
index 4b4c99c691..ef35fd070b 100644
--- a/drivers/regulator/regulator_fixed.c
+++ b/drivers/regulator/regulator_fixed.c
@@ -5,11 +5,11 @@
 
 #define DT_DRV_COMPAT regulator_fixed
 
-#include <kernel.h>
-#include <drivers/regulator.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/drivers/gpio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(regulator_fixed, CONFIG_REGULATOR_LOG_LEVEL);
 
 #define OPTION_ALWAYS_ON_POS 0
diff --git a/drivers/regulator/regulator_pmic.c b/drivers/regulator/regulator_pmic.c
index 6aa1f6e014..c80afb3bf5 100644
--- a/drivers/regulator/regulator_pmic.c
+++ b/drivers/regulator/regulator_pmic.c
@@ -15,12 +15,12 @@
 
 #define DT_DRV_COMPAT regulator_pmic
 
-#include <kernel.h>
-#include <drivers/regulator.h>
-#include <drivers/regulator/consumer.h>
-#include <drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/regulator.h>
+#include <zephyr/drivers/regulator/consumer.h>
+#include <zephyr/drivers/i2c.h>
 #include <errno.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(pmic_regulator, CONFIG_REGULATOR_LOG_LEVEL);
 
diff --git a/drivers/reset/reset_rpi_pico.c b/drivers/reset/reset_rpi_pico.c
index 3550cbd3ef..f3f23ef901 100644
--- a/drivers/reset/reset_rpi_pico.c
+++ b/drivers/reset/reset_rpi_pico.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT raspberrypi_pico_reset
 
-#include <device.h>
-#include <drivers/reset.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/reset.h>
 
 struct reset_rpi_config {
 	DEVICE_MMIO_ROM;
diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c
index 39fa9a3e35..6bf0c7ce9c 100644
--- a/drivers/sensor/adt7420/adt7420.c
+++ b/drivers/sensor/adt7420/adt7420.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT adi_adt7420
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
 
 #include "adt7420.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ADT7420, CONFIG_SENSOR_LOG_LEVEL);
 
 static int adt7420_temp_reg_read(const struct device *dev, uint8_t reg,
diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h
index 2fe806be82..6210e4f595 100644
--- a/drivers/sensor/adt7420/adt7420.h
+++ b/drivers/sensor/adt7420/adt7420.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_ADT7420_ADT7420_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 /* ADT7420 registers */
 #define ADT7420_REG_TEMP_MSB		0x00 /* Temperature value MSB */
diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c
index 0affa74b7b..a37ae01ffb 100644
--- a/drivers/sensor/adt7420/adt7420_trigger.c
+++ b/drivers/sensor/adt7420/adt7420_trigger.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "adt7420.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ADT7420, CONFIG_SENSOR_LOG_LEVEL);
 
 static void setup_int(const struct device *dev,
diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c
index b6e600067e..c1ddec0463 100644
--- a/drivers/sensor/adxl345/adxl345.c
+++ b/drivers/sensor/adxl345/adxl345.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT adi_adxl345
 
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 
 #include "adxl345.h"
 
diff --git a/drivers/sensor/adxl345/adxl345.h b/drivers/sensor/adxl345/adxl345.h
index 822f3f48ac..82497b0100 100644
--- a/drivers/sensor/adxl345/adxl345.h
+++ b/drivers/sensor/adxl345/adxl345.h
@@ -8,10 +8,10 @@
 #define ZEPHYR_DRIVERS_SENSOR_ADX345_ADX345_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define ADXL345_DEVICE_ID_REG      0x00
 #define ADXL345_RATE_REG           0x2c
diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c
index d288110638..bc70237fe8 100644
--- a/drivers/sensor/adxl362/adxl362.c
+++ b/drivers/sensor/adxl362/adxl362.c
@@ -8,15 +8,15 @@
 
 #define DT_DRV_COMPAT adi_adxl362
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <drivers/spi.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
 
 #include "adxl362.h"
 
diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h
index 23ff541b5a..4bebadd8c5 100644
--- a/drivers/sensor/adxl362/adxl362.h
+++ b/drivers/sensor/adxl362/adxl362.h
@@ -8,9 +8,9 @@
 #define ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #define ADXL362_SLAVE_ID    1
 
diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c
index b8b1ea11a4..637554aab7 100644
--- a/drivers/sensor/adxl362/adxl362_trigger.c
+++ b/drivers/sensor/adxl362/adxl362_trigger.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT adi_adxl362
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "adxl362.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ADXL362, CONFIG_SENSOR_LOG_LEVEL);
 
 static void adxl362_thread_cb(const struct device *dev)
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index c72c7bd3cf..59db1d9e4c 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT adi_adxl372
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/printk.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/__assert.h>
 #include <stdlib.h>
-#include <drivers/spi.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 #include "adxl372.h"
 
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index cfa52b6288..9649456c17 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -8,11 +8,11 @@
 #define ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 /*
  * ADXL372 registers definition
diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c
index a72fc76800..c088fc3c91 100644
--- a/drivers/sensor/adxl372/adxl372_trigger.c
+++ b/drivers/sensor/adxl372/adxl372_trigger.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT adi_adxl372
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include "adxl372.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ADXL372, CONFIG_SENSOR_LOG_LEVEL);
 
 static void adxl372_thread_cb(const struct device *dev)
diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c
index 6f25620ecd..b20c43ba95 100644
--- a/drivers/sensor/ak8975/ak8975.c
+++ b/drivers/sensor/ak8975/ak8975.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT asahi_kasei_ak8975
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 
 #include "ak8975.h"
 
diff --git a/drivers/sensor/ak8975/ak8975.h b/drivers/sensor/ak8975/ak8975.h
index 733190d2c5..fda81857a8 100644
--- a/drivers/sensor/ak8975/ak8975.h
+++ b/drivers/sensor/ak8975/ak8975.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_
 #define ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #define AK8975_REG_CHIP_ID		0x00
 #define AK8975_CHIP_ID			0x48
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index a27e8d9a2b..e20a524537 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/drivers/sensor/amg88xx/amg88xx.c
@@ -7,15 +7,15 @@
 #define DT_DRV_COMPAT panasonic_amg88xx
 
 #include <string.h>
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "amg88xx.h"
 
diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h
index abff46e881..2f00478445 100644
--- a/drivers/sensor/amg88xx/amg88xx.h
+++ b/drivers/sensor/amg88xx/amg88xx.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_AMG88XX_AMG88XX_H_
 #define ZEPHYR_DRIVERS_SENSOR_AMG88XX_AMG88XX_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #define AMG88XX_PCLT		0x00 /* Setting Power control register */
 #define AMG88XX_RST		0x01 /* Reset register */
diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c
index 381862b4a6..816726ca46 100644
--- a/drivers/sensor/amg88xx/amg88xx_trigger.c
+++ b/drivers/sensor/amg88xx/amg88xx_trigger.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include "amg88xx.h"
 
 extern struct amg88xx_data amg88xx_driver;
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(AMG88XX, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline void amg88xx_setup_int(struct amg88xx_data *drv_data,
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c
index d74a2fa1d2..460e49827f 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.c
+++ b/drivers/sensor/ams_iAQcore/iAQcore.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ams_iaqcore
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "iAQcore.h"
 
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.h b/drivers/sensor/ams_iAQcore/iAQcore.h
index 2f8e6f4020..3e18fc5d1f 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.h
+++ b/drivers/sensor/ams_iAQcore/iAQcore.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_AMS_IAQCORE_IAQCORE_H_
 #define ZEPHYR_DRIVERS_SENSOR_AMS_IAQCORE_IAQCORE_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 
 struct iaq_registers {
 	uint16_t co2_pred;
diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c
index 845d2f7ab0..51489f269a 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/drivers/sensor/apds9960/apds9960.c
@@ -11,16 +11,16 @@
  * @brief driver for APDS9960 ALS/RGB/gesture/proximity sensor
  */
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <pm/device.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "apds9960.h"
 
diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h
index f691123b5a..f1621c5176 100644
--- a/drivers/sensor/apds9960/apds9960.h
+++ b/drivers/sensor/apds9960/apds9960.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
 #define ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #define APDS9960_ENABLE_REG		0x80
 #define APDS9960_ENABLE_GEN		BIT(6)
diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c
index 2c9918cabf..17aa330c5e 100644
--- a/drivers/sensor/apds9960/apds9960_trigger.c
+++ b/drivers/sensor/apds9960/apds9960_trigger.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include "apds9960.h"
 
 extern struct apds9960_data apds9960_driver;
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(APDS9960, CONFIG_SENSOR_LOG_LEVEL);
 
 void apds9960_work_cb(struct k_work *work)
diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c
index 9c36a9161a..8aa620d96f 100644
--- a/drivers/sensor/bma280/bma280.c
+++ b/drivers/sensor/bma280/bma280.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT bosch_bma280
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "bma280.h"
 
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index 08176b32cd..03aaeaf953 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_
 #define ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #define BMA280_I2C_ADDRESS		DT_INST_REG_ADDR(0)
 
diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c
index 1fd6339c3d..c93e479f29 100644
--- a/drivers/sensor/bma280/bma280_trigger.c
+++ b/drivers/sensor/bma280/bma280_trigger.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT bosch_bma280
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "bma280.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(BMA280, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline void setup_int1(const struct device *dev,
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index d0f8c82f7a..2cc130a668 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.c
@@ -11,15 +11,15 @@
 
 #define DT_DRV_COMPAT bosch_bmc150_magn
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
 
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "bmc150_magn.h"
 
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h
index 9c4f9b6a77..3982f272ee 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.h
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.h
@@ -10,8 +10,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_
 
 #include <zephyr/types.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define BMC150_MAGN_REG_CHIP_ID		0x40
 #define BMC150_MAGN_CHIP_ID_VAL		0x32
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
index 4cd39e4717..3a3dbbb73b 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "bmc150_magn.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(BMC150_MAGN, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline void setup_drdy(const struct device *dev,
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index 1a33c5465a..472dd5d1fc 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -8,15 +8,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "bme280.h"
 
diff --git a/drivers/sensor/bme280/bme280.h b/drivers/sensor/bme280/bme280.h
index 99e0b57c3b..afc4ce275d 100644
--- a/drivers/sensor/bme280/bme280.h
+++ b/drivers/sensor/bme280/bme280.h
@@ -10,10 +10,10 @@
 #define ZEPHYR_DRIVERS_SENSOR_BME280_BME280_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/spi.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/i2c.h>
 
 #define DT_DRV_COMPAT bosch_bme280
 
diff --git a/drivers/sensor/bme280/bme280_spi.c b/drivers/sensor/bme280/bme280_spi.c
index d36040033f..c24920aea8 100644
--- a/drivers/sensor/bme280/bme280_spi.c
+++ b/drivers/sensor/bme280/bme280_spi.c
@@ -10,7 +10,7 @@
  * Bus-specific functionality for BME280s accessed via SPI.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "bme280.h"
 
 #if BME280_BUS_SPI
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index 97512b8d8b..b2fa84c1d8 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/drivers/sensor/bme680/bme680.c
@@ -11,13 +11,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "bme680.h"
 
diff --git a/drivers/sensor/bme680/bme680.h b/drivers/sensor/bme680/bme680.h
index 647a288d3a..c0c09db940 100644
--- a/drivers/sensor/bme680/bme680.h
+++ b/drivers/sensor/bme680/bme680.h
@@ -9,10 +9,10 @@
 #define __ZEPHYR_DRIVERS_SENSOR_BME680_H__
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/spi.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/i2c.h>
 
 #define DT_DRV_COMPAT bosch_bme680
 
diff --git a/drivers/sensor/bme680/bme680_spi.c b/drivers/sensor/bme680/bme680_spi.c
index 1410718633..e196de8601 100644
--- a/drivers/sensor/bme680/bme680_spi.c
+++ b/drivers/sensor/bme680/bme680_spi.c
@@ -11,7 +11,7 @@
  * Bus-specific functionality for BME680s accessed via SPI.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "bme680.h"
 
 #if BME680_BUS_SPI
diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c
index 84d9431684..17ea4b7caf 100644
--- a/drivers/sensor/bmg160/bmg160.c
+++ b/drivers/sensor/bmg160/bmg160.c
@@ -10,11 +10,11 @@
 
 #define DT_DRV_COMPAT bosch_bmg160
 
-#include <init.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #include "bmg160.h"
 
diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h
index 6ccc0c898b..b696aa5175 100644
--- a/drivers/sensor/bmg160/bmg160.h
+++ b/drivers/sensor/bmg160/bmg160.h
@@ -9,9 +9,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 #define ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 /* registers */
 #define BMG160_REG_CHIPID		0x00
diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c
index 0cf728c723..30ba1d3ea5 100644
--- a/drivers/sensor/bmg160/bmg160_trigger.c
+++ b/drivers/sensor/bmg160/bmg160_trigger.c
@@ -8,14 +8,14 @@
  * http://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMG160-DS000-09.pdf
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "bmg160.h"
 
 extern struct bmg160_device_data bmg160_data;
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(BMG160, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline int setup_int(const struct device *dev,
diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c
index 9013bb2c3a..4c867eae97 100644
--- a/drivers/sensor/bmi160/bmi160.c
+++ b/drivers/sensor/bmi160/bmi160.c
@@ -8,13 +8,13 @@
  * http://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMI160-DS000-07.pdf
  */
 
-#include <init.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
-#include <kernel.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "bmi160.h"
 
diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h
index d609f54774..49339ad896 100644
--- a/drivers/sensor/bmi160/bmi160.h
+++ b/drivers/sensor/bmi160/bmi160.h
@@ -10,11 +10,11 @@
 
 #define DT_DRV_COMPAT bosch_bmi160
 
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 
 /* registers */
 #define BMI160_REG_CHIPID		0x00
diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c
index 4405185d40..ba65aa7b68 100644
--- a/drivers/sensor/bmi160/bmi160_trigger.c
+++ b/drivers/sensor/bmi160/bmi160_trigger.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "bmi160.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(BMI160, CONFIG_SENSOR_LOG_LEVEL);
 
 static void bmi160_handle_anymotion(const struct device *dev)
diff --git a/drivers/sensor/bmi270/bmi270.c b/drivers/sensor/bmi270/bmi270.c
index 252ef1c8b4..925ca81996 100644
--- a/drivers/sensor/bmi270/bmi270.c
+++ b/drivers/sensor/bmi270/bmi270.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT bosch_bmi270
 
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 
 #include "bmi270.h"
 #include "bmi270_config_file.h"
diff --git a/drivers/sensor/bmi270/bmi270.h b/drivers/sensor/bmi270/bmi270.h
index d3a3ef6252..43013073b1 100644
--- a/drivers/sensor/bmi270/bmi270.h
+++ b/drivers/sensor/bmi270/bmi270.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BMI270_BMI270_H_
 #define ZEPHYR_DRIVERS_SENSOR_BMI270_BMI270_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 
 #define BMI270_REG_CHIP_ID         0x00
 #define BMI270_REG_ERROR           0x02
diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c
index 572acb53ec..d3f69d383e 100644
--- a/drivers/sensor/bmm150/bmm150.c
+++ b/drivers/sensor/bmm150/bmm150.c
@@ -8,7 +8,7 @@
 
 #define DT_DRV_COMPAT bosch_bmm150
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "bmm150.h"
 
 LOG_MODULE_REGISTER(BMM150, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index 5c576b478c..fa5ff5ada3 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/drivers/sensor/bmm150/bmm150.h
@@ -11,16 +11,16 @@
 
 
 #include <zephyr/types.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #include <stdint.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/gpio.h>
 
 #define BMM150_REG_CHIP_ID         0x40
 #define BMM150_CHIP_ID_VAL         0x32
diff --git a/drivers/sensor/bmp388/bmp388.c b/drivers/sensor/bmp388/bmp388.c
index bc5ea1c58f..a30b2b50f4 100644
--- a/drivers/sensor/bmp388/bmp388.c
+++ b/drivers/sensor/bmp388/bmp388.c
@@ -10,11 +10,11 @@
 
 #define DT_DRV_COMPAT bosch_bmp388
 
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <pm/device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
 
 #include "bmp388.h"
 
diff --git a/drivers/sensor/bmp388/bmp388.h b/drivers/sensor/bmp388/bmp388.h
index b5ed71416b..6322cfe25f 100644
--- a/drivers/sensor/bmp388/bmp388.h
+++ b/drivers/sensor/bmp388/bmp388.h
@@ -11,9 +11,9 @@
 #ifndef __BMP388_H
 #define __BMP388_H
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 
 /* registers */
 #define BMP388_REG_CHIPID       0x00
diff --git a/drivers/sensor/bmp388/bmp388_trigger.c b/drivers/sensor/bmp388/bmp388_trigger.c
index 410511b944..dd9cb1c686 100644
--- a/drivers/sensor/bmp388/bmp388_trigger.c
+++ b/drivers/sensor/bmp388/bmp388_trigger.c
@@ -10,11 +10,11 @@
 
 #define DT_DRV_COMPAT bosch_bmp388
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <pm/device.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/logging/log.h>
 
 #include "bmp388.h"
 
diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c
index 2f09d15b8b..6eb8d91b7d 100644
--- a/drivers/sensor/bq274xx/bq274xx.c
+++ b/drivers/sensor/bq274xx/bq274xx.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ti_bq274xx
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <drivers/sensor.h>
-#include <pm/device.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/__assert.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "bq274xx.h"
 
diff --git a/drivers/sensor/bq274xx/bq274xx.h b/drivers/sensor/bq274xx/bq274xx.h
index 8831b734fc..eaa78bb9a3 100644
--- a/drivers/sensor/bq274xx/bq274xx.h
+++ b/drivers/sensor/bq274xx/bq274xx.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BATTERY_BQ274XX_H_
 #define ZEPHYR_DRIVERS_SENSOR_BATTERY_BQ274XX_H_
 
-#include <logging/log.h>
-#include <drivers/gpio.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
 LOG_MODULE_REGISTER(bq274xx, CONFIG_SENSOR_LOG_LEVEL);
 
 /*** General Constant ***/
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index 3ee8ae32a0..760b45ad53 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/drivers/sensor/ccs811/ccs811.c
@@ -7,15 +7,15 @@
 
 #define DT_DRV_COMPAT ams_ccs811
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "ccs811.h"
 
diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h
index 1f07d79c41..f595f61ccd 100644
--- a/drivers/sensor/ccs811/ccs811.h
+++ b/drivers/sensor/ccs811/ccs811.h
@@ -8,10 +8,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_CCS811_CCS811_H_
 #define ZEPHYR_DRIVERS_SENSOR_CCS811_CCS811_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <drivers/sensor/ccs811.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor/ccs811.h>
 
 /* Registers */
 #define CCS811_REG_STATUS               0x00
diff --git a/drivers/sensor/ccs811/ccs811_trigger.c b/drivers/sensor/ccs811/ccs811_trigger.c
index 082c81ef58..f853a94a99 100644
--- a/drivers/sensor/ccs811/ccs811_trigger.c
+++ b/drivers/sensor/ccs811/ccs811_trigger.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT ams_ccs811
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include "ccs811.h"
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(CCS811);
 
 #define IRQ_PIN DT_INST_GPIO_PIN(0, irq_gpios)
diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c
index 877aa8d239..97a559b3a3 100644
--- a/drivers/sensor/dht/dht.c
+++ b/drivers/sensor/dht/dht.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT aosong_dht
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 
 #include "dht.h"
 
diff --git a/drivers/sensor/dht/dht.h b/drivers/sensor/dht/dht.h
index a1ba6728db..640831bcda 100644
--- a/drivers/sensor/dht/dht.h
+++ b/drivers/sensor/dht/dht.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_DHT_DHT_H_
 #define ZEPHYR_DRIVERS_SENSOR_DHT_DHT_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #define DHT_START_SIGNAL_DURATION		18000
 #define DHT_SIGNAL_MAX_WAIT_DURATION		100
diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c
index 6ab25f5639..efa00deb9a 100644
--- a/drivers/sensor/dps310/dps310.c
+++ b/drivers/sensor/dps310/dps310.c
@@ -8,14 +8,14 @@
 
 #define DT_DRV_COMPAT infineon_dps310
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(DPS310, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c
index 366a220ec7..edbae36094 100644
--- a/drivers/sensor/ens210/ens210.c
+++ b/drivers/sensor/ens210/ens210.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ams_ens210
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include "ens210.h"
 
 LOG_MODULE_REGISTER(ENS210, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/ens210/ens210.h b/drivers/sensor/ens210/ens210.h
index b0e1db4658..32accc53d1 100644
--- a/drivers/sensor/ens210/ens210.h
+++ b/drivers/sensor/ens210/ens210.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ENS210_ENS210_H_
 #define ZEPHYR_DRIVERS_SENSOR_ENS210_ENS210_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 /* Registers */
 #define ENS210_REG_PART_ID    0x00
diff --git a/drivers/sensor/fdc2x1x/fdc2x1x.c b/drivers/sensor/fdc2x1x/fdc2x1x.c
index 85de44c78e..8b6acb48f0 100644
--- a/drivers/sensor/fdc2x1x/fdc2x1x.c
+++ b/drivers/sensor/fdc2x1x/fdc2x1x.c
@@ -8,10 +8,10 @@
 
 #define DT_DRV_COMPAT ti_fdc2x1x
 
-#include <device.h>
-#include <pm/device.h>
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 #include <math.h>
 
 #include "fdc2x1x.h"
diff --git a/drivers/sensor/fdc2x1x/fdc2x1x.h b/drivers/sensor/fdc2x1x/fdc2x1x.h
index 39ea405f11..4c75b660af 100644
--- a/drivers/sensor/fdc2x1x/fdc2x1x.h
+++ b/drivers/sensor/fdc2x1x/fdc2x1x.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_FDC2X1X_FDC2X1X_H_
 #define ZEPHYR_DRIVERS_SENSOR_FDC2X1X_FDC2X1X_H_
 
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define PI              (3.14159265)
 
diff --git a/drivers/sensor/fdc2x1x/fdc2x1x_trigger.c b/drivers/sensor/fdc2x1x/fdc2x1x_trigger.c
index 496e5df05a..39f6c8cc41 100644
--- a/drivers/sensor/fdc2x1x/fdc2x1x_trigger.c
+++ b/drivers/sensor/fdc2x1x/fdc2x1x_trigger.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT ti_fdc2x1x
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include "fdc2x1x.h"
 
 #include <stdio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(FDC2X1X, CONFIG_SENSOR_LOG_LEVEL);
 
 static void fdc2x1x_thread_cb(const struct device *dev)
diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c
index f88ff07743..c4d0057687 100644
--- a/drivers/sensor/fxas21002/fxas21002.c
+++ b/drivers/sensor/fxas21002/fxas21002.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT nxp_fxas21002
 
 #include "fxas21002.h"
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(FXAS21002, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h
index 0b519850c1..51a33f6ec3 100644
--- a/drivers/sensor/fxas21002/fxas21002.h
+++ b/drivers/sensor/fxas21002/fxas21002.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define FXAS21002_REG_STATUS		0x00
 #define FXAS21002_REG_OUTXMSB		0x01
diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c
index f76ae78053..fab14c3c0f 100644
--- a/drivers/sensor/fxas21002/fxas21002_trigger.c
+++ b/drivers/sensor/fxas21002/fxas21002_trigger.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "fxas21002.h"
 
diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c
index 9626ce1e1a..2301ab5306 100644
--- a/drivers/sensor/fxos8700/fxos8700.c
+++ b/drivers/sensor/fxos8700/fxos8700.c
@@ -8,9 +8,9 @@
 #define DT_DRV_COMPAT nxp_fxos8700
 
 #include "fxos8700.h"
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include <stdlib.h>
 
 LOG_MODULE_REGISTER(FXOS8700, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h
index ec3d02658e..8dd1f39721 100644
--- a/drivers/sensor/fxos8700/fxos8700.h
+++ b/drivers/sensor/fxos8700/fxos8700.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define FXOS8700_REG_STATUS			0x00
 #define FXOS8700_REG_OUTXMSB			0x01
diff --git a/drivers/sensor/fxos8700/fxos8700_trigger.c b/drivers/sensor/fxos8700/fxos8700_trigger.c
index 58747089d7..049347fc81 100644
--- a/drivers/sensor/fxos8700/fxos8700_trigger.c
+++ b/drivers/sensor/fxos8700/fxos8700_trigger.c
@@ -6,7 +6,7 @@
  */
 
 #include "fxos8700.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(FXOS8700, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c
index 5c68d1393f..2fa12b174a 100644
--- a/drivers/sensor/grove/light_sensor.c
+++ b/drivers/sensor/grove/light_sensor.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT seeed_grove_light
 
-#include <drivers/adc.h>
-#include <device.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/device.h>
 #include <math.h>
-#include <drivers/sensor.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(grove_light, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c
index c1d6be9c69..049fb88107 100644
--- a/drivers/sensor/grove/temperature_sensor.c
+++ b/drivers/sensor/grove/temperature_sensor.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT seeed_grove_temperature
 
-#include <drivers/adc.h>
-#include <device.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/device.h>
 #include <math.h>
-#include <drivers/sensor.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(grove_temp, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c
index d60256f13c..97de67bb86 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.c
+++ b/drivers/sensor/hmc5883l/hmc5883l.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT honeywell_hmc5883l
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "hmc5883l.h"
 
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index e219908ffb..a43ad17172 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_HMC5883L_HMC5883L_H_
 #define ZEPHYR_DRIVERS_SENSOR_HMC5883L_HMC5883L_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #define HMC5883L_REG_CONFIG_A           0x00
 #define HMC5883L_ODR_SHIFT              2
diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
index 5505c76b8a..52eeac0cf7 100644
--- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c
+++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT honeywell_hmc5883l
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 #include "hmc5883l.h"
 
 LOG_MODULE_DECLARE(HMC5883L, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
index be30264cdb..3ff33460c4 100644
--- a/drivers/sensor/hp206c/hp206c.c
+++ b/drivers/sensor/hp206c/hp206c.c
@@ -10,13 +10,13 @@
 
 #define DT_DRV_COMPAT hoperf_hp206c
 
-#include <init.h>
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "hp206c.h"
 
diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h
index bcbbf2770c..428478b4d2 100644
--- a/drivers/sensor/hp206c/hp206c.h
+++ b/drivers/sensor/hp206c/hp206c.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_
 #define ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define HP206C_I2C_ADDRESS				0x76
 
diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c
index f62b10c629..42c3358088 100644
--- a/drivers/sensor/hts221/hts221.c
+++ b/drivers/sensor/hts221/hts221.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT st_hts221
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "hts221.h"
 
diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h
index f315b82c88..a20f57a173 100644
--- a/drivers/sensor/hts221/hts221.h
+++ b/drivers/sensor/hts221/hts221.h
@@ -7,23 +7,23 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_HTS221_HTS221_H_
 #define ZEPHYR_DRIVERS_SENSOR_HTS221_HTS221_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 #include <stmemsc.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "hts221_reg.h"
 
 #define HTS221_AUTOINCREMENT_ADDR      BIT(7)
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 struct hts221_data {
diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c
index 4566538563..314b666ab3 100644
--- a/drivers/sensor/hts221/hts221_trigger.c
+++ b/drivers/sensor/hts221/hts221_trigger.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT st_hts221
 
-#include <device.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #include "hts221.h"
 
diff --git a/drivers/sensor/i3g4250d/i3g4250d.c b/drivers/sensor/i3g4250d/i3g4250d.c
index 11d2a43a67..3dd53691b7 100644
--- a/drivers/sensor/i3g4250d/i3g4250d.c
+++ b/drivers/sensor/i3g4250d/i3g4250d.c
@@ -10,11 +10,11 @@
 
 #define DT_DRV_COMPAT st_i3g4250d
 
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "i3g4250d.h"
 
diff --git a/drivers/sensor/i3g4250d/i3g4250d.h b/drivers/sensor/i3g4250d/i3g4250d.h
index 96438f7eb4..cee44bb27c 100644
--- a/drivers/sensor/i3g4250d/i3g4250d.h
+++ b/drivers/sensor/i3g4250d/i3g4250d.h
@@ -12,10 +12,10 @@
 #define ZEPHYR_DRIVERS_SENSOR_I3G4250D_I3G4250D_H_
 
 #include <stdint.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
 #include "i3g4250d_reg.h"
 
 struct i3g4250d_device_config {
diff --git a/drivers/sensor/i3g4250d/i3g4250d_spi.c b/drivers/sensor/i3g4250d/i3g4250d_spi.c
index 30f6008915..70f049f6b1 100644
--- a/drivers/sensor/i3g4250d/i3g4250d_spi.c
+++ b/drivers/sensor/i3g4250d/i3g4250d_spi.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT st_i3g4250d
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "i3g4250d.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
diff --git a/drivers/sensor/icm42605/icm42605.c b/drivers/sensor/icm42605/icm42605.c
index 63426a5d62..36e3c2bbdf 100644
--- a/drivers/sensor/icm42605/icm42605.c
+++ b/drivers/sensor/icm42605/icm42605.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT invensense_icm42605
 
-#include <drivers/spi.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "icm42605.h"
 #include "icm42605_reg.h"
diff --git a/drivers/sensor/icm42605/icm42605.h b/drivers/sensor/icm42605/icm42605.h
index de58e58900..2025e3b8e4 100644
--- a/drivers/sensor/icm42605/icm42605.h
+++ b/drivers/sensor/icm42605/icm42605.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
 #include "icm42605_reg.h"
diff --git a/drivers/sensor/icm42605/icm42605_setup.c b/drivers/sensor/icm42605/icm42605_setup.c
index 7105d6e55f..3ea2c5e6bc 100644
--- a/drivers/sensor/icm42605/icm42605_setup.c
+++ b/drivers/sensor/icm42605/icm42605_setup.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "icm42605.h"
 #include "icm42605_reg.h"
diff --git a/drivers/sensor/icm42605/icm42605_setup.h b/drivers/sensor/icm42605/icm42605_setup.h
index cb9951038a..334103d871 100644
--- a/drivers/sensor/icm42605/icm42605_setup.h
+++ b/drivers/sensor/icm42605/icm42605_setup.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_SETUP_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_SETUP_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 int icm42605_sensor_init(const struct device *dev);
 int icm42605_turn_on_fifo(const struct device *dev);
diff --git a/drivers/sensor/icm42605/icm42605_spi.c b/drivers/sensor/icm42605/icm42605_spi.c
index e32928a307..bdc3a4c134 100644
--- a/drivers/sensor/icm42605/icm42605_spi.c
+++ b/drivers/sensor/icm42605/icm42605_spi.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-#include <sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 #include "icm42605_spi.h"
 
 LOG_MODULE_DECLARE(ICM42605, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/icm42605/icm42605_spi.h b/drivers/sensor/icm42605/icm42605_spi.h
index 1de85f0242..357aeace2d 100644
--- a/drivers/sensor/icm42605/icm42605_spi.h
+++ b/drivers/sensor/icm42605/icm42605_spi.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_SPI_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42605_ICM42605_SPI_H_
 
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 
 int inv_spi_single_write(const struct spi_dt_spec *bus, uint8_t reg, uint8_t *data);
 int inv_spi_read(const struct spi_dt_spec *bus, uint8_t reg, uint8_t *data, size_t len);
diff --git a/drivers/sensor/icm42605/icm42605_trigger.c b/drivers/sensor/icm42605/icm42605_trigger.c
index ebaff069e7..08da99e40e 100644
--- a/drivers/sensor/icm42605/icm42605_trigger.c
+++ b/drivers/sensor/icm42605/icm42605_trigger.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 #include "icm42605.h"
 #include "icm42605_setup.h"
 
diff --git a/drivers/sensor/icm42670/icm42670.c b/drivers/sensor/icm42670/icm42670.c
index a66fc0260e..bb698d5554 100644
--- a/drivers/sensor/icm42670/icm42670.c
+++ b/drivers/sensor/icm42670/icm42670.c
@@ -7,15 +7,15 @@
 
 #define DT_DRV_COMPAT invensense_icm42670
 
-#include <drivers/sensor.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 #include "icm42670.h"
 #include "icm42670_reg.h"
 #include "icm42670_spi.h"
 #include "icm42670_trigger.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ICM42670, CONFIG_SENSOR_LOG_LEVEL);
 
 /*
diff --git a/drivers/sensor/icm42670/icm42670.h b/drivers/sensor/icm42670/icm42670.h
index 882569e2ac..51055d8a4e 100644
--- a/drivers/sensor/icm42670/icm42670.h
+++ b/drivers/sensor/icm42670/icm42670.h
@@ -8,9 +8,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42670_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42670_H_
 
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
 
 struct icm42670_data {
 	int16_t accel_x;
diff --git a/drivers/sensor/icm42670/icm42670_reg.h b/drivers/sensor/icm42670/icm42670_reg.h
index 3fc73d1f2d..6a26f859a5 100644
--- a/drivers/sensor/icm42670/icm42670_reg.h
+++ b/drivers/sensor/icm42670/icm42670_reg.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42670_REG_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42670_REG_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* Helper macros for addressing registers in MREG1-3, see datasheet section 13 */
 #define REG_MADDR_BASE			0x0028
diff --git a/drivers/sensor/icm42670/icm42670_spi.c b/drivers/sensor/icm42670/icm42670_spi.c
index 5756b4f9d8..a0c830208e 100644
--- a/drivers/sensor/icm42670/icm42670_spi.c
+++ b/drivers/sensor/icm42670/icm42670_spi.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "icm42670_spi.h"
 #include "icm42670_reg.h"
 
diff --git a/drivers/sensor/icm42670/icm42670_spi.h b/drivers/sensor/icm42670/icm42670_spi.h
index 9ef944666e..68bc6524c3 100644
--- a/drivers/sensor/icm42670/icm42670_spi.h
+++ b/drivers/sensor/icm42670/icm42670_spi.h
@@ -8,8 +8,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42670_SPI_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42670_SPI_H_
 
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 
 /**
  * @brief perform a single SPI write to a ICM42670 register
diff --git a/drivers/sensor/icm42670/icm42670_trigger.c b/drivers/sensor/icm42670/icm42670_trigger.c
index f0f6c0226c..984983506a 100644
--- a/drivers/sensor/icm42670/icm42670_trigger.c
+++ b/drivers/sensor/icm42670/icm42670_trigger.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
 #include "icm42670.h"
 #include "icm42670_reg.h"
 #include "icm42670_spi.h"
 #include "icm42670_trigger.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ICM42670, CONFIG_SENSOR_LOG_LEVEL);
 
 static void icm42670_gpio_callback(const struct device *dev, struct gpio_callback *cb,
diff --git a/drivers/sensor/icm42670/icm42670_trigger.h b/drivers/sensor/icm42670/icm42670_trigger.h
index 9a5d70f131..7a9d2e1ab0 100644
--- a/drivers/sensor/icm42670/icm42670_trigger.h
+++ b/drivers/sensor/icm42670/icm42670_trigger.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ICM42670_TRIGGER_H_
 #define ZEPHYR_DRIVERS_SENSOR_ICM42670_TRIGGER_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 /** implement the trigger_set sensor api function */
 int icm42670_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
diff --git a/drivers/sensor/iis2dh/iis2dh.c b/drivers/sensor/iis2dh/iis2dh.c
index fca7d3b1cb..be68ebb7ce 100644
--- a/drivers/sensor/iis2dh/iis2dh.c
+++ b/drivers/sensor/iis2dh/iis2dh.c
@@ -10,16 +10,16 @@
 
 #define DT_DRV_COMPAT st_iis2dh
 
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
-#include <drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif
 
 #include "iis2dh.h"
diff --git a/drivers/sensor/iis2dh/iis2dh.h b/drivers/sensor/iis2dh/iis2dh.h
index 870a78a3a8..1cb051226d 100644
--- a/drivers/sensor/iis2dh/iis2dh.h
+++ b/drivers/sensor/iis2dh/iis2dh.h
@@ -11,10 +11,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_IIS2DH_IIS2DH_H_
 #define ZEPHYR_DRIVERS_SENSOR_IIS2DH_IIS2DH_H_
 
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
 #include "iis2dh_reg.h"
 
 /*
diff --git a/drivers/sensor/iis2dh/iis2dh_i2c.c b/drivers/sensor/iis2dh/iis2dh_i2c.c
index f68556d2e0..3ed7797b61 100644
--- a/drivers/sensor/iis2dh/iis2dh_i2c.c
+++ b/drivers/sensor/iis2dh/iis2dh_i2c.c
@@ -11,8 +11,8 @@
 #define DT_DRV_COMPAT st_iis2dh
 
 #include <string.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2dh.h"
 
diff --git a/drivers/sensor/iis2dh/iis2dh_spi.c b/drivers/sensor/iis2dh/iis2dh_spi.c
index e3c0aeed54..b961ad524f 100644
--- a/drivers/sensor/iis2dh/iis2dh_spi.c
+++ b/drivers/sensor/iis2dh/iis2dh_spi.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "iis2dh.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 
diff --git a/drivers/sensor/iis2dh/iis2dh_trigger.c b/drivers/sensor/iis2dh/iis2dh_trigger.c
index c8082e50e1..f0b29de19f 100644
--- a/drivers/sensor/iis2dh/iis2dh_trigger.c
+++ b/drivers/sensor/iis2dh/iis2dh_trigger.c
@@ -8,10 +8,10 @@
  * https://www.st.com/resource/en/datasheet/iis2dh.pdf
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2dh.h"
 
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c
index a1a99ba7e1..82bb374c05 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc.c
@@ -10,16 +10,16 @@
 
 #define DT_DRV_COMPAT st_iis2dlpc
 
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
-#include <drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif
 
 #include "iis2dlpc.h"
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.h b/drivers/sensor/iis2dlpc/iis2dlpc.h
index 093a8ff2e2..d536cad7de 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc.h
+++ b/drivers/sensor/iis2dlpc/iis2dlpc.h
@@ -11,18 +11,18 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_IIS2DLPC_IIS2DLPC_H_
 #define ZEPHYR_DRIVERS_SENSOR_IIS2DLPC_IIS2DLPC_H_
 
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
 #include <stmemsc.h>
 #include "iis2dlpc_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 /* Return ODR reg value based on data rate set */
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
index 274e17d820..dbc98eef6a 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_iis2dlpc
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2dlpc.h"
 
diff --git a/drivers/sensor/iis2iclx/iis2iclx.c b/drivers/sensor/iis2iclx/iis2iclx.c
index aabc0dbeaf..040e083e5a 100644
--- a/drivers/sensor/iis2iclx/iis2iclx.c
+++ b/drivers/sensor/iis2iclx/iis2iclx.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_iis2iclx
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2iclx.h"
 
diff --git a/drivers/sensor/iis2iclx/iis2iclx.h b/drivers/sensor/iis2iclx/iis2iclx.h
index 6622be8fc4..ab7a60dbe5 100644
--- a/drivers/sensor/iis2iclx/iis2iclx.h
+++ b/drivers/sensor/iis2iclx/iis2iclx.h
@@ -11,19 +11,19 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_IIS2ICLX_IIS2ICLX_H_
 #define ZEPHYR_DRIVERS_SENSOR_IIS2ICLX_IIS2ICLX_H_
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 #include <stmemsc.h>
 #include "iis2iclx_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 #define IIS2ICLX_EN_BIT					0x01
diff --git a/drivers/sensor/iis2iclx/iis2iclx_shub.c b/drivers/sensor/iis2iclx/iis2iclx_shub.c
index d41b906030..a457551b1b 100644
--- a/drivers/sensor/iis2iclx/iis2iclx_shub.c
+++ b/drivers/sensor/iis2iclx/iis2iclx_shub.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_iis2iclx
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2iclx.h"
 
diff --git a/drivers/sensor/iis2iclx/iis2iclx_trigger.c b/drivers/sensor/iis2iclx/iis2iclx_trigger.c
index ae02b7f998..0ef2227708 100644
--- a/drivers/sensor/iis2iclx/iis2iclx_trigger.c
+++ b/drivers/sensor/iis2iclx/iis2iclx_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_iis2iclx
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2iclx.h"
 
diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c
index 51450b59e6..0d322c4d5a 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.c
+++ b/drivers/sensor/iis2mdc/iis2mdc.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT st_iis2mdc
 
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "iis2mdc.h"
 
 struct iis2mdc_data iis2mdc_data;
diff --git a/drivers/sensor/iis2mdc/iis2mdc.h b/drivers/sensor/iis2mdc/iis2mdc.h
index 01a9a265d8..ffef14b16e 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.h
+++ b/drivers/sensor/iis2mdc/iis2mdc.h
@@ -11,17 +11,17 @@
 #ifndef __MAG_IIS2MDC_H
 #define __MAG_IIS2MDC_H
 
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
 #include "iis2mdc_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 
diff --git a/drivers/sensor/iis2mdc/iis2mdc_i2c.c b/drivers/sensor/iis2mdc/iis2mdc_i2c.c
index 0e1cbe1c6b..625523c706 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_i2c.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_i2c.c
@@ -11,7 +11,7 @@
 #define DT_DRV_COMPAT st_iis2mdc
 
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "iis2mdc.h"
 
diff --git a/drivers/sensor/iis2mdc/iis2mdc_spi.c b/drivers/sensor/iis2mdc/iis2mdc_spi.c
index e3ba665f25..d531236ee0 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_spi.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_spi.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "iis2mdc.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 
diff --git a/drivers/sensor/iis2mdc/iis2mdc_trigger.c b/drivers/sensor/iis2mdc/iis2mdc_trigger.c
index b8deff6aab..c98dd6061f 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_trigger.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_iis2mdc
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 #include "iis2mdc.h"
 
 LOG_MODULE_DECLARE(IIS2MDC, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c
index 061dfcfb54..3c1c6f0ec6 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT st_iis3dhhc
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "iis3dhhc.h"
 
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.h b/drivers/sensor/iis3dhhc/iis3dhhc.h
index 75f8d06739..6aa1f4c89a 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.h
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.h
@@ -12,11 +12,11 @@
 #define ZEPHYR_DRIVERS_SENSOR_IIS3DHHC_IIS3DHHC_H_
 
 #include <stdint.h>
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "iis3dhhc_reg.h"
 
 struct iis3dhhc_config {
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
index c3901ae483..51bba90595 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "iis3dhhc.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
index a9f30a881d..a55ffc917a 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_iis3dhhc
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "iis3dhhc.h"
 
diff --git a/drivers/sensor/ina219/ina219.c b/drivers/sensor/ina219/ina219.c
index e87055d241..97f5c33a41 100644
--- a/drivers/sensor/ina219/ina219.c
+++ b/drivers/sensor/ina219/ina219.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT ti_ina219
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "ina219.h"
 
diff --git a/drivers/sensor/ina23x/ina230.c b/drivers/sensor/ina23x/ina230.c
index ae6d8a1fa1..7ab8e9e800 100644
--- a/drivers/sensor/ina23x/ina230.c
+++ b/drivers/sensor/ina23x/ina230.c
@@ -7,8 +7,8 @@
 
 #define DT_DRV_COMPAT ti_ina230
 
-#include <logging/log.h>
-#include <drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor.h>
 #include "ina230.h"
 #include "ina23x_common.h"
 
diff --git a/drivers/sensor/ina23x/ina230.h b/drivers/sensor/ina23x/ina230.h
index a53c812efa..3ad9fd36f6 100644
--- a/drivers/sensor/ina23x/ina230.h
+++ b/drivers/sensor/ina23x/ina230.h
@@ -8,8 +8,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_INA23X_INA230_H_
 #define ZEPHYR_DRIVERS_SENSOR_INA23X_INA230_H_
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
 #define INA230_REG_CONFIG     0x00
 #define INA230_REG_SHUNT_VOLT 0x01
diff --git a/drivers/sensor/ina23x/ina230_trigger.c b/drivers/sensor/ina23x/ina230_trigger.c
index d63321a4dd..6b9e33b769 100644
--- a/drivers/sensor/ina23x/ina230_trigger.c
+++ b/drivers/sensor/ina23x/ina230_trigger.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "ina230.h"
 
diff --git a/drivers/sensor/ina23x/ina237.c b/drivers/sensor/ina23x/ina237.c
index 8d1c7ad235..b3600e44f8 100644
--- a/drivers/sensor/ina23x/ina237.c
+++ b/drivers/sensor/ina23x/ina237.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT ti_ina237
 
-#include <logging/log.h>
-#include <drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor.h>
 #include "ina237.h"
 #include "ina23x_common.h"
 
diff --git a/drivers/sensor/ina23x/ina237.h b/drivers/sensor/ina23x/ina237.h
index 39c1dd4437..7a8901b347 100644
--- a/drivers/sensor/ina23x/ina237.h
+++ b/drivers/sensor/ina23x/ina237.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_INA23X_INA237_H_
 #define ZEPHYR_DRIVERS_SENSOR_INA23X_INA237_H_
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 
 #define INA237_REG_CONFIG     0x00
 #define INA237_REG_ADC_CONFIG 0x01
diff --git a/drivers/sensor/ina23x/ina23x_common.c b/drivers/sensor/ina23x/ina23x_common.c
index e389fa40ca..fbf1e94112 100644
--- a/drivers/sensor/ina23x/ina23x_common.c
+++ b/drivers/sensor/ina23x/ina23x_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include "ina23x_common.h"
 
 int ina23x_reg_read_24(const struct i2c_dt_spec *bus, uint8_t reg, uint32_t *val)
diff --git a/drivers/sensor/ina23x/ina23x_common.h b/drivers/sensor/ina23x/ina23x_common.h
index 333b6cc447..3edc09e366 100644
--- a/drivers/sensor/ina23x/ina23x_common.h
+++ b/drivers/sensor/ina23x/ina23x_common.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_INA23X_COMMON_H_
 #define ZEPHYR_DRIVERS_SENSOR_INA23X_COMMON_H_
 
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 
 /**
  * @brief Macro used to test if the current's sign bit is set
diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c
index 5f7c1da3eb..72a0cd1c94 100644
--- a/drivers/sensor/isl29035/isl29035.c
+++ b/drivers/sensor/isl29035/isl29035.c
@@ -8,12 +8,12 @@
 
 #define DT_DRV_COMPAT isil_isl29035
 
-#include <kernel.h>
-#include <init.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "isl29035.h"
 
diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h
index 7c81ddd131..2903e2cda7 100644
--- a/drivers/sensor/isl29035/isl29035.h
+++ b/drivers/sensor/isl29035/isl29035.h
@@ -9,10 +9,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_
 #define ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_
 
-#include <device.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
 
 #define ISL29035_I2C_ADDRESS		DT_INST_REG_ADDR(0)
 
diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c
index 65bcdafc4e..4e939990f1 100644
--- a/drivers/sensor/isl29035/isl29035_trigger.c
+++ b/drivers/sensor/isl29035/isl29035_trigger.c
@@ -8,10 +8,10 @@
 
 #define DT_DRV_COMPAT isil_isl29035
 
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include "isl29035.h"
 
 extern struct isl29035_driver_data isl29035_data;
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c
index 100c078dc2..82093876b8 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_ism330dhcx
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "ism330dhcx.h"
 
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.h b/drivers/sensor/ism330dhcx/ism330dhcx.h
index 667f7dc423..af1cddb7d4 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.h
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.h
@@ -11,11 +11,11 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ISM330DHCX_ISM330DHCX_H_
 #define ZEPHYR_DRIVERS_SENSOR_ISM330DHCX_ISM330DHCX_H_
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 #include "ism330dhcx_reg.h"
 
 #define ISM330DHCX_EN_BIT					0x01
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
index 37031fe813..99e2bc49a2 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
@@ -11,8 +11,8 @@
 #define DT_DRV_COMPAT st_ism330dhcx
 
 #include <string.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 #include "ism330dhcx.h"
 
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
index b25129a4ba..e1640372fa 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_ism330dhcx
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "ism330dhcx.h"
 
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
index e6f1db823a..3dd29574d9 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "ism330dhcx.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
index 920d5112fb..8a72568ef2 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_ism330dhcx
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "ism330dhcx.h"
 
diff --git a/drivers/sensor/ite_tach_it8xxx2/tach_ite_it8xxx2.c b/drivers/sensor/ite_tach_it8xxx2/tach_ite_it8xxx2.c
index e447cef2de..b1fb7de027 100644
--- a/drivers/sensor/ite_tach_it8xxx2/tach_ite_it8xxx2.c
+++ b/drivers/sensor/ite_tach_it8xxx2/tach_ite_it8xxx2.c
@@ -41,15 +41,15 @@
  * from encoders.
  */
 
-#include <device.h>
-#include <drivers/pinctrl.h>
-#include <drivers/sensor.h>
-#include <dt-bindings/sensor/it8xxx2_tach.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/dt-bindings/sensor/it8xxx2_tach.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tach_ite_it8xxx2, CONFIG_SENSOR_LOG_LEVEL);
 
 /*
diff --git a/drivers/sensor/ite_vcmp_it8xxx2/vcmp_ite_it8xxx2.c b/drivers/sensor/ite_vcmp_it8xxx2/vcmp_ite_it8xxx2.c
index b09052ac73..7794b07aca 100644
--- a/drivers/sensor/ite_vcmp_it8xxx2/vcmp_ite_it8xxx2.c
+++ b/drivers/sensor/ite_vcmp_it8xxx2/vcmp_ite_it8xxx2.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_vcmp
 
-#include <device.h>
-#include <devicetree/io-channels.h>
-#include <drivers/adc.h>
-#include <drivers/sensor.h>
-#include <drivers/sensor/it8xxx2_vcmp.h>
-#include <dt-bindings/dt-util.h>
-#include <dt-bindings/sensor/it8xxx2_vcmp.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree/io-channels.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor/it8xxx2_vcmp.h>
+#include <zephyr/dt-bindings/dt-util.h>
+#include <zephyr/dt-bindings/sensor/it8xxx2_vcmp.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(vcmp_ite_it8xxx2, CONFIG_SENSOR_LOG_LEVEL);
 
 #define VCMP_REG_MASK		0x7
diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c
index 9f86f51f68..4a006c7371 100644
--- a/drivers/sensor/lis2dh/lis2dh.c
+++ b/drivers/sensor/lis2dh/lis2dh.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT st_lis2dh
 
 
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
-#include <pm/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
 
 LOG_MODULE_REGISTER(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
 #include "lis2dh.h"
diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
index 11931e041a..540b3fb60c 100644
--- a/drivers/sensor/lis2dh/lis2dh.h
+++ b/drivers/sensor/lis2dh/lis2dh.h
@@ -7,23 +7,23 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_LIS2DH_LIS2DH_H_
 #define ZEPHYR_DRIVERS_SENSOR_LIS2DH_LIS2DH_H_
 
-#include <kernel.h>
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <stdint.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
 
 #define LIS2DH_REG_WAI			0x0f
 #define LIS2DH_CHIP_ID			0x33
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 #define LIS2DH_AUTOINCREMENT_ADDR	BIT(7)
diff --git a/drivers/sensor/lis2dh/lis2dh_i2c.c b/drivers/sensor/lis2dh/lis2dh_i2c.c
index d220b7ae82..0c363963ce 100644
--- a/drivers/sensor/lis2dh/lis2dh_i2c.c
+++ b/drivers/sensor/lis2dh/lis2dh_i2c.c
@@ -11,8 +11,8 @@
 #define DT_DRV_COMPAT st_lis2dh
 
 #include <string.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 #include "lis2dh.h"
 
diff --git a/drivers/sensor/lis2dh/lis2dh_spi.c b/drivers/sensor/lis2dh/lis2dh_spi.c
index 342dbf6006..4c0fb54ee6 100644
--- a/drivers/sensor/lis2dh/lis2dh_spi.c
+++ b/drivers/sensor/lis2dh/lis2dh_spi.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "lis2dh.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 
diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c
index ffb118419e..fd422d607d 100644
--- a/drivers/sensor/lis2dh/lis2dh_trigger.c
+++ b/drivers/sensor/lis2dh/lis2dh_trigger.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT st_lis2dh
 
-#include <sys/util.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #define START_TRIG_INT1			0
 #define START_TRIG_INT2			1
diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c
index 182859c5b2..0fad943ab2 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.c
+++ b/drivers/sensor/lis2ds12/lis2ds12.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_lis2ds12
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lis2ds12.h"
 
diff --git a/drivers/sensor/lis2ds12/lis2ds12.h b/drivers/sensor/lis2ds12/lis2ds12.h
index fb96af3758..0bbccb294a 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.h
+++ b/drivers/sensor/lis2ds12/lis2ds12.h
@@ -12,17 +12,17 @@
 #define ZEPHYR_DRIVERS_SENSOR_LIS2DS12_LIS2DS12_H_
 
 #include <zephyr/types.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
 #include <stmemsc.h>
 #include "lis2ds12_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 /* Return ODR reg value based on data rate set */
diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
index 33286689d7..f03d8fccde 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
@@ -10,7 +10,7 @@
 
 #define DT_DRV_COMPAT st_lis2ds12
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "lis2ds12.h"
 
 LOG_MODULE_DECLARE(LIS2DS12, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c
index 0bd288a15e..7dd9934cde 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.c
+++ b/drivers/sensor/lis2dw12/lis2dw12.c
@@ -10,17 +10,17 @@
 
 #define DT_DRV_COMPAT st_lis2dw12
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <stdlib.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
-#include <drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/sensor.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif
 
 #include "lis2dw12.h"
diff --git a/drivers/sensor/lis2dw12/lis2dw12.h b/drivers/sensor/lis2dw12/lis2dw12.h
index f4578b4f59..4c5c0c40c0 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.h
+++ b/drivers/sensor/lis2dw12/lis2dw12.h
@@ -11,19 +11,19 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_LIS2DW12_LIS2DW12_H_
 #define ZEPHYR_DRIVERS_SENSOR_LIS2DW12_LIS2DW12_H_
 
-#include <drivers/spi.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
 #include <stmemsc.h>
 #include "lis2dw12_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 /* Return ODR reg value based on data rate set */
diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
index a3f2a9f1d3..6fdf7701cd 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_lis2dw12
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "lis2dw12.h"
 
diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c
index 4361cf5420..41491a0cfb 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.c
+++ b/drivers/sensor/lis2mdl/lis2mdl.c
@@ -10,13 +10,13 @@
 
 #define DT_DRV_COMPAT st_lis2mdl
 
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <pm/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "lis2mdl.h"
 
 /* Based on the data sheet, the maximum turn-on time is ("9.4 ms + 1/ODR") when
diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h
index e458758838..e788eb4a58 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.h
+++ b/drivers/sensor/lis2mdl/lis2mdl.h
@@ -11,18 +11,18 @@
 #ifndef __MAG_LIS2MDL_H
 #define __MAG_LIS2MDL_H
 
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
 #include <stmemsc.h>
 #include "lis2mdl_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 struct lis2mdl_config {
diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
index 613d9db60a..c0eb1b37e1 100644
--- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c
+++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_lis2mdl
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 #include "lis2mdl.h"
 
 LOG_MODULE_DECLARE(LIS2MDL, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c
index bc3498c20c..c893793ede 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.c
+++ b/drivers/sensor/lis3mdl/lis3mdl.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT st_lis3mdl_magn
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "lis3mdl.h"
 
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index 5c1bd71db0..89993c50ff 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_LIS3MDL_LIS3MDL_H_
 #define ZEPHYR_DRIVERS_SENSOR_LIS3MDL_LIS3MDL_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #define LIS3MDL_I2C_ADDR_BASE           0x1C
 #define LIS3MDL_I2C_ADDR_MASK           (~BIT(1))
diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
index 7e00fb3e88..4278e36392 100644
--- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c
+++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT st_lis3mdl_magn
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 #include "lis3mdl.h"
 
 LOG_MODULE_DECLARE(LIS3MDL, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/lm75/lm75.c b/drivers/sensor/lm75/lm75.c
index ae88a5de23..a289d00106 100644
--- a/drivers/sensor/lm75/lm75.c
+++ b/drivers/sensor/lm75/lm75.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT lm75
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(LM75, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/lm77/lm77.c b/drivers/sensor/lm77/lm77.c
index ef3da11206..bf8d3f26de 100644
--- a/drivers/sensor/lm77/lm77.c
+++ b/drivers/sensor/lm77/lm77.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT lm77
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
 
 LOG_MODULE_REGISTER(lm77, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c
index 1c2fb11e68..735c7972e0 100644
--- a/drivers/sensor/lps22hb/lps22hb.c
+++ b/drivers/sensor/lps22hb/lps22hb.c
@@ -8,13 +8,13 @@
 
 #define DT_DRV_COMPAT st_lps22hb_press
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lps22hb.h"
 
diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h
index 31ad74d5c9..b708319489 100644
--- a/drivers/sensor/lps22hb/lps22hb.h
+++ b/drivers/sensor/lps22hb/lps22hb.h
@@ -12,8 +12,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_
 
 #include <stdint.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define LPS22HB_REG_WHO_AM_I                    0x0F
 #define LPS22HB_VAL_WHO_AM_I                    0xB1
diff --git a/drivers/sensor/lps22hh/lps22hh.c b/drivers/sensor/lps22hh/lps22hh.c
index 4d3bf172a8..961d7d4258 100644
--- a/drivers/sensor/lps22hh/lps22hh.c
+++ b/drivers/sensor/lps22hh/lps22hh.c
@@ -10,13 +10,13 @@
 
 #define DT_DRV_COMPAT st_lps22hh
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lps22hh.h"
 
diff --git a/drivers/sensor/lps22hh/lps22hh.h b/drivers/sensor/lps22hh/lps22hh.h
index 4701eb03d2..0ec6b8f265 100644
--- a/drivers/sensor/lps22hh/lps22hh.h
+++ b/drivers/sensor/lps22hh/lps22hh.h
@@ -16,11 +16,11 @@
 #include "lps22hh_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 struct lps22hh_config {
diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c
index 5f5ee23ca4..2b12b88769 100644
--- a/drivers/sensor/lps22hh/lps22hh_trigger.c
+++ b/drivers/sensor/lps22hh/lps22hh_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_lps22hh
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "lps22hh.h"
 
diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c
index e032182305..c599f9de7c 100644
--- a/drivers/sensor/lps25hb/lps25hb.c
+++ b/drivers/sensor/lps25hb/lps25hb.c
@@ -8,13 +8,13 @@
 
 #define DT_DRV_COMPAT st_lps25hb_press
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lps25hb.h"
 
diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h
index b5ed4cd516..7863d9a42d 100644
--- a/drivers/sensor/lps25hb/lps25hb.h
+++ b/drivers/sensor/lps25hb/lps25hb.h
@@ -12,8 +12,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_
 
 #include <zephyr/types.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define LPS25HB_REG_WHO_AM_I                    0x0F
 #define LPS25HB_VAL_WHO_AM_I                    0xBD
diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
index 477ed85ade..1af19c7c78 100644
--- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
+++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT st_lsm303dlhc_magn
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(lsm303dlhc_magn, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c
index 5dcac87b82..f7f76cd588 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.c
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.c
@@ -10,13 +10,13 @@
 
 #define DT_DRV_COMPAT st_lsm6ds0
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6ds0.h"
 
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h
index 6195f96d27..90b2bdae0e 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.h
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.h
@@ -12,8 +12,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_
 
 #include <zephyr/types.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define LSM6DS0_REG_ACT_THS                     0x04
 #define LSM6DS0_MASK_ACT_THS_SLEEP_ON_INACT_EN	BIT(7)
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c
index 833dd16dde..82455a99b1 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_lsm6dsl
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dsl.h"
 
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h
index ae10ac7a7a..c5e0dc23af 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.h
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.h
@@ -11,17 +11,17 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_
 #define ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 #define LSM6DSL_REG_FUNC_CFG_ACCESS			0x01
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
index 4445634df4..c01bd90b2c 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
@@ -10,7 +10,7 @@
 #define DT_DRV_COMPAT st_lsm6dsl
 
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dsl.h"
 
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
index 20beeaba5b..3ede30e847 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dsl.h"
 
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
index 448cc798f4..650a833557 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
@@ -10,7 +10,7 @@
 #define DT_DRV_COMPAT st_lsm6dsl
 
 #include <string.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dsl.h"
 
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
index 7d94f18abb..9e7da437f6 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT st_lsm6dsl
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 #include "lsm6dsl.h"
 
 LOG_MODULE_DECLARE(LSM6DSL, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c
index a750bcf350..6938579d1e 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.c
+++ b/drivers/sensor/lsm6dso/lsm6dso.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_lsm6dso
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dso.h"
 
diff --git a/drivers/sensor/lsm6dso/lsm6dso.h b/drivers/sensor/lsm6dso/lsm6dso.h
index c572c28b25..1f69f54389 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.h
+++ b/drivers/sensor/lsm6dso/lsm6dso.h
@@ -11,20 +11,20 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_LSM6DSO_LSM6DSO_H_
 #define ZEPHYR_DRIVERS_SENSOR_LSM6DSO_LSM6DSO_H_
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/util.h>
 #include <stmemsc.h>
 #include "lsm6dso_reg.h"
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 
 #define LSM6DSO_EN_BIT					0x01
diff --git a/drivers/sensor/lsm6dso/lsm6dso_shub.c b/drivers/sensor/lsm6dso/lsm6dso_shub.c
index 4da76b5b88..f1bfa061ec 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_shub.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_shub.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_lsm6dso
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dso.h"
 
diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
index c3f9e05c06..628528f173 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_lsm6dso
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm6dso.h"
 
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
index 97fc08158f..8f84061704 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
@@ -8,15 +8,15 @@
 
 #define DT_DRV_COMPAT st_lsm9ds0_gyro
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
 
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm9ds0_gyro.h"
 
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
index 1dd1461044..8dc91e64b0 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
@@ -10,8 +10,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_
 
 #include <zephyr/types.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 #define DEG2RAD					0.017453292519943295769236907684
 
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index af42b92e69..8cc33663ba 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "lsm9ds0_gyro.h"
 
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
index 187ee01273..5622afaac5 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
@@ -10,14 +10,14 @@
 
 #define DT_DRV_COMPAT st_lsm9ds0_mfd
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "lsm9ds0_mfd.h"
 
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
index 81290830f1..398a017fb5 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LSM9DS0_MFD_LSM9DS0_MFD_H_
 
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define LSM9DS0_MFD_REG_OUT_TEMP_L_XM		0x05
 #define LSM9DS0_MFD_REG_OUT_TEMP_H_XM		0x06
diff --git a/drivers/sensor/max17055/max17055.c b/drivers/sensor/max17055/max17055.c
index 73e7e81e61..3c8f2c7c97 100644
--- a/drivers/sensor/max17055/max17055.c
+++ b/drivers/sensor/max17055/max17055.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(max17055, CONFIG_SENSOR_LOG_LEVEL);
 
 #include "max17055.h"
diff --git a/drivers/sensor/max17262/max17262.c b/drivers/sensor/max17262/max17262.c
index f3c03bdcbd..7f36bd9dd3 100644
--- a/drivers/sensor/max17262/max17262.c
+++ b/drivers/sensor/max17262/max17262.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(max17262, CONFIG_SENSOR_LOG_LEVEL);
 
 #include "max17262.h"
diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c
index bcd1c396b7..9ac3f201b5 100644
--- a/drivers/sensor/max30101/max30101.c
+++ b/drivers/sensor/max30101/max30101.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT maxim_max30101
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "max30101.h"
 
diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h
index 96bed08a2b..3440622210 100644
--- a/drivers/sensor/max30101/max30101.h
+++ b/drivers/sensor/max30101/max30101.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define MAX30101_REG_INT_STS1		0x00
 #define MAX30101_REG_INT_STS2		0x01
diff --git a/drivers/sensor/max31875/max31875.c b/drivers/sensor/max31875/max31875.c
index 0cb9a1043e..2b3e8a6b5e 100644
--- a/drivers/sensor/max31875/max31875.c
+++ b/drivers/sensor/max31875/max31875.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT maxim_max31875
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(MAX31875, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c
index 3d2db153b0..6bd9f2c1ad 100644
--- a/drivers/sensor/max44009/max44009.c
+++ b/drivers/sensor/max44009/max44009.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT maxim_max44009
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "max44009.h"
 
diff --git a/drivers/sensor/max44009/max44009.h b/drivers/sensor/max44009/max44009.h
index bf2713371d..c202116db7 100644
--- a/drivers/sensor/max44009/max44009.h
+++ b/drivers/sensor/max44009/max44009.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_MAX44009_MAX44009_H_
 #define ZEPHYR_DRIVERS_SENSOR_MAX44009_MAX44009_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define MAX44009_I2C_ADDRESS	DT_INST_REG_ADDR(0)
 
diff --git a/drivers/sensor/max6675/max6675.c b/drivers/sensor/max6675/max6675.c
index 0823a520bb..43f29f3a40 100644
--- a/drivers/sensor/max6675/max6675.c
+++ b/drivers/sensor/max6675/max6675.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT maxim_max6675
 
-#include <drivers/sensor.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(max6675, CONFIG_SENSOR_LOG_LEVEL);
 
 /** Thermocouple input bit (goes high if thermocouple is disconnected). */
diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
index 7dd3ec8254..225820864d 100644
--- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
+++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
@@ -8,18 +8,18 @@
 #define DT_DRV_COMPAT microchip_xec_tach
 
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 #ifdef CONFIG_SOC_SERIES_MEC172X
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
 #endif
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <soc.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(tach_xec, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c
index 172ffc0bc8..4d5be521ee 100644
--- a/drivers/sensor/mcp9808/mcp9808.c
+++ b/drivers/sensor/mcp9808/mcp9808.c
@@ -9,12 +9,12 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "mcp9808.h"
 
diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h
index 09d9d34a5a..01f15c5bd8 100644
--- a/drivers/sensor/mcp9808/mcp9808.h
+++ b/drivers/sensor/mcp9808/mcp9808.h
@@ -11,10 +11,10 @@
 #include <errno.h>
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
 
 #define MCP9808_REG_CONFIG		0x01
 #define MCP9808_REG_UPPER_LIMIT		0x02
diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c
index 1ca88c016f..0422fdbc28 100644
--- a/drivers/sensor/mcp9808/mcp9808_trigger.c
+++ b/drivers/sensor/mcp9808/mcp9808_trigger.c
@@ -5,11 +5,11 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include "mcp9808.h"
 
 LOG_MODULE_DECLARE(MCP9808, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/mcux_acmp/mcux_acmp.c b/drivers/sensor/mcux_acmp/mcux_acmp.c
index 4b0f2b790e..5fa6256d82 100644
--- a/drivers/sensor/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/mcux_acmp/mcux_acmp.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_acmp
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <drivers/sensor/mcux_acmp.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor/mcux_acmp.h>
+#include <zephyr/logging/log.h>
 #include <fsl_acmp.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 LOG_MODULE_REGISTER(mcux_acmp, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/mhz19b/mhz19b.c b/drivers/sensor/mhz19b/mhz19b.c
index f61b98cde7..a8e4ffee3e 100644
--- a/drivers/sensor/mhz19b/mhz19b.c
+++ b/drivers/sensor/mhz19b/mhz19b.c
@@ -9,11 +9,11 @@
 
 #define DT_DRV_COMPAT winsen_mhz19b
 
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
 
-#include <drivers/sensor/mhz19b.h>
+#include <zephyr/drivers/sensor/mhz19b.h>
 #include "mhz19b.h"
 
 LOG_MODULE_REGISTER(mhz19b, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/mhz19b/mhz19b.h b/drivers/sensor/mhz19b/mhz19b.h
index f98b0d5934..953fb9b144 100644
--- a/drivers/sensor/mhz19b/mhz19b.h
+++ b/drivers/sensor/mhz19b/mhz19b.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_MHZ19B_MHZ19B
 #define ZEPHYR_DRIVERS_SENSOR_MHZ19B_MHZ19B
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
 
 #define MHZ19B_BUF_LEN 9
 
diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c
index 4197e6cb10..29fee523a7 100644
--- a/drivers/sensor/mpr/mpr.c
+++ b/drivers/sensor/mpr/mpr.c
@@ -9,13 +9,13 @@
 #define DT_DRV_COMPAT honeywell_mpr
 
 #include <errno.h>
-#include <kernel.h>
-#include <sys/__assert.h>
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <init.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
 #include "mpr.h"
 #include "mpr_configuration.h"
 
diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c
index 35a6a9ca65..a17dbc0dda 100644
--- a/drivers/sensor/mpu6050/mpu6050.c
+++ b/drivers/sensor/mpu6050/mpu6050.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT invensense_mpu6050
 
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "mpu6050.h"
 
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index 4190438f9c..c3f4b50ca3 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_MPU6050_MPU6050_H_
 #define ZEPHYR_DRIVERS_SENSOR_MPU6050_MPU6050_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
 #define MPU6050_REG_CHIP_ID		0x75
diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c
index 6c1034f998..3a07fbd396 100644
--- a/drivers/sensor/mpu6050/mpu6050_trigger.c
+++ b/drivers/sensor/mpu6050/mpu6050_trigger.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 #include "mpu6050.h"
 
 LOG_MODULE_DECLARE(MPU6050, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/mpu9250/ak8963.c b/drivers/sensor/mpu9250/ak8963.c
index 0321f7a115..d36075177f 100644
--- a/drivers/sensor/mpu9250/ak8963.c
+++ b/drivers/sensor/mpu9250/ak8963.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "mpu9250.h"
 #include "ak8963.h"
diff --git a/drivers/sensor/mpu9250/ak8963.h b/drivers/sensor/mpu9250/ak8963.h
index 2afe513e50..1e379760b2 100644
--- a/drivers/sensor/mpu9250/ak8963.h
+++ b/drivers/sensor/mpu9250/ak8963.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 
 
 int ak8963_convert_magn(struct sensor_value *val, int16_t raw_val,
diff --git a/drivers/sensor/mpu9250/mpu9250.c b/drivers/sensor/mpu9250/mpu9250.c
index cecf9612b8..89586da67c 100644
--- a/drivers/sensor/mpu9250/mpu9250.c
+++ b/drivers/sensor/mpu9250/mpu9250.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT invensense_mpu9250
 
-#include <sys/byteorder.h>
-#include <logging/log.h>
-#include <devicetree.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/devicetree.h>
 
 #include "mpu9250.h"
 
diff --git a/drivers/sensor/mpu9250/mpu9250.h b/drivers/sensor/mpu9250/mpu9250.h
index b636ded7ec..88e5b56e89 100644
--- a/drivers/sensor/mpu9250/mpu9250.h
+++ b/drivers/sensor/mpu9250/mpu9250.h
@@ -8,11 +8,11 @@
 #define ZEPHYR_DRIVERS_SENSOR_MPU9250_MPU9250_H_
 
 #include <stdint.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 struct mpu9250_data {
 	int16_t accel_x;
diff --git a/drivers/sensor/mpu9250/mpu9250_trigger.c b/drivers/sensor/mpu9250/mpu9250_trigger.c
index 3bdeda4f74..1007a50761 100644
--- a/drivers/sensor/mpu9250/mpu9250_trigger.c
+++ b/drivers/sensor/mpu9250/mpu9250_trigger.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 
 #include "mpu9250.h"
 
diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c
index def8e2b79f..c840df10bb 100644
--- a/drivers/sensor/ms5607/ms5607.c
+++ b/drivers/sensor/ms5607/ms5607.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT meas_ms5607
 
-#include <init.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
 
 #include "ms5607.h"
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ms5607);
 
 static void ms5607_compensate(struct ms5607_data *data,
diff --git a/drivers/sensor/ms5607/ms5607.h b/drivers/sensor/ms5607/ms5607.h
index 7603163918..65eeb6f769 100644
--- a/drivers/sensor/ms5607/ms5607.h
+++ b/drivers/sensor/ms5607/ms5607.h
@@ -8,13 +8,13 @@
 #define __SENSOR_MS5607_H__
 
 #include <zephyr/types.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-#include <drivers/i2c.h>
+#include <zephyr/drivers/i2c.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 #define MS5607_CMD_RESET 0x1E
diff --git a/drivers/sensor/ms5607/ms5607_i2c.c b/drivers/sensor/ms5607/ms5607_i2c.c
index 0a1f5e304a..b94613bd97 100644
--- a/drivers/sensor/ms5607/ms5607_i2c.c
+++ b/drivers/sensor/ms5607/ms5607_i2c.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT meas_ms5607
 
 #include <string.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
 #include "ms5607.h"
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ms5607);
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
diff --git a/drivers/sensor/ms5607/ms5607_spi.c b/drivers/sensor/ms5607/ms5607_spi.c
index bb358422df..b891891ff0 100644
--- a/drivers/sensor/ms5607/ms5607_spi.c
+++ b/drivers/sensor/ms5607/ms5607_spi.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT meas_ms5607
 
 #include <string.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 #include "ms5607.h"
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(ms5607);
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c
index 3e7a6afe39..cd646c44ee 100644
--- a/drivers/sensor/ms5837/ms5837.c
+++ b/drivers/sensor/ms5837/ms5837.c
@@ -7,12 +7,12 @@
 
 #define DT_DRV_COMPAT meas_ms5837
 
-#include <init.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "ms5837.h"
 
diff --git a/drivers/sensor/ms5837/ms5837.h b/drivers/sensor/ms5837/ms5837.h
index 4599f5babe..270a00e727 100644
--- a/drivers/sensor/ms5837/ms5837.h
+++ b/drivers/sensor/ms5837/ms5837.h
@@ -8,8 +8,8 @@
 #define __SENSOR_MS5837_H__
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
 
 #define MS5837_CMD_RESET 0x1E
 
diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
index 02e4bbd07d..b03f541f79 100644
--- a/drivers/sensor/nrf5/temp_nrf5.c
+++ b/drivers/sensor/nrf5/temp_nrf5.c
@@ -7,11 +7,11 @@
 
 #define DT_DRV_COMPAT nordic_nrf_temp
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/logging/log.h>
 #include <hal/nrf_temp.h>
 
 LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c b/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
index 741787eb02..900e91fe11 100644
--- a/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
+++ b/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <drivers/adc/adc_npcx_threshold.h>
-#include <drivers/sensor/adc_cmp_npcx.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/adc/adc_npcx_threshold.h>
+#include <zephyr/drivers/sensor/adc_cmp_npcx.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(adc_cmp_npcx, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c b/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c
index 340832169e..46cdf72fe3 100644
--- a/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c
+++ b/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c
@@ -40,12 +40,12 @@
  */
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <drivers/sensor.h>
-#include <dt-bindings/sensor/npcx_tach.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/dt-bindings/sensor/npcx_tach.h>
 #include <soc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(tach_npcx, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
index b8d9915d33..e6fdefea24 100644
--- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
+++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_temperature
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <drivers/adc.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(temp_kinetis, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c
index a1605644eb..b439467c2d 100644
--- a/drivers/sensor/opt3001/opt3001.c
+++ b/drivers/sensor/opt3001/opt3001.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT ti_opt3001
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 
 #include "opt3001.h"
 
diff --git a/drivers/sensor/opt3001/opt3001.h b/drivers/sensor/opt3001/opt3001.h
index 56cbcafa49..aef8a199b6 100644
--- a/drivers/sensor/opt3001/opt3001.h
+++ b/drivers/sensor/opt3001/opt3001.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_OPT3001_H_
 #define ZEPHYR_DRIVERS_SENSOR_OPT3001_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define OPT3001_REG_RESULT 0x00
 #define OPT3001_REG_CONFIG 0x01
diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c
index d6ef513864..2e759b46e9 100644
--- a/drivers/sensor/pms7003/pms7003.c
+++ b/drivers/sensor/pms7003/pms7003.c
@@ -13,14 +13,14 @@
 
 #include <errno.h>
 
-#include <arch/cpu.h>
-#include <init.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include <stdlib.h>
 #include <string.h>
-#include <drivers/uart.h>
-#include <logging/log.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(PMS7003, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
index f6f4fa4468..71ae8c9fb7 100644
--- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #include <nrfx_qdec.h>
 #include <hal/nrf_gpio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(qdec_nrfx, CONFIG_SENSOR_LOG_LEVEL);
 
 #define DT_DRV_COMPAT nordic_nrf_qdec
diff --git a/drivers/sensor/qdec_sam/qdec_sam.c b/drivers/sensor/qdec_sam/qdec_sam.c
index 24f501f314..27c3b9f03d 100644
--- a/drivers/sensor/qdec_sam/qdec_sam.c
+++ b/drivers/sensor/qdec_sam/qdec_sam.c
@@ -11,15 +11,15 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/sensor.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(qdec_sam, CONFIG_SENSOR_LOG_LEVEL);
 
 /* Device constant configuration parameters */
diff --git a/drivers/sensor/sbs_gauge/sbs_gauge.c b/drivers/sensor/sbs_gauge/sbs_gauge.c
index d4712145a5..b871d1373c 100644
--- a/drivers/sensor/sbs_gauge/sbs_gauge.c
+++ b/drivers/sensor/sbs_gauge/sbs_gauge.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT sbs_sbs_gauge
 
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "sbs_gauge.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sbs_gauge, CONFIG_SENSOR_LOG_LEVEL);
 
 static int sbs_cmd_reg_read(const struct device *dev,
diff --git a/drivers/sensor/sensor_handlers.c b/drivers/sensor/sensor_handlers.c
index 2c601a0ba6..16a462c164 100644
--- a/drivers/sensor/sensor_handlers.c
+++ b/drivers/sensor/sensor_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_sensor_attr_set(const struct device *dev,
 					 enum sensor_channel chan,
diff --git a/drivers/sensor/sensor_shell.c b/drivers/sensor/sensor_shell.c
index 039c649e8d..b3dd036df9 100644
--- a/drivers/sensor/sensor_shell.c
+++ b/drivers/sensor/sensor_shell.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 
 #define SENSOR_GET_HELP \
 	"Get sensor data. Channel names are optional. All channels are read " \
diff --git a/drivers/sensor/sgp40/sgp40.c b/drivers/sensor/sgp40/sgp40.c
index 4f573ff3b7..38d0e8159b 100644
--- a/drivers/sensor/sgp40/sgp40.c
+++ b/drivers/sensor/sgp40/sgp40.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT sensirion_sgp40
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <pm/device.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
 
-#include <drivers/sensor/sgp40.h>
+#include <zephyr/drivers/sensor/sgp40.h>
 #include "sgp40.h"
 
 LOG_MODULE_REGISTER(SGP40, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/sgp40/sgp40.h b/drivers/sensor/sgp40/sgp40.h
index 2ee3862ccd..3b4a92a73e 100644
--- a/drivers/sensor/sgp40/sgp40.h
+++ b/drivers/sensor/sgp40/sgp40.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_SGP40_SGP40_H_
 #define ZEPHYR_DRIVERS_SENSOR_SGP40_SGP40_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #define SGP40_CMD_MEASURE_RAW	0x260F
 #define SGP40_CMD_MEASURE_TEST	0x280E
diff --git a/drivers/sensor/shell_battery.c b/drivers/sensor/shell_battery.c
index d8cfb1b508..ddedec87c7 100644
--- a/drivers/sensor/shell_battery.c
+++ b/drivers/sensor/shell_battery.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 
 /**
  * @brief Collect the values for several channels
diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c
index 25b635b7e4..1fd8fab01a 100644
--- a/drivers/sensor/sht3xd/sht3xd.c
+++ b/drivers/sensor/sht3xd/sht3xd.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT sensirion_sht3xd
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/logging/log.h>
 
 #include "sht3xd.h"
 
diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h
index 98429f64dd..f130eb39ae 100644
--- a/drivers/sensor/sht3xd/sht3xd.h
+++ b/drivers/sensor/sht3xd/sht3xd.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_
 #define ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_
 
-#include <device.h>
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
 
 #define SHT3XD_CMD_FETCH                0xE000
 #define SHT3XD_CMD_ART                  0x2B32
diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c
index 9867c86518..2a2572e8ad 100644
--- a/drivers/sensor/sht3xd/sht3xd_trigger.c
+++ b/drivers/sensor/sht3xd/sht3xd_trigger.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "sht3xd.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(SHT3XD, CONFIG_SENSOR_LOG_LEVEL);
 
 static uint16_t sht3xd_temp_processed_to_raw(const struct sensor_value *val)
diff --git a/drivers/sensor/sht4x/sht4x.c b/drivers/sensor/sht4x/sht4x.c
index 9b66c8cb12..5cc18d1271 100644
--- a/drivers/sensor/sht4x/sht4x.c
+++ b/drivers/sensor/sht4x/sht4x.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT sensirion_sht4x
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
 
-#include <drivers/sensor/sht4x.h>
+#include <zephyr/drivers/sensor/sht4x.h>
 #include "sht4x.h"
 
 LOG_MODULE_REGISTER(SHT4X, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/sht4x/sht4x.h b/drivers/sensor/sht4x/sht4x.h
index 80dd0c47a1..35a11d2f56 100644
--- a/drivers/sensor/sht4x/sht4x.h
+++ b/drivers/sensor/sht4x/sht4x.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_SHT4X_SHT4X_H_
 #define ZEPHYR_DRIVERS_SENSOR_SHT4X_SHT4X_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #define SHT4X_CMD_READ_SERIAL	0x89
 #define SHT4X_CMD_RESET		0x94
diff --git a/drivers/sensor/shtcx/shtcx.c b/drivers/sensor/shtcx/shtcx.c
index 7e51aa44e0..1f641e1c1a 100644
--- a/drivers/sensor/shtcx/shtcx.c
+++ b/drivers/sensor/shtcx/shtcx.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT sensirion_shtcx
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/logging/log.h>
 
 #include "shtcx.h"
 
diff --git a/drivers/sensor/shtcx/shtcx.h b/drivers/sensor/shtcx/shtcx.h
index ce1a2bce85..d6cb0c77e7 100644
--- a/drivers/sensor/shtcx/shtcx.h
+++ b/drivers/sensor/shtcx/shtcx.h
@@ -7,10 +7,10 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_SHTCX_SHTCX_H_
 #define ZEPHYR_DRIVERS_SENSOR_SHTCX_SHTCX_H_
 
-#include <device.h>
-#include <devicetree.h>
-#include <kernel.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
 
 /* common cmds */
 #define SHTCX_CMD_READ_ID		0xEFC8
diff --git a/drivers/sensor/si7006/si7006.c b/drivers/sensor/si7006/si7006.c
index 3e89e13571..6751ef4efa 100644
--- a/drivers/sensor/si7006/si7006.c
+++ b/drivers/sensor/si7006/si7006.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT silabs_si7006
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "si7006.h"
diff --git a/drivers/sensor/si7055/si7055.c b/drivers/sensor/si7055/si7055.c
index 6f0a852598..532c190bfd 100644
--- a/drivers/sensor/si7055/si7055.c
+++ b/drivers/sensor/si7055/si7055.c
@@ -7,14 +7,14 @@
 
 #define DT_DRV_COMPAT silabs_si7055
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <logging/log.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/i2c.h>
 #include "si7055.h"
 #if CONFIG_SI7055_ENABLE_CHECKSUM
-#include <sys/crc.h>
+#include <zephyr/sys/crc.h>
 #endif
 
 LOG_MODULE_REGISTER(si7055, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/si7060/si7060.c b/drivers/sensor/si7060/si7060.c
index 5d8927f591..d7459b566d 100644
--- a/drivers/sensor/si7060/si7060.c
+++ b/drivers/sensor/si7060/si7060.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT silabs_si7060
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "si7060.h"
 
diff --git a/drivers/sensor/si7210/si7210.c b/drivers/sensor/si7210/si7210.c
index 6f1e51ab98..0073ce2de0 100644
--- a/drivers/sensor/si7210/si7210.c
+++ b/drivers/sensor/si7210/si7210.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT silabs_si7210
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <pm/device.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(SI7210, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/sm351lt/sm351lt.c b/drivers/sensor/sm351lt/sm351lt.c
index eeb0478167..698ea9cd0e 100644
--- a/drivers/sensor/sm351lt/sm351lt.c
+++ b/drivers/sensor/sm351lt/sm351lt.c
@@ -8,13 +8,13 @@
 
 #include "sm351lt.h"
 
-#include <init.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
 #include <stdio.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 #include <string.h>
 
 LOG_MODULE_REGISTER(SM351LT, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/sm351lt/sm351lt.h b/drivers/sensor/sm351lt/sm351lt.h
index 20f6f76110..142bb1426b 100644
--- a/drivers/sensor/sm351lt/sm351lt.h
+++ b/drivers/sensor/sm351lt/sm351lt.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_DRIVERS_SENSOR_SM351LT_SM351LT_H_
 
 #include <stdint.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 
 #define SENSOR_ATTR_SM351LT_TRIGGER_TYPE SENSOR_ATTR_PRIV_START
 
diff --git a/drivers/sensor/stm32_temp/stm32_temp.c b/drivers/sensor/stm32_temp/stm32_temp.c
index fc2b12bb45..7c5642e876 100644
--- a/drivers/sensor/stm32_temp/stm32_temp.c
+++ b/drivers/sensor/stm32_temp/stm32_temp.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/sensor.h>
-#include <drivers/adc.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(stm32_temp, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/stmemsc/stmemsc.h b/drivers/sensor/stmemsc/stmemsc.h
index b86dc3148e..332662c457 100644
--- a/drivers/sensor/stmemsc/stmemsc.h
+++ b/drivers/sensor/stmemsc/stmemsc.h
@@ -10,8 +10,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_STMEMSC_STMEMSC_H_
 #define ZEPHYR_DRIVERS_SENSOR_STMEMSC_STMEMSC_H_
 
-#include <drivers/i2c.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/spi.h>
 
 #ifdef CONFIG_I2C
 int stmemsc_i2c_read(const struct i2c_dt_spec *stmemsc,
diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c
index 69671927a3..ce075e2a18 100644
--- a/drivers/sensor/stts751/stts751.c
+++ b/drivers/sensor/stts751/stts751.c
@@ -10,13 +10,13 @@
 
 #define DT_DRV_COMPAT st_stts751
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "stts751.h"
 
diff --git a/drivers/sensor/stts751/stts751.h b/drivers/sensor/stts751/stts751.h
index 84e72d4f35..8ea73be29c 100644
--- a/drivers/sensor/stts751/stts751.h
+++ b/drivers/sensor/stts751/stts751.h
@@ -12,11 +12,11 @@
 #define ZEPHYR_DRIVERS_SENSOR_STTS751_STTS751_H_
 
 #include <stdint.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "stts751_reg.h"
 
 struct stts751_config {
diff --git a/drivers/sensor/stts751/stts751_i2c.c b/drivers/sensor/stts751/stts751_i2c.c
index 875aca7df3..e94fdecb6f 100644
--- a/drivers/sensor/stts751/stts751_i2c.c
+++ b/drivers/sensor/stts751/stts751_i2c.c
@@ -11,8 +11,8 @@
 #define DT_DRV_COMPAT st_stts751
 
 #include <string.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 #include "stts751.h"
 
diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c
index ecac842062..0adbaaaf95 100644
--- a/drivers/sensor/stts751/stts751_trigger.c
+++ b/drivers/sensor/stts751/stts751_trigger.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT st_stts751
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "stts751.h"
 
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index c19625015c..5537bf7a6a 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -10,13 +10,13 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "sx9500.h"
 
diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h
index f6aaba259a..a7ace1abbe 100644
--- a/drivers/sensor/sx9500/sx9500.h
+++ b/drivers/sensor/sx9500/sx9500.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_SX9500_SX9500_H_
 
 #include <zephyr/types.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #define SX9500_REG_IRQ_SRC		0x00
 #define SX9500_REG_STAT			0x01
diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c
index f9dfd4ddc8..410067723a 100644
--- a/drivers/sensor/sx9500/sx9500_trigger.c
+++ b/drivers/sensor/sx9500/sx9500_trigger.c
@@ -8,15 +8,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #include "sx9500.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(SX9500, CONFIG_SENSOR_LOG_LEVEL);
 
 #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD
diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c
index f4c0fcd046..d303002dbb 100644
--- a/drivers/sensor/th02/th02.c
+++ b/drivers/sensor/th02/th02.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT hoperf_th02
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "th02.h"
 
diff --git a/drivers/sensor/th02/th02.h b/drivers/sensor/th02/th02.h
index ccd33bc3d2..c15d0b6dbc 100644
--- a/drivers/sensor/th02/th02.h
+++ b/drivers/sensor/th02/th02.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_TH02_TH02_H_
 #define ZEPHYR_DRIVERS_SENSOR_TH02_TH02_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 
 #define TH02_I2C_DEV_ID         0x40
 #define TH02_REG_STATUS         0x00
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index b951412707..9411a7b0ed 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/drivers/sensor/ti_hdc/ti_hdc.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ti_hdc
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "ti_hdc.h"
 
diff --git a/drivers/sensor/ti_hdc/ti_hdc.h b/drivers/sensor/ti_hdc/ti_hdc.h
index 18db3a80b2..6e4ebeab56 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.h
+++ b/drivers/sensor/ti_hdc/ti_hdc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_TI_HDC_TI_HDC_H_
 #define ZEPHYR_DRIVERS_SENSOR_TI_HDC_TI_HDC_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #define TI_HDC_REG_TEMP	0x0
 #define TI_HDC_REG_HUMIDITY	0x1
diff --git a/drivers/sensor/ti_hdc20xx/ti_hdc20xx.c b/drivers/sensor/ti_hdc20xx/ti_hdc20xx.c
index 61f690a10d..53e86408a1 100644
--- a/drivers/sensor/ti_hdc20xx/ti_hdc20xx.c
+++ b/drivers/sensor/ti_hdc20xx/ti_hdc20xx.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(TI_HDC20XX, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index 9efe8dd7fb..582baad81c 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/drivers/sensor/tmp007/tmp007.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ti_tmp007
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "tmp007.h"
 
diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h
index e3ab60fe1f..2602211674 100644
--- a/drivers/sensor/tmp007/tmp007.h
+++ b/drivers/sensor/tmp007/tmp007.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_TMP007_TMP007_H_
 #define ZEPHYR_DRIVERS_SENSOR_TMP007_TMP007_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #define TMP007_I2C_ADDRESS		DT_INST_REG_ADDR(0)
 
diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c
index 501438efff..6938dc9d64 100644
--- a/drivers/sensor/tmp007/tmp007_trigger.c
+++ b/drivers/sensor/tmp007/tmp007_trigger.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT ti_tmp007
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "tmp007.h"
 
 extern struct tmp007_data tmp007_driver;
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(TMP007, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline void setup_int(const struct device *dev,
diff --git a/drivers/sensor/tmp108/tmp108.c b/drivers/sensor/tmp108/tmp108.c
index 876578a402..f6b47ebcfe 100644
--- a/drivers/sensor/tmp108/tmp108.c
+++ b/drivers/sensor/tmp108/tmp108.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT ti_tmp108
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <logging/log.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 
 #include "tmp108.h"
 
diff --git a/drivers/sensor/tmp108/tmp108.h b/drivers/sensor/tmp108/tmp108.h
index 51799c49e2..4d6f925037 100644
--- a/drivers/sensor/tmp108/tmp108.h
+++ b/drivers/sensor/tmp108/tmp108.h
@@ -9,9 +9,9 @@
 
 #include <stdint.h>
 
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor/tmp108.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor/tmp108.h>
 
 #define TI_TMP108_REG_TEMP		0x00   /** Temperature register */
 #define TI_TMP108_REG_CONF		0x01   /** Configuration register */
diff --git a/drivers/sensor/tmp108/tmp108_trigger.c b/drivers/sensor/tmp108/tmp108_trigger.c
index 4a40402dce..5c0ef42803 100644
--- a/drivers/sensor/tmp108/tmp108_trigger.c
+++ b/drivers/sensor/tmp108/tmp108_trigger.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/sensor.h>
-#include <logging/log.h>
-#include <kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 
 #include "tmp108.h"
 
diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c
index 559624fd8d..ee4efea5db 100644
--- a/drivers/sensor/tmp112/tmp112.c
+++ b/drivers/sensor/tmp112/tmp112.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT ti_tmp112
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include "tmp112.h"
 
 LOG_MODULE_REGISTER(TMP112, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/tmp112/tmp112.h b/drivers/sensor/tmp112/tmp112.h
index 28f79fe6b1..6f2b3f7b32 100644
--- a/drivers/sensor/tmp112/tmp112.h
+++ b/drivers/sensor/tmp112/tmp112.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_TMP112_TMP112_H_
 #define ZEPHYR_DRIVERS_SENSOR_TMP112_TMP112_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 
 #define TMP112_REG_TEMPERATURE          0x00
 #define TMP112_DATA_INVALID_BIT         (BIT(1) | BIT(2))
diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c
index bf1d056437..80ffa8b53b 100644
--- a/drivers/sensor/tmp116/tmp116.c
+++ b/drivers/sensor/tmp116/tmp116.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ti_tmp116
 
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <drivers/sensor/tmp116.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor/tmp116.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 
 #include "tmp116.h"
 
diff --git a/drivers/sensor/vcnl4040/vcnl4040.c b/drivers/sensor/vcnl4040/vcnl4040.c
index f44aa6bba4..42baa242b9 100644
--- a/drivers/sensor/vcnl4040/vcnl4040.c
+++ b/drivers/sensor/vcnl4040/vcnl4040.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT vishay_vcnl4040
 
 #include "vcnl4040.h"
-#include <pm/device.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 #include <stdlib.h>
 
 LOG_MODULE_REGISTER(vcnl4040, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/vcnl4040/vcnl4040.h b/drivers/sensor/vcnl4040/vcnl4040.h
index 525f54902f..237d44fd1c 100644
--- a/drivers/sensor/vcnl4040/vcnl4040.h
+++ b/drivers/sensor/vcnl4040/vcnl4040.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_VCNL4040_VCNL4040_H_
 #define ZEPHYR_DRIVERS_SENSOR_VCNL4040_VCNL4040_H_
 
-#include <drivers/sensor.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 /* Registers all 16 bits */
 #define VCNL4040_REG_ALS_CONF	0x00
diff --git a/drivers/sensor/vcnl4040/vcnl4040_trigger.c b/drivers/sensor/vcnl4040/vcnl4040_trigger.c
index 39ba953f90..41305bfd65 100644
--- a/drivers/sensor/vcnl4040/vcnl4040_trigger.c
+++ b/drivers/sensor/vcnl4040/vcnl4040_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include "vcnl4040.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(vcnl4040, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index 0d70a847b9..f1ffe8b4fe 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/drivers/sensor/vl53l0x/vl53l0x.c
@@ -10,15 +10,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <drivers/sensor.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/types.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 
 #include "vl53l0x_api.h"
 #include "vl53l0x_platform.h"
diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.c b/drivers/sensor/vl53l0x/vl53l0x_platform.c
index ad57c35676..bee73216b6 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_platform.c
+++ b/drivers/sensor/vl53l0x/vl53l0x_platform.c
@@ -10,12 +10,12 @@
 
 #include "vl53l0x_platform.h"
 
-#include <drivers/sensor.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(VL53L0X, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/drivers/sensor/wsen_itds/itds.c b/drivers/sensor/wsen_itds/itds.c
index 6ddef0aeb5..947453ba4d 100644
--- a/drivers/sensor/wsen_itds/itds.c
+++ b/drivers/sensor/wsen_itds/itds.c
@@ -7,12 +7,12 @@
  * Author: Saravanan Sekar <saravanan@linumiz.com>
  */
 
-#include <init.h>
-#include <drivers/sensor.h>
-#include <sys/byteorder.h>
-#include <kernel.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include "itds.h"
 
 #define DT_DRV_COMPAT we_wsen_itds
diff --git a/drivers/sensor/wsen_itds/itds.h b/drivers/sensor/wsen_itds/itds.h
index 9178dd2a09..3ac97a3523 100644
--- a/drivers/sensor/wsen_itds/itds.h
+++ b/drivers/sensor/wsen_itds/itds.h
@@ -8,9 +8,9 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_ITDS_H_
 #define ZEPHYR_DRIVERS_SENSOR_ITDS_H_
 
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/sys/util.h>
 
 /* registers */
 #define ITDS_REG_TEMP_L			0x0d
diff --git a/drivers/sensor/wsen_itds/itds_trigger.c b/drivers/sensor/wsen_itds/itds_trigger.c
index b19f435068..0379fa3c16 100644
--- a/drivers/sensor/wsen_itds/itds_trigger.c
+++ b/drivers/sensor/wsen_itds/itds_trigger.c
@@ -7,10 +7,10 @@
  * Author: Saravanan Sekar <saravanan@linumiz.com>
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "itds.h"
 LOG_MODULE_DECLARE(ITDS, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index cb76c8d300..feaa3f66cd 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT silabs_gecko_leuart
 
 #include <errno.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <em_leuart.h>
 #include <em_gpio.h>
 #include <em_cmu.h>
diff --git a/drivers/serial/serial_test.c b/drivers/serial/serial_test.c
index 13da30d2b0..19fc22cc0a 100644
--- a/drivers/serial/serial_test.c
+++ b/drivers/serial/serial_test.c
@@ -9,8 +9,8 @@
  * devices for the "vnd,serial" devicetree compatible used in test code.
  */
 
-#include <zephyr.h>
-#include <drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
 
 #define DT_DRV_COMPAT vnd_serial
 
diff --git a/drivers/serial/uart_altera_jtag.c b/drivers/serial/uart_altera_jtag.c
index eb5cf2b090..dc9298ac49 100644
--- a/drivers/serial/uart_altera_jtag.c
+++ b/drivers/serial/uart_altera_jtag.c
@@ -5,10 +5,10 @@
  */
 
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/uart.h>
-#include <sys/sys_io.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/sys_io.h>
 
 #define DT_DRV_COMPAT   altr_jtag_uart
 
diff --git a/drivers/serial/uart_apbuart.c b/drivers/serial/uart_apbuart.c
index d925bff865..533be4941b 100644
--- a/drivers/serial/uart_apbuart.c
+++ b/drivers/serial/uart_apbuart.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT gaisler_apbuart
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <errno.h>
 
 /* APBUART registers
diff --git a/drivers/serial/uart_b91.c b/drivers/serial/uart_b91.c
index 4084307244..487a712ccf 100644
--- a/drivers/serial/uart_b91.c
+++ b/drivers/serial/uart_b91.c
@@ -7,9 +7,9 @@
 #include "analog.h"
 #include "clock.h"
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 
 
 /* Driver dts compatibility: telink,b91_uart */
diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c
index 7988edbd03..e163a66fe0 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/drivers/serial/uart_cc13xx_cc26xx.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_uart
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <sys/__assert.h>
-#include <pm/device.h>
-#include <pm/policy.h>
-#include <drivers/uart.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <driverlib/prcm.h>
 #include <driverlib/uart.h>
diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c
index 89810b4c1f..8ec19bdc08 100644
--- a/drivers/serial/uart_cc32xx.c
+++ b/drivers/serial/uart_cc32xx.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT ti_cc32xx_uart
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/uart.h>
 
 /* Driverlib includes */
 #include <inc/hw_types.h>
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index d15fb8784b..c938967e00 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -12,13 +12,13 @@
  * UART has two wires for RX and TX, and does not provide CTS or RTS.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/clock_control/arm_clock_control.h>
-#include <sys/__assert.h>
-#include <init.h>
-#include <drivers/uart.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/clock_control/arm_clock_control.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/linker/sections.h>
 
 /* UART registers struct */
 struct uart_cmsdk_apb {
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index 1ab6e4c338..1ec2401281 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -26,21 +26,21 @@
 #include <hal/uart_hal.h>
 #include <hal/uart_types.h>
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <soc/uart_reg.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 #ifndef CONFIG_SOC_ESP32C3
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #else
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #endif
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <esp_attr.h>
 
 #ifdef CONFIG_SOC_ESP32C3
diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c
index 3f3d6ebc1a..930bd4d0d9 100644
--- a/drivers/serial/uart_gecko.c
+++ b/drivers/serial/uart_gecko.c
@@ -6,7 +6,7 @@
  */
 
 #include <errno.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <em_usart.h>
 #include <em_gpio.h>
 #include <em_cmu.h>
diff --git a/drivers/serial/uart_handlers.c b/drivers/serial/uart_handlers.c
index c9df2b76ee..b57fc8e063 100644
--- a/drivers/serial/uart_handlers.c
+++ b/drivers/serial/uart_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/uart.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/syscall_handler.h>
 
 #define UART_SIMPLE(op_) \
 	static inline int z_vrfy_uart_##op_(const struct device *dev) \
diff --git a/drivers/serial/uart_hvc_xen.c b/drivers/serial/uart_hvc_xen.c
index 98292b5d28..478a1e0b39 100644
--- a/drivers/serial/uart_hvc_xen.c
+++ b/drivers/serial/uart_hvc_xen.c
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm64/hypercall.h>
-#include <xen/console.h>
-#include <xen/events.h>
-#include <xen/generic.h>
-#include <xen/hvm.h>
-#include <xen/public/io/console.h>
-#include <xen/public/sched.h>
-#include <xen/public/xen.h>
+#include <zephyr/arch/arm64/hypercall.h>
+#include <zephyr/xen/console.h>
+#include <zephyr/xen/events.h>
+#include <zephyr/xen/generic.h>
+#include <zephyr/xen/hvm.h>
+#include <zephyr/xen/public/io/console.h>
+#include <zephyr/xen/public/sched.h>
+#include <zephyr/xen/public/xen.h>
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/device_mmio.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/device_mmio.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_hvc_xen, CONFIG_UART_LOG_LEVEL);
 
 static struct hvc_xen_data hvc_data = {0};
diff --git a/drivers/serial/uart_hvc_xen_consoleio.c b/drivers/serial/uart_hvc_xen_consoleio.c
index 899fa74074..d60289565a 100644
--- a/drivers/serial/uart_hvc_xen_consoleio.c
+++ b/drivers/serial/uart_hvc_xen_consoleio.c
@@ -9,13 +9,13 @@
  * should be used (uart_hvc_xen.c), this console will not be available.
  */
 
-#include <arch/arm64/hypercall.h>
-#include <xen/public/xen.h>
+#include <zephyr/arch/arm64/hypercall.h>
+#include <zephyr/xen/public/xen.h>
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
 static int xen_consoleio_poll_in(const struct device *dev,
 			unsigned char *c)
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
index d9238d37e1..338d6c17e0 100644
--- a/drivers/serial/uart_imx.c
+++ b/drivers/serial/uart_imx.c
@@ -13,12 +13,12 @@
  *
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <init.h>
-#include <drivers/uart.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
 #include <uart_imx.h>
 
 #define UART_STRUCT(dev) \
diff --git a/drivers/serial/uart_ite_it8xxx2.c b/drivers/serial/uart_ite_it8xxx2.c
index 0999399ba4..166fee9a93 100644
--- a/drivers/serial/uart_ite_it8xxx2.c
+++ b/drivers/serial/uart_ite_it8xxx2.c
@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_uart
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/pinctrl.h>
-#include <drivers/uart.h>
-#include <kernel.h>
-#include <pm/device.h>
-#include <pm/policy.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_ite_it8xxx2, CONFIG_UART_LOG_LEVEL);
 
 #if defined(CONFIG_PM_DEVICE) && defined(CONFIG_UART_CONSOLE_INPUT_EXPIRED)
diff --git a/drivers/serial/uart_liteuart.c b/drivers/serial/uart_liteuart.c
index 81e33bb74f..1e2f8f97b6 100644
--- a/drivers/serial/uart_liteuart.c
+++ b/drivers/serial/uart_liteuart.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT litex_uart0
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <irq.h>
-#include <device.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
 #include <zephyr/types.h>
 
 #define UART_RXTX_ADDR		DT_INST_REG_ADDR_BY_NAME(0, rxtx)
diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c
index 58ddc40eeb..628cd3e35a 100644
--- a/drivers/serial/uart_lpc11u6x.c
+++ b/drivers/serial/uart_lpc11u6x.c
@@ -5,11 +5,11 @@
  */
 #define DT_DRV_COMPAT nxp_lpc11u6x_uart
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
-#include <drivers/uart.h>
-#include <drivers/pinmux.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "uart_lpc11u6x.h"
 
diff --git a/drivers/serial/uart_mchp_xec.c b/drivers/serial/uart_mchp_xec.c
index db48ba88de..8a7b74eea8 100644
--- a/drivers/serial/uart_mchp_xec.c
+++ b/drivers/serial/uart_mchp_xec.c
@@ -16,20 +16,20 @@
 #define DT_DRV_COMPAT microchip_xec_uart
 
 #include <errno.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <zephyr/types.h>
 #include <soc.h>
 
-#include <init.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <drivers/pinctrl.h>
-#include <drivers/uart.h>
-#include <sys/sys_io.h>
-#include <spinlock.h>
+#include <zephyr/init.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/spinlock.h>
 
 BUILD_ASSERT(IS_ENABLED(CONFIG_SOC_SERIES_MEC172X),
 	     "XEC UART driver only support MEC172x at this time");
diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c
index 3eba34113e..455470121c 100644
--- a/drivers/serial/uart_mcux.c
+++ b/drivers/serial/uart_mcux.c
@@ -8,13 +8,13 @@
 #define DT_DRV_COMPAT nxp_kinetis_uart
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_uart.h>
 #include <soc.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 struct uart_mcux_config {
diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c
index cd6f11f677..ffbb0e2dd4 100644
--- a/drivers/serial/uart_mcux_flexcomm.c
+++ b/drivers/serial/uart_mcux_flexcomm.c
@@ -15,14 +15,14 @@
  */
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_usart.h>
 #include <soc.h>
 #include <fsl_device_registers.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 struct mcux_flexcomm_config {
diff --git a/drivers/serial/uart_mcux_iuart.c b/drivers/serial/uart_mcux_iuart.c
index 9be45ccc78..64c46db3ce 100644
--- a/drivers/serial/uart_mcux_iuart.c
+++ b/drivers/serial/uart_mcux_iuart.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT nxp_imx_iuart
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
 #include <fsl_uart.h>
 #include <soc.h>
diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c
index 8aa4bd3d0c..35faa4b54c 100644
--- a/drivers/serial/uart_mcux_lpsci.c
+++ b/drivers/serial/uart_mcux_lpsci.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT nxp_kinetis_lpsci
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <fsl_lpsci.h>
 #include <soc.h>
 
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index fbca437265..137c88e183 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -10,19 +10,19 @@
 #include <errno.h>
 #include <soc.h>
 #include <fsl_lpuart.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
-#include <pm/policy.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/pm/policy.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 #ifdef CONFIG_UART_ASYNC_API
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #endif
 
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_mcux_lpuart, LOG_LEVEL_ERR);
 
 #ifdef CONFIG_UART_ASYNC_API
diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c
index e1fa230e08..339b521e71 100644
--- a/drivers/serial/uart_miv.c
+++ b/drivers/serial/uart_miv.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT microsemi_coreuart
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/uart.h>
 
 
 /* UART REGISTERS DEFINITIONS */
diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c
index 02319ccacd..2356994b73 100644
--- a/drivers/serial/uart_msp432p4xx.c
+++ b/drivers/serial/uart_msp432p4xx.c
@@ -12,7 +12,7 @@
  * that the definition of BIT is not overridden */
 #include <driverlib/gpio.h>
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 /* Driverlib includes */
 #include <driverlib/rom.h>
diff --git a/drivers/serial/uart_native_posix.c b/drivers/serial/uart_native_posix.c
index 42867d04c5..c298cab383 100644
--- a/drivers/serial/uart_native_posix.c
+++ b/drivers/serial/uart_native_posix.c
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <poll.h>
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include "cmdline.h" /* native_posix command line options header */
 #include "soc.h"
 
diff --git a/drivers/serial/uart_neorv32.c b/drivers/serial/uart_neorv32.c
index bc08a549fd..e9cae52bac 100644
--- a/drivers/serial/uart_neorv32.c
+++ b/drivers/serial/uart_neorv32.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT neorv32_uart
 
-#include <device.h>
-#include <drivers/syscon.h>
-#include <drivers/uart.h>
-#include <pm/device.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/syscon.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/sys_io.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_neorv32, CONFIG_UART_LOG_LEVEL);
 
 /* NEORV32 UART registers offsets */
diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c
index 03ca40c829..722a15b6bd 100644
--- a/drivers/serial/uart_npcx.c
+++ b/drivers/serial/uart_npcx.c
@@ -6,18 +6,18 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_uart
 
-#include <sys/__assert.h>
-#include <drivers/gpio.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
-#include <kernel.h>
-#include <pm/device.h>
-#include <pm/policy.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
 #include <soc.h>
 #include "soc_miwu.h"
 #include "soc_power.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_npcx, CONFIG_UART_LOG_LEVEL);
 
 /* Driver config */
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index d691d13024..d3f69935a5 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -8,13 +8,13 @@
  * @brief Driver for Nordic Semiconductor nRF5X UART
  */
 
-#include <drivers/uart.h>
-#include <pm/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/pm/device.h>
 #include <soc.h>
 #include <hal/nrf_uart.h>
 
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #else
 #include <hal/nrf_gpio.h>
 #endif /* CONFIG_PINCTRL */
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 66fff2dd96..d5b729105c 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -8,20 +8,20 @@
  * @brief Driver for Nordic Semiconductor nRF UARTE
  */
 
-#include <drivers/uart.h>
-#include <pm/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/pm/device.h>
 #include <hal/nrf_uarte.h>
 #include <nrfx_timer.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <helpers/nrfx_gppi.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_nrfx_uarte, CONFIG_UART_LOG_LEVEL);
 
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #else
 #include <hal/nrf_gpio.h>
 #endif /* CONFIG_PINCTRL */
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index 132ef53ce1..0cc7191e41 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -24,18 +24,18 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <zephyr/types.h>
 #include <soc.h>
 
-#include <init.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <drivers/uart.h>
-#include <pm/policy.h>
-#include <sys/sys_io.h>
-#include <spinlock.h>
+#include <zephyr/init.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/spinlock.h>
 
 #include "uart_ns16550.h"
 
@@ -53,7 +53,7 @@
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(pcie)
 BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "NS16550(s) in DT need CONFIG_PCIE");
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #endif
 
 /* register definitions */
diff --git a/drivers/serial/uart_numicro.c b/drivers/serial/uart_numicro.c
index d9dfdc3f94..6fa80cb8ab 100644
--- a/drivers/serial/uart_numicro.c
+++ b/drivers/serial/uart_numicro.c
@@ -5,7 +5,7 @@
  * Author: Saravanan Sekar <saravanan@linumiz.com>
  */
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <NuMicro.h>
 #include <string.h>
 
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 2f9f4e7c11..9d1130dff7 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT arm_pl011
 #define SBSA_COMPAT arm_sbsa_uart
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 /*
  * UART PL011 register map structure
diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c
index 8d6ee7822d..6bf09b22b7 100644
--- a/drivers/serial/uart_psoc6.c
+++ b/drivers/serial/uart_psoc6.c
@@ -12,12 +12,12 @@
  * - Error handling is not implemented.
  * - The driver works only in polling mode, interrupt mode is not implemented.
  */
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 #include "cy_syslib.h"
 #include "cy_sysclk.h"
diff --git a/drivers/serial/uart_rcar.c b/drivers/serial/uart_rcar.c
index e2d929a394..fd60db5098 100644
--- a/drivers/serial/uart_rcar.c
+++ b/drivers/serial/uart_rcar.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT renesas_rcar_scif
 
 #include <errno.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
-#include <drivers/pinctrl.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/spinlock.h>
 
 struct uart_rcar_cfg {
 	uint32_t reg_addr;
diff --git a/drivers/serial/uart_rpi_pico.c b/drivers/serial/uart_rpi_pico.c
index 7e0869512b..586fcb7a59 100644
--- a/drivers/serial/uart_rpi_pico.c
+++ b/drivers/serial/uart_rpi_pico.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/uart.h>
-#include <drivers/reset.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/reset.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /* pico-sdk includes */
 #include <hardware/uart.h>
diff --git a/drivers/serial/uart_rtt.c b/drivers/serial/uart_rtt.c
index 08303937cd..55373f6bab 100644
--- a/drivers/serial/uart_rtt.c
+++ b/drivers/serial/uart_rtt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <SEGGER_RTT.h>
 
 #define DT_DRV_COMPAT segger_rtt_uart
diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
index 5e7b819c00..e4ac6c7af4 100644
--- a/drivers/serial/uart_rv32m1_lpuart.c
+++ b/drivers/serial/uart_rv32m1_lpuart.c
@@ -8,13 +8,13 @@
 #define DT_DRV_COMPAT openisa_rv32m1_lpuart
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_lpuart.h>
 #include <soc.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 struct rv32m1_lpuart_config {
diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c
index f329dca225..474d289021 100644
--- a/drivers/serial/uart_sam.c
+++ b/drivers/serial/uart_sam.c
@@ -15,12 +15,12 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /* Device constant configuration parameters */
 struct uart_sam_dev_cfg {
diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c
index b7c5e3e02c..6653d8e016 100644
--- a/drivers/serial/uart_sam0.c
+++ b/drivers/serial/uart_sam0.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT atmel_sam0_uart
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <errno.h>
-#include <init.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <drivers/dma.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <string.h>
 
 #ifndef SERCOM_USART_CTRLA_MODE_USART_INT_CLK
diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c
index 925f192bf8..f8756a2de0 100644
--- a/drivers/serial/uart_sifive.c
+++ b/drivers/serial/uart_sifive.c
@@ -10,10 +10,10 @@
 
 #define DT_DRV_COMPAT sifive_uart0
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/uart.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #define RXDATA_EMPTY   (1 << 31)   /* Receive FIFO Empty */
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 32065f0b15..ac6ff54124 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -20,13 +20,13 @@
  * and STDOUT_CONSOLE APIs.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <init.h>
-#include <drivers/uart.h>
-#include <linker/sections.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/linker/sections.h>
 
 /* definitions */
 
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 34848830bc..6f6cb2747c 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -14,28 +14,28 @@
  *        Please validate for newly added series.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
-#include <init.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
-#include <pm/policy.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/pm/policy.h>
 
 #ifdef CONFIG_UART_ASYNC_API
-#include <drivers/dma/dma_stm32.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
+#include <zephyr/drivers/dma.h>
 #endif
 
-#include <linker/sections.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include "uart_stm32.h"
 
 #include <stm32_ll_usart.h>
 #include <stm32_ll_lpuart.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(uart_stm32, CONFIG_UART_LOG_LEVEL);
 
 #define HAS_LPUART_1 (DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(lpuart1), \
diff --git a/drivers/serial/uart_stm32.h b/drivers/serial/uart_stm32.h
index abe92415e2..31a5b8b917 100644
--- a/drivers/serial/uart_stm32.h
+++ b/drivers/serial/uart_stm32.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_
 #define ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #include <stm32_ll_usart.h>
 
diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index 914f6010cc..f9223d38f9 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -22,16 +22,16 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <zephyr/types.h>
 #include <soc.h>
 
-#include <init.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <drivers/uart.h>
-#include <sys/sys_io.h>
+#include <zephyr/init.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/sys_io.h>
 
 /* For all register offsets and bits / bit masks:
  * Comp. Xilinx Zynq-7000 Technical Reference Manual (ug585), chap. B.33
diff --git a/drivers/serial/uart_xlnx_uartlite.c b/drivers/serial/uart_xlnx_uartlite.c
index 2f8ab3053b..87df543000 100644
--- a/drivers/serial/uart_xlnx_uartlite.c
+++ b/drivers/serial/uart_xlnx_uartlite.c
@@ -9,9 +9,9 @@
 
 #define DT_DRV_COMPAT xlnx_xps_uartlite_1_00_a
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/sys_io.h>
 
 /* AXI UART Lite v2 registers offsets (See Xilinx PG142 for details) */
 #define RX_FIFO_OFFSET  0x00
diff --git a/drivers/serial/uart_xmc4xxx.c b/drivers/serial/uart_xmc4xxx.c
index 70a6c45411..51690fe649 100644
--- a/drivers/serial/uart_xmc4xxx.c
+++ b/drivers/serial/uart_xmc4xxx.c
@@ -9,7 +9,7 @@
 
 #include <xmc_gpio.h>
 #include <xmc_uart.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 struct uart_xmc4xx_config {
 	XMC_USIC_CH_t *uart;
diff --git a/drivers/serial/usart_gd32.c b/drivers/serial/usart_gd32.c
index 9c5ffe9906..0b11c2065f 100644
--- a/drivers/serial/usart_gd32.c
+++ b/drivers/serial/usart_gd32.c
@@ -6,8 +6,8 @@
 #define DT_DRV_COMPAT gd_gd32_usart
 
 #include <errno.h>
-#include <drivers/pinctrl.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
 #include <soc.h>
 
 /* Unify GD32 HAL USART status register name to USART_STAT */
diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c
index 42ad245e95..99ddde3f2d 100644
--- a/drivers/serial/usart_sam.c
+++ b/drivers/serial/usart_sam.c
@@ -15,12 +15,12 @@
  */
 
 #include <errno.h>
-#include <sys/__assert.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/pinctrl.h>
 
 /* Device constant configuration parameters */
 struct usart_sam_dev_cfg {
diff --git a/drivers/spi/spi_b91.c b/drivers/spi/spi_b91.c
index 126541c50f..371c77e27a 100644
--- a/drivers/spi/spi_b91.c
+++ b/drivers/spi/spi_b91.c
@@ -15,12 +15,12 @@
 
 #include "clock.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_telink);
 
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #include "spi_context.h"
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 
 #define CHIP_SELECT_COUNT               3u
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 5ef775fd46..9e22cf9134 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT zephyr_spi_bitbang
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_bitbang);
 
-#include <sys/sys_io.h>
-#include <drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/drivers/spi.h>
 #include "spi_context.h"
 
 struct spi_bitbang_data {
diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c
index a195ae77d9..0d07cf4711 100644
--- a/drivers/spi/spi_cc13xx_cc26xx.c
+++ b/drivers/spi/spi_cc13xx_cc26xx.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT ti_cc13xx_cc26xx_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_cc13xx_cc26xx);
 
-#include <drivers/spi.h>
-#include <drivers/pinctrl.h>
-#include <pm/device.h>
-#include <pm/policy.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/policy.h>
 
 #include <driverlib/prcm.h>
 #include <driverlib/ssi.h>
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index 017dc6ccbf..b9d8ab31bb 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -12,8 +12,8 @@
 #ifndef ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
 #define ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
 
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index c931c637d7..9964956e8f 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -9,7 +9,7 @@
 /* spi_dw.c - Designware SPI driver implementation */
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_dw);
 
 #if (CONFIG_SPI_LOG_LEVEL == 4)
@@ -27,22 +27,22 @@ LOG_MODULE_REGISTER(spi_dw);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
-#include <pm/device.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/pm/device.h>
 
-#include <sys/sys_io.h>
-#include <sys/util.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/util.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 #endif
 
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 
 #include "spi_dw.h"
 #include "spi_context.h"
diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h
index a021434d50..ad4b28a309 100644
--- a/drivers/spi/spi_dw.h
+++ b/drivers/spi/spi_dw.h
@@ -10,7 +10,7 @@
 #define ZEPHYR_DRIVERS_SPI_SPI_DW_H_
 
 #include <string.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 
 #include "spi_context.h"
 
diff --git a/drivers/spi/spi_emul.c b/drivers/spi/spi_emul.c
index 302f489997..953250929a 100644
--- a/drivers/spi/spi_emul.c
+++ b/drivers/spi/spi_emul.c
@@ -11,13 +11,13 @@
 #define DT_DRV_COMPAT zephyr_spi_emul_controller
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_emul_ctlr);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/spi.h>
-#include <drivers/spi_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/spi_emul.h>
 
 /** Working data for the device */
 struct spi_emul_data {
diff --git a/drivers/spi/spi_esp32_spim.c b/drivers/spi/spi_esp32_spim.c
index dae8126c14..2d682d34c6 100644
--- a/drivers/spi/spi_esp32_spim.c
+++ b/drivers/spi/spi_esp32_spim.c
@@ -10,17 +10,17 @@
 #include <hal/spi_hal.h>
 #include <esp_attr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_spi, CONFIG_SPI_LOG_LEVEL);
 
 #include <soc.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #ifndef CONFIG_SOC_ESP32C3
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #else
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #endif
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 #include "spi_context.h"
 #include "spi_esp32_spim.h"
 
diff --git a/drivers/spi/spi_esp32_spim.h b/drivers/spi/spi_esp32_spim.h
index 1d0f151f6b..185da95dba 100644
--- a/drivers/spi/spi_esp32_spim.h
+++ b/drivers/spi/spi_esp32_spim.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_
 #define ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_
 
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define SPI_MASTER_FREQ_8M      (APB_CLK_FREQ/10)
 #define SPI_MASTER_FREQ_9M      (APB_CLK_FREQ/9)    /* 8.89MHz */
diff --git a/drivers/spi/spi_gd32.c b/drivers/spi/spi_gd32.c
index 270dac319d..96a09b11dc 100644
--- a/drivers/spi/spi_gd32.c
+++ b/drivers/spi/spi_gd32.c
@@ -7,12 +7,12 @@
 #define DT_DRV_COMPAT gd_gd32_spi
 
 #include <errno.h>
-#include <kernel.h>
-#include <drivers/pinctrl.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/spi.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_gd32);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c
index f31ff7fbef..2c7aaae71f 100644
--- a/drivers/spi/spi_gecko.c
+++ b/drivers/spi/spi_gecko.c
@@ -7,13 +7,13 @@
 #define DT_DRV_COMPAT silabs_gecko_spi_usart
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_gecko);
 #include "spi_context.h"
 
-#include <sys/sys_io.h>
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 #include <soc.h>
 
 #include "em_cmu.h"
diff --git a/drivers/spi/spi_handlers.c b/drivers/spi/spi_handlers.c
index dca9408307..0cc2e7bfec 100644
--- a/drivers/spi/spi_handlers.c
+++ b/drivers/spi/spi_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/spi.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/syscall_handler.h>
 #include <string.h>
 
 /* This assumes that bufs and buf_copy are copies from the values passed
diff --git a/drivers/spi/spi_litespi.c b/drivers/spi/spi_litespi.c
index c4c35323cc..8ae3abed6d 100644
--- a/drivers/spi/spi_litespi.c
+++ b/drivers/spi/spi_litespi.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT litex_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_litespi);
 #include "spi_litespi.h"
 #include <stdbool.h>
diff --git a/drivers/spi/spi_litespi.h b/drivers/spi/spi_litespi.h
index 5eeae30bfb..4e423986ee 100644
--- a/drivers/spi/spi_litespi.h
+++ b/drivers/spi/spi_litespi.h
@@ -9,9 +9,9 @@
 
 #include "spi_context.h"
 
-#include <sys/sys_io.h>
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 
 #define SPI_BASE_ADDR DT_INST_REG_ADDR(0)
 #define SPI_CONTROL_REG SPI_BASE_ADDR
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index 7e7387f099..e747f17fa6 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -7,23 +7,23 @@
 #define DT_DRV_COMPAT st_stm32_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_ll_stm32);
 
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_spi.h>
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/pinctrl.h>
-#include <toolchain.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/toolchain.h>
 #ifdef CONFIG_SPI_STM32_DMA
-#include <drivers/dma/dma_stm32.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma/dma_stm32.h>
+#include <zephyr/drivers/dma.h>
 #endif
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "spi_ll_stm32.h"
 
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
index 5eb8da0f1c..e87b4b9ad8 100644
--- a/drivers/spi/spi_mcux_dspi.c
+++ b/drivers/spi/spi_mcux_dspi.c
@@ -8,17 +8,17 @@
 #define DT_DRV_COMPAT	nxp_kinetis_dspi
 
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_dspi.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #ifdef CONFIG_DSPI_MCUX_EDMA
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #include <fsl_edma.h>
 #endif
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_mcux_dspi);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c
index 169c9d2d21..1094a7a89f 100644
--- a/drivers/spi/spi_mcux_flexcomm.c
+++ b/drivers/spi/spi_mcux_flexcomm.c
@@ -8,17 +8,17 @@
 #define DT_DRV_COMPAT nxp_lpc_spi
 
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_spi.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #ifdef CONFIG_SPI_MCUX_FLEXCOMM_DMA
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #endif
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
-#include <sys_clock.h>
+#include <zephyr/sys_clock.h>
 
 LOG_MODULE_REGISTER(spi_mcux_flexcomm, CONFIG_SPI_LOG_LEVEL);
 
diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c
index 3e1698971b..2d83f8349c 100644
--- a/drivers/spi/spi_mcux_lpspi.c
+++ b/drivers/spi/spi_mcux_lpspi.c
@@ -7,15 +7,15 @@
 #define DT_DRV_COMPAT nxp_imx_lpspi
 
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_lpspi.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #ifdef CONFIG_SPI_MCUX_LPSPI_DMA
-#include <drivers/dma.h>
+#include <zephyr/drivers/dma.h>
 #endif
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif /* CONFIG_PINCTRL */
 
 LOG_MODULE_REGISTER(spi_mcux_lpspi, CONFIG_SPI_LOG_LEVEL);
diff --git a/drivers/spi/spi_npcx_fiu.c b/drivers/spi/spi_npcx_fiu.c
index b10af0c6a4..8e8705ba5d 100644
--- a/drivers/spi/spi_npcx_fiu.c
+++ b/drivers/spi/spi_npcx_fiu.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT nuvoton_npcx_spi_fiu
 
-#include <drivers/clock_control.h>
-#include <drivers/spi.h>
-#include <logging/log.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/logging/log.h>
 #include <soc.h>
 
 LOG_MODULE_REGISTER(spi_npcx_fiu, LOG_LEVEL_ERR);
diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c
index 9e7968b85c..c7d11b771b 100644
--- a/drivers/spi/spi_nrfx_spi.c
+++ b/drivers/spi/spi_nrfx_spi.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/spi.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_spi.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_nrfx_spi, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index fa852a3c45..933c93cd34 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/spi.h>
-#include <pm/device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58
 #include <nrfx_gpiote.h>
@@ -16,7 +16,7 @@
 #include <hal/nrf_clock.h>
 #include <string.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_nrfx_spim, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 1597e68149..92f958965a 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/spi.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <nrfx_spis.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_nrfx_spis, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c
index dd5efa10b0..f08cadbc8d 100644
--- a/drivers/spi/spi_oc_simple.c
+++ b/drivers/spi/spi_oc_simple.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT opencores_spi_simple
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_oc_simple);
 
-#include <sys/sys_io.h>
-#include <drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/drivers/spi.h>
 
 #include "spi_context.h"
 #include "spi_oc_simple.h"
diff --git a/drivers/spi/spi_psoc6.c b/drivers/spi/spi_psoc6.c
index 70d4fc5732..57d2d69b4f 100644
--- a/drivers/spi/spi_psoc6.c
+++ b/drivers/spi/spi_psoc6.c
@@ -9,11 +9,11 @@
 #define DT_DRV_COMPAT cypress_psoc6_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_psoc6);
 
 #include <errno.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/spi.h>
 #include <soc.h>
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c
index ca70cfb837..74c1381223 100644
--- a/drivers/spi/spi_rv32m1_lpspi.c
+++ b/drivers/spi/spi_rv32m1_lpspi.c
@@ -9,15 +9,15 @@
 #define DT_DRV_COMPAT openisa_rv32m1_lpspi
 
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_lpspi.h>
 #ifdef CONFIG_PINCTRL
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/pinctrl.h>
 #endif
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_rv32m1_lpspi);
 
 #include "spi_context.h"
diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c
index 300adb42a5..161ce2d5d4 100644
--- a/drivers/spi/spi_sam.c
+++ b/drivers/spi/spi_sam.c
@@ -8,14 +8,14 @@
 #define DT_DRV_COMPAT atmel_sam_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_sam);
 
 #include "spi_context.h"
 #include <errno.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #define SAM_SPI_CHIP_SELECT_COUNT			4
diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c
index 0a73e16f22..c6528e7061 100644
--- a/drivers/spi/spi_sam0.c
+++ b/drivers/spi/spi_sam0.c
@@ -6,15 +6,15 @@
 #define DT_DRV_COMPAT atmel_sam0_spi
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_sam0);
 
 #include "spi_context.h"
 #include <errno.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/dma.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 
 #ifndef SERCOM_SPI_CTRLA_MODE_SPI_MASTER_Val
diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c
index 5e960878b5..0fdb3eb489 100644
--- a/drivers/spi/spi_sifive.c
+++ b/drivers/spi/spi_sifive.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT sifive_spi0
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_sifive);
 
 #include "spi_sifive.h"
diff --git a/drivers/spi/spi_sifive.h b/drivers/spi/spi_sifive.h
index b75b6cd6c6..6cb6313722 100644
--- a/drivers/spi/spi_sifive.h
+++ b/drivers/spi/spi_sifive.h
@@ -9,10 +9,10 @@
 
 #include "spi_context.h"
 
-#include <sys/sys_io.h>
-#include <device.h>
-#include <drivers/spi.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define SPI_CFG(dev) ((struct spi_sifive_cfg *) ((dev)->config))
 #define SPI_DATA(dev) ((struct spi_sifive_data *) ((dev)->data))
diff --git a/drivers/spi/spi_test.c b/drivers/spi/spi_test.c
index ef069ca537..80bd5bfc66 100644
--- a/drivers/spi/spi_test.c
+++ b/drivers/spi/spi_test.c
@@ -9,8 +9,8 @@
  * devices for the "vnd,spi" devicetree compatible used in test code.
  */
 
-#include <zephyr.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
 
 #define DT_DRV_COMPAT vnd_spi
 
diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c
index 5662c521a1..9fa5ff4062 100644
--- a/drivers/spi/spi_xec_qmspi.c
+++ b/drivers/spi/spi_xec_qmspi.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT microchip_xec_qmspi
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_xec, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
 #include <errno.h>
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 #include <soc.h>
 
 /* Device constant configuration parameters */
diff --git a/drivers/spi/spi_xec_qmspi_ldma.c b/drivers/spi/spi_xec_qmspi_ldma.c
index e601b6c04c..f67249e532 100644
--- a/drivers/spi/spi_xec_qmspi_ldma.c
+++ b/drivers/spi/spi_xec_qmspi_ldma.c
@@ -6,27 +6,27 @@
 
 #define DT_DRV_COMPAT microchip_xec_qmspi_ldma
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(spi_xec, CONFIG_SPI_LOG_LEVEL);
 
 #include <errno.h>
-#include <device.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/gpio.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <drivers/pinctrl.h>
-#include <drivers/pinmux.h>
-#include <drivers/spi.h>
-#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
-#include <sys/sys_io.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/pinmux.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/util.h>
 #include <soc.h>
 
 #include "spi_context.h"
 
 /* #define XEC_QMSPI_DEBUG */
 #ifdef XEC_QMSPI_DEBUG
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #endif
 
 
diff --git a/drivers/spi/spi_xlnx_axi_quadspi.c b/drivers/spi/spi_xlnx_axi_quadspi.c
index cdccd989fd..ca126d90da 100644
--- a/drivers/spi/spi_xlnx_axi_quadspi.c
+++ b/drivers/spi/spi_xlnx_axi_quadspi.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT xlnx_xps_spi_2_00_a
 
-#include <device.h>
-#include <drivers/spi.h>
-#include <sys/sys_io.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(xlnx_quadspi, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"
diff --git a/drivers/syscon/syscon.c b/drivers/syscon/syscon.c
index 5a0ccee586..569ce5698b 100644
--- a/drivers/syscon/syscon.c
+++ b/drivers/syscon/syscon.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT syscon
 
-#include <sys/util.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <drivers/syscon.h>
+#include <zephyr/drivers/syscon.h>
 
 #include "syscon_common.h"
 
diff --git a/drivers/syscon/syscon_common.h b/drivers/syscon/syscon_common.h
index dd72c83b41..52ccf6c9b3 100644
--- a/drivers/syscon/syscon_common.h
+++ b/drivers/syscon/syscon_common.h
@@ -6,7 +6,7 @@
 #ifndef DRIVERS_SYSCON_SYSCON_COMMON_H_
 #define DRIVERS_SYSCON_SYSCON_COMMON_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c
index 886a8f8b6d..4744af5c82 100644
--- a/drivers/timer/altera_avalon_timer_hal.c
+++ b/drivers/timer/altera_avalon_timer_hal.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <device.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include <altera_common.h>
 
 #include "altera_avalon_timer_regs.h"
diff --git a/drivers/timer/apic_timer.c b/drivers/timer/apic_timer.c
index a5c33a2a10..24c9d66f60 100644
--- a/drivers/timer/apic_timer.c
+++ b/drivers/timer/apic_timer.c
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <drivers/interrupt_controller/loapic.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
 
 BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
 
diff --git a/drivers/timer/apic_tsc.c b/drivers/timer/apic_tsc.c
index 67a4cbadd5..dcae6e3775 100644
--- a/drivers/timer/apic_tsc.c
+++ b/drivers/timer/apic_tsc.c
@@ -2,11 +2,11 @@
  * Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <drivers/interrupt_controller/loapic.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
 
 #define IA32_TSC_DEADLINE_MSR 0x6e0
 #define IA32_TSC_ADJUST_MSR   0x03b
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index cad96f286f..51db98062b 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -4,11 +4,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <arch/arc/v2/aux_regs.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/arch/arc/v2/aux_regs.h>
 #include <soc.h>
 /*
  * note: This implementation assumes Timer0 is present. Be sure
diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c
index 63a8171854..b10878c0b7 100644
--- a/drivers/timer/arm_arch_timer.c
+++ b/drivers/timer/arm_arch_timer.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/arm_arch_timer.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/arm_arch_timer.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/arch/cpu.h>
 
 #define CYC_PER_TICK	((uint64_t)sys_clock_hw_cycles_per_sec() \
 			/ (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC)
diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c
index f65c349a84..f1d7cfb8fa 100644
--- a/drivers/timer/cavs_timer.c
+++ b/drivers/timer/cavs_timer.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 #include <cavs-idc.h>
 #include <cavs-shim.h>
 
diff --git a/drivers/timer/cc13x2_cc26x2_rtc_timer.c b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
index e90b6f4316..4afa03e62b 100644
--- a/drivers/timer/cc13x2_cc26x2_rtc_timer.c
+++ b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
@@ -15,11 +15,11 @@
  * the comparator value set is reached.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
 
 #include <driverlib/interrupt.h>
 #include <driverlib/aon_rtc.h>
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index 4679ef2baf..fbf887d0f5 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #define COUNTER_MAX 0x00ffffff
 #define TIMER_STOPPED 0xff000000
diff --git a/drivers/timer/esp32c3_sys_timer.c b/drivers/timer/esp32c3_sys_timer.c
index 11c398d4c0..fed61c2b28 100644
--- a/drivers/timer/esp32c3_sys_timer.c
+++ b/drivers/timer/esp32c3_sys_timer.c
@@ -13,11 +13,11 @@
 #include <rom/ets_sys.h>
 #include <esp_attr.h>
 
-#include <drivers/interrupt_controller/intc_esp32c3.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #define CYC_PER_TICK ((uint32_t)((uint64_t)sys_clock_hw_cycles_per_sec()	\
 			      / (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index 4e0eda30e2..1f6ed0e413 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -5,14 +5,14 @@
  */
 
 #define DT_DRV_COMPAT intel_hpet
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <irq.h>
-#include <linker/sections.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/irq.h>
+#include <zephyr/linker/sections.h>
 
-#include <dt-bindings/interrupt-controller/intel-ioapic.h>
+#include <zephyr/dt-bindings/interrupt-controller/intel-ioapic.h>
 
 #include <soc.h>
 
diff --git a/drivers/timer/ite_it8xxx2_timer.c b/drivers/timer/ite_it8xxx2_timer.c
index e0eaaab024..14a6b047d0 100644
--- a/drivers/timer/ite_it8xxx2_timer.c
+++ b/drivers/timer/ite_it8xxx2_timer.c
@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_timer
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 #include <soc.h>
-#include <spinlock.h>
-#include <sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys_clock.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(timer, LOG_LEVEL_ERR);
 
 BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 32768,
diff --git a/drivers/timer/leon_gptimer.c b/drivers/timer/leon_gptimer.c
index 3409ba671f..6d47ce1d82 100644
--- a/drivers/timer/leon_gptimer.c
+++ b/drivers/timer/leon_gptimer.c
@@ -12,9 +12,9 @@
 
 #define DT_DRV_COMPAT gaisler_gptimer
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
 
 /* GPTIMER subtimer increments each microsecond. */
 #define PRESCALER (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 1000000)
diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c
index 74f8306cc4..01711db74d 100644
--- a/drivers/timer/litex_timer.c
+++ b/drivers/timer/litex_timer.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT litex_timer0
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <device.h>
-#include <irq.h>
-#include <spinlock.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/irq.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/drivers/timer/system_timer.h>
 
 #define TIMER_LOAD_ADDR		DT_INST_REG_ADDR_BY_NAME(0, load)
 #define TIMER_RELOAD_ADDR	DT_INST_REG_ADDR_BY_NAME(0, reload)
diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c
index e094bf08b3..24a05d3294 100644
--- a/drivers/timer/mchp_xec_rtos_timer.c
+++ b/drivers/timer/mchp_xec_rtos_timer.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT microchip_xec_rtos_timer
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "XEC RTOS timer doesn't support SMP");
 BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 32768,
diff --git a/drivers/timer/mcux_gpt_timer.c b/drivers/timer/mcux_gpt_timer.c
index 54efc8e702..9c4992a5a6 100644
--- a/drivers/timer/mcux_gpt_timer.c
+++ b/drivers/timer/mcux_gpt_timer.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT nxp_gpt_hw_timer
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include <fsl_gpt.h>
-#include <sys_clock.h>
-#include <spinlock.h>
-#include <sys/time_units.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/time_units.h>
 
 
 
diff --git a/drivers/timer/mcux_lptmr_timer.c b/drivers/timer/mcux_lptmr_timer.c
index e95138a22a..9166ca5677 100644
--- a/drivers/timer/mcux_lptmr_timer.c
+++ b/drivers/timer/mcux_lptmr_timer.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_lptmr
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include <fsl_lptmr.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index 4b79a94b0d..bebb77134e 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT nxp_os_timer
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 #include "fsl_ostimer.h"
 #include "fsl_power.h"
 
diff --git a/drivers/timer/mips_cp0_timer.c b/drivers/timer/mips_cp0_timer.c
index ff24809308..31a6c35bb6 100644
--- a/drivers/timer/mips_cp0_timer.c
+++ b/drivers/timer/mips_cp0_timer.c
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 #include <soc.h>
 #include <mips/mipsregs.h>
 
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index 290d1ea523..cd7e878289 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -13,11 +13,11 @@
 #include "zephyr/types.h"
 #include "irq.h"
 #include "device.h"
-#include <drivers/timer/system_timer.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include "sys_clock.h"
 #include "timer_model.h"
 #include "soc.h"
-#include <arch/posix/posix_trace.h>
+#include <zephyr/arch/posix/posix_trace.h>
 
 static uint64_t tick_period; /* System tick period in microseconds */
 /* Time (microseconds since boot) of the last timer tick interrupt */
diff --git a/drivers/timer/npcx_itim_timer.c b/drivers/timer/npcx_itim_timer.c
index b85a8a8228..414bde7e8c 100644
--- a/drivers/timer/npcx_itim_timer.c
+++ b/drivers/timer/npcx_itim_timer.c
@@ -34,14 +34,14 @@
  *   "sleep/deep sleep" power state if CONFIG_PM is enabled.
  */
 
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(itim, LOG_LEVEL_ERR);
 
 #define NPCX_ITIM32_MAX_CNT 0xffffffff
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index fdcd9920a9..051bf1cce2 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
-#include <drivers/timer/system_timer.h>
-#include <drivers/timer/nrf_rtc_timer.h>
-#include <sys_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/drivers/timer/nrf_rtc_timer.h>
+#include <zephyr/sys_clock.h>
 #include <hal/nrf_rtc.h>
 
 #define EXT_CHAN_COUNT CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT
diff --git a/drivers/timer/rcar_cmt_timer.c b/drivers/timer/rcar_cmt_timer.c
index 0e81b8a2ec..eb20390dad 100644
--- a/drivers/timer/rcar_cmt_timer.c
+++ b/drivers/timer/rcar_cmt_timer.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/timer/system_timer.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/rcar_clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/rcar_clock_control.h>
 
 #define DT_DRV_COMPAT renesas_rcar_cmt
 
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index 1584a6dc5a..f8e5542637 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 #include <soc.h>
 
 #define CYC_PER_TICK ((uint32_t)((uint64_t) (sys_clock_hw_cycles_per_sec()			 \
diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
index db6101fda4..ceeebd71f3 100644
--- a/drivers/timer/rv32m1_lptmr_timer.c
+++ b/drivers/timer/rv32m1_lptmr_timer.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT openisa_rv32m1_lptmr
 
-#include <device.h>
-#include <zephyr.h>
-#include <sys/util.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include <soc.h>
 
 /*
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index cc35b5e3fa..074106836e 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -16,12 +16,12 @@
  * generate an interrupt every tick.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
-#include <drivers/timer/system_timer.h>
-#include <drivers/pinctrl.h>
-#include <sys_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/drivers/pinctrl.h>
+#include <zephyr/sys_clock.h>
 
 /* RTC registers. */
 #define RTC0 ((RtcMode0 *) DT_INST_REG_ADDR(0))
diff --git a/drivers/timer/stm32_lptim_timer.c b/drivers/timer/stm32_lptim_timer.c
index 9b9c56d435..e931930a74 100644
--- a/drivers/timer/stm32_lptim_timer.c
+++ b/drivers/timer/stm32_lptim_timer.c
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stm32_ll_lptim.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_system.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
 
-#include <spinlock.h>
+#include <zephyr/spinlock.h>
 
 /*
  * Assumptions and limitations:
diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c
index 5de7fa28a5..5ac8f034ec 100644
--- a/drivers/timer/sys_clock_init.c
+++ b/drivers/timer/sys_clock_init.c
@@ -12,9 +12,9 @@
  * duplication.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/timer/system_timer.h>
 
 /* Weak-linked noop defaults for optional driver interfaces*/
 
diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c
index 0cc4fc43db..a7b3372af8 100644
--- a/drivers/timer/xlnx_psttc_timer.c
+++ b/drivers/timer/xlnx_psttc_timer.c
@@ -7,9 +7,9 @@
 
 #define DT_DRV_COMPAT xlnx_ttcps
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/timer/system_timer.h>
+#include <zephyr/drivers/timer/system_timer.h>
 #include "xlnx_psttc_timer_priv.h"
 
 #define TIMER_INDEX		CONFIG_XLNX_PSTTC_TIMER_INDEX
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index 752f93a3d5..60355bde26 100644
--- a/drivers/timer/xtensa_sys_timer.c
+++ b/drivers/timer/xtensa_sys_timer.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <sys_clock.h>
-#include <spinlock.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/spinlock.h>
 
 #define TIMER_IRQ UTIL_CAT(XCHAL_TIMER,		\
 			   UTIL_CAT(CONFIG_XTENSA_TIMER_ID, _INTERRUPT))
diff --git a/drivers/usb/device/usb_dc_dw.c b/drivers/usb/device/usb_dc_dw.c
index 77e2ba98ea..e1e464c7fe 100644
--- a/drivers/usb/device/usb_dc_dw.c
+++ b/drivers/usb/device/usb_dc_dw.c
@@ -18,13 +18,13 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include "usb_dw_registers.h"
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_dw);
 
 /* Number of SETUP back-to-back packets */
diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c
index b5c3ce7443..78294330df 100644
--- a/drivers/usb/device/usb_dc_kinetis.c
+++ b/drivers/usb/device/usb_dc_kinetis.c
@@ -11,13 +11,13 @@
 #include <soc.h>
 #include <string.h>
 #include <stdio.h>
-#include <kernel.h>
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/device.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_kinetis);
 
 #define NUM_OF_EP_MAX		DT_INST_PROP(0, num_bidir_endpoints)
diff --git a/drivers/usb/device/usb_dc_mcux.c b/drivers/usb/device/usb_dc_mcux.c
index c02018ef8f..5190d21e8e 100644
--- a/drivers/usb/device/usb_dc_mcux.c
+++ b/drivers/usb/device/usb_dc_mcux.c
@@ -9,10 +9,10 @@
 
 #include <soc.h>
 #include <string.h>
-#include <drivers/usb/usb_dc.h>
-#include <usb/usb_device.h>
+#include <zephyr/drivers/usb/usb_dc.h>
+#include <zephyr/usb/usb_device.h>
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include "usb_dc_mcux.h"
 #ifdef CONFIG_USB_DC_NXP_EHCI
 #include "usb_device_ehci.h"
@@ -25,7 +25,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_mcux);
 
 static void usb_isr_handler(void);
diff --git a/drivers/usb/device/usb_dc_native_posix.c b/drivers/usb/device/usb_dc_native_posix.c
index 9d7f74c77f..107cbfabf7 100644
--- a/drivers/usb/device/usb_dc_native_posix.c
+++ b/drivers/usb/device/usb_dc_native_posix.c
@@ -11,15 +11,15 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <sys/byteorder.h>
-#include <drivers/usb/usb_dc.h>
-#include <usb/usb_device.h>
-#include <net/net_ip.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/usb/usb_dc.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/net/net_ip.h>
 
 #include "usb_dc_native_posix_adapt.h"
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(native_posix);
 
 #define USBIP_IN_EP_NUM		8
diff --git a/drivers/usb/device/usb_dc_native_posix_adapt.c b/drivers/usb/device/usb_dc_native_posix_adapt.c
index c66a3e53f5..f62b624249 100644
--- a/drivers/usb/device/usb_dc_native_posix_adapt.c
+++ b/drivers/usb/device/usb_dc_native_posix_adapt.c
@@ -24,8 +24,8 @@
 #include <arpa/inet.h>
 
 /* Zephyr headers */
-#include <kernel.h>
-#include <usb/usb_device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/usb/usb_device.h>
 
 #include <posix_board_if.h>
 #include "usb_dc_native_posix_adapt.h"
diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index 8004dd5529..97e83d91a6 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -16,17 +16,17 @@
 #include <soc.h>
 #include <string.h>
 #include <stdio.h>
-#include <kernel.h>
-#include <drivers/usb/usb_dc.h>
-#include <usb/usb_device.h>
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/usb/usb_dc.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #include <nrfx_usbd.h>
 #include <nrfx_power.h>
 
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_nrfx);
 
 /* USB device controller access from devicetree */
diff --git a/drivers/usb/device/usb_dc_sam0.c b/drivers/usb/device/usb_dc_sam0.c
index c6da3944f1..d00566e97c 100644
--- a/drivers/usb/device/usb_dc_sam0.c
+++ b/drivers/usb/device/usb_dc_sam0.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT atmel_sam0_usb
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_sam0);
 
-#include <usb/usb_device.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/drivers/pinctrl.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/usb/device/usb_dc_sam_usbc.c b/drivers/usb/device/usb_dc_sam_usbc.c
index 0f28f5ee53..ef04c8dded 100644
--- a/drivers/usb/device/usb_dc_sam_usbc.c
+++ b/drivers/usb/device/usb_dc_sam_usbc.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT atmel_sam_usbc
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_sam_usbc, CONFIG_USB_DRIVER_LOG_LEVEL);
 
-#include <kernel.h>
-#include <usb/usb_device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/usb/usb_device.h>
 #include <soc.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/pinctrl.h>
 
 #define EP_UDINT_MASK           0x000FF000
 
diff --git a/drivers/usb/device/usb_dc_sam_usbhs.c b/drivers/usb/device/usb_dc_sam_usbhs.c
index b01a6a3f50..b5e1aa2c4c 100644
--- a/drivers/usb/device/usb_dc_sam_usbhs.c
+++ b/drivers/usb/device/usb_dc_sam_usbhs.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT atmel_sam_usbhs
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #include <soc.h>
 #include <string.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_sam_usbhs);
 
 /*
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index 74a792f1d9..6854dc803c 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -20,15 +20,15 @@
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_system.h>
 #include <string.h>
-#include <usb/usb_device.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pinctrl.h>
 #include "stm32_hsem.h"
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_stm32);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otgfs) && DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs)
diff --git a/drivers/usb/device/usb_dw_registers.h b/drivers/usb/device/usb_dw_registers.h
index bc53a0464e..71c5f5b430 100644
--- a/drivers/usb/device/usb_dw_registers.h
+++ b/drivers/usb/device/usb_dw_registers.h
@@ -15,7 +15,7 @@
 #ifndef ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_
 #define ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/usbc/tcpc/ucpd_stm32.c b/drivers/usbc/tcpc/ucpd_stm32.c
index febb21a39a..ef647060f4 100644
--- a/drivers/usbc/tcpc/ucpd_stm32.c
+++ b/drivers/usbc/tcpc/ucpd_stm32.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT st_stm32_ucpd
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ucpd_stm32, CONFIG_USBC_LOG_LEVEL);
 
-#include <device.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stddef.h>
-#include <math/ilog2.h>
+#include <zephyr/math/ilog2.h>
 #include <stm32g0xx_ll_system.h>
 
 #include "ucpd_stm32_priv.h"
diff --git a/drivers/usbc/tcpc/ucpd_stm32_priv.h b/drivers/usbc/tcpc/ucpd_stm32_priv.h
index 01a7468b4f..abca1d2ae1 100644
--- a/drivers/usbc/tcpc/ucpd_stm32_priv.h
+++ b/drivers/usbc/tcpc/ucpd_stm32_priv.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_USBC_DEVICE_UCPD_STM32_PRIV_H_
 #define ZEPHYR_DRIVERS_USBC_DEVICE_UCPD_STM32_PRIV_H_
 
-#include <sys/util.h>
-#include <drivers/usbc/usbc_tcpc.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/usbc/usbc_tcpc.h>
 #include <stm32_ll_ucpd.h>
 
 /**
diff --git a/drivers/video/mt9m114.c b/drivers/video/mt9m114.c
index 5b79c516b7..d808f39572 100644
--- a/drivers/video/mt9m114.c
+++ b/drivers/video/mt9m114.c
@@ -5,16 +5,16 @@
  */
 
 #define DT_DRV_COMPAT aptina_mt9m114
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <drivers/video.h>
-#include <drivers/i2c.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/i2c.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mt9m114);
 
 #define MT9M114_CHIP_ID_VAL				0x2481
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index bc15bd3f7d..7643edcb3a 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -5,15 +5,15 @@
  */
 
 #define DT_DRV_COMPAT ovti_ov2640
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
-#include <drivers/video.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ov2640);
 
 /* DSP register bank FF=0x00*/
diff --git a/drivers/video/ov7725.c b/drivers/video/ov7725.c
index 14e05fd711..1aefee42b5 100644
--- a/drivers/video/ov7725.c
+++ b/drivers/video/ov7725.c
@@ -5,17 +5,17 @@
  */
 
 #define DT_DRV_COMPAT ovti_ov7725
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <drivers/video.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ov7725);
 
 #define OV7725_REVISION  0x7721U
diff --git a/drivers/video/video_common.c b/drivers/video/video_common.c
index 6042439d2c..64a2af7352 100644
--- a/drivers/video/video_common.c
+++ b/drivers/video/video_common.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <drivers/video.h>
+#include <zephyr/drivers/video.h>
 
 K_HEAP_DEFINE(video_buffer_pool,
 	      CONFIG_VIDEO_BUFFER_POOL_SZ_MAX *
diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c
index a2a6c1927e..788f68e30c 100644
--- a/drivers/video/video_mcux_csi.c
+++ b/drivers/video/video_mcux_csi.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_imx_csi
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <fsl_csi.h>
 
@@ -14,8 +14,8 @@
 #include <fsl_cache.h>
 #endif
 
-#include <drivers/video.h>
-#include <drivers/pinctrl.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/pinctrl.h>
 
 struct video_mcux_csi_config {
 	CSI_Type *base;
diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c
index 713fa38dfc..eb43bf5ef2 100644
--- a/drivers/video/video_sw_generator.c
+++ b/drivers/video/video_sw_generator.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <drivers/video.h>
+#include <zephyr/drivers/video.h>
 
 #define VIDEO_PATTERN_COLOR_BAR	0
 #define VIDEO_PATTERN_FPS	30
diff --git a/drivers/virtualization/virt_ivshmem.c b/drivers/virtualization/virt_ivshmem.c
index f4b780a434..3c10f154e3 100644
--- a/drivers/virtualization/virt_ivshmem.c
+++ b/drivers/virtualization/virt_ivshmem.c
@@ -7,19 +7,19 @@
 #define DT_DRV_COMPAT qemu_ivshmem
 
 #define LOG_LEVEL CONFIG_IVSHMEM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ivshmem);
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <drivers/virtualization/ivshmem.h>
+#include <zephyr/drivers/virtualization/ivshmem.h>
 #include "virt_ivshmem.h"
 
 #ifdef CONFIG_IVSHMEM_DOORBELL
diff --git a/drivers/virtualization/virt_ivshmem.h b/drivers/virtualization/virt_ivshmem.h
index b3e2b93508..9eef358864 100644
--- a/drivers/virtualization/virt_ivshmem.h
+++ b/drivers/virtualization/virt_ivshmem.h
@@ -7,8 +7,8 @@
 #ifndef ZEPHYR_DRIVERS_VIRTUALIZATION_VIRT_IVSHMEM_H_
 #define ZEPHYR_DRIVERS_VIRTUALIZATION_VIRT_IVSHMEM_H_
 
-#include <drivers/pcie/pcie.h>
-#include <drivers/pcie/msi.h>
+#include <zephyr/drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/msi.h>
 
 #define IVSHMEM_VENDOR_ID		0x1AF4
 #define IVSHMEM_DEVICE_ID		0x1110
diff --git a/drivers/virtualization/virt_ivshmem_handlers.c b/drivers/virtualization/virt_ivshmem_handlers.c
index 303da54445..64ecaa70ba 100644
--- a/drivers/virtualization/virt_ivshmem_handlers.c
+++ b/drivers/virtualization/virt_ivshmem_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/virtualization/ivshmem.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/virtualization/ivshmem.h>
+#include <zephyr/syscall_handler.h>
 #include <string.h>
 
 static inline size_t z_vrfy_ivshmem_get_mem(const struct device *dev,
diff --git a/drivers/virtualization/virt_ivshmem_shell.c b/drivers/virtualization/virt_ivshmem_shell.c
index c5f5d219f9..6360e55db0 100644
--- a/drivers/virtualization/virt_ivshmem_shell.c
+++ b/drivers/virtualization/virt_ivshmem_shell.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <drivers/virtualization/ivshmem.h>
+#include <zephyr/drivers/virtualization/ivshmem.h>
 
 static const struct device *ivshmem;
 
diff --git a/drivers/watchdog/wdt_cc32xx.c b/drivers/watchdog/wdt_cc32xx.c
index 2319fcc763..fbe7deb934 100644
--- a/drivers/watchdog/wdt_cc32xx.c
+++ b/drivers/watchdog/wdt_cc32xx.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT ti_cc32xx_watchdog
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 #include <errno.h>
 
@@ -22,8 +22,8 @@
 #define MAX_RELOAD_VALUE        0xFFFFFFFF
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 LOG_MODULE_REGISTER(wdt_cc32xx);
 
 struct wdt_cc32xx_data {
diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c
index 8351014cc9..9156c9db05 100644
--- a/drivers/watchdog/wdt_cmsdk_apb.c
+++ b/drivers/watchdog/wdt_cmsdk_apb.c
@@ -12,9 +12,9 @@
 
 #include <errno.h>
 #include <soc.h>
-#include <drivers/watchdog.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/reboot.h>
 
 struct wdog_cmsdk_apb {
 	/* offset: 0x000 (r/w) watchdog load register */
diff --git a/drivers/watchdog/wdt_counter.c b/drivers/watchdog/wdt_counter.c
index bc39448a0c..2fe2530eae 100644
--- a/drivers/watchdog/wdt_counter.c
+++ b/drivers/watchdog/wdt_counter.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/watchdog.h>
-#include <drivers/counter.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #define WDT_CHANNEL_COUNT DT_PROP(DT_WDT_COUNTER, num_channels)
 #define DT_WDT_COUNTER DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_counter_watchdog)
diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index e1dbf0f5f4..07e88a2b0e 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -13,16 +13,16 @@
 #include <hal/wdt_hal.h>
 
 #include <string.h>
-#include <drivers/watchdog.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control.h>
 #ifndef CONFIG_SOC_ESP32C3
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #else
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #endif
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_esp32, CONFIG_WDT_LOG_LEVEL);
 
 #ifdef CONFIG_SOC_ESP32C3
diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c
index 3c8403119d..6e02a2327c 100644
--- a/drivers/watchdog/wdt_gecko.c
+++ b/drivers/watchdog/wdt_gecko.c
@@ -8,11 +8,11 @@
 #define DT_DRV_COMPAT silabs_gecko_wdog
 
 #include <soc.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <em_wdog.h>
 #include <em_cmu.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_gecko, CONFIG_WDT_LOG_LEVEL);
 
 #ifdef cmuClock_CORELE
diff --git a/drivers/watchdog/wdt_handlers.c b/drivers/watchdog/wdt_handlers.c
index 37cbb3db9d..2af0785144 100644
--- a/drivers/watchdog/wdt_handlers.c
+++ b/drivers/watchdog/wdt_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/watchdog.h>
-#include <syscall_handler.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/syscall_handler.h>
 
 static inline int z_vrfy_wdt_setup(const struct device *dev, uint8_t options)
 {
diff --git a/drivers/watchdog/wdt_ite_it8xxx2.c b/drivers/watchdog/wdt_ite_it8xxx2.c
index 2bff9c41bb..88d40afe7a 100644
--- a/drivers/watchdog/wdt_ite_it8xxx2.c
+++ b/drivers/watchdog/wdt_ite_it8xxx2.c
@@ -5,11 +5,11 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_watchdog
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <errno.h>
 #include <soc.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
 LOG_MODULE_REGISTER(wdt_ite_it8xxx2);
 
diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c
index c13d3f77e5..7f4554b112 100644
--- a/drivers/watchdog/wdt_iwdg_stm32.c
+++ b/drivers/watchdog/wdt_iwdg_stm32.c
@@ -9,7 +9,7 @@
 
 #define DT_DRV_COMPAT st_stm32_watchdog
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_iwdg.h>
diff --git a/drivers/watchdog/wdt_mchp_xec.c b/drivers/watchdog/wdt_mchp_xec.c
index f46e653b57..b82199020b 100644
--- a/drivers/watchdog/wdt_mchp_xec.c
+++ b/drivers/watchdog/wdt_mchp_xec.c
@@ -9,10 +9,10 @@
  */
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_mchp_xec);
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 #include <errno.h>
 
diff --git a/drivers/watchdog/wdt_mcux_imx_wdog.c b/drivers/watchdog/wdt_mcux_imx_wdog.c
index 958a93f994..da3d619a15 100644
--- a/drivers/watchdog/wdt_mcux_imx_wdog.c
+++ b/drivers/watchdog/wdt_mcux_imx_wdog.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT nxp_imx_wdog
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <fsl_wdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_mcux_wdog);
 
 #define WDOG_TMOUT_SEC(x)  (((x * 2) / MSEC_PER_SEC) - 1)
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index 6b5c3ff22e..cfddb336df 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -7,12 +7,12 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_wdog
 
-#include <drivers/watchdog.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_wdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_mcux_wdog);
 
 #define MIN_TIMEOUT 4
diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c
index 1b2c83640f..650dca841a 100644
--- a/drivers/watchdog/wdt_mcux_wdog32.c
+++ b/drivers/watchdog/wdt_mcux_wdog32.c
@@ -9,12 +9,12 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_wdog32
 
-#include <drivers/watchdog.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/drivers/clock_control.h>
 #include <fsl_wdog32.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_mcux_wdog32);
 
 #define MIN_TIMEOUT 1
diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c
index f92fe927b3..754e4f3645 100644
--- a/drivers/watchdog/wdt_mcux_wwdt.c
+++ b/drivers/watchdog/wdt_mcux_wwdt.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT nxp_lpc_wwdt
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <fsl_wwdt.h>
 #include <fsl_clock.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_mcux_wwdt);
 
 #define MIN_TIMEOUT 0xFF
diff --git a/drivers/watchdog/wdt_npcx.c b/drivers/watchdog/wdt_npcx.c
index 3924e935de..d70afdbf14 100644
--- a/drivers/watchdog/wdt_npcx.c
+++ b/drivers/watchdog/wdt_npcx.c
@@ -29,13 +29,13 @@
  */
 
 #include <assert.h>
-#include <drivers/gpio.h>
-#include <drivers/clock_control.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 
 #include "soc_miwu.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_npcx, CONFIG_WDT_LOG_LEVEL);
 
 /* Watchdog operating frequency is fixed to LFCLK (32.768) kHz */
diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index 91d2b186e0..0fd39596db 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -5,10 +5,10 @@
  */
 
 #include <nrfx_wdt.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_nrfx);
 
 struct wdt_nrfx_data {
diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c
index a6055b0af4..b54d795394 100644
--- a/drivers/watchdog/wdt_sam.c
+++ b/drivers/watchdog/wdt_sam.c
@@ -19,11 +19,11 @@
  *   CONFIG_WDT_DISABLE_AT_BOOT must be unset in the app's config file
  */
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_sam);
 
 #define SAM_PRESCALAR   128
diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c
index ac94f6342e..b760a4ba56 100644
--- a/drivers/watchdog/wdt_sam0.c
+++ b/drivers/watchdog/wdt_sam0.c
@@ -8,10 +8,10 @@
 #define DT_DRV_COMPAT atmel_sam0_watchdog
 
 #include <soc.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_sam0);
 
 #define WDT_REGS ((Wdt *)DT_INST_REG_ADDR(0))
diff --git a/drivers/watchdog/wdt_sifive.c b/drivers/watchdog/wdt_sifive.c
index 16a2e51659..4e3726fc01 100644
--- a/drivers/watchdog/wdt_sifive.c
+++ b/drivers/watchdog/wdt_sifive.c
@@ -10,12 +10,12 @@
 
 #define DT_DRV_COMPAT sifive_wdt
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_sifive);
 
 #define WDOGCFG_SCALE_MAX     0xf
diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c
index e82db7b33d..1a2bbc2eda 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.c
+++ b/drivers/watchdog/wdt_wwdg_stm32.c
@@ -6,20 +6,20 @@
 
 #define DT_DRV_COMPAT st_stm32_window_watchdog
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_wwdg.h>
 #include <stm32_ll_system.h>
 #include <errno.h>
-#include <sys/__assert.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "wdt_wwdg_stm32.h"
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_wwdg_stm32);
 
 #define WWDG_INTERNAL_DIVIDER   4096U
diff --git a/drivers/watchdog/wdt_wwdg_stm32.h b/drivers/watchdog/wdt_wwdg_stm32.h
index c1cbe66594..4ed47452e2 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.h
+++ b/drivers/watchdog/wdt_wwdg_stm32.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_DRIVERS_WATCHDOG_WWDG_STM32_H_
 
 #include <zephyr/types.h>
-#include <drivers/clock_control/stm32_clock_control.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 
 /**
  * @brief Driver for System Window Watchdog (WWDG) for STM32 MCUs
diff --git a/drivers/wifi/esp32/src/esp_wifi_drv.c b/drivers/wifi/esp32/src/esp_wifi_drv.c
index e6b1c4b502..15af68ee36 100644
--- a/drivers/wifi/esp32/src/esp_wifi_drv.c
+++ b/drivers/wifi/esp32/src/esp_wifi_drv.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT espressif_esp32_wifi
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_wifi, CONFIG_WIFI_LOG_LEVEL);
 
-#include <net/ethernet.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <device.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <ethernet/eth_stats.h>
 #include "esp_networking_priv.h"
diff --git a/drivers/wifi/esp_at/esp.c b/drivers/wifi/esp_at/esp.c
index 251034e949..fe0c3cde42 100644
--- a/drivers/wifi/esp_at/esp.c
+++ b/drivers/wifi/esp_at/esp.c
@@ -7,25 +7,25 @@
 
 #define DT_DRV_COMPAT espressif_esp_at
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wifi_esp_at, CONFIG_WIFI_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stdlib.h>
 
-#include <drivers/gpio.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/uart.h>
 
-#include <net/dns_resolve.h>
-#include <net/net_if.h>
-#include <net/net_ip.h>
-#include <net/net_offload.h>
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/wifi_mgmt.h>
 
 #include "esp.h"
 
diff --git a/drivers/wifi/esp_at/esp.h b/drivers/wifi/esp_at/esp.h
index 9ce2a5e517..2a08b33844 100644
--- a/drivers/wifi/esp_at/esp.h
+++ b/drivers/wifi/esp_at/esp.h
@@ -8,12 +8,12 @@
 #ifndef ZEPHYR_INCLUDE_DRIVERS_WIFI_ESP_AT_ESP_H_
 #define ZEPHYR_INCLUDE_DRIVERS_WIFI_ESP_AT_ESP_H_
 
-#include <kernel.h>
-#include <net/net_context.h>
-#include <net/net_if.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/wifi_mgmt.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/wifi_mgmt.h>
 
 #include "modem_context.h"
 #include "modem_cmd_handler.h"
diff --git a/drivers/wifi/esp_at/esp_offload.c b/drivers/wifi/esp_at/esp_offload.c
index c9fac55e78..a0b5dbb2b9 100644
--- a/drivers/wifi/esp_at/esp_offload.c
+++ b/drivers/wifi/esp_at/esp_offload.c
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wifi_esp_at_offload, CONFIG_WIFI_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_offload.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_offload.h>
 
 #include "esp.h"
 
diff --git a/drivers/wifi/esp_at/esp_socket.c b/drivers/wifi/esp_at/esp_socket.c
index c83fb27e99..0dc922ee05 100644
--- a/drivers/wifi/esp_at/esp_socket.c
+++ b/drivers/wifi/esp_at/esp_socket.c
@@ -7,7 +7,7 @@
 
 #include "esp.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(wifi_esp_at, CONFIG_WIFI_LOG_LEVEL);
 
 #define RX_NET_PKT_ALLOC_TIMEOUT				\
diff --git a/drivers/wifi/eswifi/eswifi.h b/drivers/wifi/eswifi/eswifi.h
index ebe30a1452..b982cc39c6 100644
--- a/drivers/wifi/eswifi/eswifi.h
+++ b/drivers/wifi/eswifi/eswifi.h
@@ -7,12 +7,12 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_ESWIFI_ESWIFI_H_
 #define ZEPHYR_DRIVERS_WIFI_ESWIFI_ESWIFI_H_
 
-#include <zephyr.h>
-#include <kernel.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/wifi_mgmt.h>
 
 #include "eswifi_offload.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_bus_spi.c b/drivers/wifi/eswifi/eswifi_bus_spi.c
index b152637cd9..234ff0a802 100644
--- a/drivers/wifi/eswifi/eswifi_bus_spi.c
+++ b/drivers/wifi/eswifi/eswifi_bus_spi.c
@@ -8,13 +8,13 @@
 #include "eswifi_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_bus_uart.c b/drivers/wifi/eswifi/eswifi_bus_uart.c
index 69f312b34b..b008449c01 100644
--- a/drivers/wifi/eswifi/eswifi_bus_uart.c
+++ b/drivers/wifi/eswifi/eswifi_bus_uart.c
@@ -10,14 +10,14 @@
 #include "eswifi_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/ring_buffer.h>
-#include <drivers/gpio.h>
-#include <drivers/uart.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/uart.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
index 88041fce47..0d7895d7e4 100644
--- a/drivers/wifi/eswifi/eswifi_core.c
+++ b/drivers/wifi/eswifi/eswifi_core.c
@@ -13,27 +13,27 @@
 #include "eswifi_log.h"
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <drivers/gpio.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
-#include <net/net_offload.h>
-#include <net/wifi_mgmt.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/wifi_mgmt.h>
 
-#include <net/ethernet.h>
+#include <zephyr/net/ethernet.h>
 #include <net_private.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_log.h b/drivers/wifi/eswifi/eswifi_log.h
index 2fca68273e..378d77dd34 100644
--- a/drivers/wifi/eswifi/eswifi_log.h
+++ b/drivers/wifi/eswifi/eswifi_log.h
@@ -10,6 +10,6 @@
 #define LOG_MODULE_NAME wifi_eswifi
 #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #endif /* ZEPHYR_DRIVERS_WIFI_ESWIFI_ESWIFI_LOG_H_ */
diff --git a/drivers/wifi/eswifi/eswifi_offload.c b/drivers/wifi/eswifi/eswifi_offload.c
index bc64b3ce39..d2beb090ab 100644
--- a/drivers/wifi/eswifi/eswifi_offload.c
+++ b/drivers/wifi/eswifi/eswifi_offload.c
@@ -7,16 +7,16 @@
 #include "eswifi_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include <net/net_pkt.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_offload.h b/drivers/wifi/eswifi/eswifi_offload.h
index 91e0ce4721..ebb405d99a 100644
--- a/drivers/wifi/eswifi/eswifi_offload.h
+++ b/drivers/wifi/eswifi/eswifi_offload.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_ESWIFI_ESWIFI_OFFLOAD_H_
 #define ZEPHYR_DRIVERS_WIFI_ESWIFI_ESWIFI_OFFLOAD_H_
 
-#include <net/net_offload.h>
+#include <zephyr/net/net_offload.h>
 #include "eswifi.h"
 
 #define ESWIFI_OFFLOAD_MAX_SOCKETS 4
diff --git a/drivers/wifi/eswifi/eswifi_shell.c b/drivers/wifi/eswifi/eswifi_shell.c
index b367f49c9c..be53c9d62a 100644
--- a/drivers/wifi/eswifi/eswifi_shell.c
+++ b/drivers/wifi/eswifi/eswifi_shell.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <shell/shell.h>
+#include <zephyr/kernel.h>
+#include <zephyr/shell/shell.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/eswifi/eswifi_socket.c b/drivers/wifi/eswifi/eswifi_socket.c
index 6d4acbef92..fb142066a7 100644
--- a/drivers/wifi/eswifi/eswifi_socket.c
+++ b/drivers/wifi/eswifi/eswifi_socket.c
@@ -7,16 +7,16 @@
 #include "eswifi_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
 #include "eswifi.h"
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 int eswifi_socket_type_from_zephyr(int proto, enum eswifi_transport_type *type)
 {
diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c
index 685f460436..428fe59c97 100644
--- a/drivers/wifi/eswifi/eswifi_socket_offload.c
+++ b/drivers/wifi/eswifi/eswifi_socket_offload.c
@@ -7,23 +7,23 @@
 #include "eswifi_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include <net/socket_offload.h>
-#include <net/tls_credentials.h>
+#include <zephyr/net/socket_offload.h>
+#include <zephyr/net/tls_credentials.h>
 
 #include "sockets_internal.h"
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 #include "tls_internal.h"
 #endif
 #include "eswifi.h"
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 /* Increment by 1 to make sure we do not store the value of 0, which has
  * a special meaning in the fdtable subsys.
diff --git a/drivers/wifi/simplelink/simplelink.c b/drivers/wifi/simplelink/simplelink.c
index 23c12f23be..a93bcf6a30 100644
--- a/drivers/wifi/simplelink/simplelink.c
+++ b/drivers/wifi/simplelink/simplelink.c
@@ -7,14 +7,14 @@
 #include "simplelink_log.h"
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <device.h>
-#include <net/net_if.h>
-#include <net/wifi_mgmt.h>
-#include <net/net_offload.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/net_offload.h>
 #ifdef CONFIG_NET_SOCKETS_OFFLOAD
-#include <net/socket_offload.h>
+#include <zephyr/net/socket_offload.h>
 #endif
 
 #include <ti/drivers/net/wifi/wlan.h>
diff --git a/drivers/wifi/simplelink/simplelink_log.h b/drivers/wifi/simplelink/simplelink_log.h
index 53c5ff34d4..57c2c43ab0 100644
--- a/drivers/wifi/simplelink/simplelink_log.h
+++ b/drivers/wifi/simplelink/simplelink_log.h
@@ -10,6 +10,6 @@
 #define LOG_MODULE_NAME wifi_simplelink
 #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #endif /* ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_LOG_H_ */
diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c
index f65495d3bc..079b770d02 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.c
+++ b/drivers/wifi/simplelink/simplelink_sockets.c
@@ -11,9 +11,9 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 #include <limits.h>
 #include <fcntl.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 /* Define sockaddr, etc, before simplelink.h */
-#include <net/socket_offload.h>
+#include <zephyr/net/socket_offload.h>
 
 #include <errno.h>
 #include <ti/drivers/net/wifi/simplelink.h>
diff --git a/drivers/wifi/simplelink/simplelink_support.c b/drivers/wifi/simplelink/simplelink_support.c
index 9d0f4f7d42..cc58c90681 100644
--- a/drivers/wifi/simplelink/simplelink_support.c
+++ b/drivers/wifi/simplelink/simplelink_support.c
@@ -11,7 +11,7 @@
 #include "simplelink_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdint.h>
 
 #include <ti/drivers/net/wifi/simplelink.h>
diff --git a/drivers/wifi/simplelink/simplelink_support.h b/drivers/wifi/simplelink/simplelink_support.h
index 273aeab1ea..24b3c3cd2d 100644
--- a/drivers/wifi/simplelink/simplelink_support.h
+++ b/drivers/wifi/simplelink/simplelink_support.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
 #define ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
 
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/wifi_mgmt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c
index d9ee285a20..826a9d79ac 100644
--- a/drivers/wifi/winc1500/wifi_winc1500.c
+++ b/drivers/wifi/winc1500/wifi_winc1500.c
@@ -7,23 +7,23 @@
 #define LOG_MODULE_NAME wifi_winc1500
 #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <debug/stack.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_l2.h>
-#include <net/net_context.h>
-#include <net/net_offload.h>
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/wifi_mgmt.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 /* We do not need <socket/include/socket.h>
  * It seems there is a bug in ASF side: if OS is already defining sockaddr
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
index 4e4174b8ce..2d61fc2069 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
@@ -7,9 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_
 #define ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #include "wifi_winc1500_config.h"
 #include <bus_wrapper/include/nm_bus_wrapper.h>
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
index 619dc82427..7a982f36c8 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
@@ -7,14 +7,14 @@
 #define DT_DRV_COMPAT atmel_winc1500
 
 #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(winc1500);
 
 #include <stdio.h>
 #include <stdint.h>
 
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 
 #include "wifi_winc1500_nm_bsp_internal.h"
 
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 2ffbb95a50..3566a874c0 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm64/hypercall.h>
-#include <xen/public/xen.h>
-#include <xen/public/event_channel.h>
-#include <xen/events.h>
+#include <zephyr/arch/arm64/hypercall.h>
+#include <zephyr/xen/public/xen.h>
+#include <zephyr/xen/public/event_channel.h>
+#include <zephyr/xen/events.h>
 
 #include <errno.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(xen_events);
 
diff --git a/drivers/xen/hvm.c b/drivers/xen/hvm.c
index 80895a84ef..c271fb151e 100644
--- a/drivers/xen/hvm.c
+++ b/drivers/xen/hvm.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm64/hypercall.h>
-#include <xen/hvm.h>
-#include <xen/public/hvm/hvm_op.h>
-#include <xen/public/hvm/params.h>
+#include <zephyr/arch/arm64/hypercall.h>
+#include <zephyr/xen/hvm.h>
+#include <zephyr/xen/public/hvm/hvm_op.h>
+#include <zephyr/xen/public/hvm/params.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 int hvm_set_parameter(int idx, uint64_t value)
 {