cleanup: include/: move misc/__assert.h to sys/__assert.h

move misc/__assert.h to sys/__assert.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

arch/arc/core/cache.c

@@ -21,7 +21,7 @@
 #include <linker/linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
 #include <kernel_internal.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <init.h>
 #include <stdbool.h>
 

arch/arc/core/irq_manage.c

@@ -19,7 +19,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <sw_isr_table.h>

arch/arm/core/cortex_m/mpu/nxp_mpu.c

@@ -10,7 +10,7 @@
 #include <soc.h>
 #include "arm_core_mpu_dev.h"
 #include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <linker/linker-defs.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL

arch/arm/core/irq_manage.c

@@ -17,7 +17,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <arch/arm/cortex_m/cmsis.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <sw_isr_table.h>

arch/arm/core/thread_abort.c

@@ -23,7 +23,7 @@
 #include <ksched.h>
 #include <kswap.h>
 #include <wait_q.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 extern void z_thread_single_abort(struct k_thread *thread);
 

arch/common/sw_isr_common.c

@@ -6,7 +6,7 @@
 
 #include <sw_isr_table.h>
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 /*
  * Common code for arches that use software ISR tables (CONFIG_GEN_ISR_TABLES)
  */

arch/nios2/core/cache.c

@@ -5,7 +5,7 @@
  */
 
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 
 /**

arch/x86/core/ia32/irq_manage.c

@@ -17,7 +17,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/printk.h>
 #include <irq.h>
 #include <debug/tracing.h>

arch/xtensa/core/irq_manage.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <xtensa_api.h>
 #include <kernel_arch_data.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 /*
  * @internal
  *

drivers/adc/adc_sam_afec.c

@@ -13,7 +13,7 @@
  */
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <device.h>
 #include <init.h>

drivers/clock_control/nrf_power_clock.c

@@ -10,7 +10,7 @@
 #include <sys/atomic.h>
 #include <device.h>
 #include <drivers/clock_control.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <nrf_clock.h>
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 #include <nrf_power.h>

drivers/clock_control/quark_se_clock_control.c

@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <device.h>
 #include <init.h>

drivers/console/ipm_console_receiver.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <drivers/ipm.h>
 #include <console/ipm_console.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 {

drivers/dma/dma_sam_xdmac.c

@@ -9,7 +9,7 @@
  */
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <device.h>
 #include <init.h>
 #include <string.h>

drivers/entropy/entropy_stm32.c

@@ -9,7 +9,7 @@
 #include <drivers/entropy.h>
 #include <random/rand32.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <errno.h>
 #include <soc.h>

drivers/ethernet/eth_dw.c

@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <errno.h>
 #include <init.h>
 #include <kernel.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
 #include <stdbool.h>

drivers/ethernet/eth_sam_gmac.c

@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <kernel.h>
 #include <device.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <errno.h>
 #include <stdbool.h>

drivers/ethernet/eth_smsc911x.c

@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <errno.h>
 #include <init.h>
 #include <kernel.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
 #include <stdbool.h>

drivers/ethernet/eth_stm32_hal.c

@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <kernel.h>
 #include <device.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <errno.h>
 #include <stdbool.h>

drivers/flash/flash_stm32wbx.c

@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <drivers/flash.h>
 #include <init.h>
 #include <soc.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "flash_stm32.h"
 

drivers/flash/soc_flash_nrf.c

@@ -17,7 +17,7 @@
 #include <nrfx_nvmc.h>
 
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <bluetooth/hci.h>
 #include "controller/hal/ticker.h"
 #include "controller/ticker/ticker.h"

drivers/gpio/gpio_cc13xx_cc26xx.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <device.h>
 #include <errno.h>
 #include <drivers/gpio.h>

drivers/gpio/gpio_dw.c

@@ -15,7 +15,7 @@
 #include <sys/sys_io.h>
 #include <init.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/clock_control.h>
 
 #ifdef CONFIG_SHARED_IRQ

drivers/gpio/gpio_intel_apl.c

