run zephyr/script/utils/migrate_includes.py

boards/arm/csk6011a_c3_nano/csk6011a_c3_nano.dts

@@ -2,8 +2,8 @@
 
 /dts-v1/;
 #include <csk/csk6011a.dtsi>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include "csk6011a_c3_nano_pinctrl.dtsi"
 
 / {

boards/arm/csk6011a_nano/csk6011a_nano.dts

@@ -2,8 +2,8 @@
 
 /dts-v1/;
 #include <csk/csk6.dtsi>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include "csk6011a_nano_pinctrl.dtsi"
 
 / {

boards/arm/csk6012_c3_nano/csk6012_c3_nano.dts

@@ -2,8 +2,8 @@
 
 /dts-v1/;
 #include <csk/csk6012.dtsi>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include "csk6012_c3_nano_pinctrl.dtsi"
 
 / {

boards/arm/csk6012_nano/csk6012_nano.dts

@@ -2,8 +2,8 @@
 
 /dts-v1/;
 #include <csk/csk6012.dtsi>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/dt-bindings/pwm/pwm.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include "csk6012_nano_pinctrl.dtsi"
 
 / {

drivers/adc/adc_csk6.c

@@ -7,8 +7,8 @@
 #define DT_DRV_COMPAT listenai_csk_adc
 
 #include <assert.h>
-#include <drivers/adc.h>
-#include <kernel.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/drivers/pinctrl.h>
 
@@ -20,7 +20,7 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk6_adc, LOG_LEVEL_WRN);
 
 #define DEV_DATA(dev) ((struct adc_csk6_data * const)(dev)->data)

drivers/adc/adc_csk6_ch32v003.c

@@ -13,7 +13,7 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk6_adc_ch32v003, CONFIG_ADC_LOG_LEVEL);
 
 #include "exmcu_comm.h"

drivers/counter/counter_csk6.c

@@ -5,7 +5,7 @@
 #define DT_DRV_COMPAT listenai_csk_rtc
 
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #include "Driver_RTC.h"
 #include "rtc.h"
 

drivers/counter/counter_csk6_gptchannel.c

@@ -8,7 +8,7 @@
 #include "gpt_timer.h"
 #include "gpt.h"
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 
 #define DEV_CFG(dev)  ((struct counter_csk_config *)(dev)->config)
 #define DEV_DATA(dev) ((struct counter_csk_data *)(dev)->data)

drivers/counter/counter_dual_csk6.c

@@ -7,7 +7,7 @@
 #include "Driver_DUAL_TIMER.h"
 #include "dual_timer.h"
 
-#include <drivers/counter.h>
+#include <zephyr/drivers/counter.h>
 #define DEV_CFG(dev)  ((struct counter_csk_config *)(dev)->config)
 #define DEV_DATA(dev) ((struct counter_csk_data *)(dev)->data)
 #define MAX_FREQ 32000

drivers/crypto/crypto_csk6.c

@@ -5,16 +5,16 @@
  */
 #define DT_DRV_COMPAT listenai_csk_crypto
 
-#include <init.h>
-#include <kernel.h>
-#include <device.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/__assert.h>
 #include "crypto/crypto.h"
 
 #include "Driver_CRYPTO.h"
 #include "crypto.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(crypto_csk6, LOG_LEVEL_DBG);
 
 

drivers/display/display_csk6_lcd.c

 #include "display_csk6_lcd.h"
 #include <stdint.h>
 #include <zephyr/kernel.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LCD_SPI_FAST_CODE __attribute__((section(".itcm")))
 

drivers/dma/dma_csk6.c

@@ -4,11 +4,11 @@
 
 #define DT_DRV_COMPAT listenai_csk_dma
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/dma.h>
-#include <logging/log.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/logging/log.h>
 
 #define DMA_CHANNEL_NUM_MAX DT_INST_PROP(0, dma_channels)
 

drivers/flash/flash_csk6.c

@@ -13,13 +13,13 @@
 #define FLASH_BASE_ADDRESS DT_REG_ADDR_BY_IDX(SOC_NV_FLASH_NODE, 0)
 
 #include <string.h>
-#include <kernel.h>
-#include <cache.h>
-#include <drivers/flash.h>
+#include <zephyr/kernel.h>
+#include <zephyr/cache.h>
+#include <zephyr/drivers/flash.h>
 #include <venus_ap.h>
 #include <spiflash.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_csk6, CONFIG_FLASH_LOG_LEVEL);
 
 

drivers/hwinfo/hwinfo_csk6.c

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <zephyr/init.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk6_hwinfo);
 
 EFUSE_RegDef *efuse = (EFUSE_RegDef *)AON_EFUSECTRL_BASE;

drivers/i2c/i2c_csk6.c

@@ -11,8 +11,8 @@
 
 #include <zephyr/drivers/pinctrl.h>
 
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(i2c_csk, CONFIG_I2C_LOG_LEVEL);
 
 #define DEV_CFG(dev)	 ((const struct i2c_csk_config *const)(dev)->config)

drivers/infrared/infrared_csk6.c

@@ -11,9 +11,9 @@
 
 #include <infrared.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/drivers/pinctrl.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 
 LOG_MODULE_REGISTER(csk6_infrared, CONFIG_LOG_DEFAULT_LEVEL);

drivers/kscan/kscan_bl6xxx.c

@@ -5,10 +5,10 @@
  */
 #include <stdint.h>
 
-#include <drivers/kscan.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #define DT_DRV_COMPAT betterlife_bl6xxx
 

drivers/misc/csk6-exmcu/exmcu_comm.c

@@ -10,7 +10,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(csk6_exmcu_i2c);
 

drivers/pwm/pwm_csk6.c

@@ -10,14 +10,14 @@
 
 #include <soc.h>
 #include <zephyr/drivers/pinctrl.h>
-#include <drivers/pwm.h>
-#include <device.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include "Driver_GPT_PWM.h"
 #include "venus_ap.h"
 #include "cmn_sysctrl_reg_venus.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include "gpt.h"
 
 LOG_MODULE_REGISTER(pwm_csk6, CONFIG_PWM_LOG_LEVEL);

drivers/pwm/pwm_csk6_ch32v003.c

@@ -11,7 +11,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pwm.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(pwm_csk_ch32v003, CONFIG_PWM_LOG_LEVEL);
 

drivers/spi/spi_csk6.c

@@ -5,13 +5,13 @@
 #define DT_DRV_COMPAT listenai_csk_spi
 
 #include <assert.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <drivers/spi.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk6_spi, CONFIG_SPI_LOG_LEVEL);
 
 #include "spi_context.h"

drivers/usb/device/usb_dc_csk6.c

@@ -8,16 +8,16 @@
 #include <stdint.h>
 #define DT_DRV_COMPAT listenai_csk_usbd
 
-#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 "usb_venus.h"
 #include "csk6_cm33/include/cache.h"
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dc_csk);
 
 

drivers/video/ov9655.c

@@ -6,16 +6,16 @@
 
 #define DT_DRV_COMPAT ovti_ov9655
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
-#include <drivers/video.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
-#include <drivers/i2c.h>
-#include <drivers/gpio.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(ov9655);
 
 /** 

drivers/video/sco30iot.c

@@ -5,14 +5,14 @@
 
 #define DT_DRV_COMPAT smartsens_sco30iot
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/i2c.h>
-#include <drivers/video.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sco30iot, CONFIG_LOG_DEFAULT_LEVEL);
 
 /**

drivers/video/video_csk6_dvp.c

@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT listenai_csk_dvp
 
-#include <zephyr.h>
-#include <drivers/video.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
 #include "Driver_DVP.h"
 #include <soc.h>
@@ -15,7 +15,7 @@
 #include "venus_ap.h"
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk6_dvp);
 
 #define AP2CP_PSRAM_ADDR_OFFSET   (0x30000000)

drivers/watchdog/wdt_csk6.c

@@ -7,7 +7,7 @@
 #include "Driver_AON_WDT.h"
 #include "aon_timer.h"
 
-#include <drivers/watchdog.h>
+#include <zephyr/drivers/watchdog.h>
 
 #define DT_DRV_COMPAT listenai_csk6_watchdog
 

drivers/wifi/csk6/include/csk6/priv/csk_wifi_priv.h

@@ -4,10 +4,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <kernel.h>
-#include <net/ethernet.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
 
 #if CONFIG_ESP_HOSTED
 #include "spi_drv.h"

drivers/wifi/csk6/src/csk_wifi.c

@@ -6,7 +6,7 @@
 
 #include "csk6/priv/csk_wifi_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(csk_wifi, CONFIG_WIFI_LOG_LEVEL);
 
 

drivers/wifi/csk6/src/csk_wifi_819s.c

@@ -6,7 +6,7 @@
 
 #include "csk6/priv/csk_wifi_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(csk_wifi, CONFIG_WIFI_LOG_LEVEL);
 
 #define WIFI_MAX_SCAN_NUM       CONFIG_MAX_SCAN_APS_NUM

drivers/wifi/csk6/src/csk_wifi_api.c

 #include "csk6/priv/csk_wifi_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk_wifi, CONFIG_WIFI_LOG_LEVEL);
 
 K_MUTEX_DEFINE(wifi_api_mutex);

drivers/wifi/csk6/src/csk_wifi_api_819s.c

 #include "csk6/priv/csk_wifi_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk_wifi, CONFIG_WIFI_LOG_LEVEL);
 
 K_MUTEX_DEFINE(wifi_api_mutex);

samples/boards/csk6/driver/adc/src/main.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/adc.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #if !DT_NODE_EXISTS(DT_PATH(zephyr_user)) || !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
 #error "No suitable devicetree overlay specified"

samples/boards/csk6/driver/counter/src/main.c

@@ -7,11 +7,11 @@
 #include <errno.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/counter.h>
-#include <kernel.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define RTC_STACK_SIZE 4096
 struct k_thread rtc_thread_data;

samples/boards/csk6/driver/counter_timer/src/main.c

@@ -2,13 +2,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <device.h>
-#include <drivers/counter.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/counter.h>
 
 #ifdef CONFIG_COUNTER_CSK6_GPTCHANNEL
 	#define DEVICE_NAME  DT_LABEL(DT_NODELABEL(gptchannel0))

samples/boards/csk6/driver/crypto/aes128_cbc/src/main.c

@@ -6,10 +6,10 @@
 
 #include <string.h>
 
-#include <crypto/crypto.h>
-#include <device.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(crypto), okay)

samples/boards/csk6/driver/crypto/aes128_ecb/src/main.c

@@ -8,9 +8,9 @@
 
 #include <string.h>
 
-#include <device.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(crypto), okay)

samples/boards/csk6/driver/display/ili9488/boards/csk6011a_nano.overlay

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <dt-bindings/display/ili9xxx.h>
+#include <zephyr/dt-bindings/display/ili9xxx.h>
 
 &pinctrl {
 	pinctrl_spi0_sclk_default: spi0_sclk_default {

samples/boards/csk6/driver/display/ili9488/boards/csk6012_nano.overlay

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <dt-bindings/display/ili9xxx.h>
+#include <zephyr/dt-bindings/display/ili9xxx.h>
 
 &pinctrl {
 	pinctrl_spi0_sclk_default: spi0_sclk_default {

samples/boards/csk6/driver/display/ili9488/src/main.c

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 
-#include <device.h>
-#include <drivers/display.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/zephyr.h>
 
 #define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, ilitek_ili9488))
 

samples/boards/csk6/driver/display/reflash_rate/boards/csk6011a_nano.overlay

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <dt-bindings/display/ili9xxx.h>
+#include <zephyr/dt-bindings/display/ili9xxx.h>
 
 &pinctrl {
 	pinctrl_spi0_sclk_default: spi0_sclk_default {

samples/boards/csk6/driver/display/reflash_rate/boards/csk6012_nano.overlay

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <dt-bindings/display/ili9xxx.h>
+#include <zephyr/dt-bindings/display/ili9xxx.h>
 
 &pinctrl {
 	pinctrl_spi0_sclk_default: spi0_sclk_default {

samples/boards/csk6/driver/display/reflash_rate/src/main.c

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 
-#include <device.h>
-#include <drivers/display.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/zephyr.h>
 
 #if CONFIG_FRAME_MEM_PSRAM
 #define K_HEAP_CUSTOM_SECTION_DEFINE(name, bytes)                                                  \

samples/boards/csk6/driver/display_kscan/src/main.c

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 
-#include <device.h>
-#include <drivers/display.h>
-#include <drivers/kscan.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/zephyr.h>
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, ilitek_ili9340), okay)
 #define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, ilitek_ili9340))

samples/boards/csk6/driver/dma_memcpy/src/main.c

@@ -7,12 +7,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/dma.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/dma.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define BUFFER_SIZE		    (1024 * 10)
 #define CONFIG_TEST_DMA_CHANNEL_NUN (1)

samples/boards/csk6/driver/entropy/src/main.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/entropy.h>
-#include <zephyr.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample);
 
 #define ENTROPY_LEN_MAX 256

samples/boards/csk6/driver/exmcu_adc/src/main.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/adc.h>
-#include <sys/printk.h>
-#include <zephyr.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
 
 #if !DT_NODE_EXISTS(DT_PATH(zephyr_user)) || !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
 #error "No suitable devicetree overlay specified"

samples/boards/csk6/driver/exmcu_gpio_led/src/main.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 /* 1000 msec = 1 sec */
 #define SLEEP_TIME_MS 1000