@@ -25,7 +25,7 @@
 #include <drivers/gpio.h>
 #include <soc.h>
 #include <sys/sys_io.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/slist.h>
 #include <misc/speculation.h>
 

drivers/i2c/i2c_sam_twi.c

@@ -13,7 +13,7 @@
  */
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <stdbool.h>
 #include <kernel.h>
 #include <device.h>

drivers/i2c/i2c_sam_twihs.c

@@ -12,7 +12,7 @@
 
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel.h>
 #include <device.h>
 #include <init.h>

drivers/i2s/i2s_cavs.c

@@ -14,7 +14,7 @@
 
 #include <errno.h>
 #include <string.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel.h>
 #include <device.h>
 #include <init.h>

drivers/i2s/i2s_sam_ssc.c

@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <string.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel.h>
 #include <device.h>
 #include <init.h>

drivers/interrupt_controller/exti_stm32.c

@@ -18,7 +18,7 @@
  */
 #include <device.h>
 #include <soc.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include "exti_stm32.h"
 
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || \

drivers/interrupt_controller/loapic_intr.c

@@ -12,7 +12,7 @@
 #include <arch/cpu.h>
 #include <zephyr/types.h>
 #include <string.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <arch/x86/msr.h>
 
 #include <toolchain.h>

drivers/interrupt_controller/system_apic.c

@@ -10,7 +10,7 @@
  *
  */
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <drivers/interrupt_controller/ioapic.h>

drivers/ipm/ipm_quark_se.c

@@ -14,7 +14,7 @@
 #include <drivers/ipm.h>
 #include <arch/cpu.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <errno.h>
 #include "ipm_quark_se.h"
 

drivers/pinmux/pinmux_cc13xx_cc26xx.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/pinmux.h>
 
 #include <driverlib/ioc.h>

drivers/pinmux/pinmux_cc2650.c

@@ -50,7 +50,7 @@
  * 0x38 - RF Core SMI command link in
  */
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <toolchain.h>
 #include <device.h>

drivers/sensor/adt7420/adt7420.c

@@ -10,7 +10,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "adt7420.h"
 

drivers/sensor/adxl362/adxl362.c

@@ -11,7 +11,7 @@
 #include <init.h>
 #include <drivers/gpio.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/spi.h>
 #include <logging/log.h>
 

drivers/sensor/adxl372/adxl372.c

@@ -10,7 +10,7 @@
 #include <init.h>
 #include <drivers/gpio.h>
 #include <misc/printk.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <stdlib.h>
 #include <drivers/spi.h>
 #include <drivers/i2c.h>

drivers/sensor/ak8975/ak8975.c

@@ -8,7 +8,7 @@
 #include <drivers/i2c.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <logging/log.h>

drivers/sensor/amg88xx/amg88xx.c

@@ -12,7 +12,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "amg88xx.h"

drivers/sensor/ams_iAQcore/iAQcore.c

@@ -10,7 +10,7 @@
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "iAQcore.h"

drivers/sensor/apds9960/apds9960.c

@@ -12,7 +12,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <init.h>
 #include <kernel.h>

drivers/sensor/bma280/bma280.c

@@ -7,7 +7,7 @@
 #include <drivers/i2c.h>
 #include <init.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "bma280.h"

drivers/sensor/bmc150_magn/bmc150_magn.c

@@ -14,7 +14,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <drivers/gpio.h>
 #include <logging/log.h>

drivers/sensor/bme280/bme280.c

@@ -12,7 +12,7 @@
 #include <init.h>
 #include <drivers/gpio.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #ifdef DT_BOSCH_BME280_BUS_I2C
 #include <drivers/i2c.h>

drivers/sensor/bme680/bme680.c

@@ -16,7 +16,7 @@
 #include <init.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/sensor.h>
 
 #include <logging/log.h>

drivers/sensor/bmi160/bmi160.c

@@ -12,7 +12,7 @@
 #include <drivers/sensor.h>
 #include <misc/byteorder.h>
 #include <kernel.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "bmi160.h"

drivers/sensor/bmm150/bmm150.h

@@ -19,7 +19,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/gpio.h>
 
 #define BMM150_REG_CHIP_ID         0x40