samples/boards/csk6/driver/exmcu_pwm/src/main.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/pwm.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/zephyr.h>
 
 /* 1000 msec = 1 sec */
 #define SLEEP_TIME_MS 1000

samples/boards/csk6/driver/hwinfo/src/main.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 

samples/boards/csk6/driver/i2c/master_slave/src/main.c

@@ -11,7 +11,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/sys/printk.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
 #define I2C0_DEV_NAME DT_LABEL(DT_ALIAS(i2c_0))

samples/boards/csk6/driver/infrared/src/main.c

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

samples/boards/csk6/driver/keysense/src/main.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
 #include <soc.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define KSCAN_DEVICE DT_LABEL(DT_ALIAS(analogkey))
 

samples/boards/csk6/driver/kscan/bl6xxx/src/main.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
 #include <soc.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define KSCAN_DEVICE DT_LABEL(DT_INST(0, betterlife_bl6xxx))
 

samples/boards/csk6/driver/nor_flash/src/main.c

@@ -7,11 +7,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <device.h>
-#include <drivers/flash.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
 #include "drivers/csk6_driver.h"
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #if DT_NODE_HAS_STATUS(DT_INST(0, listenai_csk_flash_controller), okay)
 #define FLASH_DEVICE DT_LABEL(DT_INST(0, listenai_csk_flash_controller))

samples/boards/csk6/driver/rtc/pcf8563/src/main.c

@@ -10,7 +10,7 @@
 #include <zephyr/drivers/rtc.h>
 #include <zephyr/zephyr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(rtc, LOG_LEVEL_INF);
 

samples/boards/csk6/driver/sdmmc/src/main.c

@@ -10,7 +10,7 @@
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/zephyr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_DBG);
 
 #define NUM_SECTORS (1U)

samples/boards/csk6/driver/spi_master/src/main.c

@@ -7,11 +7,11 @@
 #include <errno.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/spi.h>
-#include <kernel.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define UINT8_MAX_NUM (0xff)
 

samples/boards/csk6/driver/spi_master_slave/src/main.c

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <device.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/spi.h>
 #include <string.h>
 
 #define MASTER_MODE 0

samples/boards/csk6/driver/uart/uart_async/src/main.c

@@ -5,12 +5,12 @@
  */
 #include <string.h>
 
-#include <devicetree.h>
-#include <drivers/uart.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 

samples/boards/csk6/driver/uart/uart_configure/src/main.c

@@ -5,11 +5,11 @@
  */
 #include <string.h>
 
-#include <devicetree.h>
-#include <drivers/uart.h>
-#include <kernel.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define DELAY_TIME_SEC 6
 #define NEW_BAUDRATE   115200

samples/boards/csk6/driver/uart/uart_interrupt/src/main.c

@@ -5,12 +5,12 @@
  */
 #include <string.h>
 
-#include <devicetree.h>
-#include <drivers/uart.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 #define UART0 DT_NODELABEL(uart0)
 #define UART1 DT_NODELABEL(uart1)

samples/boards/csk6/driver/uart/uart_polling/src/main.c

@@ -5,12 +5,12 @@
  */
 #include <string.h>
 