drivers/sensor/ccs811/ccs811.c

@@ -11,7 +11,7 @@
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "ccs811.h"

drivers/sensor/ens210/ens210.c

@@ -10,7 +10,7 @@
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 #include "ens210.h"
 

drivers/sensor/fxas21002/fxas21002.c

@@ -6,7 +6,7 @@
 
 #include "fxas21002.h"
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL

drivers/sensor/fxos8700/fxos8700.c

@@ -7,7 +7,7 @@
 
 #include "fxos8700.h"
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 #include <stdlib.h>
 

drivers/sensor/hmc5883l/hmc5883l.c

@@ -6,7 +6,7 @@
 
 #include <drivers/i2c.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <drivers/sensor.h>
 #include <string.h>

drivers/sensor/hmc5883l/hmc5883l_trigger.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/hts221/hts221.c

@@ -6,7 +6,7 @@
 
 #include <drivers/i2c.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <drivers/sensor.h>
 #include <string.h>

drivers/sensor/hts221/hts221_trigger.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/isl29035/isl29035.c

@@ -10,7 +10,7 @@
 #include <init.h>
 #include <drivers/i2c.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "isl29035.h"

drivers/sensor/lis2dh/lis2dh.c

@@ -7,7 +7,7 @@
 
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL

drivers/sensor/lis2ds12/lis2ds12.c

@@ -14,7 +14,7 @@
 #include <init.h>
 #include <string.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "lis2ds12.h"

drivers/sensor/lis2ds12/lis2ds12_trigger.c

@@ -10,7 +10,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/lis2dw12/lis2dw12.c

@@ -9,7 +9,7 @@
  */
 
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <logging/log.h>
 #include <drivers/sensor.h>

drivers/sensor/lis2mdl/lis2mdl.c

@@ -7,7 +7,7 @@
  */
 
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <drivers/sensor.h>
 #include <string.h>

drivers/sensor/lis3mdl/lis3mdl.c

@@ -6,7 +6,7 @@
 
 #include <drivers/i2c.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/byteorder.h>
 #include <drivers/sensor.h>
 #include <string.h>

drivers/sensor/lis3mdl/lis3mdl_trigger.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/lps22hb/lps22hb.c

@@ -11,7 +11,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "lps22hb.h"

drivers/sensor/lps25hb/lps25hb.c

@@ -11,7 +11,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "lps25hb.h"

drivers/sensor/lsm6ds0/lsm6ds0.c

@@ -13,7 +13,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "lsm6ds0.h"

drivers/sensor/lsm6dsl/lsm6dsl.c

@@ -14,7 +14,7 @@
 #include <init.h>
 #include <string.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "lsm6dsl.h"

drivers/sensor/lsm6dsl/lsm6dsl_shub.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/lsm6dsl/lsm6dsl_trigger.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <drivers/i2c.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>

drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c

@@ -11,7 +11,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <drivers/gpio.h>
 #include <logging/log.h>

drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c

@@ -10,7 +10,7 @@
 #include <init.h>
 #include <drivers/i2c.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <drivers/gpio.h>
 

drivers/sensor/max44009/max44009.c

@@ -7,7 +7,7 @@
 #include <device.h>
 #include <drivers/i2c.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "max44009.h"

drivers/sensor/mcp9808/mcp9808.c

@@ -12,7 +12,7 @@
 #include <drivers/i2c.h>
 #include <init.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "mcp9808.h"

drivers/sensor/mcp9808/mcp9808_trigger.c

@@ -10,7 +10,7 @@
 #include <kernel.h>
 #include <drivers/i2c.h>
 #include <misc/byteorder.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "mcp9808.h"
 

drivers/sensor/ms5837/ms5837.c

@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <misc/byteorder.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include "ms5837.h"
 

drivers/sensor/sht3xd/sht3xd.c

@@ -8,7 +8,7 @@
 #include <drivers/i2c.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "sht3xd.h"

drivers/sensor/sx9500/sx9500.c