-#include <devicetree.h>
-#include <drivers/uart.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 #define UART0 DT_NODELABEL(uart0)
 

samples/boards/csk6/driver/video/bf30a2/sample/drivers/bf30a2.c

@@ -6,27 +6,27 @@
 
 #define DT_DRV_COMPAT byd_bf30a2
 
-#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 <drivers/spi.h>
-#include <drivers/pwm.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/drivers/uart.h>
 
-#include <drivers/spi.h>
-#include <drivers/dma.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/dma.h>
 
 #include "spi.h"
 #include "Driver_SPI.h"
 #include "IOMuxManager.h"
 
 #include <stdbool.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 

samples/boards/csk6/driver/video/bf30a2/sample/src/main.c

@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <cache.h>
-#include <drivers/video.h>
-#include <device.h>
+#include <zephyr/cache.h>
+#include <zephyr/drivers/video.h>
+#include <zephyr/device.h>
 
 #include "venus_ap.h"
 #include "cmn_sysctrl_reg_venus.h"
 #include "PSRAMManager.h"
 
-#include <logging/log.h>
-#include <drivers/uart.h>
-#include <drivers/ipm.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/ipm.h>
 
 LOG_MODULE_REGISTER(main, 4);
 

samples/boards/csk6/driver/video/gc032a/src/main.c

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/video.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
 #define VIDEO_DEV		DT_LABEL(DT_NODELABEL(dvp))

samples/boards/csk6/driver/video/gc032a/src/serial_protocol.c

@@ -6,9 +6,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/zephyr.h>
 
 #define UART0		 DT_NODELABEL(uart1)
 #define MAX_TX_FRAME_LEN (32 * 1024)

samples/boards/csk6/driver/video/ov9655_dvp/src/main.c

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/video.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
 #define VIDEO_DEV    DT_LABEL(DT_NODELABEL(dvp))

samples/boards/csk6/driver/video/ov9655_dvp/src/serial_protocol.c

@@ -6,9 +6,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/zephyr.h>
 
 #define UART0		 DT_NODELABEL(uart1)
 #define MAX_TX_FRAME_LEN (32 * 1024)

samples/boards/csk6/driver/video/sco30iot/src/main.c

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/video.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/video.h>
 #include <drivers/csk6_video_extend.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
 #define VIDEO_DEV		DT_LABEL(DT_NODELABEL(dvp))

samples/boards/csk6/driver/video/sco30iot/src/serial_protocol.c

@@ -6,9 +6,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/zephyr.h>
 
 #define UART0		 DT_NODELABEL(uart1)
 #define MAX_TX_FRAME_LEN (32 * 1024)

samples/boards/csk6/driver/wdt/src/main.c

@@ -5,10 +5,10 @@
  */
 #include <stdbool.h>
 
-#include <device.h>
-#include <drivers/watchdog.h>
-#include <sys/printk.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/zephyr.h>
 
 #define WDT_FEED_TRIES 1
 

samples/boards/csk6/network/wifi_mgr/src/main.c

@@ -8,12 +8,12 @@
 
 #include <stdlib.h>
 
-#include <net/net_context.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/reboot.h>
 
 K_SEM_DEFINE(wifi_conn_sem, 0, 1);
 K_SEM_DEFINE(ipv4_sem, 0, 1);

samples/boards/csk6/network/wifi_scan_ap/src/main.c

@@ -5,15 +5,15 @@
  */
 
 #include <stdlib.h>
-#include <sys/printk.h>
-#include <sys/sys_heap.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/sys_heap.h>
 
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(csk_wifi_sta, LOG_LEVEL_DBG);
 
 #include "csk6/csk_wifi.h"

samples/boards/csk6/network/wifi_softap/src/main.c

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <stdlib.h>
-#include <zephyr.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
 
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
 
 #include "csk6/csk_wifi.h"
 

samples/boards/csk6/network/wifi_sta/src/main.c

@@ -6,12 +6,12 @@
 
 #include <stdlib.h>
 
-#include <net/net_context.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <sys/printk.h>
-#include <sys/sys_heap.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/sys_heap.h>
 
 #include "csk6/csk_wifi.h"
 

samples/boards/csk6/subsys/avf/audio/acapture/src/main.c

@@ -8,7 +8,7 @@
 #include <avf/slogger.h>
 #include <licak/licak.h>
 #include <licak/modules/audio/acapture.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define ACAPTURE_DATA_EVENT_THRES  (1024)
 #define ACAPTURE_DATA_TOTAL_LENGTH (1024 * 100)

samples/boards/csk6/subsys/avf/audio/aplay/src/main.c

@@ -11,7 +11,7 @@
 #include <avf/slogger.h>
 #include <licak/licak.h>
 #include <licak/modules/audio/aplay.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define ID_RIFF 0x46464952
 #define ID_WAVE 0x45564157

samples/boards/csk6/subsys/avf/audio/aplay/src/pwr_amp.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 #if defined(__ZEPHYR__) && (DT_NODE_HAS_STATUS(DT_ALIAS(avf_audio_pwr_amp), okay))
 

samples/boards/csk6/subsys/avf/audio/record_play/src/main.c

@@ -6,13 +6,13 @@
 #include "pwr_amp.c"
 #include <avf/framework/avf_platform.h>
 #include <avf/slogger.h>
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
 #include <licak/licak.h>
 #include <licak/modules/audio/acapture.h>
 #include <licak/modules/audio/aplay.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define ACAPTURE_DATA_EVENT_THRES  (1024)
 #define ACAPTURE_DATA_TOTAL_LENGTH (1024 * 100)

samples/boards/csk6/subsys/avf/audio/record_play/src/pwr_amp.c

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 #if defined(__ZEPHYR__) && (DT_NODE_HAS_STATUS(DT_ALIAS(avf_audio_pwr_amp), okay))
 

samples/boards/csk6/subsys/csk_malloc/src/main.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <csk_malloc.h>
 #define MALLOC_SIZE	(1000)
 #define REALLOC_SIZE	(4000)

samples/boards/csk6/subsys/display/lvgl/benchmark/src/main.c

@@ -6,13 +6,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <device.h>
-#include <drivers/display.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/display.h>
 #include <lvgl.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(app);
 
 void main(void)

samples/boards/csk6/subsys/sqlite3_littlefs/src/main.c

@@ -9,11 +9,11 @@
 
 #include <stdio.h>
 
-#include <device.h>
-#include <fs/fs.h>
-#include <fs/littlefs.h>
-#include <storage/flash_map.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/littlefs.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/zephyr.h>
 
 /* Matches LFS_NAME_MAX */
 #define MAX_PATH_LEN 255

samples/boards/csk6/subsys/usb/audio/aplay_by_uac/src/main.c

@@ -10,10 +10,10 @@
 #include "logging/log.h"
 #include <stdint.h>
 #include <string.h>
-#include <zephyr.h>
-#include <sys/ring_buffer.h>
-#include <usb/usb_device.h>
-#include <usb/class/usb_audio.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_audio.h>
 #include <avf/framework/avf_platform.h>
 #include <licak/modules/audio/aplay.h>
 #include <licak/licak.h>

samples/boards/csk6/subsys/usb/audio/aplay_by_uac/src/pwr_amp.c

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <device.h>
-#include <drivers/gpio.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/zephyr.h>
 
 #if defined(__ZEPHYR__) && (DT_NODE_HAS_STATUS(DT_ALIAS(avf_audio_pwr_amp), okay))
 

soc/arm/csk6/cache.c

@@ -12,7 +12,7 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include "cache.h"
 

tests/boards/listenai_csk6/sdtest/src/main.c

@@ -6,7 +6,7 @@
 #include <ztest.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/device.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_DBG);
 
 /* 最大支持block size为512字节 */

tests/boards/listenai_csk6/wifi/src/test_csk_wifi.h

@@ -4,7 +4,7 @@
 #include "sys_clock.h"
 #include "ztest_assert.h"
 #include "ztest_test.h"
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 #include "csk6/csk_wifi.h"
 

tests/boards/listenai_csk6/wifi_mgr_behavior/src/main.c

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "kernel.h"

tests/boards/listenai_csk6/wifi_mgr_behavior/src/test_wifi_mgr_control.c

 #include <stdbool.h>
 #include <stdint.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "kernel.h"

tests/boards/listenai_csk6/wifi_mgr_behavior/src/test_wifi_mgr_storage.c

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 #include "kernel.h"