@@ -13,7 +13,7 @@
 #include <drivers/sensor.h>
 #include <init.h>
 #include <drivers/gpio.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "sx9500.h"

drivers/sensor/th02/th02.c

@@ -10,7 +10,7 @@
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "th02.h"

drivers/sensor/ti_hdc/ti_hdc.c

@@ -10,7 +10,7 @@
 #include <kernel.h>
 #include <drivers/sensor.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "ti_hdc.h"

drivers/sensor/tmp007/tmp007.c

@@ -11,7 +11,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #include "tmp007.h"

drivers/sensor/tmp112/tmp112.c

@@ -10,7 +10,7 @@
 #include <misc/util.h>
 #include <kernel.h>
 #include <drivers/sensor.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <logging/log.h>
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL

drivers/sensor/vl53l0x/vl53l0x.c

@@ -13,7 +13,7 @@
 #include <drivers/sensor.h>
 #include <init.h>
 #include <drivers/gpio.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <zephyr/types.h>
 #include <device.h>
 #include <logging/log.h>

drivers/serial/uart_cc13xx_cc26xx.c

@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <drivers/uart.h>
 
 #include <driverlib/ioc.h>

drivers/serial/uart_cmsdk_apb.c

@@ -13,7 +13,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <clock_control/arm_clock_control.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <init.h>
 #include <drivers/uart.h>
 #include <linker/sections.h>

drivers/serial/uart_imx.c

@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <init.h>
 #include <drivers/uart.h>

drivers/serial/uart_nsim.c

@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <linker/sections.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <zephyr/types.h>
 #include <misc/util.h>
 #include <string.h>

drivers/serial/uart_psoc6.c

@@ -13,7 +13,7 @@
 #include <device.h>
 #include <errno.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <drivers/uart.h>
 

drivers/serial/uart_sam.c

@@ -13,7 +13,7 @@
  */
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>

drivers/serial/uart_sam0.c

@@ -7,7 +7,7 @@
 #include <device.h>
 #include <errno.h>
 #include <init.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <drivers/uart.h>
 #include <drivers/dma.h>

drivers/serial/uart_stellaris.c

@@ -20,7 +20,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <init.h>
 #include <drivers/uart.h>

drivers/serial/uart_stm32.c

@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <init.h>
 #include <drivers/uart.h>

drivers/serial/usart_sam.c

@@ -13,7 +13,7 @@
  */
 
 #include <errno.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>

drivers/spi/spi_intel.c

@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(spi_intel);
 #include <kernel.h>
 #include <arch/cpu.h>
 
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <soc.h>
 #include <init.h>
 

ext/hal/ti/simplelink/kernel/zephyr/dpl/ClockP_zephyr.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel/zephyr/dpl/dpl.h>
 #include <ti/drivers/dpl/ClockP.h>
 

ext/hal/ti/simplelink/kernel/zephyr/dpl/HwiP_zephyr.c

@@ -6,7 +6,7 @@
 
 
 #include <zephyr.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel/zephyr/dpl/dpl.h>
 #include <ti/drivers/dpl/HwiP.h>
 

ext/hal/ti/simplelink/kernel/zephyr/dpl/MutexP_zephyr.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel/zephyr/dpl/dpl.h>
 #include <ti/drivers/dpl/MutexP.h>
 

ext/hal/ti/simplelink/kernel/zephyr/dpl/SemaphoreP_zephyr.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <kernel/zephyr/dpl/dpl.h>
 #include <ti/drivers/dpl/SemaphoreP.h>
 

ext/hal/ti/simplelink/kernel/zephyr/dpl/dpl.c

@@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 
 #include <inc/hw_types.h>
 #include <inc/hw_ints.h>

include/crypto/cipher.h

@@ -20,7 +20,7 @@
 #include <device.h>
 #include <errno.h>
 #include <misc/util.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include "cipher_structs.h"
 
 /* The API a crypto driver should implement */

include/drivers/clock_control.h

@@ -12,7 +12,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
-#include <misc/__assert.h>
+#include <sys/__assert.h>
 #include <misc/slist.h>
 
 #ifdef __cplusplus